metrics: update ModelView

[nit.git] / src / metrics / rta_metrics.nit

diff --git a/src/metrics/rta_metrics.nit b/src/metrics/rta_metrics.nit
index a4c3e28..ef11924 100644 (file)
--- a/src/metrics/rta_metrics.nit
+++ b/src/metrics/rta_metrics.nit
@@ -38,25 +38,26 @@ private class RTAMetricsPhase
                out.mkdir
 
                var model = toolcontext.modelbuilder.model
-               var model_view = model.protected_view
+               var model_view = new ModelView(model, mainmodule)
+               model_view.min_visibility = protected_visibility
 
                print toolcontext.format_h1("\n# RTA metrics")
 
                print toolcontext.format_h2("\n ## Live instances by mainmodules")
                var mmetrics = new MetricSet
-               mmetrics.register(new MNLC(mainmodule, model_view, toolcontext.modelbuilder))
-               mmetrics.register(new MNLT(mainmodule, model_view, toolcontext.modelbuilder))
-               mmetrics.register(new MNCT(mainmodule, model_view, toolcontext.modelbuilder))
-               mmetrics.register(new MNLI(mainmodule, model_view, toolcontext.modelbuilder))
-               mmetrics.register(new MNLM(mainmodule, model_view, toolcontext.modelbuilder))
-               mmetrics.register(new MNLMD(mainmodule, model_view, toolcontext.modelbuilder))
-               mmetrics.register(new MNLDD(mainmodule, model_view, toolcontext.modelbuilder))
+               mmetrics.register(new MNLC(model_view, toolcontext.modelbuilder))
+               mmetrics.register(new MNLT(model_view, toolcontext.modelbuilder))
+               mmetrics.register(new MNCT(model_view, toolcontext.modelbuilder))
+               mmetrics.register(new MNLI(model_view, toolcontext.modelbuilder))
+               mmetrics.register(new MNLM(model_view, toolcontext.modelbuilder))
+               mmetrics.register(new MNLMD(model_view, toolcontext.modelbuilder))
+               mmetrics.register(new MNLDD(model_view, toolcontext.modelbuilder))
                mmetrics.collect(new HashSet[MModule].from([mainmodule]))
                mmetrics.to_console(1, not toolcontext.opt_nocolors.value)
                if csv then mmetrics.to_csv.write_to_file("{out}/{mainmodule}.csv")
 
                var mtypes = new HashSet[MType]
-               var analysis = new RapidTypeAnalysis(toolcontext.modelbuilder, mainmodule)
+               var analysis = new MetricsRapidTypeAnalysis(toolcontext.modelbuilder, mainmodule, model_view)
                analysis.run_analysis
                mtypes.add_all(analysis.live_types)
                mtypes.add_all(analysis.live_cast_types)
@@ -139,7 +140,7 @@ class MNLI
 
        redef fun collect(mainmodules) do
                for mainmodule in mainmodules do
-                       var analysis = new RapidTypeAnalysis(modelbuilder, mainmodule)
+                       var analysis = new MetricsRapidTypeAnalysis(modelbuilder, mainmodule, model_view)
                        analysis.run_analysis
                        values[mainmodule] = analysis.tnli.sum
                end
@@ -155,7 +156,7 @@ class MNLT
 
        redef fun collect(mainmodules) do
                for mainmodule in mainmodules do
-                       var analysis = new RapidTypeAnalysis(modelbuilder, mainmodule)
+                       var analysis = new MetricsRapidTypeAnalysis(modelbuilder, mainmodule, model_view)
                        analysis.run_analysis
                        values[mainmodule] = analysis.live_types.length
                end
@@ -171,7 +172,7 @@ class MNCT
 
        redef fun collect(mainmodules) do
                for mainmodule in mainmodules do
-                       var analysis = new RapidTypeAnalysis(modelbuilder, mainmodule)
+                       var analysis = new MetricsRapidTypeAnalysis(modelbuilder, mainmodule, model_view)
                        analysis.run_analysis
                        values[mainmodule] = analysis.live_cast_types.length
                end
@@ -188,7 +189,7 @@ class MNLC
        redef fun collect(mainmodules) do
                for mainmodule in mainmodules do
                        var live = new HashSet[MClass]
-                       var analysis = new RapidTypeAnalysis(modelbuilder, mainmodule)
+                       var analysis = new MetricsRapidTypeAnalysis(modelbuilder, mainmodule, model_view)
                        analysis.run_analysis
                        for mtype in analysis.live_types do
                                live.add(mtype.mclass)
@@ -207,7 +208,7 @@ class MNLM
 
        redef fun collect(mainmodules) do
                for mainmodule in mainmodules do
-                       var analysis = new RapidTypeAnalysis(modelbuilder, mainmodule)
+                       var analysis = new MetricsRapidTypeAnalysis(modelbuilder, mainmodule, model_view)
                        analysis.run_analysis
                        values[mainmodule] = analysis.live_methods.length
                end
@@ -223,7 +224,7 @@ class MNLMD
 
        redef fun collect(mainmodules) do
                for mainmodule in mainmodules do
-                       var analysis = new RapidTypeAnalysis(modelbuilder, mainmodule)
+                       var analysis = new MetricsRapidTypeAnalysis(modelbuilder, mainmodule, model_view)
                        analysis.run_analysis
                        values[mainmodule] = analysis.live_methoddefs.length
                end
@@ -240,7 +241,7 @@ class MNLDD
        redef fun collect(mainmodules) do
                for mainmodule in mainmodules do
                        var dead = 0
-                       var analysis = new RapidTypeAnalysis(modelbuilder, mainmodule)
+                       var analysis = new MetricsRapidTypeAnalysis(modelbuilder, mainmodule, model_view)
                        analysis.run_analysis
                        for mmethod in analysis.live_methods do
                                for mdef in mmethod.mpropdefs do
@@ -351,13 +352,18 @@ end
 
 # rta redef
 
-redef class RapidTypeAnalysis
+# Custom RTA analyzer
+class MetricsRapidTypeAnalysis
+       super RapidTypeAnalysis
+
+       # Model view used to linearize classes
+       var view: ModelView
 
        # Class Live Instances
-       var cnli: CNLI is lazy do return new CNLI(mainmodule, modelbuilder.model.protected_view)
+       var cnli: CNLI is lazy do return new CNLI(view)
 
        # Class Live Casts
-       var cnlc: CNLC is lazy do return new CNLC(mainmodule, modelbuilder.model.protected_view)
+       var cnlc: CNLC is lazy do return new CNLC(view)
 
        # Type Live Instances
        var tnli = new TNLI