Redefined OrdPWMap

Author: Kalashnikovni

sbg/CMakeLists.txt

@@ -15,8 +15,10 @@ target_sources(
     linear_expr.cpp
     map.cpp
     map_detail.cpp
+    map_entry.cpp
     multidim_inter.cpp
     natural.cpp
+    ord_pwmap.cpp
     ord_set.cpp
     ord_unidim_dense_set.cpp
     pw_map.cpp
@@ -25,11 +27,10 @@ target_sources(
     sbg.cpp
     set.cpp
     set_fact.cpp
+    set_perimeter.cpp
     unord_pwmap.cpp
     unord_set.cpp
     #dom_ord_pwmap.cpp
-    #map_entry.cpp
-    #ord_pwmap.cpp
 )
 
 add_custom_target(sbg-doc

sbg/map_entry.cpp

@@ -23,101 +23,33 @@ namespace SBG {
 
 namespace LIB {
 
-namespace Internal {
+namespace detail {
 
-SetPerimeter calculatePerimeter(const Set& s)
-{
-  std::size_t ar = s.arity();
-  MD_NAT min_per(ar, Inf); 
-  MD_NAT max_per(ar, 0);
-  
-  for (const SetPiece& mdi : s) {
-    MD_NAT candidate_min = mdi.minElem();
-    MD_NAT candidate_max = mdi.maxElem();
-    for (size_t i = 0; i < ar; ++i) {
-      min_per[i] = std::min(min_per[i], candidate_min[i]);
-      max_per[i] = std::max(max_per[i], candidate_max[i]);
-    }
-  }
-  
-  return {min_per, max_per};
-}
+////////////////////////////////////////////////////////////////////////////////
+// Map entry -------------------------------------------------------------------
+////////////////////////////////////////////////////////////////////////////////
 
-bool doInt(const SetPerimeter& p1, const SetPerimeter& p2)
-{
-  const auto min_per_p1 = p1.first;
-  const auto max_per_p1 = p1.second;
-  const auto min_per_p2 = p2.first;
-  const auto max_per_p2 = p2.second;
-  const unsigned int arity = max_per_p1.arity();
-
-  for (unsigned int j = 0; j < arity; ++j) {
-    if (max_per_p1[j] < min_per_p2[j] || max_per_p2[j] < min_per_p1[j]) {
-      return false;  // No intersection
-    }
-  }
-  
-  return true;  // Intersection detected
-}
-
-MapEntry createMapEntry(const Map& m)
-{
-  return {m, calculatePerimeter(m.dom())}; 
-}
+MapEntry::MapEntry(const Map& m)
+  : _map(m), _perimeter(m.domain().perimeter()) {}
 
-bool operator<(const MapEntry& mpe1, const MapEntry& mpe2) 
-{
-  return mpe1.second.first < mpe2.second.first;
-}
+MapEntry::MapEntry(Map&& m)
+  : _map(std::move(m)), _perimeter(m.domain().perimeter()) {}
 
-void emplaceBack(OrdMapCollection& ord_pw, const MapEntry& entry)
-{
-  if (!entry.first.isEmpty()) {
-    ord_pw.emplace_back(entry);
-  }
-}
+const Map& MapEntry::map() const { return _map; }
 
-void emplaceBack(OrdMapCollection& ord_pw, const Map& m)
-{
-  if (!m.isEmpty()) {
-    ord_pw.emplace_back(createMapEntry(m));
-  }
-}
+const SetPerimeter& MapEntry::perimeter() const { return _perimeter; }
 
-void emplaceHint(OrdMapCollection& ord_pw, const Map& m, NAT hint)
+bool MapEntry::operator==(const MapEntry& other) const
 {
-  if (!m.isEmpty()) {
-    auto it = ord_pw.begin();
-    std::advance(it, hint);
-    auto end = ord_pw.end();
-    MapEntry mpe = createMapEntry(m);
-    while (it != end) {
-      if (it->second.first < mpe.second.first) {
-        ++it;
-      } else {
-        break;
-      }
-    }
-    ord_pw.emplace(it, mpe);
-  }
+  return _map == other._map;
 }
 
-void advanceHint(OrdMapCollection& ord_pw, const MD_NAT crit, NAT& hint)
+bool MapEntry::operator<(const MapEntry& other) const 
 {
-  auto it = ord_pw.begin();
-  std::advance(it, hint);
-  auto end = ord_pw.end();
-  while (it != end) {
-    if (it->second.first < crit) {
-      ++it;
-      ++hint;
-    } else {
-      break;
-    }
-  } 
+  return _perimeter.min() < other._perimeter.min();
 }
-
-} // namespace Internal
+	
+} // namespace detail
 
 } // namespace LIB
 

sbg/map_entry.hpp

@@ -23,34 +23,38 @@
 
  ******************************************************************************/
 
-#ifndef SBG_MAP_ENTRY_HPP
-#define SBG_MAP_ENTRY_HPP
+#ifndef SBGRAPH_SBG_MAP_ENTRY_HPP_
+#define SBGRAPH_SBG_MAP_ENTRY_HPP_
 
 #include "sbg/map.hpp"
+#include "sbg/set_perimeter.hpp"
 
 namespace SBG {
 
 namespace LIB {
 
-namespace Internal {
+namespace detail {
 
-using SetPerimeter = std::pair<MD_NAT, MD_NAT>;
-using MapEntry = std::pair<Map, SetPerimeter>;
-using OrdMapCollection = std::vector<MapEntry>;
+class MapEntry {
+public:
+  MapEntry(const Map& m);
+  MapEntry(Map&& m);
 
-SetPerimeter calculatePerimeter(const Set &s);
-bool doInt(const SetPerimeter& p1, const SetPerimeter& p2);
-MapEntry createMapEntry(const Map& m);
-bool operator<(const MapEntry& mpe1, const MapEntry& mpe2);
-void emplaceBack(OrdMapCollection& ord_pw, const MapEntry& entry);
-void emplaceBack(OrdMapCollection& ord_pw, const Map& m);
-void emplaceHint(OrdMapCollection& ord_pw, const Map& m, NAT hint);
-void advanceHint(OrdMapCollection& ord_pw, const MD_NAT crit, NAT& hint);
+  const Map& map() const;
+  const SetPerimeter& perimeter() const;
 
-} // namespace Internal
+  bool operator==(const MapEntry& other) const;
+  bool operator<(const MapEntry& other) const;
+
+private:
+  Map _map;
+  SetPerimeter _perimeter;
+};
+
+} // namespace detail
 
 } // namespace LIB
 
 } // namespace SBG
 
-#endif
+#endif // SBGRAPH_SBG_MAP_ENTRY_HPP_