Range stuff better, RecursiveFixpoint broken.

1 files changed, 14 insertions, 9 deletions

diff --git a/impl/Operator.hpp b/impl/Operator.hpp
index 5f7cd1e..87e4eea 100644
--- a/impl/Operator.hpp
+++ b/impl/Operator.hpp
@@ -21,18 +21,21 @@ struct Expression;
 
 template<typename T>
 struct Operator {
+  Operator(const std::string& name) : op_name(name) { }
   virtual ~Operator() { }
   virtual T operator() (const std::vector< Expression<T>* >& args, const VariableAssignment<T>& rho) const = 0;
+  const std::string op_name;
 };
 template<typename T>
 struct Maximum : public Operator<T> {
+  Maximum() : Operator<T>("max") { }
   virtual T operator() (const std::vector< Expression<T>* >& args, const VariableAssignment<T>& assignment) const {
     T value = -infinity<T>();
     for (typename std::vector< Expression<T>* >::const_iterator it = args.begin();
          it != args.end();
          ++it) {
       T temporary = (**it)(assignment);
-      value = (temporary > value ? temporary : value);
+      value = (value < temporary ? value : temporary);
       //if (value == infinity<T>()) break;
     }
     return value;
@@ -40,6 +43,7 @@ struct Maximum : public Operator<T> {
 };
 template<typename T>
 struct Minimum : public Operator<T> {
+  Minimum() : Operator<T>("min") { }
   virtual T operator() (const std::vector< Expression<T>* >& args, const VariableAssignment<T>& assignment) const {
     T value = infinity<T>();
     for (typename std::vector< Expression<T>* >::const_iterator it = args.begin();
@@ -55,8 +59,8 @@ struct Minimum : public Operator<T> {
 
 template<typename T>
 struct Constant : public Operator<T> {
-  Constant(const T& val)
-    : _value(val) { }
+  Constant(const std::string& value, const T& val)
+    : Operator<T>(value), _value(val) { }
   T operator() (const std::vector< Expression<T>* >& args, const VariableAssignment<T>& ass) const {
     return _value;
   }
@@ -66,6 +70,7 @@ struct Constant : public Operator<T> {
 
 template<typename T>
 struct Addition: public Operator<T> {
+  Addition() : Operator<T>("add") { }
   T operator() (const std::vector< Expression<T>* >& args, const VariableAssignment<T>& ass) const {
     T sum = (*args[0])(ass);
     for (unsigned int i = 1, size = args.size(); i < size; ++i) {
@@ -76,18 +81,17 @@ struct Addition: public Operator<T> {
 };
 
 template<typename T>
-struct Subtraction: public Operator<T> {
+struct Negate: public Operator<T> {
+  Negate() : Operator<T>("neg") { }
   T operator() (const std::vector< Expression<T>* >& args, const VariableAssignment<T>& ass) const {
-    T sum = (*args[0])(ass);
-    for (unsigned int i = 1, size = args.size(); i < size; ++i) {
-      sum -= (*args[i])(ass);
-    }
-    return sum;
+    // assert(args.size() == 1);
+    return -(*args[0])(ass);
   }
 };
 
 template<typename T>
 struct Comma: public Operator<T> {
+  Comma() : Operator<T>("comma") { }
   T operator() (const std::vector< Expression<T>* >& args, const VariableAssignment<T>& ass) const {
     if ((*args[0])(ass) == -infinity<T>()) {
       std::cout << "Comma - neg inf" << std::endl;
@@ -101,6 +105,7 @@ struct Comma: public Operator<T> {
 
 template<typename T>
 struct Guard: public Operator<T> {
+  Guard() : Operator<T>("guard") { }
   T operator() (const std::vector< Expression<T>* >& args, const VariableAssignment<T>& ass) const {
     if ((*args[0])(ass) < (*args[1])(ass)) {
       return -infinity<T>();