All scripts must call a constructor with options

Christian Schulte · Christian Schulte · commit 72fbdf94ce7c · 2015-03-17T15:09:39.000Z
git-svn-id: file:///Users/tack/GecodeGitMigration/gecode-svn-mirror/gecode/trunk@14447 e85b7adc-8362-4630-8c63-7469d557c915
diff --git a/examples/all-interval.cpp b/examples/all-interval.cpp
@@ -72,6 +72,7 @@ class AllInterval : public Script {
 public:
   /// Actual model
   AllInterval(const SizeOptions& opt) :
+    Script(opt),
     x(*this, opt.size(), 0, opt.size()-1),
     d(*this, opt.size()-1, 1, opt.size()-1) {
     const int n = x.size();
diff --git a/examples/alpha.cpp b/examples/alpha.cpp
@@ -64,7 +64,8 @@ class Alpha : public Script {
     BRANCH_SIZE     ///< Choose variable with smallest size
   };
   /// Actual model
-  Alpha(const Options& opt) : le(*this,n,1,n) {
+  Alpha(const Options& opt) 
+    : Script(opt), le(*this,n,1,n) {
     IntVar
       a(le[ 0]), b(le[ 1]), c(le[ 2]), e(le[ 4]), f(le[ 5]),
       g(le[ 6]), h(le[ 7]), i(le[ 8]), j(le[ 9]), k(le[10]),
diff --git a/examples/archimedean-spiral.cpp b/examples/archimedean-spiral.cpp
@@ -68,16 +68,14 @@ using namespace Gecode;
  *
  * \ingroup Example
  */
-class ArchimedeanSpiral : public Script {
+class ArchimedeanSpiral : public FloatMaximizeScript {
 protected:
   /// The numbers
   FloatVarArray f;
-  /// Minimum distance between two solutions
-  FloatNum step;
 public:
   /// Actual model
-  ArchimedeanSpiral(const Options&) 
-    : f(*this,4,-20,20), step(0.1) {
+  ArchimedeanSpiral(const Options& opt) 
+    : FloatMaximizeScript(opt), f(*this,4,-20,20) {
     // Post equation
     FloatVar theta = f[0];
     FloatVar r = f[3];
@@ -95,17 +93,16 @@ class ArchimedeanSpiral : public Script {
   }
   /// Constructor for cloning \a p
   ArchimedeanSpiral(bool share, ArchimedeanSpiral& p) 
-    : Script(share,p), step(p.step) {
+    : FloatMaximizeScript(share,p) {
     f.update(*this,share,p.f);
   }
   /// Copy during cloning
   virtual Space* copy(bool share) { 
     return new ArchimedeanSpiral(share,*this); 
   }
-  /// Add constraint to current model to get next solution (not too close)
-  virtual void constrain(const Space& _b) {
-    const ArchimedeanSpiral& b = static_cast<const ArchimedeanSpiral&>(_b);
-    rel(*this, f[0] >= (b.f[0].max()+step));
+  /// Cost function
+  virtual FloatVar cost(void) const {
+    return f[0];
   }
   /// Print solution coordinates
   virtual void print(std::ostream& os) const {
@@ -120,9 +117,10 @@ class ArchimedeanSpiral : public Script {
  */
 int main(int argc, char* argv[]) {
   Options opt("ArchimedeanSpiral");
-  opt.parse(argc,argv);
   opt.solutions(0);
-  Script::run<ArchimedeanSpiral,BAB,Options>(opt);
+  opt.step(0.1);
+  opt.parse(argc,argv);
+  FloatMaximizeScript::run<ArchimedeanSpiral,BAB,Options>(opt);
   return 0;
 }
 
diff --git a/examples/bacp.cpp b/examples/bacp.cpp
@@ -120,7 +120,8 @@ class BACP : public IntMinimizeScript {
   };
 
   /// Actual model
-  BACP(const SizeOptions& opt) : curr(curriculum[opt.size()]) {
+  BACP(const SizeOptions& opt)
+    : IntMinimizeScript(opt), curr(curriculum[opt.size()]) {
     std::map<std::string, int> courseMap; // Map names to course numbers
     int maxCredit = 0;
     int numberOfCourses = 0;
diff --git a/examples/bibd.cpp b/examples/bibd.cpp
@@ -109,7 +109,7 @@ class BIBD : public Script {
 
   /// Actual model
   BIBD(const BIBDOptions& o)
-    : opt(o), _p(*this,opt.v*opt.b,0,1) {
+    : Script(opt), opt(o), _p(*this,opt.v*opt.b,0,1) {
     Matrix<BoolVarArray> p(_p,opt.b,opt.v);
 
     // r ones per row
diff --git a/examples/bin-packing.cpp b/examples/bin-packing.cpp
@@ -413,7 +413,8 @@ class BinPacking : public IntMinimizeScript {
   };
   /// Actual model
   BinPacking(const InstanceOptions& opt) 
-    : spec(opt.instance()),
+    : IntMinimizeScript(opt), 
+      spec(opt.instance()),
       load(*this, spec.upper(), 0, spec.capacity()),
       bin(*this, spec.items(), 0, spec.upper()-1),
       bins(*this, spec.lower(), spec.upper()) {
diff --git a/examples/black-hole.cpp b/examples/black-hole.cpp
@@ -129,8 +129,7 @@ class BlackHole : public Script {
   };
   /// Actual model
   BlackHole(const SizeOptions& opt)
-    : x(*this, 52, 0,51), y(*this, 52, 0,51)
-  {
+    : Script(opt), x(*this, 52, 0,51), y(*this, 52, 0,51) {
     // Black ace at bottom
     rel(*this, x[0], IRT_EQ, 0);
 
diff --git a/examples/car-sequencing.cpp b/examples/car-sequencing.cpp
@@ -245,7 +245,8 @@ class CarSequencing : public Script {
 public:
   /// Initial model
   CarSequencing(const CarOptions& opt)
-    : problem(opt.size()),
+    : Script(opt),
+      problem(opt.size()),
       ncars(problems[problem][0]), 
       noptions(problems[problem][1]), 
       nclasses(problems[problem][2]),
diff --git a/examples/cartesian-heart.cpp b/examples/cartesian-heart.cpp
@@ -72,8 +72,8 @@ class CartesianHeart : public Script {
   FloatNum step;
 public:
   /// Actual model
-  CartesianHeart(const Options&) 
-    : f(*this,2,-20,20), step(0.01) {
+  CartesianHeart(const Options& opt) 
+    : Script(opt), f(*this,2,-20,20), step(0.01) {
     int q = 2;
     FloatNum p = 0.5;
     // Post equation
diff --git a/examples/colored-matrix.cpp b/examples/colored-matrix.cpp
@@ -361,7 +361,8 @@ class ColoredMatrix : public IntMinimizeScript {
 
   /// Actual model
   ColoredMatrix(const ColoredMatrixOptions& opt0)
-    : opt(opt0), height(opt.height()), width(opt.width()), colors(opt.colors()),
+    : IntMinimizeScript(opt0), 
+      opt(opt0), height(opt.height()), width(opt.width()), colors(opt.colors()),
       x(*this, height*width, 1, colors),
       max_color(*this, 1, colors)
   {
diff --git a/examples/crew.cpp b/examples/crew.cpp
@@ -97,9 +97,8 @@ class Crew : public Script {
   SetVarArray flight;
 
   /// The actual model
-  Crew(const Options&) :
-    flight(*this,noOfFlights,IntSet::empty,0,noOfEmployees-1)
-  {
+  Crew(const Options& opt) 
+    : Script(opt), flight(*this,noOfFlights,IntSet::empty,0,noOfEmployees-1) {
     IntSet stewardsDS(stewards,noOfStewards);
     IntSet hostessesDS(hostesses,noOfHostesses);
     IntSet spanishDS(spanishSpeaking, noOfSpanishSpeaking);
diff --git a/examples/crossword.cpp b/examples/crossword.cpp
@@ -84,7 +84,8 @@ class Crossword : public Script {
   };
   /// Actual model
   Crossword(const SizeOptions& opt)
-    : w(grids[opt.size()][0]), h(grids[opt.size()][1]),
+    : Script(opt), 
+      w(grids[opt.size()][0]), h(grids[opt.size()][1]),
       letters(*this,w*h,'a','z') {
     // Pointer into the grid specification (width and height already skipped)
     const int* g = &grids[opt.size()][2];
diff --git a/examples/crowded-chess.cpp b/examples/crowded-chess.cpp
@@ -236,7 +236,8 @@ class CrowdedChess : public Script {
 
   /// The model of the problem
   CrowdedChess(const SizeOptions& opt)
-    : n(opt.size()),
+    : Script(opt), 
+      n(opt.size()),
       s(*this, n*n, 0, PMAX-1),
       queens(*this, n, 0, n-1),
       rooks(*this, n, 0, n-1),
diff --git a/examples/descartes-folium.cpp b/examples/descartes-folium.cpp
@@ -77,8 +77,8 @@ class DescartesFolium : public Script {
   double step;
 public:
   /// Actual model
-  DescartesFolium(const Options&) 
-    : f(*this,3,-20,20), step(0.1) {
+  DescartesFolium(const Options& opt) 
+    : Script(opt), f(*this,3,-20,20), step(0.1) {
     // Post equation
     FloatVar p = f[0];
     FloatVar x = f[1];
diff --git a/examples/dominating-queens.cpp b/examples/dominating-queens.cpp
@@ -88,7 +88,8 @@ class DominatingQueens : public IntMinimizeScript {
 public:
   /// The actual problem
   DominatingQueens(const SizeOptions& opt)
-    : n(opt.size()), b(*this,n*n,0,n*n-1), q(*this,1,n) {
+    : IntMinimizeScript(opt),
+      n(opt.size()), b(*this,n*n,0,n*n-1), q(*this,1,n) {
 
     // Constrain field to the fields that can attack a field
     for (int i=0; i<n*n; i++)
diff --git a/examples/domino.cpp b/examples/domino.cpp
@@ -90,7 +90,8 @@ class Domino : public Script {
 
   /// Actual model
   Domino(const SizeOptions& opt)
-    : spec(specs[opt.size()]),
+    : Script(opt), 
+      spec(specs[opt.size()]),
       width(spec[0]), height(spec[1]),
       x(*this, (width+1)*height, 0, 28) {
     spec+=2; // skip board size information
diff --git a/examples/donald.cpp b/examples/donald.cpp
@@ -62,8 +62,8 @@ class Donald : public Script {
     MODEL_CARRY   ///< Use carries
   };
   /// Actual model
-  Donald(const Options& opt) :
-    le(*this,nl,0,9) {
+  Donald(const Options& opt)
+    : Script(opt), le(*this,nl,0,9) {
     IntVar
       d(le[0]), o(le[1]), n(le[2]), a(le[3]), l(le[4]),
       g(le[5]), e(le[6]), r(le[7]), b(le[8]), t(le[9]);
diff --git a/examples/efpa.cpp b/examples/efpa.cpp
@@ -129,7 +129,8 @@ class EFPA : public Script {
 public:
   /// Actual model
   EFPA(const EFPAOptions& opt)
-    : v(opt.v()),
+    : Script(opt), 
+      v(opt.v()),
       q(opt.q()),
       l(opt.l()),
       d(opt.d()),
diff --git a/examples/eq20.cpp b/examples/eq20.cpp
@@ -59,7 +59,7 @@ class Eq20 : public Script {
 public:
   /// The actual problem
   Eq20(const Options& opt)
-    : x(*this,x_n,0,10) {
+    : Script(opt), x(*this,x_n,0,10) {
     // Coefficients and constants for the equations
     int eqs[e_n][x_n+1] = {
       {876370, -16105, 62397, -6704, 43340, 95100, -68610, 58301},
diff --git a/examples/golden-spiral.cpp b/examples/golden-spiral.cpp
@@ -86,8 +86,8 @@ class GoldenSpiral : public Script {
   FloatNum step;
 public:
   /// Actual model
-  GoldenSpiral(const Options&) 
-    : f(*this,4,-20,20), step(0.1) {
+  GoldenSpiral(const Options& opt) 
+    : Script(opt), f(*this,4,-20,20), step(0.1) {
     // Post equation
     FloatVar theta = f[0];
     FloatVar r = f[3];
diff --git a/examples/golf.cpp b/examples/golf.cpp
@@ -92,8 +92,10 @@ class Golf : public Script {
   SetVarArray groups;
 
   /// Actual model
-  Golf(const GolfOptions& opt) : g(opt.g()), s(opt.s()), w(opt.w()),
-    groups(*this,g*w,IntSet::empty,0,g*s-1,s,s) {
+  Golf(const GolfOptions& opt) 
+    : Script(opt), 
+      g(opt.g()), s(opt.s()), w(opt.w()),
+      groups(*this,g*w,IntSet::empty,0,g*s-1,s,s) {
     Matrix<SetVarArray> schedule(groups,g,w);
 
     // Groups in one week must be disjoint
diff --git a/examples/golomb-ruler.cpp b/examples/golomb-ruler.cpp
@@ -70,7 +70,8 @@ class GolombRuler : public IntMinimizeScript {
 public:
   /// Actual model
   GolombRuler(const SizeOptions& opt)
-    : m(*this,opt.size(),0,
+    : IntMinimizeScript(opt),
+      m(*this,opt.size(),0,
         (opt.size() < 31) ? (1 << (opt.size()-1))-1 : Int::Limits::max) {
 
     // Assume first mark to be zero
diff --git a/examples/graph-color.cpp b/examples/graph-color.cpp
@@ -340,7 +340,8 @@ class GraphColor : public IntMinimizeScript {
   };
   /// The actual model
   GraphColor(const SizeOptions& opt)
-    : g(opt.size() == 1 ? g2 : g1),
+    : IntMinimizeScript(opt),
+      g(opt.size() == 1 ? g2 : g1),
       v(*this,g.n_v,0,g.n_v-1),
       m(*this,0,g.n_v-1) {
     rel(*this, v, IRT_LQ, m);
diff --git a/examples/grocery.cpp b/examples/grocery.cpp
@@ -67,7 +67,8 @@ class Grocery : public Script {
   static const int p = 711 * 100 * 100 * 100;
 public:
   /// The actual model
-  Grocery(const Options& opt) : abcd(*this,4,0,s) {
+  Grocery(const Options& opt) 
+    : Script(opt), abcd(*this,4,0,s) {
     IntVar a(abcd[0]), b(abcd[1]), c(abcd[2]), d(abcd[3]);
 
     // The sum of all variables is s
diff --git a/examples/hamming.cpp b/examples/hamming.cpp
@@ -94,6 +94,7 @@ class Hamming : public Script {
 public:
   /// Actual model
   Hamming(const HammingOptions& opt) :
+    Script(opt), 
     x(*this,opt.size(),IntSet::empty,1,opt.bits()) {
     SetVarArgs cx(x.size());
     for (int i=x.size(); i--;)
diff --git a/examples/ind-set.cpp b/examples/ind-set.cpp
@@ -92,7 +92,8 @@ class IndSet : public IntMaximizeScript {
 public:
   /// Actual model
   IndSet(const SizeOptions& opt)
-    : g(opt.size() == 0 ?  g_20_10 : g_40_20),
+    : IntMaximizeScript(opt),
+      g(opt.size() == 0 ?  g_20_10 : g_40_20),
       v(*this,g.n_v,0,1), k(*this,0,g.n_v) {
     const int* e = g.e;
     for (int i = g.n_e; i--; ) {
diff --git a/examples/kakuro.cpp b/examples/kakuro.cpp
@@ -539,7 +539,8 @@ class Kakuro : public Script {
   }
   /// The actual problem
   Kakuro(const SizeOptions& opt)
-    : w(examples[opt.size()][0]),  h(examples[opt.size()][1]),
+    : Script(opt),
+      w(examples[opt.size()][0]),  h(examples[opt.size()][1]),
       f(*this,w*h) {
     IntVar black(*this,0,0);
     // Initialize all fields as black (unused). Only if a field
diff --git a/examples/knights.cpp b/examples/knights.cpp
@@ -208,7 +208,7 @@ class Knights : public Script {
   }
   /// Constructor
   Knights(const SizeOptions& opt)
-    : n(opt.size()), succ(*this,n*n,0,n*n-1) {
+    : Script(opt), n(opt.size()), succ(*this,n*n,0,n*n-1) {
     switch (opt.branching()) {
     case BRANCH_NAIVE:
       branch(*this, succ, INT_VAR_NONE(), INT_VAL_MIN());
diff --git a/examples/langford-number.cpp b/examples/langford-number.cpp
@@ -95,7 +95,7 @@ class LangfordNumber : public Script {
   };
   /// Construct model
   LangfordNumber(const LangfordNumberOptions& opt)
-    : k(opt.k), n(opt.n), y(*this,k*n,1,n) {
+    : Script(opt), k(opt.k), n(opt.n), y(*this,k*n,1,n) {
 
     switch (opt.propagation()) {
     case PROP_REIFIED:
diff --git a/examples/magic-sequence.cpp b/examples/magic-sequence.cpp
@@ -74,7 +74,7 @@ class MagicSequence : public Script {
   };
   /// The actual model
   MagicSequence(const SizeOptions& opt)
-    : n(opt.size()), s(*this,n,0,n-1) {
+    : Script(opt), n(opt.size()), s(*this,n,0,n-1) {
     switch (opt.propagation()) {
     case PROP_COUNT:
       for (int i=n; i--; )
diff --git a/examples/magic-square.cpp b/examples/magic-square.cpp
@@ -66,7 +66,7 @@ class MagicSquare : public Script {
   };
   /// Post constraints
   MagicSquare(const SizeOptions& opt)
-    : n(opt.size()), x(*this,n*n,1,n*n) {
+    : Script(opt), n(opt.size()), x(*this,n*n,1,n*n) {
     // Number of fields on square
     const int nn = n*n;
 
diff --git a/examples/minesweeper.cpp b/examples/minesweeper.cpp
@@ -97,7 +97,7 @@ class MineSweeper : public Script {
 public:
   /// Actual model
   MineSweeper(const SizeOptions& opt)
-    : spec(specs[opt.size()]),
+    : Script(opt), spec(specs[opt.size()]),
       size(spec_size(spec)),
       b(*this,size*size,0,1) {
     Matrix<BoolVarArray> m(b, size, size);
diff --git a/examples/money.cpp b/examples/money.cpp
@@ -63,7 +63,7 @@ class Money : public Script {
     MODEL_CARRY   ///< Use carries
   };
   /// Actual model
-  Money(const Options& opt) : le(*this,nl,0,9) {
+  Money(const Options& opt) : Script(opt), le(*this,nl,0,9) {
     IntVar
       s(le[0]), e(le[1]), n(le[2]), d(le[3]),
       m(le[4]), o(le[5]), r(le[6]), y(le[7]);
diff --git a/examples/multi-bin-packing.cpp b/examples/multi-bin-packing.cpp
@@ -132,7 +132,7 @@ class MultiBinPacking : public Script {
   };
   /// Actual model
   MultiBinPacking(const InstanceOptions& opt) 
-    : spec(opt.instance()),
+    : Script(opt), spec(opt.instance()),
       bin(*this, spec.items(), 0, spec.bins()-1), 
       load(*this, spec.bins()*spec.dimension(), 0, Int::Limits::max) 
   { 
diff --git a/examples/nonogram.cpp b/examples/nonogram.cpp
@@ -109,7 +109,7 @@ class Nonogram : public Script {
 
   /// Construction of the model.
   Nonogram(const SizeOptions& opt)
-    : spec(specs[opt.size()]), b(*this,width()*height(),0,1) {
+    : Script(opt), spec(specs[opt.size()]), b(*this,width()*height(),0,1) {
     Matrix<BoolVarArray> m(b, width(), height());
 
     {
diff --git a/examples/open-shop.cpp b/examples/open-shop.cpp
@@ -194,7 +194,8 @@ class OpenShop : public IntMinimizeScript {
 public:
   /// The actual problem
   OpenShop(const SizeOptions& opt)
-    : spec(examples[opt.size()]),
+    : IntMinimizeScript(opt),
+      spec(examples[opt.size()]),
       b(*this, (spec.n+spec.m-2)*spec.n*spec.m/2, 0,1),
       makespan(*this, 0, Int::Limits::max),
       _start(*this, spec.m*spec.n, 0, Int::Limits::max) {
diff --git a/examples/ortho-latin.cpp b/examples/ortho-latin.cpp
diff --git a/examples/partition.cpp b/examples/partition.cpp
diff --git a/examples/pentominoes.cpp b/examples/pentominoes.cpp
diff --git a/examples/perfect-square.cpp b/examples/perfect-square.cpp
diff --git a/examples/photo.cpp b/examples/photo.cpp
diff --git a/examples/qcp.cpp b/examples/qcp.cpp
diff --git a/examples/queen-armies.cpp b/examples/queen-armies.cpp
diff --git a/examples/queens.cpp b/examples/queens.cpp
diff --git a/examples/radiotherapy.cpp b/examples/radiotherapy.cpp
diff --git a/examples/sat.cpp b/examples/sat.cpp
diff --git a/examples/schurs-lemma.cpp b/examples/schurs-lemma.cpp
diff --git a/examples/sports-league.cpp b/examples/sports-league.cpp
diff --git a/examples/steel-mill.cpp b/examples/steel-mill.cpp
diff --git a/examples/steiner.cpp b/examples/steiner.cpp
diff --git a/examples/sudoku.cpp b/examples/sudoku.cpp
diff --git a/examples/tsp.cpp b/examples/tsp.cpp
diff --git a/examples/warehouses.cpp b/examples/warehouses.cpp
diff --git a/examples/word-square.cpp b/examples/word-square.cpp

Original file line number	Diff line number	Diff line change
`@@ -361,7 +361,8 @@ class ColoredMatrix : public IntMinimizeScript {`
`361`	`361`
`362`	`362`	`/// Actual model`
`363`	`363`	`ColoredMatrix(const ColoredMatrixOptions& opt0)`
`364`		`- : opt(opt0), height(opt.height()), width(opt.width()), colors(opt.colors()),`
	`364`	`+ : IntMinimizeScript(opt0),`
	`365`	`+ opt(opt0), height(opt.height()), width(opt.width()), colors(opt.colors()),`
`365`	`366`	`x(this, heightwidth, 1, colors),`
`366`	`367`	`max_color(*this, 1, colors)`
`367`	`368`	`{`