Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Optimization develop dict to optimization to optimization develop #358

Merged
merged 4 commits into from
May 28, 2024

Conversation

klevdiamanti
Copy link
Contributor

Title: Column name dictionary to optimization develop

Problem: We had created the branch optimization_develop_dict from an earlier version of optimization_develop. In the meantime, optimization_develop had been updated. More importantly, the sysdata.rda file had been updated as well as tests accomodating this. This resulted inte optimization_develop_dict being essentially impossible to merge via PR, as the conflicts had to be solved manually.

Solution: We did resolve the conflicts in the branch optimization_develop_dict_resolve by manually adding the changes of optimization_develop_dict to optimization_develop.

Key Features:

  • Autodetection of column names of datasets
  • Breaking ties if multiple matches occurr

Checklist

  • Make sure you are requesting to pull a feature/bugfix branch (right side). This should not be main or develop.
  • Make sure you are make a pull request against either main or develop (left side). (Requesting to main should be reserved for bugfixes and new releases)
  • Add or update unit tests (if applicable)
  • Check your code with any unit tests (Run devtools::check() locally)
  • Add neccessary documentation (if applicable)

Type of changes

What type of changes does your code introduce?
Put an x in the boxes that apply

  • Bugfix (non-breaking change which fixes an issue) (link the issue on the right)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • Code style update (formatting, renaming)
  • Documentation Update
  • Other (explain)

@klevdiamanti klevdiamanti added the enhancement New feature or request label May 21, 2024
@klevdiamanti
Copy link
Contributor Author

klevdiamanti commented May 22, 2024

CI passing for Mac fixed in PR #360 . Waiting for this to be merged and then we can merge #360 too.

@klevdiamanti
Copy link
Contributor Author

@MasoumehSheikhi for some reason I see your comment on my email notification but not on github.

@klevdiamanti klevdiamanti merged commit 62b1c49 into optimization_develop May 28, 2024
13 checks passed
@klevdiamanti klevdiamanti deleted the optimization_develop_dict_resolve branch May 28, 2024 20:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

1 participant