Added Map::lessImage, upgraded PWMap::minMap

Author: Kalashnikovni

algorithms/scc/decreasing_edges_mrv.cpp

@@ -42,11 +42,8 @@ Set LtEdgesMRV::decreasingRepresentative(const PWMap& rmap) const
   PWMap rmapB = rmap.composition(mapB);
   PWMap rmapD = rmap.composition(mapD);
 
-  Set less_eq1 = rmapD.lessEqImage(rmapB);
-  Set less_eq2 = rmapB.lessEqImage(rmapD);
-  less_eq1 = less_eq1.difference(less_eq2);
-
-  return less_eq1;
+  Set result = rmapD.lessImage(rmapB);
+  return result;
 }
 
 Set LtEdgesMRV::edgesInPaths(const PWMap& smap) const

algorithms/scc/minadj_mrv.cpp

@@ -91,9 +91,7 @@ PWMap MinAdjMRV::calculate(const DSBG& dsbg)
                 }
                 PWMap dmapB = dmap.composition(mapB), dmapD = dmap.composition(mapD);
                 // Get edges where the end is closer to the rep than the beginning
-                Set not_cycle_edges = dmapD.lessEqImage(dmapB);
-                Set less_eq2 = dmapB.lessEqImage(dmapD);
-                not_cycle_edges = not_cycle_edges.difference(less_eq2);
+                Set not_cycle_edges = dmapD.lessImage(dmapB);
                 ER = ER.intersection(not_cycle_edges);
 
                 // Extend to subset-edge

eval/eval_exec.cpp

@@ -79,8 +79,8 @@ EvalExecutor::EvalExecutor() : scc_impl_(1)
      "\n  - 2 for domain ordered PWMaps")
     ("scc_impl", Util::prog_opts::value(&scc_impl_),
      "Desired SCC algorithm implementation:"
-     "\n  - 0 for V1 of minimum reachable SCC (default option)"
-     "\n  - 1 for V2 of minimum reachable SCC");
+     "\n  - 0 for V1 of minimum reachable SCC"
+     "\n  - 1 for V2 of minimum reachable SCC (default option)");
 
   cmd_line_opts_.add(generic_).add(config_).add(hidden_);
   cfg_file_opts_.add(config_).add(hidden_);

sbg/dom_ord_pwmap.cpp

@@ -188,7 +188,7 @@ PWMapStratPtr DomOrdPWMap::operator+(const PWMapStrategy& other) const
   Set set_in = SET_FACT.createSet();
   Set set_out = SET_FACT.createSet();
   OrdMapCollection res;
-  processMapsOrd(other,set_in, set_out, res, &DomOrdPWMap::processAdd, false);
+  processMapsOrd(other,set_in, set_out, res,& DomOrdPWMap::processAdd, false);
   return std::make_unique<DomOrdPWMap>(res);
 }
 
@@ -602,7 +602,7 @@ PWMapStratPtr DomOrdPWMap::minMap(const PWMapStrategy& other) const
   if (isEmpty() || other.isEmpty())
     return std::make_unique<DomOrdPWMap>();
 
-  Set min_in_pw1 = lessEqImage(other);
+  Set min_in_pw1 = lessImage(other);
   return restrict(min_in_pw1)->combine(*other.restrict(dom())); 
 }
 
@@ -611,7 +611,7 @@ PWMapStratPtr DomOrdPWMap::minAdjMap(const PWMapStrategy& other) const
   Set set_in = SET_FACT.createSet();
   Set set_out = SET_FACT.createSet();
   OrdMapCollection res;
-  processMapsOrd(other, set_in, set_out, res, &DomOrdPWMap::processMinAdjMap, true);
+  processMapsOrd(other, set_in, set_out, res,& DomOrdPWMap::processMinAdjMap, true);
   std::sort(res.begin(), res.end(), operator<); 
   return std::make_unique<DomOrdPWMap>(res);
 }
@@ -722,7 +722,7 @@ Set DomOrdPWMap::equalImage(const PWMapStrategy& other) const
   Set set_in = SET_FACT.createSet();
   Set set_out = SET_FACT.createSet();
   OrdMapCollection no_used;
-  processMapsOrd(other, set_in, set_out, no_used, &DomOrdPWMap::processEqualImage
+  processMapsOrd(other, set_in, set_out, no_used,& DomOrdPWMap::processEqualImage
     , false);
   return set_out;
 }
@@ -741,7 +741,7 @@ void DomOrdPWMap::processEqualImage(const Map& m1, const Map& m2,
   }
 }
 
-Set DomOrdPWMap::lessEqImage(const PWMapStrategy& other) const
+Set DomOrdPWMap::lessImage(const PWMapStrategy& other) const
 {
   if (isEmpty() || other.isEmpty())
     return SET_FACT.createSet();
@@ -750,7 +750,7 @@ Set DomOrdPWMap::lessEqImage(const PWMapStrategy& other) const
   Set min_in_pw1 = SET_FACT.createSet();
   for (const MapEntry& me1 : pieces_) {
     for (const MapEntry& me2 : othr.pieces_) {
-      min_in_pw1 = min_in_pw1.disjointCup(me1.first.lessEqImage(me2.first));
+      min_in_pw1 = min_in_pw1.disjointCup(me1.first.lessImage(me2.first));
     }
   }
 
@@ -761,7 +761,7 @@ void DomOrdPWMap::processMapsOrd(
   const PWMapStrategy& other,
   Set& set_in,
   Set& set_out,
-  OrdMapCollection & ord_map,
+  OrdMapCollection&  ord_map,
   ProcessFunc process,
   bool order_mts
   ) const

sbg/dom_ord_pwmap.hpp

@@ -108,7 +108,7 @@ struct DomOrdPWMap : public OrdPWMap {
   PWMapStratPtr filterMap(bool (*f)(const Map& )) const override;
 
   Set equalImage(const PWMapStrategy& other) const override;
-  Set lessEqImage(const PWMapStrategy& other) const override;
+  Set lessImage(const PWMapStrategy& other) const override;
   Set sharedImage() const override;
 
   PWMapStratPtr offsetDom(const MD_NAT& off) const override;

sbg/map.cpp

@@ -254,7 +254,7 @@ bool Map::isId() const
   return exp_.isId();
 }
 
-Set Map::lessEqImage(const Map& other) const
+Set Map::lessImage(const Map& other) const
 {
   Set result = SET_FACT.createSet();
 
@@ -264,7 +264,7 @@ Set Map::lessEqImage(const Map& other) const
   Exp exp2 = other.exp_;
 
   Set cap_dom = dom_.intersection(other.dom_);
-  if (exp1 == exp2)
+  if (cap_dom.isEmpty())
     return cap_dom; 
 
   for (int k = 0; k < ar; ++k) {
@@ -276,7 +276,7 @@ Set Map::lessEqImage(const Map& other) const
     if (m1 == m2) {
       RATIONAL h1 = linear_exp1.offset();
       RATIONAL h2 = linear_exp2.offset();
-      if (h2 >= h1) {
+      if (h1 < h2) {
         result.emplaceBack(min_in_m1);
       }
       break;

sbg/map.hpp

@@ -146,11 +146,11 @@ struct Map {
   bool isId() const;
 
   /**
-   * @brief Returns the set of elements of the domain that have a lesser or
-   * equal image in the first argument.
-   * For example: lessEqImage({[1:100]} -> x, {[1:100]} -> -x+100) = {[1:50]}.
+   * @brief Returns the set of elements of the domain that have a lesser
+   * image in the first argument.
+   * For example: lessImage({[1:100]} -> x, {[1:100]} -> -x+100) = {[1:49]}.
    */
-  Set lessEqImage(const Map& other) const;
+  Set lessImage(const Map& other) const;
 
   /**
    * @brief Compact the domain of two maps if both share the same expression. If