-
Notifications
You must be signed in to change notification settings - Fork 29
[ANT-4033] Feat: Support setObjectiveOffset #3207
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
Merged
Merged
Changes from 24 commits
Commits
Show all changes
90 commits
Select commit
Hold shift + click to select a range
17fdbb2
Add setObjectiveOffset
JasonMarechal25 6ce6190
Offset fail
JasonMarechal25 ef1d0b6
Not implemented in sirius
JasonMarechal25 7ac83b7
Only param ok
JasonMarechal25 c22bec2
Var in time OK
JasonMarechal25 5dd8b88
Time dependent offset fail
JasonMarechal25 3d802d0
Time dependent offset unsupported
JasonMarechal25 44e4152
Time dependent offset unsupported
JasonMarechal25 040366b
Refacto
JasonMarechal25 c48aeaf
Delta double comparaison
JasonMarechal25 0f188c0
Default highs for cucumber
JasonMarechal25 579c9cb
Merge branch 'develop' into feature/set_offset
JasonMarechal25 1090878
Use highs by default in tests
JasonMarechal25 fa98604
Merge remote-tracking branch 'origin/develop' into feature/set_offset
JasonMarechal25 691baf2
Fix merge
JasonMarechal25 e5df6ac
Fix merge
JasonMarechal25 3c47266
Merge branch 'develop' into feature/set_offset
JasonMarechal25 3dd1b98
Highs default
JasonMarechal25 8246d0e
Fix update offset
JasonMarechal25 1926e89
Slight improvement
JasonMarechal25 eee5d5f
Fix unit tests
JasonMarechal25 5a63ba5
Add message to error
JasonMarechal25 a167d65
Improve log when simulation tables don't match
JasonMarechal25 6596e2d
Improve log
JasonMarechal25 af51a70
Proper offset computation
JasonMarechal25 01577d2
Test description
JasonMarechal25 746626c
Test pass
JasonMarechal25 3786a08
Handle N studies
JasonMarechal25 cc34597
Split test suites
JasonMarechal25 0ef6b40
style: More explicit tests
JasonMarechal25 89c51e5
style: Remove intermediate variable
JasonMarechal25 fc7d6db
style: Declare reference outside loop
JasonMarechal25 cd277d4
Merge branch 'develop' into feature/set_offset
JasonMarechal25 7edd830
style: Format
JasonMarechal25 a5f5db5
test: Objective offset varying in scenario
JasonMarechal25 8c4feb6
test: Objective offset varying in time and scenario
JasonMarechal25 9c34d75
test: Objective offset and variable varying in time and scenario
JasonMarechal25 86e30cc
Objective offset : proposal for small improvement (#3241)
guilpier-code 7a7276f
test: Proper objective offset for several expression
JasonMarechal25 14dc9cc
test: Proper objective offset for several objectives
JasonMarechal25 f50ad73
fix: Proper objective offset for several objectives
JasonMarechal25 7385d07
chore: Split large test suite
JasonMarechal25 9396db9
feat: Time dependent objective is not supported
JasonMarechal25 cfeedb7
test: add-node helper
JasonMarechal25 477cbd5
doc: Update expression documentation
JasonMarechal25 256e535
Merge branch 'develop' into feature/time_dep_obj
JasonMarechal25 bd9a060
feat: Time dependent objective is not supported
JasonMarechal25 4aafeaa
feat: Objective offset
JasonMarechal25 946b95d
Merge remote-tracking branch 'origin/feature/time_dep_obj' into featu…
JasonMarechal25 aa95227
fix: build post rebase
JasonMarechal25 8368e33
wip
JasonMarechal25 3c7715b
fix: proper offset for multiple time steps
JasonMarechal25 480a4f5
Merge remote-tracking branch 'origin/develop' into feature/set_offset
JasonMarechal25 d83a1ff
fix: build after merge
JasonMarechal25 be9e7d7
feat: setObjectiveOffset API
JasonMarechal25 f0e9b7f
feat: Don't throw error when using setObjectiveOffset with Sirius
JasonMarechal25 4932b40
refactor: improve design setObjectiveOffset
JasonMarechal25 549192b
feat: Don't throw error when using setObjectiveOffset with Sirius
JasonMarechal25 086e6df
refactor: improve design setObjectiveOffset
JasonMarechal25 d43e9ec
Merge branch 'feature/non_blocking_offset' into feature/set_offset
JasonMarechal25 83136e0
fix: Remove unused import
JasonMarechal25 49b1e19
refactor: more descriptive parameter name
JasonMarechal25 4a5d655
refactor: more descriptive class name
JasonMarechal25 a07e8ba
doc: method doc
JasonMarechal25 36b00a6
Merge branch 'feature/non_blocking_offset' into feature/set_offset
JasonMarechal25 cd56ace
refactor: use Objective() value
JasonMarechal25 295c8af
wip
JasonMarechal25 05a1def
wip
JasonMarechal25 bcb1979
Merge remote-tracking branch 'origin/develop' into feature/set_offset
JasonMarechal25 6b2def5
fix: build after merge
JasonMarechal25 d49902c
fix: properly handle objective offset for value
JasonMarechal25 01489fb
chore: update ortools to 9.14
JasonMarechal25 e9638d5
chore: update ortools to 9.13-rte1.2
JasonMarechal25 ae56b7f
chore: update ortools to 9.13-rte1.2
JasonMarechal25 2e4f083
Revert "refactor: use Objective() value"
JasonMarechal25 9c994dc
chore: update ortools to 9.13-rte1.3
JasonMarechal25 1f642a1
chore: bump registry
JasonMarechal25 9597205
fix
JasonMarechal25 9c89bf8
Merge remote-tracking branch 'origin/develop' into feature/set_offset
JasonMarechal25 40e2cd3
fix: build
JasonMarechal25 335a8c9
fix: build TIMESERIE -> TIMESERIES
JasonMarechal25 55b03dc
Revert "Revert "refactor: use Objective() value""
JasonMarechal25 9f38df6
Revert "Revert "Revert "refactor: use Objective() value"""
JasonMarechal25 07bfb75
Merge branch 'develop' into feature/set_offset
JasonMarechal25 b373401
fix: return proper objective value
JasonMarechal25 f098b60
tests: test on getObjectiveValue
JasonMarechal25 fc2003d
fix: remove unused header
JasonMarechal25 d6e0b98
refactor: cleaner
JasonMarechal25 25e22e8
Merge branch 'develop' into feature/set_offset
JasonMarechal25 7fdc23f
fix: unit tests after rebase
JasonMarechal25 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Some comments aren't visible on the classic Files Changed page.
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.