Clean info files

CIFASIS · Jul 26, 2024 · 25947a3 · 25947a3
2 parents 96c8b38 + 4ea5eef
commit 25947a3
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 313 deletions.
diff --git a/sbg/info.cpp b/sbg/info.cpp
diff --git a/sbg/info.hpp b/sbg/info.hpp
diff --git a/sbg/sbg_algorithms.cpp b/sbg/sbg_algorithms.cpp
@@ -703,7 +703,7 @@ Exp SBGTopSort<Set>::calculateExp(Util::MD_NAT from, Util::MD_NAT to)
   Exp res;
 
   Util::RATIONAL one(1, 1);
-  for (unsigned int j = 0; j < from.arity(); ++j) { 
+  for (unsigned int j = 0; j < from.size(); ++j) { 
     Util::RATIONAL r_from(from[j]), r_to(to[j]);
     res.emplaceBack(LExp(1, r_to - r_from));
   }

diff --git a/sbg/sbg_algorithms.hpp b/sbg/sbg_algorithms.hpp
@@ -176,24 +176,13 @@ typedef SBGSCC<OrdSet> CanonSCC;
 
 template<typename Set>
 struct SBGTopSort {
+  using Map = SBGMap<Set>;
   using PW = PWMap<Set>;
 
   //*** SBG info, constant
   member_class(DSBGraph<Set>, dsbg);
 
   //-----------------------------
-  member_class(PW, smap);
-
-  member_class(Set, E);
-  member_class(PW, mapB);
-  member_class(PW, mapD);
-
-  member_class(Set, unordered);
-  member_class(Set, not_dependent);
-  member_class(Set, visitedV);
-
-  member_class(Util::MD_NAT, curr);
-
   member_class(bool, debug);
 
   SBGTopSort();
@@ -202,9 +191,7 @@ struct SBGTopSort {
   PW calculate(); 
 
   private:
-  Exp calculateExp(Util::MD_NAT x1, Util::MD_NAT x2);
-  void topSortStep();
-  void updateStatus(Set dom, Exp exp, Set ingoing);
+  Exp calculateExp(Util::MD_NAT from, Util::MD_NAT to);
 };
 
 typedef SBGTopSort<UnordSet> BaseTopSort;