Renamed channel to channelSorted and added the more intuitive channel as aliases in minimodel

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

Author: guidotack

examples/steiner.cpp

@@ -101,8 +101,8 @@ class Steiner : public Script {
            * Using matching constraints
            */
 
-          channel(*this, IntVarArgs()<<x1<<x2<<x3, x);
-          channel(*this, IntVarArgs()<<y1<<y2<<y3, y);
+          channelSorted(*this, IntVarArgs()<<x1<<x2<<x3, x);
+          channelSorted(*this, IntVarArgs()<<y1<<y2<<y3, y);
         } else if (opt.model() == MODEL_SEQ) {
           SetVar sx1 = expr(*this, singleton(x1));
           SetVar sx2 = expr(*this, singleton(x2));

gecode/minimodel.hh

@@ -1314,6 +1314,14 @@ namespace Gecode {
     IntVar x(home,0,1); channel(home,b,x);
     return x;
   }
+  /// Return set variable equal to \f$\{x_0,\dots,x_{n-1}\}\f$
+  inline SetVar
+  channel(Home home, const IntVarArgs& x, IntConLevel icl=ICL_DEF) {
+    (void) icl;
+    SetVar s(home,IntSet::empty,Set::Limits::min,Set::Limits::max);
+    rel(home,SOT_UNION,x,s);
+    return s;
+  }
   //@}
 
 }
@@ -1535,6 +1543,25 @@ namespace Gecode {
 
   //@}
 
+  /**
+   * \defgroup TaskModelMiniModelSetAlias Aliases for set constraints
+   *
+   * Contains definitions of common constraints which have different
+   * names in Gecode.
+   *
+   * \ingroup TaskModelMiniModel
+   */
+
+  //@{
+  /** \brief Post propagator for \f$\{x_0,\dots,x_{n-1}\}=y\f$
+   */
+  inline void
+  channel(Home home, const IntVarArgs& x, SetVar y) {
+    rel(home,SOT_UNION,x,y);
+  }
+  //@}
+  
+
 }
 
 namespace Gecode {

gecode/set.hh

@@ -873,7 +873,7 @@ namespace Gecode {
 
   /// Post propagator for \f$\{x_0,\dots,x_{n-1}\}=y\f$ and \f$x_i<x_{i+1}\f$
   GECODE_SET_EXPORT void
-  channel(Home home, const IntVarArgs& x, SetVar y);
+  channelSorted(Home home, const IntVarArgs& x, SetVar y);
 
   /// Post propagator for \f$x_i=j \Leftrightarrow i\in y_j\f$
   GECODE_SET_EXPORT void

gecode/set/int.cpp

@@ -153,10 +153,10 @@ namespace Gecode {
   }
 
   void
-  channel(Home home, const IntVarArgs& x, SetVar y) {
+  channelSorted(Home home, const IntVarArgs& x, SetVar y) {
     if (home.failed()) return;
     ViewArray<IntView> xa(home,x);
-    GECODE_ES_FAIL(Set::Int::Match<Set::SetView>::post(home,s,xa));
+    GECODE_ES_FAIL(Set::Int::Match<Set::SetView>::post(home,y,xa));
   }
 
   void

test/set/int.cpp

@@ -446,7 +446,7 @@ namespace Test { namespace Set {
       }
       /// Post constraint on \a x
       virtual void post(Space& home, SetVarArray& x, IntVarArray& y) {
-        Gecode::channel(home, y, x[0]);
+        Gecode::channelSorted(home, y, x[0]);
       }
     };
     Match _match("Int::Match");