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

optional objectives now considered in MILP #40

Merged
merged 1 commit into from
Mar 17, 2016

Conversation

lvenerosy
Copy link
Contributor

MILP.js

  • all MILP related behaviours are now part of Tableau
  • optional objectives are now used when several solutions have the same value for their main objective function

Tableau/Tableau.js

  • solving logic moved from Model.js to Tableau/Tableau.js
  • copy method added for OptionalObjective

Tableau/backup.js

  • optional objectives are now part of the copy/restore logic

new problem added

  • test/OptionalObjectiveTest.js : UI based problem to test if the optional objectives are considered

// var solution = this.tableau.solve().getSolution();
// this.tableau.updateVariableValues();
// return solution;
// }
Copy link
Collaborator

Choose a reason for hiding this comment

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

These comments can be removed

JWally added a commit that referenced this pull request Mar 17, 2016
optional objectives now considered in MILP
@JWally JWally merged commit a201b4d into JWally:master Mar 17, 2016
@bchevalier
Copy link
Collaborator

@JWally thanks for the reactivity!
You merge PRs faster than they arrive.

But next time can we wait for all the comments to be resolved?

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