small reindent
This commit is contained in:
@@ -71,14 +71,14 @@ void RunAllExamples() {
|
||||
LOG(INFO) << "---- Integer programming example with SCIP ----";
|
||||
RunIntegerProgrammingExample(MPSolver::SCIP_MIXED_INTEGER_PROGRAMMING);
|
||||
#endif
|
||||
#if defined(USE_GUROBI)
|
||||
#if defined(USE_GUROBI)
|
||||
LOG(INFO) << "---- Integer programming example with Gurobi ----";
|
||||
RunIntegerProgrammingExample(MPSolver::GUROBI_MIXED_INTEGER_PROGRAMMING);
|
||||
#endif // USE_GUROBI
|
||||
#if defined(USE_CPLEX)
|
||||
#endif // USE_GUROBI
|
||||
#if defined(USE_CPLEX)
|
||||
LOG(INFO) << "---- Integer programming example with CPLEX ----";
|
||||
RunIntegerProgrammingExample(MPSolver::CPLEX_MIXED_INTEGER_PROGRAMMING);
|
||||
#endif // USE_CPLEX
|
||||
#endif // USE_CPLEX
|
||||
}
|
||||
} // namespace operations_research
|
||||
|
||||
|
||||
@@ -61,7 +61,7 @@ void AnotherAssignment() {
|
||||
}
|
||||
}
|
||||
|
||||
bool succes = assignement->ComputeAssignment();
|
||||
assignement->ComputeAssignment();
|
||||
LOG(INFO) << "Cost : " << assignement->GetCost();
|
||||
}
|
||||
|
||||
|
||||
@@ -803,8 +803,8 @@ class NetworkRoutingSolver {
|
||||
}
|
||||
|
||||
// DecisionBuilder.
|
||||
Solver::IndexEvaluator2 eval_marginal_cost =
|
||||
[this, &usage_costs](int64 var, int64 value) {
|
||||
Solver::IndexEvaluator2 eval_marginal_cost = [this, &usage_costs](
|
||||
int64 var, int64 value) {
|
||||
return EvaluateMarginalCost(usage_costs, var, value);
|
||||
};
|
||||
|
||||
|
||||
@@ -388,7 +388,6 @@ clean_cc:
|
||||
-$(DEL) $(OBJ_DIR)$Slinear_solver$S*.$O
|
||||
-$(DEL) $(OBJ_DIR)$Sutil$S*.$O
|
||||
-$(DEL) $(BIN_DIR)$Sfz$E
|
||||
-$(DEL) $(BIN_DIR)$Sfz2$E
|
||||
-$(DEL) $(BIN_DIR)$Ssat_runner$E
|
||||
-$(DEL) $(CPBINARIES)
|
||||
-$(DEL) $(LPBINARIES)
|
||||
|
||||
Reference in New Issue
Block a user