Skip to content

Commit

Permalink
Remove all references to Gecode::Gist
Browse files Browse the repository at this point in the history
  • Loading branch information
pierrewillenbrockdfki committed Jul 20, 2023
1 parent 799abc9 commit 115c024
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 16 deletions.
1 change: 0 additions & 1 deletion src/problems/Scheduling.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
#include "Scheduling.hpp"
#include <gecode/gist.hh>

using namespace Gecode;

Expand Down
15 changes: 0 additions & 15 deletions src/solvers/csp/TransportNetwork.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
#include <numeric/Stats.hpp>
#include <gecode/minimodel.hh>
#include <gecode/set.hh>
#include <gecode/gist.hh>
#include <gecode/search.hh>

#include <iterator>
Expand Down Expand Up @@ -1467,7 +1466,6 @@ void TransportNetwork::postTemporalConstraints()
double modelAfcDecay = mpContext->configuration().getValueAs<double>("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();
Expand All @@ -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
Expand All @@ -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<TransportNetwork> 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)
Expand Down Expand Up @@ -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);
}


Expand Down

0 comments on commit 115c024

Please sign in to comment.