Delegation+AbsFact up to PWMap [may need debugging]

Author: Kalashnikovni

sbg/af_map.hpp

@@ -1,6 +1,15 @@
 /** @file af_map.hpp
 
+<<<<<<< HEAD
  @brief <b>Map Factory</b>
+=======
+ @brief <b>Map Abstract Factory</b>
+
+ It was proposed to try implementing SBG maps with "atomic" domains (i.e.,
+ the domain is a described with a mdi). For this reason, it was decided that
+ delegation should be used to provide different implementations, and also an
+ abstract factory was needed to create objects with the desired implementation.
+>>>>>>> 184fd91f83c3ebe8685db86370ecf5dee8410781
 
  <hr>
 

sbg/interval.cpp

@@ -17,7 +17,6 @@
 
  ******************************************************************************/
 
-#include <iostream>
 #include "sbg/interval.hpp"
 
 namespace SBG {

sbg/map.cpp

@@ -18,7 +18,6 @@
  ******************************************************************************/
 
 #include "sbg/map.hpp"
-#include <iostream>
 
 namespace SBG {
 
@@ -96,7 +95,7 @@ Map::Map(const SetAF &fact, Set s, Exp exp)
 
 bool Map::operator==(const Map &other) const
 {
-  if (dom_ == other.dom_) {
+  if (dom_ == other.dom()) {
     if (dom_.cardinal() == 1) {
       return image() == other.image();
     }
@@ -205,6 +204,9 @@ Set Map::preImage(const Set &subcodom) const
 
 Map Map::composition(const Map &other) const
 {
+  if (exp_.isId())
+    return Map(fact_, std::move(dom_), exp_);
+
   Set res_dom = dom_.intersection(other.image());
   res_dom = other.preImage(res_dom);
   Exp res_exp = exp_.composition(other.exp_);

sbg/map.hpp

@@ -97,6 +97,7 @@ struct Map {
    * example, arity([1:1:10]x[1:1:10]) = 2.
    */
   std::size_t arity() const;
+
   bool isEmpty() const;
 
   /**

sbg/pw_map.cpp

@@ -17,7 +17,6 @@
 
  ******************************************************************************/
 
-#include <iostream>
 #include "sbg/pw_map.hpp"
 
 namespace SBG {

sbg/set.cpp

@@ -17,7 +17,6 @@
 
  ******************************************************************************/
 
-#include <iostream>
 #include "sbg/set.hpp"
 
 namespace SBG {
@@ -827,16 +826,6 @@ bool Set::operator==(const Set &other) const
 
 bool Set::operator!=(const Set &other) const { return !(*this == other); }
 
-/*
-Set &Set::operator=(const Set &other)
-{
-  if (this != &other)
-    delegate_ = other.delegate_ ? other.delegate_->clone() : nullptr;
-
-  return *this;
-}
-*/
-
 Set &Set::operator=(Set &&other)
 {
   if (this != &other)