nitg-s: replaced NaiveTypeColoring by BMTypeLayoutBuilder

[nit.git] / src / coloring.nit

diff --git a/src/coloring.nit b/src/coloring.nit
index e43e26e..3f94e87 100644 (file)
--- a/src/coloring.nit
+++ b/src/coloring.nit
@@ -18,6 +18,40 @@ module coloring
 import typing
 
 abstract class TypeLayoutBuilder
+       private var mmodule: MModule
+       init(mmodule: MModule) do self.mmodule = mmodule
+end
+
+class TypeLayout
+       # Unic ids or each Mtype
+       var ids: Map[MType, Int] = new HashMap[MType, Int]
+       # Fixed positions of each MType in all tables
+       var pos: Map[MType, Int] = new HashMap[MType, Int]
+end
+
+# Layout builder for MType using Binary Matrix (BM)
+class BMTypeLayoutBuilder
+       super TypeLayoutBuilder
+
+       init(mmodule: MModule) do super
+
+       # Compute mtypes ids and position using BM
+       fun build_layout(mtypes: Set[MType]): TypeLayout do
+               var result = new TypeLayout
+               result.ids = self.compute_ids(mtypes)
+               result.pos = result.ids
+               return result
+       end
+
+       # Give each MType a unic id using a descending linearization of the `mtypes` set
+       private fun compute_ids(mtypes: Set[MType]): Map[MType, Int] do
+               var ids = new HashMap[MType, Int]
+               var lin = self.mmodule.reverse_linearize_mtypes(mtypes)
+               for mtype in lin do
+                       ids[mtype] = ids.length
+               end
+               return ids
+       end
 end
 
 abstract class AbstractColoring[E: Object]
@@ -157,9 +191,7 @@ class TypeColoring
 
        type T: MType
 
-       private var mmodule: MModule
-
-       init(mainmodule: MModule) do self.mmodule = mainmodule
+       init(mmodule: MModule) do self.mmodule = mmodule
 
        redef fun super_elements(element, elements) do return self.mmodule.super_mtypes(element, elements)
        redef fun is_element_mi(element, elements) do return self.super_elements(element, elements).length > 1
@@ -168,19 +200,6 @@ class TypeColoring
        redef fun reverse_linearize(elements) do return self.mmodule.reverse_linearize_mtypes(elements)
 end
 
-class NaiveTypeColoring
-       super TypeColoring
-
-       init(mainmodule: MModule) do super
-
-       # naive coloring that use incremental coloring
-       redef fun colorize_elements(elements) do
-               for e in elements do
-                       self.coloration_result[e] = self.coloration_result.length
-               end
-       end
-end
-
 abstract class TypePerfectHashing
        super TypeColoring