Merge pull request #75 from Argonne-National-Laboratory/patch/scip-ve…

…rsion SCIP version check
Argonne-National-Laboratory · Jun 18, 2020 · 8a659f3 · 8a659f3
2 parents 24cdbd2 + ee46107
commit 8a659f3
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/SolverInterface/OsiScipSolverInterface.cpp b/src/SolverInterface/OsiScipSolverInterface.cpp
@@ -286,10 +286,10 @@ void OsiScipSolverInterface::setColSolution(const double* colsol) {
 	SCIP_CALL_ABORT(SCIPsetSolVals(scip_, sol, SCIPgetNOrigVars(scip_), &vars_[0], &solution_[0]));
 
 	/** check solution and free if infeasible */
-#if SCIP_VERSION_MAJOR >= 6
-	SCIP_CALL_ABORT(SCIPtrySolFree(scip_, &sol, true, true, true, true, true, &stored));
-#else
+#if SCIP_VERSION_MAJOR < 6
 	SCIP_CALL_ABORT(SCIPtrySolFree(scip_, &sol, true, true, true, true, &stored));
+#else
+	SCIP_CALL_ABORT(SCIPtrySolFree(scip_, &sol, true, true, true, true, true, &stored));
 #endif
 }