fix delayed solution value in sat solution observer

This commit is contained in:
Laurent Perron
2017-11-04 23:50:06 +01:00
parent 42e0a0b91f
commit 432cfed06f
2 changed files with 1 additions and 2 deletions

View File

@@ -237,7 +237,6 @@ def SolveRcpsp(problem, proto_file):
print(' - wall time : %f s' % solver.WallTime())
def main(args):
parser = pywraputil.RcpspParser()
parser.LoadFile(args.input)

View File

@@ -2317,7 +2317,6 @@ CpSolverResponse SolveCpModelInternal(
&external_solution_observer, objective_var](const Model& sat_model) {
num_solutions++;
FillSolutionInResponse(model_proto, m, &response);
external_solution_observer(response);
int64 objective_value = 0;
for (int i = 0; i < model_proto.objective().vars_size(); ++i) {
objective_value += model_proto.objective().coeffs(i) *
@@ -2326,6 +2325,7 @@ CpSolverResponse SolveCpModelInternal(
}
response.set_objective_value(
ScaleObjectiveValue(obj, objective_value));
external_solution_observer(response);
VLOG(1) << "Solution #" << num_solutions
<< " obj:" << response.objective_value()
<< " num_bool:" << sat_model.Get<SatSolver>()->NumVariables();