Debugged map operations

CIFASIS · May 16, 2024 · 8a3d510 · 8a3d510
1 parent 7e1c699
commit 8a3d510
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/sbg/map.cpp b/sbg/map.cpp
@@ -27,6 +27,9 @@ namespace LIB {
 
 void compatible(Interval i, LExp le)
 {
+  if (i.begin() == i.end())
+    return;
+
   Util::RATIONAL rat_inf(Util::INT_Inf, 1);
   if (le.slope() == rat_inf || le.slope() > rat_inf)
     return;
@@ -70,6 +73,11 @@ Interval image(Interval i, LExp le) {
   if (m == rat_inf || m > rat_inf)
     return Interval(0, 1, Util::Inf);
 
+  if (i.begin() == i.end()) {
+    Util::NAT x = (m * i.begin() + h).toNat();
+    return Interval(x, 1, x);
+  }
+
   // Increasing expression
   if (m > 0) {
     new_begin = (m * i.minElem() + h).toNat();

diff --git a/sbg/pw_map.cpp b/sbg/pw_map.cpp
@@ -18,6 +18,7 @@
  ******************************************************************************/
 
 #include "sbg/pw_map.hpp"
+#include <iostream>
 
 namespace SBG {
 
@@ -713,7 +714,7 @@ PWMap<Set> PWMap<Set>::minAdjMap(
       Set again = dom_res.intersection(visited);
       if (!again.isEmpty()) {
         PWMap r_res = res.restrict(again), r_map = ith_pw.restrict(again);
-        res = res.minMap(ith_pw).combine(res);
+        res = other3.minMap(res, ith_pw, other3).combine(res);
         res = res.combine(ith_pw);
       }
       else