Revert "Data.Set for class parents"

This reverts commit 557a46f6b8a4ea59331ea0609cd3ce0311ff9c01.

Revert "Use Data.Sequence for classes parents"

This reverts commit 308886f332bb4452713474577724f1d44466ddce.

Author: alt-romes

src/Data/Equality/Graph.hs

@@ -38,10 +38,11 @@ import Data.Function
 import Data.Bifunctor
 import Data.Containers.ListUtils
 
-import qualified Data.Foldable as F
 import qualified Data.IntMap.Strict as IM
 import qualified Data.Set    as S
 
+import Data.Equality.Utils.SizedList
+
 import Data.Equality.Graph.Internal
 import Data.Equality.Graph.ReprUnionFind
 import Data.Equality.Graph.Classes
@@ -83,7 +84,7 @@ add uncanon_e egr =
             -- to the e-class parents the new e-node and its e-class id
             --
             -- And add new e-class to existing e-classes
-            new_parents      = (S.insert (new_eclass_id, new_en))
+            new_parents      = ((new_eclass_id, new_en) |:)
             new_classes      = IM.insert new_eclass_id new_eclass $
                                     foldr  (IM.adjust ((_parents %~ new_parents)))
                                            (classes egr)
@@ -152,7 +153,7 @@ merge a b egr0 =
 
            -- Leader is the class with more parents
            (leader, leader_class, sub, sub_class) =
-               if S.size (class_a^._parents) < S.size (class_b^._parents)
+               if sizeSL (class_a^._parents) < sizeSL (class_b^._parents)
                   then (b', class_b, a', class_a) -- b is leader
                   else (a', class_a, b', class_b) -- a is leader
 
@@ -173,20 +174,18 @@ merge a b egr0 =
            -- Add all subsumed parents to worklist We can do this instead of
            -- adding the new e-class itself to the worklist because it would end
            -- up adding its parents anyway
-           new_worklist = F.toList (sub_class^._parents) <> worklist egr0
+           new_worklist = toListSL (sub_class^._parents) <> (worklist egr0)
 
            -- If the new_data is different from the classes, the parents of the
            -- class whose data is different from the merged must be put on the
            -- analysisWorklist
            new_analysis_worklist =
-             (
-               (if new_data /= (sub_class^._data)
-                   then sub_class^._parents
-                   else mempty) <>
-               (if new_data /= (leader_class^._data)
-                  then leader_class^._parents
-                  else mempty)
-             ) <>
+             (if new_data /= (sub_class^._data)
+                then toListSL (sub_class^._parents)
+                else mempty) <>
+             (if new_data /= (leader_class^._data)
+                then toListSL (leader_class^._parents)
+                else mempty) <>
              (analysisWorklist egr0)
 
            -- ROMES:TODO: The code that makes the -1 * cos test pass when some other things are tweaked
@@ -218,9 +217,9 @@ rebuild (EGraph uf cls mm wl awl) =
   -- empty worklists
   -- repair deduplicated e-classes
   let
-    emptiedEgr = EGraph uf cls mm mempty mempty
+    emptiedEgr = (EGraph uf cls mm mempty mempty)
     wl'   = nubOrd $ bimap (`find` emptiedEgr) (`canonicalize` emptiedEgr) <$> wl
-    awl'  = S.map (bimap (`find` emptiedEgr) (`canonicalize` emptiedEgr)) awl
+    awl'  = nubOrd $ bimap (`find` emptiedEgr) (`canonicalize` emptiedEgr) <$> awl
     egr'  = foldr repair emptiedEgr wl'
     egr'' = foldr repairAnal egr'   awl'
   in
@@ -256,7 +255,7 @@ repairAnal (repair_id, node) egr =
     if c^._data /= new_data
         -- Merge result is different from original class data, update class
         -- with new_data
-       then egr { analysisWorklist = (c^._parents) <> analysisWorklist egr
+       then egr { analysisWorklist = toListSL (c^._parents) <> analysisWorklist egr
                 }
                 & _class repair_id._data .~ new_data
                 & modifyA repair_id

src/Data/Equality/Graph/Classes.hs

@@ -15,6 +15,8 @@ import Data.Functor.Classes
 import Data.Equality.Graph.Classes.Id
 import Data.Equality.Graph.Nodes
 
+import Data.Equality.Utils.SizedList
+
 import Data.Equality.Analysis
 
 -- | An e-class (an equivalence class of terms) of a language @l@.
@@ -27,9 +29,9 @@ data EClass l = EClass
     { eClassId      :: {-# UNPACK #-} !ClassId -- ^ E-class identifier
     , eClassNodes   :: !(S.Set (ENode l))      -- ^ E-nodes in this class
     , eClassData    :: Domain l                -- ^ The analysis data associated with this eclass.
-    , eClassParents :: !(S.Set (ClassId, ENode l))   -- ^ E-nodes which are parents of this e-class and their corresponding e-class ids.
+    , eClassParents :: !(SList (ClassId, ENode l))   -- ^ E-nodes which are parents of this e-class and their corresponding e-class ids.
     }
 
 instance (Show (Domain l), Show1 l) => Show (EClass l) where
-    show (EClass a b d c) = "Id: " <> show a <> "\nNodes: " <> show b <> "\nParents: " <> show c <> "\nData: " <> show d
+    show (EClass a b d (SList c _)) = "Id: " <> show a <> "\nNodes: " <> show b <> "\nParents: " <> show c <> "\nData: " <> show d
 

src/Data/Equality/Graph/Internal.hs

@@ -7,7 +7,6 @@
 module Data.Equality.Graph.Internal where
 
 import Data.Functor.Classes
-import qualified Data.Set as S
 
 import Data.Equality.Graph.ReprUnionFind
 import Data.Equality.Graph.Classes
@@ -24,7 +23,7 @@ data EGraph l = EGraph
     , classes   :: !(ClassIdMap (EClass l)) -- ^ Map canonical e-class ids to their e-classes
     , memo      :: !(Memo l)                -- ^ Hashcons maps all canonical e-nodes to their e-class ids
     , worklist  :: !(Worklist l)            -- ^ Worklist of e-class ids that need to be upward merged
-    , analysisWorklist :: !(S.Set (ClassId, ENode l))     -- ^ Like 'worklist' but for analysis repairing
+    , analysisWorklist :: !(Worklist l)     -- ^ Like 'worklist' but for analysis repairing
     }
 
 -- | The hashcons 𝐻  is a map from e-nodes to e-class ids

src/Data/Equality/Graph/Lens.hs

@@ -14,6 +14,7 @@ import qualified Data.Set as S
 import Data.Functor.Identity
 import Data.Functor.Const
 
+import Data.Equality.Utils.SizedList
 import Data.Equality.Graph.Internal
 import Data.Equality.Graph.Classes.Id
 import Data.Equality.Graph.Nodes
@@ -61,7 +62,7 @@ _data afa EClass{..} = (\d1 -> EClass eClassId eClassNodes d1 eClassParents) <$>
 {-# INLINE _data #-}
 
 -- | Lens for the parent e-classes of an e-class
-_parents :: Lens' (EClass l) (S.Set (ClassId, ENode l))
+_parents :: Lens' (EClass l) (SList (ClassId, ENode l))
 _parents afa EClass{..} = (\ps -> EClass eClassId eClassNodes eClassData ps) <$> afa eClassParents
 {-# INLINE _parents #-}