Merge branch 'sb-graph-dev' of https://github.com/CIFASIS/sb-graph in…

…to sb-graph-dev

eval/defs.cpp

@@ -43,9 +43,9 @@ FuncEnv::FuncEnv() {}
 FuncEnvType FuncEnv::mapping_ = {
   {"isEmpty", 0}, {"isMember", 1}, {"minElem", 2}, {"maxElem", 3}, {"lt", 4}
   , {"compose", 5}, {"inv", 6}, {"image", 7}, {"preImage", 8}, {"dom", 9}
-  , {"combine", 10}, {"minMap", 11}, {"reduce", 12}, {"minAdj", 13}, {"CC", 14}
-  , {"minReach", 15}, {"matching", 16}, {"scc", 17}, {"sort", 18}
-  , {"firstInv", 19}, {"matchSCC", 20}, {"matchSCCTS", 21}
+  , {"combine", 10}, {"firstInv", 11}, {"minMap", 12}, {"reduce", 13}
+  , {"minAdj", 14}, {"mapInf", 15}, {"CC", 16}, {"matching", 17}, {"scc", 18}
+  , {"sort", 19}, {"matchSCC", 20}, {"matchSCCTS", 21}
 };
 
 MaybeFValue FuncEnv::operator[](FKey k) const

eval/defs.hpp

@@ -122,7 +122,7 @@ struct FuncEnv{
 };
 
 typedef enum { empty, member, min, max, lt, comp, inv, im, preim, dom, comb
-  , min_map, red, min_adj, connected, min_reach, matching, scc, ts, first_inv
+  , first_inv, min_map, red, min_adj, inf, connected, matching, scc, ts
   , match_scc, match_scc_ts } Func;
 
 // Classes for pretty printing ------------------------------------------------

eval/visitors/eval_expr.cpp

@@ -130,6 +130,19 @@ auto combine_visitor_ = Util::Overload {
   }
 };
 
+auto first_inv_visitor_ = Util::Overload {
+  [](LIB::BasePWMap a) { 
+    return MapBaseType(a.firstInv()); 
+  },
+  [](LIB::CanonPWMap a) {
+    return MapBaseType(a.firstInv());
+  },
+  [](auto a) {
+    Util::ERROR("Wrong arguments for firstInv");
+    return MapBaseType();
+  }
+};
+
 auto min_map_visitor2_ = Util::Overload {
   [](LIB::BasePWMap a, LIB::BasePWMap b) { return MapBaseType(a.minMap(b)); },
   [](LIB::CanonPWMap a, LIB::CanonPWMap b) { return MapBaseType(a.minMap(b)); },
@@ -236,6 +249,15 @@ auto min_adj_visitor2_ = Util::Overload {
   }
 };
 
+auto inf_visitor_ = Util::Overload {
+  [](LIB::BasePWMap a) { return MapBaseType(a.mapInf()); },
+  [](LIB::CanonPWMap a) { return MapBaseType(a.mapInf()); },
+  [](auto a, auto b) { 
+    Util::ERROR("Wrong arguments for mapInf");
+    return MapBaseType(); 
+  }
+};
+
 auto connected_visitor_ = Util::Overload {
   [](LIB::BaseSBG a) { return MapBaseType(connectedComponents(a)); },
   [](LIB::CanonSBG a) { return MapBaseType(connectedComponents(a)); },
@@ -290,19 +312,6 @@ auto ts_visitor_ = Util::Overload {
   }
 };
 
-auto first_inv_visitor_ = Util::Overload {
-  [](LIB::BasePWMap a) { 
-    return MapBaseType(a.firstInv()); 
-  },
-  [](LIB::CanonPWMap a) {
-    return MapBaseType(a.firstInv());
-  },
-  [](auto a) {
-    Util::ERROR("Wrong arguments for firstInv");
-    return MapBaseType();
-  }
-};
-
 auto match_scc_visitor_ = Util::Overload {
   [](LIB::BaseSBG a, Util::MD_NAT b, bool c) { 
     LIB::BaseMatch match(a.copy(b[0]), c);
@@ -580,6 +589,15 @@ ExprBaseType EvalExpression::operator()(AST::Call v) const
         }
         break;
 
+      case Eval::Func::first_inv:
+        if (eval_args.size() == 1) {
+          arity_ok = true;
+
+          MapBaseType pw = std::visit(EvalMap(), eval_args[0]); 
+          MapBaseType result = std::visit(first_inv_visitor_, pw);
+          return result;
+        }
+
       case Eval::Func::min_map:
         if (eval_args.size() == 2) {
           arity_ok = true;
@@ -664,6 +682,16 @@ ExprBaseType EvalExpression::operator()(AST::Call v) const
         }
         break;
 
+      case Eval::Func::inf:
+        if (eval_args.size() == 1) {
+          arity_ok = true;
+
+          MapBaseType map = std::visit(EvalMap{}, eval_args[0]);
+          MapBaseType result = std::visit(inf_visitor_, map);
+          return result;
+        }
+        break;
+
       case Eval::Func::connected:
         if (eval_args.size() == 1) {
           arity_ok = true;
@@ -712,15 +740,6 @@ ExprBaseType EvalExpression::operator()(AST::Call v) const
         }
         break;
 
-      case Eval::Func::first_inv:
-        if (eval_args.size() == 1) {
-          arity_ok = true;
-
-          MapBaseType pw = std::visit(EvalMap(), eval_args[0]); 
-          MapBaseType result = std::visit(first_inv_visitor_, pw);
-          return result;
-        }
-
       case Eval::Func::match_scc:
         if (eval_args.size() == 2) {
           arity_ok = true;

test/pw_map1.test

@@ -12,3 +12,5 @@ minMap(<<{[1:1:10], [15:3:30]} -> 1*x+0, {[12:3:12], [50:5:100]} -> 1*x+1>>, <<{
 reduce(<<{[100:1:200]} -> 1*x-1>>)
 
 firstInv(<<{[1:1:10]} -> 0*x+10>>)
+
+mapInf(<<{[50:1:50]} -> 1*x-49, {[49:1:49]} -> 1*x-48, {[3:1:48]} -> 1*x+1>>)

test/scc2.test

@@ -1,6 +1,6 @@
 // SCC test, with a simple long cycle
 
-N = 10000
+N = 10
 
 V1 = N
 V2 = 1+V1

test/scc4.test

@@ -1,4 +1,5 @@
-// SCC test, with a simple long cycle
+// SCC test, with a long path, and a branch in the middle
+// that goes to a minimum value
 
 N = 100
 N2 = 50