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

Merge branch 'master' of github.com:google/or-tools

Browse Source
This commit is contained in:
Laurent Perron
2020-03-19 00:24:27 +01:00
parent a0cc52731e 8232d39b69
commit 4ba76781a1
4 changed files with 2866 additions and 2784 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5642
makefiles/Makefile.gen.mk
View File

File diff suppressed because it is too large Load Diff

4
ortools/constraint_solver/demon_profiler.cc
View File

@@ -144,11 +144,11 @@ class DemonProfiler : public PropagationMonitor {
}
void BeginDemonRun(Demon* const demon) override {
CHECK(demon != nullptr);
if (demon->priority() == Solver::VAR_PRIORITY) {
return;
}
CHECK(active_demon_ == nullptr);
CHECK(demon != nullptr);
active_demon_ = demon;
DemonRuns* const demon_run = demon_map_[active_demon_];
if (demon_run != nullptr) {
@@ -157,11 +157,11 @@ class DemonProfiler : public PropagationMonitor {
}
void EndDemonRun(Demon* const demon) override {
CHECK(demon != nullptr);
if (demon->priority() == Solver::VAR_PRIORITY) {
return;
}
CHECK_EQ(active_demon_, demon);
CHECK(demon != nullptr);
DemonRuns* const demon_run = demon_map_[active_demon_];
if (demon_run != nullptr) {
demon_run->add_end_time(CurrentTime());

2
ortools/linear_solver/clp_interface.cc
View File

@@ -504,7 +504,7 @@ MPSolver::ResultStatus CLPInterface::Solve(const MPSolverParameters& param) {
ResetParameters();
sync_status_ = SOLUTION_SYNCHRONIZED;
return result_status_;
} catch (CoinError e) {
} catch (CoinError &e) {
LOG(WARNING) << "Caught exception in Coin LP: " << e.message();
result_status_ = MPSolver::ABNORMAL;
return result_status_;

2
tools/generate_deps.sh
View File

@@ -49,7 +49,7 @@ function get_dependencies {
# Output: dependencies command for that file:
# objs/sub_dir/filename.o : ortools/
function print_dependencies {
cmd=$(gcc -MM -MT "objs/${2}/${1}.o" -c "ortools/${2}/${1}.cc" -I. -Iortools/gen \
cmd=$(gcc -std=c++11 -MM -MT "objs/${2}/${1}.o" -c "ortools/${2}/${1}.cc" -I. -Iortools/gen \
-isystem dependencies/install/include \
-isystem dependencies/install/include/coin \
-DUSE_GLOP -DUSE_BOP -DUSE_CLP -DUSE_CBC \