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

Various bugfixes #69

Merged
merged 19 commits into from
Apr 27, 2020
Merged

Various bugfixes #69

merged 19 commits into from
Apr 27, 2020

Conversation

andreaslundell
Copy link
Member

  • Also do partitioning on sum of convex functions (including quadratic terms).
  • Allow selecting similar primal solution with higher accuracy.
  • Enhance debug output of fixed NLP strategy.
  • Refactor task for fixed NLP strategy.
  • No longer add integer cuts if NLP solver gives solution outside variable bounds.
  • Disable check for already added constraints if single-tree strategy is used (Gurobi and Cplex cannot guarantee that cuts are added in all threads).
  • Add optimality tolerance setting for MIP solvers.
  • Remove some unused options.
  • Various other small fixes.

@andreaslundell andreaslundell merged commit 539a0ca into master Apr 27, 2020
@andreaslundell andreaslundell deleted the normcon-ref branch April 27, 2020 20:02
@svigerske
Copy link
Member

I'm getting some unused variables warning from these changes:

TaskSelectPrimalCandidatesFromNLP.cpp: In member function ‘virtual bool SHOT::TaskSelectPrimalCandidatesFromNLP::solveFixedNLP()’:
TaskSelectPrimalCandidatesFromNLP.cpp:179:16: warning: unused variable ‘timeStart’ [-Wunused-variable]
  179 |         double timeStart = env->timing->getElapsedTime("Total");
      |                ^~~~~~~~~
TaskSelectPrimalCandidatesFromNLP.cpp:263:16: warning: unused variable ‘timeEnd’ [-Wunused-variable]
  263 |         double timeEnd = env->timing->getElapsedTime("Total");
      |                ^~~~~~~

I'll remove these from my copy of the code, but were these variables meant to be used?

@andreaslundell
Copy link
Member Author

No, they were used for debug output, but I removed it. Can you commit your fix?

@svigerske
Copy link
Member

ok. f9b8e98

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.

None yet

2 participants