Adapted SBG structures [may need debugging]

Author: Kalashnikovni

ast/statement.cpp

@@ -42,7 +42,7 @@ ConfigDims::ConfigDims(LIB::NAT nmbr_dims) : nmbr_dims_() {
     set_nmbr_dims(nmbr_dims);
 
   else
-    Util::ERROR("ConfigDims: dimension should be greater than 0\n");
+    Debug::ERROR("ConfigDims: dimension should be greater than 0\n");
 }
 
 member_imp(ConfigDims, LIB::NAT, nmbr_dims);

parser/main.cpp

@@ -27,7 +27,7 @@ void parseProgramFromFile(std::string fname)
 {
   std::ifstream in(fname.c_str());
   if (in.fail()) 
-    SBG::Util::ERROR("Unable to open file ", fname, "\n");
+    SBG::Debug::ERROR("Unable to open file ", fname, "\n");
   in.unsetf(std::ios::skipws);
 
   std::string str(
@@ -160,7 +160,7 @@ int main(int argc, char** argv)
   if (!filename.empty())
     parseProgramFromFile(filename);
   else
-    SBG::Util::ERROR("A filename should be provided\n");
+    SBG::Debug::ERROR("A filename should be provided\n");
 
   return 0;
 }

sbg/Makefile.include

@@ -4,6 +4,7 @@ SBG_ROOT := sbg
 
 # Sources
 	SBG_SRC := \
+    $(SBG_ROOT)/sbg.cpp \
     $(SBG_ROOT)/af_pwmap.cpp \
     $(SBG_ROOT)/pw_map.cpp \
   	$(SBG_ROOT)/af_map.cpp \
@@ -17,7 +18,6 @@ SBG_ROOT := sbg
   	$(SBG_ROOT)/interval.cpp \
     $(SBG_ROOT)/natural.cpp \
     $(UTIL_ROOT)/logger.cpp #\
-    #$(SBG_ROOT)/sbg.cpp \
     #$(SBG_ROOT)/sbg_algorithms.cpp
 
 include util/Makefile.include

sbg/multidim_inter.cpp

@@ -28,16 +28,16 @@ member_imp(MultiDimInter, InterVector, intervals);
 MultiDimInter::MultiDimInter() : intervals_() {}
 MultiDimInter::MultiDimInter(const MD_NAT &x) : intervals_() {
   for (NAT xi : x)
-    intervals_.emplace_back(Interval(xi, 1, xi));
+    intervals_.push_back(Interval(xi, 1, xi));
 }
 MultiDimInter::MultiDimInter(const Interval &i) : intervals_()
 {
-  intervals_.emplace_back(i);
+  intervals_.push_back(i);
 }
 MultiDimInter::MultiDimInter(const unsigned int &nmbr_copies
                              , const Interval &i) : intervals_() {
   for (unsigned int j = 0; j < nmbr_copies; ++j)
-    intervals_.emplace_back(i);
+    intervals_.push_back(i);
 }
 MultiDimInter::MultiDimInter(const InterVector &iv)
   : intervals_(std::move(iv)) {}
@@ -58,7 +58,7 @@ void MultiDimInter::emplaceBack(Interval i)
   if (i.isEmpty())
     intervals_ = InterVector();
   else
-    intervals_.emplace_back(i);
+    intervals_.push_back(i);
   return;
 }
 

sbg/multidim_inter.hpp

@@ -66,7 +66,7 @@ struct MultiDimInter {
   MultiDimInter(const unsigned int &nmbr_copies, const Interval &i);
 
   /**
-   * @brief Pseudo copy constructor.
+   * @brief Collection move constructor.
    */
   MultiDimInter(const InterVector &iv);
 

sbg/multidim_lexp.cpp

@@ -24,18 +24,18 @@ namespace SBG {
 namespace LIB {
 
 MDLExp::MDLExp() : exps_() {}
-MDLExp::MDLExp(MD_NAT x)
+MDLExp::MDLExp(const MD_NAT &x)
 {
   for (NAT xi : x)
-    exps_.emplace_back(LExp(0, RATIONAL(xi)));
+    exps_.push_back(LExp(0, RATIONAL(xi)));
 }
-MDLExp::MDLExp(LExp le) : exps_() { exps_.emplace_back(le); }
-MDLExp::MDLExp(unsigned int nmbr_copies, LExp le) : exps_()
+MDLExp::MDLExp(const LExp &le) : exps_() { exps_.push_back(le); }
+MDLExp::MDLExp(unsigned int nmbr_copies, const LExp &le) : exps_()
 {  
   for (unsigned int j = 0; j < nmbr_copies; ++j)
-    exps_.emplace_back(le);
+    exps_.push_back(le);
 }
-MDLExp::MDLExp(LExpVector v) : exps_(std::move(v)) {}
+MDLExp::MDLExp(const LExpVector &v) : exps_(std::move(v)) {}
 
 member_imp(MDLExp, LExpVector, exps);
 
@@ -44,7 +44,7 @@ MDLExp::iterator MDLExp::end() { return exps_.end(); }
 MDLExp::const_iterator MDLExp::begin() const { return exps_.begin(); }
 MDLExp::const_iterator MDLExp::end() const { return exps_.end(); }
 
-void MDLExp::emplaceBack(LExp le) { exps_.emplace_back(le); }
+void MDLExp::emplaceBack(LExp le) { exps_.push_back(le); }
 
 LExp &MDLExp::operator[](std::size_t n) { return exps_[n]; }
 const LExp &MDLExp::operator[](std::size_t n) const { return exps_[n]; }

sbg/multidim_lexp.hpp

@@ -40,11 +40,31 @@ typedef LExpVector::const_iterator LExpVectorConstIt;
 struct MDLExp {
   member_class(LExpVector, exps);
 
+  /**
+   * @brief Empty multi-dimensional expression constructor.
+   */
   MDLExp();
-  MDLExp(MD_NAT x);
-  MDLExp(LExp le);
-  MDLExp(unsigned int nmbr_copies, LExp le);
-  MDLExp(LExpVector v);
+
+  /**
+   * @brief Constructs a constant mdle in all dimensions that maps to x.
+   */
+  MDLExp(const MD_NAT &x);
+
+  /**
+   * @brief Constructs a one-dimensional mdle composed only by le.
+   */
+  MDLExp(const LExp &le);
+
+  /**
+   * @brief Constructs a mdle of dimension nmbr_copies with le as linear
+   * expression in each dimensions.
+   */
+  MDLExp(unsigned int nmbr_copies, const LExp &le);
+
+  /**
+   * @brief Collection move constructor.
+   */
+  MDLExp(const LExpVector &v);
 
   typedef LExpVectorIt iterator;
   typedef LExpVectorConstIt const_iterator;

sbg/pw_map.cpp

@@ -53,6 +53,11 @@ UnordPWMap::UnordPWMap(const MapAF &fact, const UnordMapCollection &pieces)
 UnordPWMap::UnordPWMap(const UnordPWMap &pw)
   : PWMapDelegate(pw.fact_), pieces_(pw.pieces_) {}
 
+PWMapDelegPtr UnordPWMap::clone() const
+{
+  return std::make_unique<UnordPWMap>(*this);
+}
+
 member_imp(UnordPWMap::Iterator, UnordMapCollection::const_iterator, it);
 
 UnordPWMap::Iterator::Iterator(UnordMapCollection::const_iterator it)
@@ -695,6 +700,8 @@ PWMapDelegPtr UnordPWMap::compact() const
 ////////////////////////////////////////////////////////////////////////////////
 
 PWMap::PWMap(PWMapDelegPtr deleg) : delegate_(std::move(deleg)) {}
+PWMap::PWMap(const PWMap &other)
+  : delegate_(other.delegate_ ? other.delegate_->clone() : nullptr) {}
 
 PWMap::Iterator::Iterator(std::shared_ptr<PWMapDelegate::Iterator> it)
   : it_(std::move(it)) {}
@@ -728,6 +735,14 @@ bool PWMap::operator==(const PWMap &other) const
 
 bool PWMap::operator!=(const PWMap &other) const { return !(*this == other); }
 
+PWMap &PWMap::operator=(const PWMap &other)
+{
+  if (this != &other)
+    delegate_ = other.delegate_->clone();
+
+  return *this;
+}
+
 PWMap &PWMap::operator=(PWMap &&other)
 {
   if (this != &other)

sbg/pw_map.hpp

@@ -56,20 +56,10 @@ struct PWMapDelegate {
    */
   PWMapDelegate(const MapAF &fact);
 
-  ///**
-  // * @brief Constructs a pw with s as its domain, and the 1*x+0 as its law. 
-  // */
-  //PWMapDelegate(const MapAF &fact, const Set &s);
-
-  ///**
-  // * @brief Constructs a pw with an unique map m.
-  // */
-  //PWMapDelegate(const MapAF &fact, const Map &m);
-
   /**
    * @brief Auxiliary function for defining the copy constructor of PWMap.
    */
-  //virtual SetDelegPtr clone() const = 0;
+  virtual PWMapDelegPtr clone() const = 0;
 
   struct Iterator {
     public:
@@ -289,7 +279,7 @@ struct UnordPWMap : public PWMapDelegate {
   UnordPWMap(const MapAF &fact, const UnordMapCollection &pieces);
   UnordPWMap(const UnordPWMap &pw);
 
-  //SetDelegPtr clone() const override;
+  PWMapDelegPtr clone() const override;
 
   struct Iterator : public PWMapDelegate::Iterator {
     member_class(UnordMapCollection::const_iterator, it);
@@ -368,8 +358,7 @@ struct PWMap {
 
   public:
   PWMap(PWMapDelegPtr deleg);
-
-  //SetDelegPtr clone() const;
+  PWMap(const PWMap &other);
 
   struct Iterator {
     private:
@@ -389,6 +378,7 @@ struct PWMap {
 
   bool operator==(const PWMap &other) const;
   bool operator!=(const PWMap &other) const;
+  PWMap &operator=(const PWMap &other);
   PWMap &operator=(PWMap &&other);
   std::ostream &print(std::ostream &out) const;