[iss-45]

Author: LucasCavagna

eval/main.cpp

@@ -62,23 +62,37 @@ void parseEvalProgramFromFile(std::string fname, Impl impl, bool debug)
     std::cout << "Parsing succeeded\n";
     std::cout << "-------------------------\n";
     std::cout << ">>>>>> Eval result <<<<<<\n";
-    std::cout << "-------------------------\n\n";
+    std::cout << "-------------------------\n";
 
     std::shared_ptr<SBG::LIB::SetAF> set_fact 
       = std::make_shared<SBG::LIB::UnordAF>();
-
     switch (impl.set_impl_) {
+      case 1:
+        std::cout << ">>>>>> Ordered Sets <<<<<<\n";
+        std::cout << "-------------------------\n\n";
+        set_fact = std::make_shared<SBG::LIB::OrdAF>();
+        break;
       case 2:
+        std::cout << ">>>>>> Ordered Dense Sets <<<<<<\n";
+        std::cout << "-------------------------\n\n";
         set_fact = std::make_shared<SBG::LIB::OrdDenseAF>();
+        break;
 
       default:
+        std::cout << ">>>>>> Unordered Sets <<<<<<\n";
+        std::cout << "-------------------------\n\n";
         break;
     }
 
     SBG::LIB::MapAF map_fact(*set_fact);
     std::shared_ptr<SBG::LIB::PWMapAF> fact
       = std::make_shared<SBG::LIB::UnordPWMapAF>(map_fact);
     switch (impl.pw_impl_) {
+      case 1:
+        std::cout << ">>>>>> Ordered PWMaps <<<<<<\n";
+        std::cout << "-------------------------\n\n";
+        fact = std::make_shared<SBG::LIB::OrdPWMapAF>(map_fact);
+        break;
       default:
         break;
     }
@@ -106,6 +120,8 @@ void usage()
   std::cout << "-f, --file      SBG program file used as input\n";
   std::cout << "-s, --set_impl  Choose set implementation: 0 unordered sets,\n";
   std::cout << "                1 ordered sets, 2 ordered dense sets.\n";
+  std::cout << "-p, --pwmap_impl  Choose pwmap implementation: 0 unordered,\n";
+  std::cout << "                1 ordered.\n";
   std::cout << "-h, --help      Display this information and exit\n";
   std::cout << "-d, --debug     Activate debug info\n";
   std::cout << "-v, --version   Display version information and exit\n\n";
@@ -232,18 +248,19 @@ void version()
 int main(int argc, char**argv)
 {
   std::string filename;
-  int opt, set_impl = 0, pw_impl = 0;
+  int opt, set_impl = 0, pwmap_impl = 0;
   extern char* optarg;
   bool debug = false;
 
   while (true) {
     static struct option long_options[] = {{"file", required_argument, 0, 'f'}
                                            , {"set_impl", required_argument, 0, 's'}
+                                           , {"pwmap_impl", required_argument, 0, 'p'}
                                            , {"help", no_argument, 0, 'h'}
                                            , {"debug", no_argument, 0, 'd'}
                                            , {"version", no_argument, 0, 'v'}
                                            , {0, 0, 0, 0}};
-    opt = getopt_long(argc, argv, "f:s:hdv", long_options, nullptr);
+    opt = getopt_long(argc, argv, "f:s:p:hdv", long_options, nullptr);
     if (opt == EOF) 
       break;
     switch (opt) {
@@ -253,6 +270,9 @@ int main(int argc, char**argv)
       case 's':
         set_impl = std::stoi(optarg);
         break;
+      case 'p':
+        pwmap_impl = std::stoi(optarg);
+        break;
       case 'h':
         usage();
         exit(0);
@@ -272,7 +292,7 @@ int main(int argc, char**argv)
   }
 
   if (!filename.empty())
-    parseEvalProgramFromFile(filename, Impl(set_impl, pw_impl), debug);
+    parseEvalProgramFromFile(filename, Impl(set_impl, pwmap_impl), debug);
   else
     SBG::Util::ERROR("A filename should be provided\n");
 

sbg/interval.cpp

@@ -143,16 +143,21 @@ Interval Interval::least(const Interval &other) const
 MaybeInterval Interval::compact(const Interval &other) const
 {
   if (step_ == other.step_) {
-    if (end_+step_ == other.begin_)
+    if (end_ + step_ == other.begin_) 
       return Interval(begin_, step_, other.end_);
-
-    else if (other.end_+step_ == begin_)
+    
+    else if (other.end_ + step_ == begin_) 
       return Interval(other.begin_, step_, end_);
-
-    else if (!intersection(other).isEmpty()) {
-      NAT new_b = std::min(begin_, other.begin_);
-      NAT new_e = std::max(end_, other.end_);
-      return Interval(new_b, step_, new_e);
+    
+    else {
+      Interval inter = intersection(other);
+      if (!inter.isEmpty()) {
+        if (inter == other)
+          return {};
+        NAT new_b = std::min(begin_, other.begin_);
+        NAT new_e = std::max(end_, other.end_);
+        return Interval(new_b, step_, new_e);
+      }
     }
   }
 

sbg/multidim_inter.cpp

@@ -54,9 +54,9 @@ MultiDimInter::const_iterator MultiDimInter::end() const
 }
 
 void MultiDimInter::emplaceBack(Interval i) 
-{
-  if (i.isEmpty())
-    intervals_ = InterVector();
+{ 
+  if (i.isEmpty()){
+    intervals_ = InterVector();}
   else
     intervals_.push_back(i);
   return;
@@ -93,6 +93,7 @@ bool MultiDimInter::operator<(const MultiDimInter &other) const
   return minElem() < other.minElem();
 }
 
+
 std::ostream &operator<<(std::ostream &out, const MultiDimInter &mdi)
 {
   std::size_t sz = mdi.arity();

sbg/multidim_inter.hpp

@@ -28,8 +28,11 @@
 #ifndef SBG_MULTIDIM_INTERVAL_HPP
 #define SBG_MULTIDIM_INTERVAL_HPP
 
+#include <iostream>
 #include "sbg/interval.hpp"
 
+
+
 namespace SBG {
 
 namespace LIB {
@@ -125,6 +128,7 @@ struct MultiDimInter {
    * not an mdi, so no value is returned.
    */
   MaybeMDI compact(const MultiDimInter &other) const;
+  
 };
 std::ostream &operator<<(std::ostream &out, const MultiDimInter &mi);
 

sbg/natural.cpp

@@ -63,14 +63,6 @@ bool MD_NAT::operator<(const MD_NAT &other) const
   return false;
 }
 
-bool MD_NAT::menorThan(const MD_NAT &other) const
-{
-  for (unsigned int j = 0; j < arity(); ++j){
-    if (operator[](j) < other[j])
-      return true;
-  }
-  return false;
-}
 
 bool MD_NAT::operator<=(const MD_NAT &other) const
 {

sbg/natural.hpp

@@ -90,7 +90,6 @@ struct MD_NAT {
    * i for which x1[i] < x2[i] and for every j < i, x1[j] == x2[j]. 
    */ 
   bool operator<(const MD_NAT &other) const;
-  bool menorThan(const MD_NAT &other) const;
 
   bool operator<=(const MD_NAT &other) const;