Added OrdPWMap to evaluator

Author: Kalashnikovni

sbg/map_entry.cpp

@@ -29,12 +29,12 @@ namespace detail {
 // Map entry -------------------------------------------------------------------
 ////////////////////////////////////////////////////////////////////////////////
 
+MapEntry::MapEntry(const Set& s, const Expression& expr)
+  : _map(s, expr), _perimeter(s.perimeter()) {}
+
 MapEntry::MapEntry(const Map& m)
   : _map(m), _perimeter(m.domain().perimeter()) {}
 
-MapEntry::MapEntry(Map&& m)
-  : _map(std::move(m)), _perimeter(m.domain().perimeter()) {}
-
 const Map& MapEntry::map() const { return _map; }
 
 const SetPerimeter& MapEntry::perimeter() const { return _perimeter; }

sbg/map_entry.hpp

@@ -26,7 +26,9 @@
 #ifndef SBGRAPH_SBG_MAP_ENTRY_HPP_
 #define SBGRAPH_SBG_MAP_ENTRY_HPP_
 
+#include "sbg/expression.hpp"
 #include "sbg/map.hpp"
+#include "sbg/set.hpp"
 #include "sbg/set_perimeter.hpp"
 
 namespace SBG {
@@ -37,8 +39,8 @@ namespace detail {
 
 class MapEntry {
 public:
+  MapEntry(const Set& s, const Expression& expr);
   MapEntry(const Map& m);
-  MapEntry(Map&& m);
 
   const Map& map() const;
   const SetPerimeter& perimeter() const;

sbg/ord_pwmap.cpp

@@ -151,7 +151,7 @@ std::size_t OrdPWMap::advanceHint(std::size_t hint, const MapEntry& jth_entry)
     } else {
       break;
     }
-  } 
+  }
 
   return hint;
 }

sbg/ord_pwmap.hpp

@@ -104,8 +104,8 @@ class OrdPWMap {
 private:
   template<typename... Args>
   void emplaceBack(Args&&... args);
-  void pushBack(const Map& entry);
-  void pushBack(Map&& entry);
+  void pushBack(const Map& m);
+  void pushBack(Map&& m);
   void pushBack(const MapEntry& entry);
   void pushBack(MapEntry&& entry);
 
@@ -145,7 +145,7 @@ class OrdPWMap {
 template<typename... Args>
 inline void OrdPWMap::emplace(Args&&... args)
 {
-  _pieces.emplace(std::forward<Args>(args)...);
+  insert(Map{std::forward<Args>(args)...});
 }
 
 template<typename... Args>

sbg/pw_map.cpp

@@ -131,7 +131,7 @@ PWMap::PWMap(const PWMapKind kind, Set s) : _impl()
     }
 
     case PWMapKind::kOrdered: {
-      _impl = detail::UnordPWMap{s};
+      _impl = detail::OrdPWMap{s};
       break;
     }
 
@@ -155,7 +155,7 @@ PWMap::PWMap(const PWMapKind kind, Map m) : _impl()
     }
 
     case PWMapKind::kOrdered: {
-      _impl = detail::UnordPWMap{m};
+      _impl = detail::OrdPWMap{m};
       break;
     }
 

sbg/pwmap_fact.cpp

@@ -49,25 +49,25 @@ PWMap UnordPWMapFact::createPWMap(const Map& m) const
 // OrdPWMap Factory ------------------------------------------------------------
 ////////////////////////////////////////////////////////////////////////////////
 
-//OrdPWMapFact::OrdPWMapFact() {}
-//
-//PWMap OrdPWMapFact::createPWMap() const
-//{
-//  return PWMap(std::make_unique<OrdPWMap>());
-//}
-//
-//PWMap OrdPWMapFact::createPWMap(const Set &s) const
-//{
-//  return PWMap(std::make_unique<OrdPWMap>(s));
-//}
-//
-//PWMap OrdPWMapFact::createPWMap(const Map &m) const
-//{
-//  return PWMap(std::make_unique<OrdPWMap>(m));
-//}
-//
+OrdPWMapFact::OrdPWMapFact() {}
+
+PWMap OrdPWMapFact::createPWMap() const
+{
+  return PWMap{PWMapKind::kOrdered};
+}
+
+PWMap OrdPWMapFact::createPWMap(const Set& s) const
+{
+  return PWMap{PWMapKind::kOrdered, s};
+}
+
+PWMap OrdPWMapFact::createPWMap(const Map& m) const
+{
+  return PWMap{PWMapKind::kOrdered, m};
+}
+
 //////////////////////////////////////////////////////////////////////////////////
-//// DomOrdPWMap Factory ------------------------------------------------------------
+//// DomOrdPWMap Factory ---------------------------------------------------------
 //////////////////////////////////////////////////////////////////////////////////
 //
 //DomOrdPWMapFact::DomOrdPWMapFact() {}
@@ -104,18 +104,19 @@ const PWMapKind& PWMapFactory::kind() const { return _kind; }
 
 void PWMapFactory::set_pwmap_fact(PWMapKind kind)
 {
+  _kind = kind;
   switch (kind) {
     case PWMapKind::kUnordered: {
-      _kind = kind;
       _impl = UnordPWMapFact{};
       break;
     }
 
-    //case SetKind::kOrdered: {
-    //  _impl = OrdPWMapFact{};
-    //}
+    case PWMapKind::kOrdered: {
+      _impl = OrdPWMapFact{};
+      break;
+    }
 
-    //case SetKind::OrdUnidimDense: {
+    //case PWMapKind::kDomOrdered: {
     //  _impl = DomOrdPWMapFact{};
     //}
 

sbg/pwmap_fact.hpp

@@ -39,26 +39,26 @@ class UnordPWMapFact {
   UnordPWMapFact();
 
   PWMap createPWMap() const;
-  PWMap createPWMap(const Set &s) const;
-  PWMap createPWMap(const Map &m) const;
+  PWMap createPWMap(const Set& s) const;
+  PWMap createPWMap(const Map& m) const;
+};
+
+class OrdPWMapFact {
+public:
+  OrdPWMapFact();
+
+  PWMap createPWMap() const;
+  PWMap createPWMap(const Set& s) const;
+  PWMap createPWMap(const Map& m) const;
 };
 
-//class OrdPWMapFact {
-//  public:
-//  OrdPWMapFact();
-//
-//  PWMap createPWMap() const override;
-//  PWMap createPWMap(const Set &s) const override;
-//  PWMap createPWMap(const Map &m) const override;
-//};
-//
 //class DomOrdPWMapFact {
 //  public:
 //  DomOrdPWMapFact();
 //
 //  PWMap createPWMap() const override;
-//  PWMap createPWMap(const Set &s) const override;
-//  PWMap createPWMap(const Map &m) const override;
+//  PWMap createPWMap(const Set& s) const override;
+//  PWMap createPWMap(const Map& m) const override;
 //};
 
 /**
@@ -80,7 +80,7 @@ class PWMapFactory {
   PWMap createPWMap(Map m) const;
 
 private:
-  using FactImpl = std::variant<UnordPWMapFact>;
+  using FactImpl = std::variant<UnordPWMapFact, OrdPWMapFact>;
 
   PWMapFactory();