src/model: model_visitor uses MEntity::visibility

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

diff --git a/src/metrics/mclasses_metrics.nit b/src/metrics/mclasses_metrics.nit
index ed41a9f..0951d10 100644 (file)
--- a/src/metrics/mclasses_metrics.nit
+++ b/src/metrics/mclasses_metrics.nit
@@ -34,32 +34,32 @@ private class MClassesMetricsPhase
                var out = "{toolcontext.opt_dir.value or else "metrics"}/mclasses"
                out.mkdir
 
+               var model = toolcontext.modelbuilder.model
+               var model_view = model.private_view
 
                print toolcontext.format_h1("\n# MClasses metrics")
 
                var metrics = new MetricSet
-               var min_vis = private_visibility
                metrics.register(new CNOA(mainmodule))
                metrics.register(new CNOP(mainmodule))
                metrics.register(new CNOC(mainmodule))
                metrics.register(new CNOD(mainmodule))
                metrics.register(new CDIT(mainmodule))
-               metrics.register(new CNBP(mainmodule, min_vis))
-               metrics.register(new CNBA(mainmodule, min_vis))
-               metrics.register(new CNBIP(mainmodule, min_vis))
-               metrics.register(new CNBRP(mainmodule, min_vis))
-               metrics.register(new CNBHP(mainmodule, min_vis))
+               metrics.register(new CNBP(mainmodule, model_view))
+               metrics.register(new CNBA(mainmodule, model_view))
+               metrics.register(new CNBIP(mainmodule, model_view))
+               metrics.register(new CNBRP(mainmodule, model_view))
+               metrics.register(new CNBHP(mainmodule, model_view))
                #TODO metrics.register(new CNBI) # nb init
                #TODO metrics.register(new CNBM) # nb methods
                #TODO metrics.register(new CNBV) # nb vtypes
 
-               var model = toolcontext.modelbuilder.model
                var mclasses = new HashSet[MClass]
-               for mproject in model.mprojects do
+               for mpackage in model.mpackages do
 
-                       print toolcontext.format_h2("\n ## project {mproject}")
+                       print toolcontext.format_h2("\n ## package {mpackage}")
 
-                       for mgroup in mproject.mgroups do
+                       for mgroup in mpackage.mgroups do
                                if mgroup.mmodules.is_empty then continue
                                metrics.clear
 
@@ -71,7 +71,7 @@ private class MClassesMetricsPhase
                                mclasses.add_all(mod_mclasses)
                                metrics.collect(new HashSet[MClass].from(mod_mclasses))
                                metrics.to_console(1, not toolcontext.opt_nocolors.value)
-                               if csv then metrics.to_csv.save("{out}/{mgroup}.csv")
+                               if csv then metrics.to_csv.write_to_file("{out}/{mgroup}.csv")
                        end
                end
                if not mclasses.is_empty then
@@ -80,7 +80,7 @@ private class MClassesMetricsPhase
                        print toolcontext.format_h2("\n ## global metrics")
                        metrics.collect(mclasses)
                        metrics.to_console(1, not toolcontext.opt_nocolors.value)
-                       if csv then metrics.to_csv.save("{out}/summary.csv")
+                       if csv then metrics.to_csv.write_to_file("{out}/summary.csv")
                end
        end
 end
@@ -184,16 +184,16 @@ class CNBP
        redef fun desc do return "number of accessible properties (inherited + local)"
 
        var mainmodule: MModule
-       var min_visibility: MVisibility
+       var model_view: ModelView
 
-       init(mainmodule: MModule, min_visibility: MVisibility) do
+       init(mainmodule: MModule, model_view: ModelView) do
                self.mainmodule = mainmodule
-               self.min_visibility = min_visibility
+               self.model_view = model_view
        end
 
        redef fun collect(mclasses) do
                for mclass in mclasses do
-                       values[mclass] = mclass.collect_accessible_mproperties(min_visibility).length
+                       values[mclass] = mclass.collect_accessible_mproperties(model_view).length
                end
        end
 end
@@ -206,16 +206,16 @@ class CNBA
        redef fun desc do return "number of accessible attributes (inherited + local)"
 
        var mainmodule: MModule
-       var min_visibility: MVisibility
+       var model_view: ModelView
 
-       init(mainmodule: MModule, min_visibility: MVisibility) do
+       init(mainmodule: MModule, model_view: ModelView) do
                self.mainmodule = mainmodule
-               self.min_visibility = min_visibility
+               self.model_view = model_view
        end
 
        redef fun collect(mclasses) do
                for mclass in mclasses do
-                       values[mclass] = mclass.collect_accessible_mattributes(min_visibility).length
+                       values[mclass] = mclass.collect_accessible_mattributes(model_view).length
                end
        end
 end
@@ -228,16 +228,16 @@ class CNBIP
        redef fun desc do return "number of introduced properties"
 
        var mainmodule: MModule
-       var min_visibility: MVisibility
+       var model_view: ModelView
 
-       init(mainmodule: MModule, min_visibility: MVisibility) do
+       init(mainmodule: MModule, model_view: ModelView) do
                self.mainmodule = mainmodule
-               self.min_visibility = min_visibility
+               self.model_view = model_view
        end
 
        redef fun collect(mclasses) do
                for mclass in mclasses do
-                       values[mclass] = mclass.collect_intro_mproperties(min_visibility).length
+                       values[mclass] = mclass.collect_intro_mproperties(model_view).length
                end
        end
 end
@@ -250,16 +250,16 @@ class CNBRP
        redef fun desc do return "number of redefined properties"
 
        var mainmodule: MModule
-       var min_visibility: MVisibility
+       var model_view: ModelView
 
-       init(mainmodule: MModule, min_visibility: MVisibility) do
+       init(mainmodule: MModule, model_view: ModelView) do
                self.mainmodule = mainmodule
-               self.min_visibility = min_visibility
+               self.model_view = model_view
        end
 
        redef fun collect(mclasses) do
                for mclass in mclasses do
-                       values[mclass] = mclass.collect_redef_mproperties(min_visibility).length
+                       values[mclass] = mclass.collect_redef_mproperties(model_view).length
                end
        end
 end
@@ -272,16 +272,16 @@ class CNBHP
        redef fun desc do return "number of inherited properties"
 
        var mainmodule: MModule
-       var min_visibility: MVisibility
+       var model_view: ModelView
 
-       init(mainmodule: MModule, min_visibility: MVisibility) do
+       init(mainmodule: MModule, model_view: ModelView) do
                self.mainmodule = mainmodule
-               self.min_visibility = min_visibility
+               self.model_view = model_view
        end
 
        redef fun collect(mclasses) do
                for mclass in mclasses do
-                       values[mclass] = mclass.collect_inherited_mproperties(min_visibility).length
+                       values[mclass] = mclass.collect_inherited_mproperties(model_view).length
                end
        end
 end
@@ -294,16 +294,16 @@ class CNBLP
        redef fun desc do return "number of local properties (intro + redef)"
 
        var mainmodule: MModule
-       var min_visibility: MVisibility
+       var model_view: ModelView
 
-       init(mainmodule: MModule, min_visibility: MVisibility) do
+       init(mainmodule: MModule, model_view: ModelView) do
                self.mainmodule = mainmodule
-               self.min_visibility = min_visibility
+               self.model_view = model_view
        end
 
        redef fun collect(mclasses) do
                for mclass in mclasses do
-                       values[mclass] = mclass.collect_local_mproperties(min_visibility).length
+                       values[mclass] = mclass.collect_local_mproperties(model_view).length
                end
        end
 end