Skip to content

Remove the last call to Gecode::Gist #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
pierrewillenbrockdfki wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Remove the last call to Gecode::Gist #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
67b087a
Remove the last call to Gecode::Gist
pierrewillenbrockdfki Jul 19, 2023
1a994b6
Remove all references to Gecode::Gist
pierrewillenbrockdfki Jul 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion src/problems/Scheduling.cpp
View file
Open in desktop
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
View file
Open in desktop
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