diff --git a/makefiles/Makefile.gen.mk b/makefiles/Makefile.gen.mk index bce3033d5f..388b867628 100644 --- a/makefiles/Makefile.gen.mk +++ b/makefiles/Makefile.gen.mk @@ -1372,10 +1372,10 @@ objs/sat/cp_model_lns.$O: ortools/sat/cp_model_lns.cc \ ortools/glop/update_row.h ortools/glop/variables_info.h \ ortools/glop/reduced_costs.h ortools/glop/variable_values.h \ ortools/lp_data/lp_print_utils.h ortools/lp_data/sparse_row.h \ - ortools/lp_data/matrix_scaler.h ortools/sat/cuts.h \ - ortools/sat/implied_bounds.h ortools/sat/linear_constraint.h \ - ortools/sat/linear_constraint_manager.h ortools/sat/util.h \ - ortools/sat/rins.h | $(OBJ_DIR)/sat + ortools/lp_data/lp_data_utils.h ortools/lp_data/matrix_scaler.h \ + ortools/sat/cuts.h ortools/sat/implied_bounds.h \ + ortools/sat/linear_constraint.h ortools/sat/linear_constraint_manager.h \ + ortools/sat/util.h ortools/sat/rins.h | $(OBJ_DIR)/sat $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Ssat$Scp_model_lns.cc $(OBJ_OUT)$(OBJ_DIR)$Ssat$Scp_model_lns.$O objs/sat/cp_model_loader.$O: ortools/sat/cp_model_loader.cc \ @@ -1506,10 +1506,10 @@ objs/sat/cp_model_solver.$O: ortools/sat/cp_model_solver.cc \ ortools/glop/update_row.h ortools/glop/variables_info.h \ ortools/glop/reduced_costs.h ortools/glop/variable_values.h \ ortools/lp_data/lp_print_utils.h ortools/lp_data/sparse_row.h \ - ortools/lp_data/matrix_scaler.h ortools/sat/util.h \ - ortools/sat/linear_relaxation.h ortools/sat/optimization.h \ - ortools/gen/ortools/sat/boolean_problem.pb.h ortools/sat/probing.h \ - ortools/sat/rins.h ortools/sat/simplification.h \ + ortools/lp_data/lp_data_utils.h ortools/lp_data/matrix_scaler.h \ + ortools/sat/util.h ortools/sat/linear_relaxation.h \ + ortools/sat/optimization.h ortools/gen/ortools/sat/boolean_problem.pb.h \ + ortools/sat/probing.h ortools/sat/rins.h ortools/sat/simplification.h \ ortools/base/adjustable_priority_queue.h | $(OBJ_DIR)/sat $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Ssat$Scp_model_solver.cc $(OBJ_OUT)$(OBJ_DIR)$Ssat$Scp_model_solver.$O @@ -1754,10 +1754,11 @@ objs/sat/integer_search.$O: ortools/sat/integer_search.cc \ ortools/glop/update_row.h ortools/glop/variables_info.h \ ortools/glop/reduced_costs.h ortools/glop/variable_values.h \ ortools/lp_data/lp_print_utils.h ortools/lp_data/sparse_row.h \ - ortools/lp_data/matrix_scaler.h ortools/sat/cuts.h \ - ortools/sat/linear_constraint.h ortools/sat/linear_constraint_manager.h \ - ortools/sat/integer_expr.h ortools/sat/precedences.h ortools/sat/util.h \ - ortools/sat/probing.h ortools/sat/pseudo_costs.h ortools/sat/rins.h | $(OBJ_DIR)/sat + ortools/lp_data/lp_data_utils.h ortools/lp_data/matrix_scaler.h \ + ortools/sat/cuts.h ortools/sat/linear_constraint.h \ + ortools/sat/linear_constraint_manager.h ortools/sat/integer_expr.h \ + ortools/sat/precedences.h ortools/sat/util.h ortools/sat/probing.h \ + ortools/sat/pseudo_costs.h ortools/sat/rins.h | $(OBJ_DIR)/sat $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Ssat$Sinteger_search.cc $(OBJ_OUT)$(OBJ_DIR)$Ssat$Sinteger_search.$O objs/sat/intervals.$O: ortools/sat/intervals.cc ortools/sat/intervals.h \ @@ -1842,8 +1843,8 @@ objs/sat/linear_programming_constraint.$O: \ ortools/glop/variable_values.h ortools/lp_data/lp_print_utils.h \ ortools/lp_data/sparse_row.h ortools/util/time_limit.h \ ortools/base/commandlineflags.h ortools/util/running_stat.h \ - ortools/lp_data/matrix_scaler.h ortools/sat/cuts.h \ - ortools/sat/implied_bounds.h ortools/sat/integer.h \ + ortools/lp_data/lp_data_utils.h ortools/lp_data/matrix_scaler.h \ + ortools/sat/cuts.h ortools/sat/implied_bounds.h ortools/sat/integer.h \ ortools/base/map_util.h ortools/sat/model.h ortools/base/typeid.h \ ortools/sat/sat_base.h ortools/sat/sat_solver.h ortools/sat/clause.h \ ortools/sat/drat_proof_handler.h ortools/sat/drat_checker.h \ @@ -1893,10 +1894,10 @@ objs/sat/linear_relaxation.$O: ortools/sat/linear_relaxation.cc \ ortools/glop/update_row.h ortools/glop/variables_info.h \ ortools/glop/reduced_costs.h ortools/glop/variable_values.h \ ortools/lp_data/lp_print_utils.h ortools/lp_data/sparse_row.h \ - ortools/lp_data/matrix_scaler.h ortools/sat/cuts.h \ - ortools/sat/implied_bounds.h ortools/sat/linear_constraint.h \ - ortools/sat/linear_constraint_manager.h ortools/sat/util.h \ - ortools/base/iterator_adaptors.h | $(OBJ_DIR)/sat + ortools/lp_data/lp_data_utils.h ortools/lp_data/matrix_scaler.h \ + ortools/sat/cuts.h ortools/sat/implied_bounds.h \ + ortools/sat/linear_constraint.h ortools/sat/linear_constraint_manager.h \ + ortools/sat/util.h ortools/base/iterator_adaptors.h | $(OBJ_DIR)/sat $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Ssat$Slinear_relaxation.cc $(OBJ_OUT)$(OBJ_DIR)$Ssat$Slinear_relaxation.$O objs/sat/lp_utils.$O: ortools/sat/lp_utils.cc ortools/sat/lp_utils.h \ @@ -2038,7 +2039,8 @@ objs/sat/presolve_util.$O: ortools/sat/presolve_util.cc \ ortools/sat/presolve_util.h ortools/base/int_type.h \ ortools/base/macros.h ortools/base/int_type_indexed_vector.h \ ortools/base/integral_types.h ortools/base/logging.h \ - ortools/util/bitset.h ortools/util/sorted_interval_list.h \ + ortools/gen/ortools/sat/cp_model.pb.h ortools/sat/cp_model_utils.h \ + ortools/util/sorted_interval_list.h ortools/util/bitset.h \ ortools/base/map_util.h | $(OBJ_DIR)/sat $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Ssat$Spresolve_util.cc $(OBJ_OUT)$(OBJ_DIR)$Ssat$Spresolve_util.$O @@ -2118,10 +2120,10 @@ objs/sat/rins.$O: ortools/sat/rins.cc ortools/sat/rins.h \ ortools/glop/update_row.h ortools/glop/variables_info.h \ ortools/glop/reduced_costs.h ortools/glop/variable_values.h \ ortools/lp_data/lp_print_utils.h ortools/lp_data/sparse_row.h \ - ortools/lp_data/matrix_scaler.h ortools/sat/cuts.h \ - ortools/sat/implied_bounds.h ortools/sat/linear_constraint.h \ - ortools/sat/linear_constraint_manager.h ortools/sat/integer_expr.h \ - ortools/sat/precedences.h ortools/sat/util.h \ + ortools/lp_data/lp_data_utils.h ortools/lp_data/matrix_scaler.h \ + ortools/sat/cuts.h ortools/sat/implied_bounds.h \ + ortools/sat/linear_constraint.h ortools/sat/linear_constraint_manager.h \ + ortools/sat/integer_expr.h ortools/sat/precedences.h ortools/sat/util.h \ ortools/sat/cp_model_loader.h ortools/gen/ortools/sat/cp_model.pb.h \ ortools/sat/cp_model_utils.h ortools/sat/intervals.h \ ortools/sat/cp_constraints.h | $(OBJ_DIR)/sat @@ -2714,6 +2716,8 @@ LP_DEPS = \ $(SRC_DIR)/ortools/linear_solver/model_exporter.h \ $(SRC_DIR)/ortools/linear_solver/model_exporter_swig_helper.h \ $(SRC_DIR)/ortools/linear_solver/model_validator.h \ + $(SRC_DIR)/ortools/linear_solver/sat_proto_solver.h \ + $(SRC_DIR)/ortools/linear_solver/sat_solver_utils.h \ $(SRC_DIR)/ortools/linear_solver/scip_helper_macros.h \ $(SRC_DIR)/ortools/linear_solver/scip_proto_solver.h \ $(GEN_DIR)/ortools/linear_solver/linear_solver.pb.h @@ -2733,6 +2737,9 @@ LP_LIB_OBJS = \ $(OBJ_DIR)/linear_solver/linear_solver.$O \ $(OBJ_DIR)/linear_solver/model_exporter.$O \ $(OBJ_DIR)/linear_solver/model_validator.$O \ + $(OBJ_DIR)/linear_solver/sat_interface.$O \ + $(OBJ_DIR)/linear_solver/sat_proto_solver.$O \ + $(OBJ_DIR)/linear_solver/sat_solver_utils.$O \ $(OBJ_DIR)/linear_solver/scip_interface.$O \ $(OBJ_DIR)/linear_solver/scip_proto_solver.$O \ $(OBJ_DIR)/linear_solver/xpress_interface.$O \ @@ -2903,6 +2910,108 @@ objs/linear_solver/model_validator.$O: \ ortools/port/proto_utils.h ortools/util/fp_utils.h | $(OBJ_DIR)/linear_solver $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Slinear_solver$Smodel_validator.cc $(OBJ_OUT)$(OBJ_DIR)$Slinear_solver$Smodel_validator.$O +objs/linear_solver/sat_interface.$O: \ + ortools/linear_solver/sat_interface.cc ortools/base/hash.h \ + ortools/base/basictypes.h ortools/base/integral_types.h \ + ortools/base/logging.h ortools/base/macros.h \ + ortools/linear_solver/linear_solver.h ortools/base/commandlineflags.h \ + ortools/base/status.h ortools/base/timer.h \ + ortools/linear_solver/linear_expr.h \ + ortools/gen/ortools/linear_solver/linear_solver.pb.h \ + ortools/gen/ortools/util/optional_boolean.pb.h \ + ortools/port/proto_utils.h ortools/linear_solver/sat_proto_solver.h \ + ortools/base/statusor.h ortools/gen/ortools/sat/cp_model.pb.h \ + ortools/sat/cp_model_solver.h ortools/sat/model.h \ + ortools/base/map_util.h ortools/base/typeid.h \ + ortools/gen/ortools/sat/sat_parameters.pb.h ortools/sat/lp_utils.h \ + ortools/lp_data/lp_data.h ortools/base/int_type.h \ + ortools/base/int_type_indexed_vector.h \ + ortools/gen/ortools/glop/parameters.pb.h ortools/lp_data/lp_types.h \ + ortools/util/bitset.h ortools/lp_data/sparse.h \ + ortools/lp_data/permutation.h ortools/base/random.h \ + ortools/util/return_macros.h ortools/lp_data/scattered_vector.h \ + ortools/lp_data/sparse_column.h ortools/lp_data/sparse_vector.h \ + ortools/graph/iterators.h ortools/util/fp_utils.h \ + ortools/gen/ortools/sat/boolean_problem.pb.h ortools/sat/sat_solver.h \ + ortools/sat/clause.h ortools/sat/drat_proof_handler.h \ + ortools/sat/drat_checker.h ortools/sat/sat_base.h \ + ortools/sat/drat_writer.h ortools/base/file.h \ + ortools/util/random_engine.h ortools/util/stats.h \ + ortools/sat/pb_constraint.h ortools/sat/restart.h \ + ortools/util/running_stat.h ortools/sat/sat_decision.h \ + ortools/util/integer_pq.h ortools/util/time_limit.h | $(OBJ_DIR)/linear_solver + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Slinear_solver$Ssat_interface.cc $(OBJ_OUT)$(OBJ_DIR)$Slinear_solver$Ssat_interface.$O + +objs/linear_solver/sat_proto_solver.$O: \ + ortools/linear_solver/sat_proto_solver.cc \ + ortools/linear_solver/sat_proto_solver.h ortools/base/statusor.h \ + ortools/base/status.h ortools/base/logging.h \ + ortools/base/integral_types.h ortools/base/macros.h \ + ortools/gen/ortools/linear_solver/linear_solver.pb.h \ + ortools/gen/ortools/util/optional_boolean.pb.h \ + ortools/linear_solver/model_validator.h ortools/util/lazy_mutable_copy.h \ + ortools/linear_solver/sat_solver_utils.h ortools/glop/preprocessor.h \ + ortools/gen/ortools/glop/parameters.pb.h ortools/glop/revised_simplex.h \ + ortools/glop/basis_representation.h ortools/glop/lu_factorization.h \ + ortools/glop/markowitz.h ortools/glop/status.h \ + ortools/lp_data/lp_types.h ortools/base/basictypes.h \ + ortools/base/int_type.h ortools/base/int_type_indexed_vector.h \ + ortools/util/bitset.h ortools/lp_data/permutation.h \ + ortools/base/random.h ortools/util/return_macros.h \ + ortools/lp_data/sparse.h ortools/lp_data/scattered_vector.h \ + ortools/lp_data/sparse_column.h ortools/lp_data/sparse_vector.h \ + ortools/graph/iterators.h ortools/util/stats.h ortools/base/timer.h \ + ortools/glop/rank_one_update.h ortools/lp_data/lp_utils.h \ + ortools/base/accurate_sum.h ortools/glop/dual_edge_norms.h \ + ortools/lp_data/lp_data.h ortools/base/hash.h ortools/util/fp_utils.h \ + ortools/glop/entering_variable.h ortools/glop/primal_edge_norms.h \ + ortools/glop/update_row.h ortools/glop/variables_info.h \ + ortools/glop/reduced_costs.h ortools/util/random_engine.h \ + ortools/glop/variable_values.h ortools/lp_data/lp_print_utils.h \ + ortools/lp_data/sparse_row.h ortools/util/time_limit.h \ + ortools/base/commandlineflags.h ortools/util/running_stat.h \ + ortools/lp_data/matrix_scaler.h ortools/port/proto_utils.h \ + ortools/gen/ortools/sat/cp_model.pb.h ortools/sat/cp_model_solver.h \ + ortools/sat/model.h ortools/base/map_util.h ortools/base/typeid.h \ + ortools/gen/ortools/sat/sat_parameters.pb.h ortools/sat/lp_utils.h \ + ortools/gen/ortools/sat/boolean_problem.pb.h ortools/sat/sat_solver.h \ + ortools/sat/clause.h ortools/sat/drat_proof_handler.h \ + ortools/sat/drat_checker.h ortools/sat/sat_base.h \ + ortools/sat/drat_writer.h ortools/base/file.h \ + ortools/sat/pb_constraint.h ortools/sat/restart.h \ + ortools/sat/sat_decision.h ortools/util/integer_pq.h | $(OBJ_DIR)/linear_solver + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Slinear_solver$Ssat_proto_solver.cc $(OBJ_OUT)$(OBJ_DIR)$Slinear_solver$Ssat_proto_solver.$O + +objs/linear_solver/sat_solver_utils.$O: \ + ortools/linear_solver/sat_solver_utils.cc \ + ortools/linear_solver/sat_solver_utils.h ortools/glop/preprocessor.h \ + ortools/gen/ortools/glop/parameters.pb.h ortools/glop/revised_simplex.h \ + ortools/base/integral_types.h ortools/base/macros.h \ + ortools/glop/basis_representation.h ortools/base/logging.h \ + ortools/glop/lu_factorization.h ortools/glop/markowitz.h \ + ortools/glop/status.h ortools/lp_data/lp_types.h \ + ortools/base/basictypes.h ortools/base/int_type.h \ + ortools/base/int_type_indexed_vector.h ortools/util/bitset.h \ + ortools/lp_data/permutation.h ortools/base/random.h \ + ortools/util/return_macros.h ortools/lp_data/sparse.h \ + ortools/lp_data/scattered_vector.h ortools/lp_data/sparse_column.h \ + ortools/lp_data/sparse_vector.h ortools/graph/iterators.h \ + ortools/util/stats.h ortools/base/timer.h ortools/glop/rank_one_update.h \ + ortools/lp_data/lp_utils.h ortools/base/accurate_sum.h \ + ortools/glop/dual_edge_norms.h ortools/lp_data/lp_data.h \ + ortools/base/hash.h ortools/util/fp_utils.h \ + ortools/glop/entering_variable.h ortools/glop/primal_edge_norms.h \ + ortools/glop/update_row.h ortools/glop/variables_info.h \ + ortools/glop/reduced_costs.h ortools/util/random_engine.h \ + ortools/glop/variable_values.h ortools/lp_data/lp_print_utils.h \ + ortools/lp_data/sparse_row.h ortools/util/time_limit.h \ + ortools/base/commandlineflags.h ortools/util/running_stat.h \ + ortools/lp_data/matrix_scaler.h \ + ortools/gen/ortools/linear_solver/linear_solver.pb.h \ + ortools/gen/ortools/util/optional_boolean.pb.h \ + ortools/lp_data/proto_utils.h | $(OBJ_DIR)/linear_solver + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Slinear_solver$Ssat_solver_utils.cc $(OBJ_OUT)$(OBJ_DIR)$Slinear_solver$Ssat_solver_utils.$O + objs/linear_solver/scip_interface.$O: \ ortools/linear_solver/scip_interface.cc ortools/base/canonical_errors.h \ ortools/base/status.h ortools/base/logging.h \ @@ -3247,7 +3356,8 @@ objs/constraint_solver/local_search.$O: \ ortools/constraint_solver/local_search.cc \ ortools/base/commandlineflags.h ortools/base/hash.h \ ortools/base/basictypes.h ortools/base/integral_types.h \ - ortools/base/logging.h ortools/base/macros.h ortools/base/map_util.h \ + ortools/base/logging.h ortools/base/macros.h \ + ortools/base/iterator_adaptors.h ortools/base/map_util.h \ ortools/base/random.h ortools/constraint_solver/constraint_solver.h \ ortools/base/sysinfo.h ortools/base/timer.h \ ortools/gen/ortools/constraint_solver/solver_parameters.pb.h \