support Visual studio 2013 using Solver::IndexEvaluator2

This commit is contained in:
Driss Lahlou
2016-11-04 16:26:27 +01:00
parent d1688a1da4
commit a220b1b146
3 changed files with 10 additions and 9 deletions

View File

@@ -578,10 +578,12 @@ void HardFapSolver(const std::map<int, FapVariable>& data_variables,
hash_map<int64, std::pair<int64, int64>> history;
if (FLAGS_value_evaluator == "value_evaluator") {
LOG(INFO) << "Using ValueEvaluator for value selection strategy.";
db = solver.MakePhase(variables, variable_strategy,
[&history](int64 var, int64 value) {
return ValueEvaluator(&history, var, value);
});
Solver::IndexEvaluator2 index_evaluator2 = [&history](int64 var,
int64 value) {
return ValueEvaluator(&history, var, value);
};
LOG(INFO) << "Using ValueEvaluator for value selection strategy.";
db = solver.MakePhase(variables, variable_strategy, index_evaluator2);
} else {
LOG(INFO) << "Using Solver::ASSIGN_MIN_VALUE for value selection strategy.";
db = solver.MakePhase(variables, variable_strategy,