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

Use independent discrete-optimization library #208

Merged
merged 10 commits into from
Sep 26, 2022

Conversation

nhuet
Copy link
Contributor

@nhuet nhuet commented Sep 23, 2022

The discrete-optimization part of scikit-decide is now managed in an independent repository.
The dependencies are updated to use the newly deployed library and the code is slightly updated to adapt to the changes in discrete-optimization 0.2.0.

@nhuet nhuet force-pushed the nht/do_desintegration branch from 8fefae7 to 0b7b6aa Compare September 23, 2022 14:33
@nhuet nhuet marked this pull request as ready for review September 26, 2022 07:37
nhuet and others added 10 commits September 26, 2022 15:04
n_jobs is now equal to n_jobs_non_dummy + 2 (was  n_jobs_non_dummy in a
previous version)
Fix a bug in test_scheduling::test_optimality() and test_scheduling::test_gecode_optimality()
Make sure that the argument passed to the partial SGS function
follow requirement of discrete optimisation :
disjoint "completed" and "scheduled"(=ongoing) taks.

Previous behaviour was leading to wrong policy results.
Make it easier to see in which if block the code pass through.
MS_RCPSPSolution_Variant being a MS_RCPSPSolution, it is now clearer
that the code pass first by the MS_RCPSPSolution block.
Indeed this is included in the stand-alone library
discrete-optimization
This will be covered by examples in discrete-optimization proper arborescence.
We move the data in examples/discrete-optimization in
examples/scheduling as it is used there.
Indeed, it is already a dependency of discrete-optimization library.
If minizinc (or discrete-optimization which imports itself minizinc)
is imported before skdecide, the paths to minizinc are not yet
configured as it is done in skdecide.hub.__init__.py
So we do it manually
- Remove depencies that are actually dependencies of
  discrete-optimization
- Add discrete-optimization as a dependency
- Update poetry.lock accordingly with
	poetry update

NB: poetry update was taking ages (never finishing actually), until I
update poetry to 1.2.
@nhuet nhuet force-pushed the nht/do_desintegration branch from 0b7b6aa to 9eef073 Compare September 26, 2022 13:18
Copy link
Contributor

@galleon galleon left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

Copy link
Contributor

@galleon galleon left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@galleon galleon merged commit 55b2028 into airbus:master Sep 26, 2022
@nhuet nhuet deleted the nht/do_desintegration branch October 6, 2022 12:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants