Debugged new initial implementation

Author: Kalashnikovni

sbg/dom_ord_pwmap.cpp

@@ -29,7 +29,9 @@ namespace LIB {
 // Domain Ordered PWMap Implementation -----------------------------------------
 ////////////////////////////////////////////////////////////////////////////////
 
-// Auxiliary functions - Ordered Piecewise maps --------------------------------
+// Auxiliary functions - Domain Ordered Piecewise maps -------------------------
+
+namespace {
 
 DomOrdPWMap::SetPerimeter calculatePerimeter(const Set &s)
 {
@@ -121,7 +123,9 @@ void advanceHint(DomOrdPWMap::OrdMapCollection &ord_pw, const MD_NAT crit
   }  
 }
 
-// Member functions - Ordered Piecewise maps -----------------------------------
+}
+
+// Member functions - Domain Ordered Piecewise maps ----------------------------
 
 member_imp(DomOrdPWMap, DomOrdPWMap::OrdMapCollection, pieces);
 

sbg/dom_ord_pwmap.hpp

@@ -2,7 +2,9 @@
 
  @brief <b>Domain Ordered PWMap Implementation</b>
 
- Domain ordered and map ordered piecewise map implementation.
+ Domain ordered and map ordered piecewise map implementation. The evaluator will
+ be in charge of checking that the choosen set implementation is ordered when
+ this structure is used.
 
  <hr>
 

sbg/ord_pwmap.cpp

@@ -31,6 +31,8 @@ namespace LIB {
 
 // Auxiliary functions - Ordered Piecewise maps --------------------------------
 
+namespace {
+
 OrdPWMap::SetPerimeter calculatePerimeter(const Set &s)
 {
   MD_NAT max_per(s.arity(), 0);
@@ -121,6 +123,8 @@ void advanceHint(OrdPWMap::OrdMapCollection &ord_pw, const MD_NAT crit
   }  
 }
 
+}
+
 // Member functions - Ordered Piecewise maps -----------------------------------
 
 member_imp(OrdPWMap, OrdPWMap::OrdMapCollection, pieces);

sbg/pwmap_fact.cpp

@@ -18,6 +18,7 @@
  ******************************************************************************/
 
 #include "sbg/pwmap_fact.hpp"
+#include "sbg/dom_ord_pwmap.hpp"
 #include "sbg/ord_pwmap.hpp"
 #include "sbg/unord_pwmap.hpp"
 

test/eval/eval_test.cpp

@@ -43,7 +43,7 @@ TEST_P(EvalTests, Eval)
   const std::string DIR_CMD = "mkdir -p " + TEST_DIR;
   std::system(DIR_CMD.c_str());
   const std::string EVAL_CMD = TEST_ROOT + "/../build/eval/sbg-eval " + TEST_ROOT + "/" + NAME
-    + ".test > " + TEST_DIR + "/" + NAME + ".log 2>&1";
+    + ".test -s 0 -p 0 > " + TEST_DIR + "/" + NAME + ".log 2>&1";
   std::system(EVAL_CMD.c_str());
   const std::string TEST_CMD = EVAL_TEST_ROOT + "/results.sh " + NAME + " " + EVAL_TEST_ROOT;
   std::system(TEST_CMD.c_str());