Major cleanup

Makefile.in

@@ -91,7 +91,7 @@ doc:
 
 test: lib-gtest $(SBG_TEST)
 
-TEST_DIRS         := test/parser test/performance test/eval
+TEST_DIRS         := test/parser test/performance test/performance/boost test/eval
 
 clean:
 	$(RM) -rf $(BIN_DIR) $(OBJ_DIR) $(LIB_SBGRAPH) $(ROOT)/lib $(ROOT)/include $(3RD_PARTY_DIR)/gtest/usr

sbg/interval.cpp

@@ -159,16 +159,6 @@ Interval::MaybeInterval Interval::compact(const Interval &other) const
   return {};
 }
 
-std::size_t hash_value(const Interval &i)
-{
-  std::size_t seed = 0;
-  boost::hash_combine(seed, i.begin());
-  boost::hash_combine(seed, i.step());
-  boost::hash_combine(seed, i.end());
-
-  return seed;
-}
-
 } // namespace LIB
 
 } // namespace SBG

sbg/interval.hpp

@@ -76,8 +76,6 @@ struct Interval {
 };
 std::ostream &operator<<(std::ostream &out, const Interval &i);
 
-std::size_t hash_value(const Interval &i);
-
 } // namespace LIB
 
 }  // namespace SBG

sbg/lexp.cpp

@@ -94,10 +94,9 @@ LExp LExp::inverse() const
   RAT new_slope(0, 1), new_offset(0, 1);
 
   // Non constant map
-  RAT slo = slope_;
-  if (slo != 0) {
-    new_slope = RAT(slo.denominator(), slo.numerator());
-    new_offset = (-offset_)/slo;
+  if (slope_ != 0) {
+    new_slope = RAT(slope_.denominator(), slope_.numerator());
+    new_offset = (-offset_)/slope_;
   }
 
   // Constant map
@@ -113,17 +112,6 @@ bool LExp::isId() const { return slope_ == 1 && offset_ == 0; }
 
 bool LExp::isConstant() const { return slope_ == 0; }
 
-std::size_t hash_value(const LExp &le)
-{
-  std::size_t seed = 0;
-  boost::hash_combine(seed, le.slope().numerator());
-  boost::hash_combine(seed, le.slope().denominator());
-  boost::hash_combine(seed, le.offset().numerator());
-  boost::hash_combine(seed, le.offset().denominator());
-
-  return seed;
-}
-
 } // namespace LIB
 
 } // namespace SBG

sbg/lexp.hpp

@@ -70,8 +70,6 @@ struct LExp {
 };
 std::ostream &operator<<(std::ostream &out, const LExp &le);
 
-std::size_t hash_value(const LExp &le);
-
 } // namespace LIB
 
 } // namespace SBG

sbg/map.cpp

@@ -282,25 +282,13 @@ std::optional<SBGMap<Set>> SBGMap<Set>::compact(const SBGMap<Set> &other) const
   return {};
 }
 
-template<typename Set>
-std::size_t hash_value(const SBGMap<Set> &sbgmap)
-{
-  std::size_t seed = 0;
-  boost::hash_combine(seed, sbgmap.dom());
-  boost::hash_combine(seed, sbgmap.exp());
-
-  return seed;
-}
-
 // Templates -------------------------------------------------------------------
 
 template struct SBGMap<UnordSet>;
 template std::ostream &operator<<(std::ostream &out, const BaseMap &sbgmap);
-template std::size_t hash_value<UnordSet>(const BaseMap &sbgmap);
 
 template struct SBGMap<OrdSet>;
 template std::ostream &operator<<(std::ostream &out, const CanonMap &sbgmap);
-template std::size_t hash_value<OrdSet>(const CanonMap &sbgmap);
 
 } // namespace LIB
 

sbg/map.hpp

@@ -76,9 +76,6 @@ struct SBGMap {
 template<typename Set>
 std::ostream &operator<<(std::ostream &out, const SBGMap<Set> &sbgmap);
 
-template<typename Set>
-std::size_t hash_value(const SBGMap<Set> &sbgmap);
-
 template<typename Set>
 using SBGMap = SBGMap<Set>;
 

sbg/multidim_inter.cpp

@@ -248,11 +248,6 @@ MultiDimInter::MaybeMDI MultiDimInter::compact(const MultiDimInter &other) const
   return res;
 }
 
-std::size_t hash_value(const MultiDimInter &mdi)
-{
-  return boost::hash_range(mdi.begin(), mdi.end());
-}
-
 } // namespace LIB
 
 } // namespace SBG

sbg/multidim_inter.hpp

@@ -82,8 +82,6 @@ struct MultiDimInter {
 };
 std::ostream &operator<<(std::ostream &out, const MultiDimInter &mi);
 
-std::size_t hash_value(const MultiDimInter &mdi);
-
 typedef MultiDimInter SetPiece;
 
 } // namespace LIB

sbg/multidim_lexp.cpp

@@ -139,11 +139,6 @@ bool MDLExp::isConstant() const
   return true;
 }
 
-std::size_t hash_value(const MDLExp &mdle)
-{
-  return boost::hash_range(mdle.begin(), mdle.end());
-}
-
 } // namespace LIB
 
 } // namespace SBG

sbg/multidim_lexp.hpp

@@ -79,8 +79,6 @@ struct MDLExp {
 };
 std::ostream &operator<<(std::ostream &out, const MDLExp &mdle);
 
-std::size_t hash_value(const MDLExp &mdle);
-
 typedef MDLExp Exp;
 
 } // namespace LIB

sbg/ord_pw_mdinter.cpp

@@ -29,7 +29,7 @@ std::ostream &operator<<(std::ostream &out, const MDInterOrdSet &ii)
 {
   std::size_t sz = ii.size();
 
-  out << "{{";
+  out << "{";
   if (sz > 0) {
     unsigned int j = 0;
     for (const SetPiece &mdi : ii) { 
@@ -41,7 +41,7 @@ std::ostream &operator<<(std::ostream &out, const MDInterOrdSet &ii)
       ++j;
     }
   }
-  out << "}}";
+  out << "}";
 
   return out;
 }
@@ -436,11 +436,6 @@ MDInterOrdSet OrdPWMDInter::traverse(
   return res;
 }
 
-std::size_t hash_value(const OrdPWMDInter &pwi)
-{
-  return boost::hash_range(pwi.begin(), pwi.end());
-}
-
 } // namespace LIB
 
 } // namespace SBG

sbg/ord_pw_mdinter.hpp

@@ -130,8 +130,6 @@ struct OrdPWMDInter {
 };
 std::ostream &operator<<(std::ostream &out, const OrdPWMDInter &i);
 
-std::size_t hash_value(const OrdPWMDInter &pwi);
-
 typedef OrdPWMDInter OrdSet;
 
 } // namespace LIB

sbg/pw_map.cpp

@@ -947,23 +947,15 @@ Set PWMap<Set>::sharedImage()
   return res;
 }
 
-template<typename Set>
-std::size_t hash_value(const PWMap<Set> &pw)
-{
-  return boost::hash_range(pw.begin(), pw.end());
-}
-
 // Templates -------------------------------------------------------------------
 
 template std::ostream &operator<<(std::ostream &out, const MapSet<UnordSet> &ms);
 template struct PWMap<UnordSet>;
 template std::ostream &operator<<(std::ostream &out, const BasePWMap &pw);
-template std::size_t hash_value(const PWMap<UnordSet> &pw);
 
 template std::ostream &operator<<(std::ostream &out, const MapSet<OrdSet> &ms);
 template struct PWMap<OrdSet>;
 template std::ostream &operator<<(std::ostream &out, const CanonPWMap &pw);
-template std::size_t hash_value(const PWMap<OrdSet> &pw);
 
 } // namespace LIB
 

sbg/pw_map.hpp

@@ -183,10 +183,6 @@ struct PWMap {
 template<typename Set>
 std::ostream &operator<<(std::ostream &out, const PWMap<Set> &pw);
 
-
-template<typename Set>
-std::size_t hash_value(const PWMap<Set> &pw);
-
 typedef PWMap<UnordSet> BasePWMap;
 typedef PWMap<OrdSet> CanonPWMap;
 

sbg/unord_pw_mdinter.cpp

@@ -413,11 +413,6 @@ UnordPWMDInter UnordPWMDInter::compact() const
   return res;
 }
 
-std::size_t hash_value(const UnordPWMDInter &pwi)
-{
-  return boost::hash_range(pwi.begin(), pwi.end());
-}
-
 } // namespace LIB
 
 } // namespace SBG

sbg/unord_pw_mdinter.hpp

@@ -137,8 +137,6 @@ struct UnordPWMDInter {
 };
 std::ostream &operator<<(std::ostream &out, const UnordPWMDInter &pwi);
 
-std::size_t hash_value(const UnordPWMDInter &pwi);
-
 typedef UnordPWMDInter UnordSet;
 
 } // namespace LIB

test/performance/boost/ordinary_graph_builder.cpp

@@ -25,13 +25,13 @@ SBG::Util::MD_NAT nextElem(SBG::Util::MD_NAT curr, SBG::LIB::SetPiece mdi)
 {
   assert(!mdi.isEmpty());
   SBG::Util::MD_NAT min = mdi.minElem(), max = mdi.maxElem(), res;
-  for (unsigned int j = 0; j < mdi.size(); ++j) {
+  for (unsigned int j = 0; j < mdi.arity(); ++j) {
     if (curr[j] == max[j]) 
       res.emplaceBack(min[j]);
 
     else {
       res.emplaceBack(curr[j] + 1);
-      for (unsigned int k = 1; k < mdi.size() - j; ++k)
+      for (unsigned int k = 1; k < mdi.arity() - j; ++k)
         res.emplaceBack(curr[j]);
       break;
     } 

util/defs.cpp

@@ -229,7 +229,9 @@ NAT RATIONAL::toNat() const
   if (denominator() == 1 && 0 <= value_)
     return numerator();
 
-  ERROR("toNat: RATIONAL is not NAT");
+  std::stringstream ss;
+  ss << *this;
+  ERROR("toNat: RATIONAL %s is not NAT", ss.str().c_str());
   return 0;
 }