Added compact operations

Author: Kalashnikovni

sbg/map.cpp

@@ -17,7 +17,6 @@
 
  ******************************************************************************/
 
-#include <iostream>
 #include "sbg/map.hpp"
 
 namespace SBG {
@@ -112,6 +111,14 @@ bool Map::operator!=(const Map &other) const
   return !(*this == other);
 }
 
+Map &Map::operator=(const Map &other)
+{
+  dom_ = other.dom_;
+  exp_ = other.exp_;
+
+  return *this;
+}
+
 Map Map::operator+(const Map &other) const
 {
   Set res_dom = dom_.intersection(other.dom());
@@ -239,7 +246,7 @@ MaybeMap Map::compact(const Map &other) const
 {
   Set res_dom = fact_.createSet();
   if (exp_ == other.exp())
-    return Map(fact_, dom_.cup(other.dom()), exp_);
+    return Map(fact_, dom_.cup(other.dom()).compact(), exp_);
 
   return {};
 }

sbg/map.hpp

@@ -84,6 +84,7 @@ struct Map {
 
   bool operator==(const Map &other) const;
   bool operator!=(const Map &other) const;
+  Map &operator=(const Map &other);
 
   /**
    * @brief Calculates the sum of both maps for elements that belong to both

sbg/pw_map.cpp

@@ -692,7 +692,34 @@ PWMapDelegPtr UnordPWMap::offsetImage(const Exp &off) const
 // TODO
 PWMapDelegPtr UnordPWMap::compact() const
 {
-  return std::make_unique<UnordPWMap>(*this);
+  UnordPWMap res(fact_);
+
+  if (dom().isEmpty())
+    return std::make_unique<UnordPWMap>(res);
+
+  Set compacted = fact_.createSet();
+  for (auto it = pieces_.begin(); it != pieces_.end(); ++it) {
+    auto next_it = it;
+    ++next_it;
+    Set ith_compacted = compacted.intersection(it->dom());
+    if (ith_compacted.isEmpty()) {
+      Map new_ith = fact_.createMap(it->dom().compact(), it->exp());
+      for (; next_it != pieces_.end(); ++next_it) {
+        Set next_compacted = compacted.intersection(next_it->dom());
+        if (next_compacted.isEmpty()) {
+          auto ith = new_ith.compact(*next_it);
+          if (ith) {
+            new_ith = ith.value();
+            compacted = compacted.cup(next_it->dom());
+          }
+        }
+      }
+
+      res.emplaceBack(new_ith);
+    }
+  }
+
+  return std::make_unique<UnordPWMap>(res);
 }
 
 ////////////////////////////////////////////////////////////////////////////////