always-cautious/ortools-clone
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

more minor sync with internal code

Browse Source
This commit is contained in:
Laurent Perron
2019-03-13 14:45:05 +01:00
parent 2b9adc6255
commit 3c436d1542
4 changed files with 51 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
makefiles/Makefile.gen.mk
View File

@@ -1045,9 +1045,9 @@ objs/algorithms/knapsack_solver_for_cuts.$O: \
ortools/algorithms/knapsack_solver_for_cuts.h ortools/base/int_type.h \
ortools/base/macros.h ortools/base/int_type_indexed_vector.h \
ortools/base/logging.h ortools/base/integral_types.h \
ortools/base/ptr_util.h ortools/util/time_limit.h \
ortools/base/commandlineflags.h ortools/base/timer.h \
ortools/base/basictypes.h ortools/util/running_stat.h | $(OBJ_DIR)/algorithms
ortools/util/time_limit.h ortools/base/commandlineflags.h \
ortools/base/timer.h ortools/base/basictypes.h \
ortools/util/running_stat.h | $(OBJ_DIR)/algorithms
$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Salgorithms$Sknapsack_solver_for_cuts.cc $(OBJ_OUT)$(OBJ_DIR)$Salgorithms$Sknapsack_solver_for_cuts.$O
objs/algorithms/sparse_permutation.$O: \
@@ -1298,9 +1298,40 @@ objs/sat/cp_model_expand.$O: ortools/sat/cp_model_expand.cc \
objs/sat/cp_model_lns.$O: ortools/sat/cp_model_lns.cc \
ortools/sat/cp_model_lns.h ortools/base/integral_types.h \
ortools/gen/ortools/sat/cp_model.pb.h ortools/sat/cp_model_utils.h \
ortools/base/logging.h ortools/base/macros.h \
ortools/util/sorted_interval_list.h ortools/util/random_engine.h | $(OBJ_DIR)/sat
ortools/gen/ortools/sat/cp_model.pb.h ortools/sat/model.h \
ortools/base/logging.h ortools/base/macros.h ortools/base/map_util.h \
ortools/base/typeid.h ortools/sat/cp_model_loader.h \
ortools/base/int_type.h ortools/base/int_type_indexed_vector.h \
ortools/sat/cp_model_utils.h ortools/util/sorted_interval_list.h \
ortools/sat/integer.h ortools/base/hash.h ortools/base/basictypes.h \
ortools/graph/iterators.h ortools/sat/sat_base.h ortools/util/bitset.h \
ortools/sat/sat_solver.h ortools/base/timer.h ortools/sat/clause.h \
ortools/sat/drat_proof_handler.h ortools/sat/drat_checker.h \
ortools/sat/drat_writer.h ortools/base/file.h ortools/base/status.h \
ortools/gen/ortools/sat/sat_parameters.pb.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 \
ortools/base/commandlineflags.h ortools/util/rev.h \
ortools/util/saturated_arithmetic.h ortools/sat/intervals.h \
ortools/sat/cp_constraints.h ortools/sat/integer_expr.h \
ortools/sat/precedences.h ortools/sat/linear_programming_constraint.h \
ortools/glop/revised_simplex.h ortools/glop/basis_representation.h \
ortools/glop/lu_factorization.h ortools/glop/markowitz.h \
ortools/gen/ortools/glop/parameters.pb.h ortools/glop/status.h \
ortools/lp_data/lp_types.h ortools/lp_data/sparse.h \
ortools/lp_data/permutation.h ortools/base/random.h \
ortools/util/return_macros.h ortools/lp_data/sparse_column.h \
ortools/lp_data/sparse_vector.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/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/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 | $(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 \
@@ -1495,7 +1526,7 @@ objs/sat/cuts.$O: ortools/sat/cuts.cc ortools/sat/cuts.h \
ortools/base/commandlineflags.h ortools/util/rev.h \
ortools/util/saturated_arithmetic.h ortools/util/sorted_interval_list.h \
ortools/sat/linear_constraint.h \
ortools/algorithms/knapsack_solver_for_cuts.h ortools/base/ptr_util.h | $(OBJ_DIR)/sat
ortools/algorithms/knapsack_solver_for_cuts.h | $(OBJ_DIR)/sat
$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Ssat$Scuts.cc $(OBJ_OUT)$(OBJ_DIR)$Ssat$Scuts.$O
objs/sat/diffn.$O: ortools/sat/diffn.cc ortools/sat/diffn.h \
@@ -1697,7 +1728,8 @@ objs/sat/linear_constraint.$O: ortools/sat/linear_constraint.cc \
ortools/util/running_stat.h ortools/sat/sat_decision.h \
ortools/util/integer_pq.h ortools/util/time_limit.h \
ortools/base/commandlineflags.h ortools/util/rev.h \
ortools/util/saturated_arithmetic.h ortools/util/sorted_interval_list.h | $(OBJ_DIR)/sat
ortools/util/saturated_arithmetic.h ortools/util/sorted_interval_list.h \
ortools/base/mathutil.h | $(OBJ_DIR)/sat
$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Ssat$Slinear_constraint.cc $(OBJ_OUT)$(OBJ_DIR)$Ssat$Slinear_constraint.$O
objs/sat/linear_constraint_manager.$O: \
@@ -1810,13 +1842,13 @@ objs/sat/lp_utils.$O: ortools/sat/lp_utils.cc ortools/sat/lp_utils.h \
ortools/util/return_macros.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/gen/ortools/sat/cp_model.pb.h ortools/sat/sat_solver.h \
ortools/gen/ortools/sat/cp_model.pb.h \
ortools/gen/ortools/sat/sat_parameters.pb.h ortools/sat/sat_solver.h \
ortools/base/timer.h ortools/sat/clause.h \
ortools/sat/drat_proof_handler.h ortools/sat/drat_checker.h \
ortools/sat/sat_base.h ortools/sat/model.h ortools/base/map_util.h \
ortools/base/typeid.h ortools/sat/drat_writer.h ortools/base/file.h \
ortools/base/status.h ortools/gen/ortools/sat/sat_parameters.pb.h \
ortools/util/random_engine.h ortools/util/stats.h \
ortools/base/status.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 \

4
ortools/sat/BUILD
View File

@@ -997,7 +997,10 @@ cc_library(
visibility = ["//visibility:public"],
deps = [
":cp_model_cc_proto",
":cp_model_loader",
":cp_model_utils",
":linear_programming_constraint",
":model",
"//ortools/base",
"//ortools/util:random_engine",
"//ortools/util:time_limit",
@@ -1027,6 +1030,7 @@ cc_library(
"//ortools/base:int_type",
"//ortools/base:int_type_indexed_vector",
"//ortools/base:status",
"@com_google_absl//absl/hash",
"@com_google_absl//absl/memory",
"@com_google_absl//absl/types:span",
],

8
ortools/sat/integer.cc
View File

@@ -933,10 +933,10 @@ bool IntegerTrail::ReasonIsValid(
}
}
DLOG_IF(WARNING, num_literal_assigned_after_root_node == 0)
<< "Propagating a literal with no reason at a positive level!\n"
<< "level:" << integer_search_levels_.size() << " "
<< ReasonDebugString(literal_reason, integer_reason) << "\n"
<< DebugString();
<< "Propagating a literal with no reason at a positive level!\n"
<< "level:" << integer_search_levels_.size() << " "
<< ReasonDebugString(literal_reason, integer_reason) << "\n"
<< DebugString();
}
return true;

1
ortools/sat/integer.h
View File

@@ -28,7 +28,6 @@
#include "absl/strings/str_cat.h"
#include "absl/types/span.h"
#include "ortools/base/hash.h"
#include "ortools/base/integral_types.h"
#include "ortools/base/int_type.h"
#include "ortools/base/int_type_indexed_vector.h"
#include "ortools/base/integral_types.h"