Added support for missing flatzinc builtins array_float_element, float_lin_lt and float_lin_lt_reif

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

Author: guidotack

changelog.in

@@ -72,6 +72,15 @@ Date: 2015-01-20
 [DESCRIPTION]
 Yada! Yada!
 
+[ENTRY]
+Module: flatzinc
+What:   bug
+Rank:   minor
+Thanks: Ahmed Kamal
+[DESCRIPTION]
+Added support for missing builtins array_float_element
+(by decomposition), float_lin_lt and float_lin_lt_reif.
+
 [ENTRY]
 Module: search
 What:   new

gecode/flatzinc/mznlib/redefinitions.mzn

@@ -73,3 +73,11 @@ predicate float_tanh(var float: a, var float: b) =
 
 predicate float_ne_reif(var float: a, var float: b, var bool: c) =
     not c <-> a==b;
+
+predicate array_float_element(var int: b, array[int] of float: as, var float: c) =
+    b in index_set(as) /\
+    forall(d in index_set(as))( b = d -> as[d] = c );
+
+predicate array_var_float_element(var int: b, array[int] of var float: as, var float: c) =
+    b in index_set(as) /\
+    forall(d in index_set(as))( b = d -> as[d] = c );

gecode/flatzinc/registry.cpp

@@ -1991,10 +1991,17 @@ namespace Gecode { namespace FlatZinc {
     void p_float_lin_le(FlatZincSpace& s, const ConExpr& ce, AST::Node* ann) {
       p_float_lin_cmp(s,FRT_LQ,ce,ann);
     }
+    void p_float_lin_lt(FlatZincSpace& s, const ConExpr& ce, AST::Node* ann) {
+      p_float_lin_cmp(s,FRT_LE,ce,ann);
+    }
     void p_float_lin_le_reif(FlatZincSpace& s, const ConExpr& ce,
                              AST::Node* ann) {
       p_float_lin_cmp_reif(s,FRT_LQ,ce,ann);
     }
+    void p_float_lin_lt_reif(FlatZincSpace& s, const ConExpr& ce,
+                             AST::Node* ann) {
+      p_float_lin_cmp_reif(s,FRT_LE,ce,ann);
+    }
 
     void p_float_times(FlatZincSpace& s, const ConExpr& ce, AST::Node*) {
       FloatVar x = s.arg2FloatVar(ce[0]);
@@ -2146,7 +2153,9 @@ namespace Gecode { namespace FlatZinc {
         registry().add("float_lin_eq",&p_float_lin_eq);
         registry().add("float_lin_eq_reif",&p_float_lin_eq_reif);
         registry().add("float_lin_le",&p_float_lin_le);
+        registry().add("float_lin_lt",&p_float_lin_lt);
         registry().add("float_lin_le_reif",&p_float_lin_le_reif);
+        registry().add("float_lin_lt_reif",&p_float_lin_lt_reif);
 
 #ifdef GECODE_HAS_MPFR
         registry().add("float_acos",&p_float_acos);