Do not use init

git-svn-id: file:///Users/tack/GecodeGitMigration/gecode-svn-mirror/gecode/trunk@11019 e85b7adc-8362-4630-8c63-7469d557c915

Author: Christian Schulte

examples/crossword.cpp

@@ -115,11 +115,9 @@ class Crossword : public Script {
         fail();
       } else {
         // Array of all words of length w_l
-        IntVarArgs words(n);
-        for (int i=n; i--; ) {
-          words[i].init(*this,0,n_w-1);
+        IntVarArgs words(*this,n,0,n_w-1);
+        for (int i=n; i--; )
           allwords[aw_i++]=words[i];
-        }
 
         // All words of same length must be different
         distinct(*this, words, opt.icl());

examples/kakuro.cpp

@@ -486,7 +486,7 @@ class Kakuro : public Script {
   /// Init the variable \a x if necessary
   IntVar init(IntVar& x) {
     if (x.min() == 0)
-      x.init(*this,1,9);
+      x = IntVar(*this,1,9);
     return x;
   }
   /// Post a distinct-linear constraint on variables \a x with sum \a c

examples/pentominoes.cpp

@@ -386,9 +386,7 @@ class Pentominoes : public Script {
     } else { // opt.propagation() == PROPAGATION_BOOLEAN
       int ncolors = ntiles + 2;
       // Boolean variables for channeling
-      BoolVarArgs p(ncolors * board.size());
-      for (int i=p.size(); i--; )
-        p[i].init(*this,0,1);
+      BoolVarArgs p(*this,ncolors * board.size(),0,1);
 
       // Post channel constraints
       for (int i=board.size(); i--; ) {

examples/sports-league.cpp

@@ -229,10 +229,8 @@ class SportsLeague : public Script {
     // Domain for gamenumber of period
     for (int w=0; w<weeks(); w++) {
       IntArgs rh(periods()), ra(periods()), rg(periods());
-      IntVarArgs n(periods());
+      IntVarArgs n(*this,periods(),0,periods()-1);
 
-      for (int p=0; p<periods(); p++)
-        n[p].init(*this,0,periods()-1);
       distinct(*this, n, opt.icl());
 
       r.hag(w,rh,ra,rg);

examples/tsp.cpp

@@ -254,11 +254,7 @@ class TSP : public MinimizeScript {
           rel(*this, succ[i], IRT_NQ, j);
 
     // Cost of each edge
-    IntVarArgs costs(n);
-
-    // Initialize cost variables for edges
-    for (int i=n; i--; )
-      costs[i].init(*this, Int::Limits::min, Int::Limits::max);
+    IntVarArgs costs(*this, n, Int::Limits::min, Int::Limits::max);
 
     // Enforce that the succesors yield a tour with appropriate costs
     circuit(*this, c, succ, costs, total, opt.icl());

examples/word-square.cpp

@@ -86,9 +86,7 @@ class WordSquare : public Script {
     const int n_w = dict.words(w_l);
 
     // Initialize word array
-    IntVarArgs words(w_l);
-    for (int i=0; i<w_l; i++)
-      words[i].init(*this,0,n_w-1);
+    IntVarArgs words(*this, w_l, 0, n_w-1);
 
     // All words must be different
     distinct(*this, words);