From 67b087a7920f39e9f41f638599a2274ad11c89c2 Mon Sep 17 00:00:00 2001 From: Pierre Willenbrock Date: Wed, 19 Jul 2023 10:58:07 +0200 Subject: [PATCH 1/2] Remove the last call to Gecode::Gist Gist is the Gecode Interactive Search Tool, using Qt to display a GUI. --- src/solvers/csp/TransportNetwork.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/solvers/csp/TransportNetwork.cpp b/src/solvers/csp/TransportNetwork.cpp index 7acb955..847b9ca 100644 --- a/src/solvers/csp/TransportNetwork.cpp +++ b/src/solvers/csp/TransportNetwork.cpp @@ -1842,7 +1842,7 @@ void TransportNetwork::postRoleAssignments() // to draw system by supply demand //branchTimelines(*this, mTimelines, mSupplyDemand); Gecode::branch(*this,&TransportNetwork::doPostMinCostFlow); - Gecode::Gist::stopBranch(*this); + //Gecode::Gist::stopBranch(*this); } From 1a994b6ea4bdefc6a7c5130c78e985a09615037f Mon Sep 17 00:00:00 2001 From: Pierre Willenbrock Date: Thu, 20 Jul 2023 12:19:26 +0200 Subject: [PATCH 2/2] Remove all references to Gecode::Gist --- src/problems/Scheduling.cpp | 1 - src/solvers/csp/TransportNetwork.cpp | 15 --------------- 2 files changed, 16 deletions(-) diff --git a/src/problems/Scheduling.cpp b/src/problems/Scheduling.cpp index ad0b9f5..c26e48c 100644 --- a/src/problems/Scheduling.cpp +++ b/src/problems/Scheduling.cpp @@ -1,5 +1,4 @@ #include "Scheduling.hpp" -#include using namespace Gecode; diff --git a/src/solvers/csp/TransportNetwork.cpp b/src/solvers/csp/TransportNetwork.cpp index 847b9ca..cb051c9 100644 --- a/src/solvers/csp/TransportNetwork.cpp +++ b/src/solvers/csp/TransportNetwork.cpp @@ -4,7 +4,6 @@ #include #include #include -#include #include #include @@ -1467,7 +1466,6 @@ void TransportNetwork::postTemporalConstraints() double modelAfcDecay = mpContext->configuration().getValueAs("TransportNetwork/search/options/model-usage/afc-decay",0.95); modelUsageAfc.decay(*this, modelAfcDecay); branch(*this, mModelUsage, Gecode::INT_VAR_AFC_MIN(modelUsageAfc), Gecode::INT_VAL_SPLIT_MIN()); - //Gecode::Gist::stopBranch(*this); Gecode::Rnd modelUsageRnd; modelUsageRnd.hw(); @@ -1476,7 +1474,6 @@ void TransportNetwork::postTemporalConstraints() branch(*this, mModelUsage, Gecode::tiebreak(Gecode::INT_VAR_DEGREE_MAX(), Gecode::INT_VAR_SIZE_MIN()), Gecode::INT_VAL_SPLIT_MIN()); - //Gecode::Gist::stopBranch(*this); // Regarding the use of INT_VALUES_MIN() and INT_VALUES_MAX(): "This is // typically a poor choice, as none of the alternatives can benefit from @@ -1502,20 +1499,9 @@ void TransportNetwork::postTemporalConstraints() Gecode::INT_VAR_SIZE_MIN()), Gecode::INT_VAL_SPLIT_MIN()); - //Gecode::Gist::stopBranch(*this); // see 8.14 Executing code between branchers Gecode::branch(*this, &TransportNetwork::doPostRoleAssignments); - //Gecode::Gist::Print p("Print solution"); - //Gecode::Gist::Options options; - //options.threads = 1; - //Gecode::Search::Cutoff * c = Gecode::Search::Cutoff::constant(2); - //options.cutoff = c; - //options.inspect.click(&p); - ////Gecode::Gist::bab(this, o); - //Gecode::Gist::dfs(this, options); - - // General resource constraints // - identify overlapping fts, limit resources for these (TODO: better // identification of overlapping requirements) @@ -1842,7 +1828,6 @@ void TransportNetwork::postRoleAssignments() // to draw system by supply demand //branchTimelines(*this, mTimelines, mSupplyDemand); Gecode::branch(*this,&TransportNetwork::doPostMinCostFlow); - //Gecode::Gist::stopBranch(*this); }