fix bug

ortools/glop/basis_representation.cc

@@ -13,6 +13,8 @@
 
 #include "ortools/glop/basis_representation.h"
 
+#include <algorithm>
+
 #include "ortools/base/stl_util.h"
 #include "ortools/glop/status.h"
 #include "ortools/lp_data/lp_utils.h"

ortools/glop/basis_representation.h

@@ -14,6 +14,8 @@
 #ifndef OR_TOOLS_GLOP_BASIS_REPRESENTATION_H_
 #define OR_TOOLS_GLOP_BASIS_REPRESENTATION_H_
 
+#include <string>
+
 #include "ortools/base/logging.h"
 #include "ortools/glop/lu_factorization.h"
 #include "ortools/glop/parameters.pb.h"

ortools/glop/dual_edge_norms.h

@@ -14,6 +14,8 @@
 #ifndef OR_TOOLS_GLOP_DUAL_EDGE_NORMS_H_
 #define OR_TOOLS_GLOP_DUAL_EDGE_NORMS_H_
 
+#include <string>
+
 #include "ortools/glop/basis_representation.h"
 #include "ortools/glop/parameters.pb.h"
 #include "ortools/lp_data/lp_data.h"

ortools/glop/entering_variable.cc

@@ -13,6 +13,7 @@
 
 #include "ortools/glop/entering_variable.h"
 
+#include <algorithm>
 #include <queue>
 
 #include "ortools/base/timer.h"

ortools/glop/entering_variable.h

@@ -15,6 +15,7 @@
 #define OR_TOOLS_GLOP_ENTERING_VARIABLE_H_
 
 #include <cstdint>
+#include <string>
 
 #include "absl/random/bit_gen_ref.h"
 #include "ortools/glop/basis_representation.h"

ortools/glop/initial_basis.cc

@@ -13,6 +13,7 @@
 
 #include "ortools/glop/initial_basis.h"
 
+#include <algorithm>
 #include <queue>
 
 #include "ortools/glop/markowitz.h"

ortools/glop/lp_solver.cc

@@ -13,8 +13,10 @@
 
 #include "ortools/glop/lp_solver.h"
 
+#include <algorithm>
 #include <cmath>
 #include <stack>
+#include <string>
 #include <vector>
 
 #include "absl/memory/memory.h"
@@ -213,6 +215,17 @@ ProblemStatus LPSolver::SolveWithTimeLimit(const LinearProgram& lp,
   ProblemSolution solution(current_linear_program_.num_constraints(),
                            current_linear_program_.num_variables());
   solution.status = preprocessor.status();
+  // LoadAndVerifySolution() below updates primal_values_, dual_values_,
+  // variable_statuses_ and constraint_statuses_ with the values stored in
+  // solution by RunPrimalDualPathFollowingMethodIfNeeded() and
+  // RunRevisedSimplexIfNeeded(), and hence clears any results stored in them
+  // from a previous run. In contrast, primal_ray_, constraints_dual_ray_, and
+  // variable_bounds_dual_ray_ are modified directly by
+  // RunRevisedSimplexIfNeeded(), so we explicitly clear them from previous run
+  // results.
+  primal_ray_.clear();
+  constraints_dual_ray_.clear();
+  variable_bounds_dual_ray_.clear();
 
   // Do not launch the solver if the time limit was already reached. This might
   // mean that the pre-processors were not all run, and current_linear_program_

ortools/glop/lp_solver.h

@@ -271,7 +271,9 @@ class LPSolver {
   int num_revised_simplex_iterations_;
 
   // The current ProblemSolution.
-  // TODO(user): use a ProblemSolution directly?
+  // TODO(user): use a ProblemSolution directly? Note, that primal_ray_,
+  // constraints_dual_ray_ and variable_bounds_dual_ray_ are not currently in
+  // ProblemSolution and are filled directly by RunRevisedSimplexIfNeeded().
   DenseRow primal_values_;
   DenseColumn dual_values_;
   VariableStatusRow variable_statuses_;

ortools/glop/variable_values.cc

@@ -13,6 +13,8 @@
 
 #include "ortools/glop/variable_values.h"
 
+#include <algorithm>
+
 #include "ortools/graph/iterators.h"
 #include "ortools/lp_data/lp_utils.h"
 

ortools/glop/variable_values.h

@@ -14,6 +14,8 @@
 #ifndef OR_TOOLS_GLOP_VARIABLE_VALUES_H_
 #define OR_TOOLS_GLOP_VARIABLE_VALUES_H_
 
+#include <string>
+
 #include "ortools/glop/basis_representation.h"
 #include "ortools/glop/dual_edge_norms.h"
 #include "ortools/glop/pricing.h"