metrics: update ModelView

Signed-off-by: Alexandre Terrasa <alexandre@moz-code.org>

diff --git a/src/metrics/codesmells_metrics.nit b/src/metrics/codesmells_metrics.nit
index e335d8f..7e9b8d3 100644 (file)
--- a/src/metrics/codesmells_metrics.nit
+++ b/src/metrics/codesmells_metrics.nit
@@ -33,8 +33,10 @@ class CodeSmellsMetricsPhase
 
        redef fun process_mainmodule(mainmodule, given_mmodules) do
                print toolcontext.format_h1("--- Code Smells Metrics ---")
 
        redef fun process_mainmodule(mainmodule, given_mmodules) do
                print toolcontext.format_h1("--- Code Smells Metrics ---")

-               self.set_all_average_metrics
-               var mclass_codesmell = new BadConceptonController
+
+               var view = new ModelView(toolcontext.modelbuilder.model, mainmodule)
+               self.set_all_average_metrics(view)
+               var mclass_codesmell = new BadConceptonController(view)

                var collect = new Counter[MClassDef]
                var mclassdefs = new Array[MClassDef]
 
                var collect = new Counter[MClassDef]
                var mclassdefs = new Array[MClassDef]
 

@@ -48,17 +50,19 @@ class CodeSmellsMetricsPhase
                end
        end
 
                end
        end
 

-       fun set_all_average_metrics do
+       fun set_all_average_metrics(view: ModelView) do

                var model_builder = toolcontext.modelbuilder
                var model_builder = toolcontext.modelbuilder

-               var model_view = model_builder.model.private_view
-               self.average_number_of_lines = model_view.get_avg_linenumber(model_builder)
-               self.average_number_of_parameter = model_view.get_avg_parameter
-               self.average_number_of_method = model_view.get_avg_method
-               self.average_number_of_attribute = model_view.get_avg_attribut
+               self.average_number_of_lines = view.get_avg_linenumber(model_builder)
+               self.average_number_of_parameter = view.get_avg_parameter
+               self.average_number_of_method = view.get_avg_method
+               self.average_number_of_attribute = view.get_avg_attribut

        end
 end
 
 class BadConceptonController
        end
 end
 
 class BadConceptonController

+
+       var view: ModelView
+

        # Code smell list
        var bad_conception_elements = new Array[BadConceptionFinder]
 
        # Code smell list
        var bad_conception_elements = new Array[BadConceptionFinder]
 

@@ -79,7 +83,7 @@ class BadConceptonController
        # Collect method take Array of mclassdef to find the code smells for every class
        fun collect(mclassdefs: Array[MClassDef],phase: CodeSmellsMetricsPhase) do
                for mclassdef in mclassdefs do
        # Collect method take Array of mclassdef to find the code smells for every class
        fun collect(mclassdefs: Array[MClassDef],phase: CodeSmellsMetricsPhase) do
                for mclassdef in mclassdefs do

-                       var bad_conception_class = new BadConceptionFinder(mclassdef,phase)
+                       var bad_conception_class = new BadConceptionFinder(mclassdef, phase, view)

                        bad_conception_class.collect
                        bad_conception_elements.add(bad_conception_class)
                end
                        bad_conception_class.collect
                        bad_conception_elements.add(bad_conception_class)
                end

@@ -112,17 +116,18 @@ class BadConceptionFinder
        var mclassdef: MClassDef
        var array_badconception = new Array[BadConception]
        var phase: CodeSmellsMetricsPhase
        var mclassdef: MClassDef
        var array_badconception = new Array[BadConception]
        var phase: CodeSmellsMetricsPhase

+       var view: ModelView

        var score = 0.0
 
        # Collect code smell with selected toolcontext option
        fun collect do
                var bad_conception_elements = new Array[BadConception]
                # Check toolcontext option
        var score = 0.0
 
        # Collect code smell with selected toolcontext option
        fun collect do
                var bad_conception_elements = new Array[BadConception]
                # Check toolcontext option

-               if phase.toolcontext.opt_feature_envy.value or phase.toolcontext.opt_all.value then bad_conception_elements.add(new FeatureEnvy(phase))
-               if phase.toolcontext.opt_long_method.value or phase.toolcontext.opt_all.value then bad_conception_elements.add(new LongMethod(phase))
-               if phase.toolcontext.opt_long_params.value or phase.toolcontext.opt_all.value then bad_conception_elements.add(new LongParameterList(phase))
-               if phase.toolcontext.opt_no_abstract_implementation.value or phase.toolcontext.opt_all.value then bad_conception_elements.add(new NoAbstractImplementation(phase))
-               if phase.toolcontext.opt_large_class.value or phase.toolcontext.opt_all.value then bad_conception_elements.add(new LargeClass(phase))
+               if phase.toolcontext.opt_feature_envy.value or phase.toolcontext.opt_all.value then bad_conception_elements.add(new FeatureEnvy(phase, view))
+               if phase.toolcontext.opt_long_method.value or phase.toolcontext.opt_all.value then bad_conception_elements.add(new LongMethod(phase, view))
+               if phase.toolcontext.opt_long_params.value or phase.toolcontext.opt_all.value then bad_conception_elements.add(new LongParameterList(phase, view))
+               if phase.toolcontext.opt_no_abstract_implementation.value or phase.toolcontext.opt_all.value then bad_conception_elements.add(new NoAbstractImplementation(phase, view))
+               if phase.toolcontext.opt_large_class.value or phase.toolcontext.opt_all.value then bad_conception_elements.add(new LargeClass(phase, view))

                # Collected all code smell if their state is true
                for bad_conception_element in bad_conception_elements do
                        if bad_conception_element.collect(self.mclassdef,phase.toolcontext.modelbuilder) then array_badconception.add(bad_conception_element)
                # Collected all code smell if their state is true
                for bad_conception_element in bad_conception_elements do
                        if bad_conception_element.collect(self.mclassdef,phase.toolcontext.modelbuilder) then array_badconception.add(bad_conception_element)

@@ -153,6 +158,8 @@ end
 abstract class BadConception
        var phase: CodeSmellsMetricsPhase
 
 abstract class BadConception
        var phase: CodeSmellsMetricsPhase
 

+       var view: ModelView
+

        var score = 0.0
 
        # Name
        var score = 0.0
 
        # Name

@@ -184,9 +191,9 @@ class LargeClass
        redef fun desc do return "Large class"
 
        redef fun collect(mclassdef, model_builder): Bool do
        redef fun desc do return "Large class"
 
        redef fun collect(mclassdef, model_builder): Bool do

-               self.number_attribut = mclassdef.collect_intro_and_redef_mattributes(model_builder.model.private_view).length
+               self.number_attribut = mclassdef.collect_intro_and_redef_mattributes(view).length

                # Get the number of methods (Accessor include) (subtract the get and set of attibutes with (numberAtribut*2))
                # Get the number of methods (Accessor include) (subtract the get and set of attibutes with (numberAtribut*2))

-               self.number_method = mclassdef.collect_intro_and_redef_methods(model_builder.model.private_view).length
+               self.number_method = mclassdef.collect_intro_and_redef_methods(view).length

                self.score_rate
                return self.number_method.to_f > phase.average_number_of_method and self.number_attribut.to_f > phase.average_number_of_attribute
        end
                self.score_rate
                return self.number_method.to_f > phase.average_number_of_method and self.number_attribut.to_f > phase.average_number_of_attribute
        end

@@ -209,7 +216,7 @@ class LongParameterList
        redef fun desc do return "Long parameter list"
 
        redef fun collect(mclassdef, model_builder): Bool do
        redef fun desc do return "Long parameter list"
 
        redef fun collect(mclassdef, model_builder): Bool do

-               for meth in mclassdef.collect_intro_and_redef_mpropdefs(model_builder.model.private_view) do
+               for meth in mclassdef.collect_intro_and_redef_mpropdefs(view) do

                        var threshold_value = 4
                        # Get the threshold value from the toolcontext command
                        if phase.toolcontext.opt_long_params_threshold.value != 0 then threshold_value = phase.toolcontext.opt_long_params_threshold.value
                        var threshold_value = 4
                        # Get the threshold value from the toolcontext command
                        if phase.toolcontext.opt_long_params_threshold.value != 0 then threshold_value = phase.toolcontext.opt_long_params_threshold.value

@@ -250,7 +257,7 @@ class FeatureEnvy
        redef fun desc do return "Feature envy"
 
        redef fun collect(mclassdef, model_builder): Bool do
        redef fun desc do return "Feature envy"
 
        redef fun collect(mclassdef, model_builder): Bool do

-               var mmethoddefs = call_analyze_methods(mclassdef,model_builder)
+               var mmethoddefs = call_analyze_methods(mclassdef,model_builder, view)

                for mmethoddef in mmethoddefs do
                        var max_class_call = mmethoddef.class_call.max
                        # Check if the class with the maximum call is >= auto-call and the maximum call class is != of this class
                for mmethoddef in mmethoddefs do
                        var max_class_call = mmethoddef.class_call.max
                        # Check if the class with the maximum call is >= auto-call and the maximum call class is != of this class

@@ -295,7 +302,7 @@ class LongMethod
        redef fun desc do return "Long method"
 
        redef fun collect(mclassdef, model_builder): Bool do
        redef fun desc do return "Long method"
 
        redef fun collect(mclassdef, model_builder): Bool do

-               var mmethoddefs = call_analyze_methods(mclassdef,model_builder)
+               var mmethoddefs = call_analyze_methods(mclassdef,model_builder, view)

                var threshold_value = phase.average_number_of_lines.to_i
                # Get the threshold value from the toolcontext command
                if phase.toolcontext.opt_long_method_threshold.value != 0 then threshold_value = phase.toolcontext.opt_long_method_threshold.value
                var threshold_value = phase.average_number_of_lines.to_i
                # Get the threshold value from the toolcontext command
                if phase.toolcontext.opt_long_method_threshold.value != 0 then threshold_value = phase.toolcontext.opt_long_method_threshold.value

@@ -335,8 +342,8 @@ class NoAbstractImplementation
 
        redef fun collect(mclassdef, model_builder): Bool do
                if not mclassdef.mclass.is_abstract and not mclassdef.mclass.is_interface then
 
        redef fun collect(mclassdef, model_builder): Bool do
                if not mclassdef.mclass.is_abstract and not mclassdef.mclass.is_interface then

-                       if mclassdef.collect_abstract_methods(model_builder.model.private_view).not_empty then
-                               bad_methods.add_all(mclassdef.collect_not_define_properties(model_builder.model.private_view))
+                       if mclassdef.collect_abstract_methods(view).not_empty then
+                               bad_methods.add_all(mclassdef.collect_not_define_properties(view))

                        end
                end
                self.score_rate
                        end
                end
                self.score_rate

@@ -399,7 +406,7 @@ redef class ModelView
                for mclassdef in mclassdefs do
                        var result = 0
                        var count = 0
                for mclassdef in mclassdefs do
                        var result = 0
                        var count = 0

-                       for mmethoddef in call_analyze_methods(mclassdef,model_builder) do
+                       for mmethoddef in call_analyze_methods(mclassdef,model_builder, self) do

                                result += mmethoddef.line_number
                                if mmethoddef.line_number == 0 then continue
                                count += 1
                                result += mmethoddef.line_number
                                if mmethoddef.line_number == 0 then continue
                                count += 1

diff --git a/src/metrics/inheritance_metrics.nit b/src/metrics/inheritance_metrics.nit
index a9a4a6d..29a15ce 100644 (file)
--- a/src/metrics/inheritance_metrics.nit
+++ b/src/metrics/inheritance_metrics.nit
@@ -38,28 +38,28 @@ private class InheritanceMetricsPhase
                out.mkdir
 
                var model = toolcontext.modelbuilder.model
                out.mkdir
 
                var model = toolcontext.modelbuilder.model

-               var model_view = model.private_view
+               var model_view = new ModelView(model, mainmodule)

 
                print toolcontext.format_h1("\n# Inheritance metrics")
 
                var hmetrics = new MetricSet
 
                print toolcontext.format_h1("\n# Inheritance metrics")
 
                var hmetrics = new MetricSet

-               hmetrics.register(new MDUI(mainmodule, model_view))
-               hmetrics.register(new MDUIC(mainmodule, model_view))
-               hmetrics.register(new MDUII(mainmodule, model_view))
-               hmetrics.register(new MIF(mainmodule, model_view))
-               hmetrics.register(new MIFC(mainmodule, model_view))
-               hmetrics.register(new MIFI(mainmodule, model_view))
+               hmetrics.register(new MDUI(model_view))
+               hmetrics.register(new MDUIC(model_view))
+               hmetrics.register(new MDUII(model_view))
+               hmetrics.register(new MIF(model_view))
+               hmetrics.register(new MIFC(model_view))
+               hmetrics.register(new MIFI(model_view))

 
                var cmetrics = new MetricSet
 
                var cmetrics = new MetricSet

-               cmetrics.register(new CNOAC(mainmodule, model_view))
-               cmetrics.register(new CNOPC(mainmodule, model_view))
-               cmetrics.register(new CNOCC(mainmodule, model_view))
-               cmetrics.register(new CNODC(mainmodule, model_view))
-               cmetrics.register(new CNOPI(mainmodule, model_view))
-               cmetrics.register(new CNOCI(mainmodule, model_view))
-               cmetrics.register(new CNODI(mainmodule, model_view))
-               cmetrics.register(new CDITC(mainmodule, model_view))
-               cmetrics.register(new CDITI(mainmodule, model_view))
+               cmetrics.register(new CNOAC(model_view))
+               cmetrics.register(new CNOPC(model_view))
+               cmetrics.register(new CNOCC(model_view))
+               cmetrics.register(new CNODC(model_view))
+               cmetrics.register(new CNOPI(model_view))
+               cmetrics.register(new CNOCI(model_view))
+               cmetrics.register(new CNODI(model_view))
+               cmetrics.register(new CDITC(model_view))
+               cmetrics.register(new CDITI(model_view))

 
                var mmodules = new HashSet[MModule]
                var mclasses = new HashSet[MClass]
 
                var mmodules = new HashSet[MModule]
                var mclasses = new HashSet[MClass]

@@ -116,7 +116,7 @@ class MDUI
                for mmodule in mmodules do
                        var count = 0
                        for mclass in mmodule.intro_mclasses do
                for mmodule in mmodules do
                        var count = 0
                        for mclass in mmodule.intro_mclasses do

-                               if mclass.in_hierarchy(mainmodule).greaters.length > 2 then count += 1
+                               if mclass.in_hierarchy(model_view.mainmodule).greaters.length > 2 then count += 1

                        end
                        if mmodule.intro_mclasses.is_empty then
                                values[mmodule] = 0.0
                        end
                        if mmodule.intro_mclasses.is_empty then
                                values[mmodule] = 0.0

@@ -142,7 +142,7 @@ class MDUIC
                        var nb = 0
                        for mclass in mmodule.intro_mclasses do
                                if mclass.kind == abstract_kind or mclass.kind == concrete_kind or mclass.kind == extern_kind then
                        var nb = 0
                        for mclass in mmodule.intro_mclasses do
                                if mclass.kind == abstract_kind or mclass.kind == concrete_kind or mclass.kind == extern_kind then

-                                       if mclass.in_hierarchy(mainmodule).greaters.length > 2 then count += 1
+                                       if mclass.in_hierarchy(model_view.mainmodule).greaters.length > 2 then count += 1

                                end
                                nb += 1
                        end
                                end
                                nb += 1
                        end

@@ -170,7 +170,7 @@ class MDUII
                        var nb = 0
                        for mclass in mmodule.intro_mclasses do
                                if mclass.kind == interface_kind then
                        var nb = 0
                        for mclass in mmodule.intro_mclasses do
                                if mclass.kind == interface_kind then

-                                       if mclass.in_hierarchy(mainmodule).greaters.length > 2 then count += 1
+                                       if mclass.in_hierarchy(model_view.mainmodule).greaters.length > 2 then count += 1

                                end
                                nb += 1
                        end
                                end
                                nb += 1
                        end

@@ -196,7 +196,7 @@ class MIF
                for mmodule in mmodules do
                        var count = 0
                        for mclass in mmodule.intro_mclasses do
                for mmodule in mmodules do
                        var count = 0
                        for mclass in mmodule.intro_mclasses do

-                               if mclass.in_hierarchy(mainmodule).direct_smallers.length > 0 then count += 1
+                               if mclass.in_hierarchy(model_view.mainmodule).direct_smallers.length > 0 then count += 1

                        end
                        if mmodule.intro_mclasses.is_empty then
                                values[mmodule] = 0.0
                        end
                        if mmodule.intro_mclasses.is_empty then
                                values[mmodule] = 0.0

@@ -222,7 +222,7 @@ class MIFC
                        var nb = 0
                        for mclass in mmodule.intro_mclasses do
                                if mclass.kind == abstract_kind or mclass.kind == concrete_kind or mclass.kind == extern_kind then
                        var nb = 0
                        for mclass in mmodule.intro_mclasses do
                                if mclass.kind == abstract_kind or mclass.kind == concrete_kind or mclass.kind == extern_kind then

-                                       if mclass.in_hierarchy(mainmodule).direct_smallers.length > 0 then count += 1
+                                       if mclass.in_hierarchy(model_view.mainmodule).direct_smallers.length > 0 then count += 1

                                end
                                nb += 1
                        end
                                end
                                nb += 1
                        end

@@ -250,7 +250,7 @@ class MIFI
                        var nb = 0
                        for mclass in mmodule.intro_mclasses do
                                if mclass.kind == interface_kind then
                        var nb = 0
                        for mclass in mmodule.intro_mclasses do
                                if mclass.kind == interface_kind then

-                                       if mclass.in_hierarchy(mainmodule).direct_smallers.length > 0 then count += 1
+                                       if mclass.in_hierarchy(model_view.mainmodule).direct_smallers.length > 0 then count += 1

                                end
                                nb += 1
                        end
                                end
                                nb += 1
                        end

@@ -275,7 +275,7 @@ class CNOAC
        redef fun collect(mclasses) do
                for mclass in mclasses do
                        var count = 0
        redef fun collect(mclasses) do
                for mclass in mclasses do
                        var count = 0

-                       for parent in mclass.in_hierarchy(mainmodule).greaters do
+                       for parent in mclass.in_hierarchy(model_view.mainmodule).greaters do

                                if parent == mclass then continue
                                if parent.kind == abstract_kind or parent.kind == concrete_kind or parent.kind == extern_kind then
                                        count += 1
                                if parent == mclass then continue
                                if parent.kind == abstract_kind or parent.kind == concrete_kind or parent.kind == extern_kind then
                                        count += 1

@@ -298,7 +298,7 @@ class CNOPC
        redef fun collect(mclasses) do
                for mclass in mclasses do
                        var count = 0
        redef fun collect(mclasses) do
                for mclass in mclasses do
                        var count = 0

-                       for parent in mclass.in_hierarchy(mainmodule).direct_greaters do
+                       for parent in mclass.in_hierarchy(model_view.mainmodule).direct_greaters do

                                if parent == mclass then continue
                                if parent.kind == abstract_kind or parent.kind == concrete_kind or parent.kind == extern_kind then
                                        count += 1
                                if parent == mclass then continue
                                if parent.kind == abstract_kind or parent.kind == concrete_kind or parent.kind == extern_kind then
                                        count += 1

@@ -321,7 +321,7 @@ class CNOCC
        redef fun collect(mclasses) do
                for mclass in mclasses do
                        var count = 0
        redef fun collect(mclasses) do
                for mclass in mclasses do
                        var count = 0

-                       for parent in mclass.in_hierarchy(mainmodule).direct_smallers do
+                       for parent in mclass.in_hierarchy(model_view.mainmodule).direct_smallers do

                                if parent == mclass then continue
                                if parent.kind == abstract_kind or parent.kind == concrete_kind or parent.kind == extern_kind then
                                        count += 1
                                if parent == mclass then continue
                                if parent.kind == abstract_kind or parent.kind == concrete_kind or parent.kind == extern_kind then
                                        count += 1

@@ -344,7 +344,7 @@ class CNODC
        redef fun collect(mclasses) do
                for mclass in mclasses do
                        var count = 0
        redef fun collect(mclasses) do
                for mclass in mclasses do
                        var count = 0

-                       for parent in mclass.in_hierarchy(mainmodule).smallers do
+                       for parent in mclass.in_hierarchy(model_view.mainmodule).smallers do

                                if parent == mclass then continue
                                if parent.kind == abstract_kind or parent.kind == concrete_kind or parent.kind == extern_kind then
                                        count += 1
                                if parent == mclass then continue
                                if parent.kind == abstract_kind or parent.kind == concrete_kind or parent.kind == extern_kind then
                                        count += 1

@@ -367,7 +367,7 @@ class CNOAA
        redef fun collect(mclasses) do
                for mclass in mclasses do
                        var count = 0
        redef fun collect(mclasses) do
                for mclass in mclasses do
                        var count = 0

-                       for parent in mclass.in_hierarchy(mainmodule).greaters do
+                       for parent in mclass.in_hierarchy(model_view.mainmodule).greaters do

                                if parent == mclass then continue
                                if parent.kind == abstract_kind then
                                        count += 1
                                if parent == mclass then continue
                                if parent.kind == abstract_kind then
                                        count += 1

@@ -390,7 +390,7 @@ class CNOAI
        redef fun collect(mclasses) do
                for mclass in mclasses do
                        var count = 0
        redef fun collect(mclasses) do
                for mclass in mclasses do
                        var count = 0

-                       for parent in mclass.in_hierarchy(mainmodule).greaters do
+                       for parent in mclass.in_hierarchy(model_view.mainmodule).greaters do

                                if parent == mclass then continue
                                if parent.kind == interface_kind then
                                        count += 1
                                if parent == mclass then continue
                                if parent.kind == interface_kind then
                                        count += 1

@@ -413,7 +413,7 @@ class CNOPI
        redef fun collect(mclasses) do
                for mclass in mclasses do
                        var count = 0
        redef fun collect(mclasses) do
                for mclass in mclasses do
                        var count = 0

-                       for parent in mclass.in_hierarchy(mainmodule).direct_greaters do
+                       for parent in mclass.in_hierarchy(model_view.mainmodule).direct_greaters do

                                if parent == mclass then continue
                                if parent.kind == interface_kind then
                                        count += 1
                                if parent == mclass then continue
                                if parent.kind == interface_kind then
                                        count += 1

@@ -436,7 +436,7 @@ class CNOCI
        redef fun collect(mclasses) do
                for mclass in mclasses do
                        var count = 0
        redef fun collect(mclasses) do
                for mclass in mclasses do
                        var count = 0

-                       for parent in mclass.in_hierarchy(mainmodule).direct_smallers do
+                       for parent in mclass.in_hierarchy(model_view.mainmodule).direct_smallers do

                                if parent == mclass then continue
                                if parent.kind == interface_kind then
                                        count += 1
                                if parent == mclass then continue
                                if parent.kind == interface_kind then
                                        count += 1

@@ -459,7 +459,7 @@ class CNODI
        redef fun collect(mclasses) do
                for mclass in mclasses do
                        var count = 0
        redef fun collect(mclasses) do
                for mclass in mclasses do
                        var count = 0

-                       for parent in mclass.in_hierarchy(mainmodule).smallers do
+                       for parent in mclass.in_hierarchy(model_view.mainmodule).smallers do

                                if parent == mclass then continue
                                if parent.kind == interface_kind then
                                        count += 1
                                if parent == mclass then continue
                                if parent.kind == interface_kind then
                                        count += 1

@@ -481,7 +481,7 @@ class CDITC
 
        redef fun collect(mclasses) do
                for mclass in mclasses do
 
        redef fun collect(mclasses) do
                for mclass in mclasses do

-                       values[mclass] = mclass.ditc(mainmodule)
+                       values[mclass] = mclass.ditc(model_view.mainmodule)

                end
        end
 end
                end
        end
 end

@@ -497,7 +497,7 @@ class CDITI
 
        redef fun collect(mclasses) do
                for mclass in mclasses do
 
        redef fun collect(mclasses) do
                for mclass in mclasses do

-                       values[mclass] = mclass.diti(mainmodule)
+                       values[mclass] = mclass.diti(model_view.mainmodule)

                end
        end
 end
                end
        end
 end

diff --git a/src/metrics/mclasses_metrics.nit b/src/metrics/mclasses_metrics.nit
index 872d66e..2f8b9ef 100644 (file)
--- a/src/metrics/mclasses_metrics.nit
+++ b/src/metrics/mclasses_metrics.nit
@@ -37,24 +37,24 @@ private class MClassesMetricsPhase
                out.mkdir
 
                var model = toolcontext.modelbuilder.model
                out.mkdir
 
                var model = toolcontext.modelbuilder.model

-               var model_view = model.private_view
+               var model_view = new ModelView(model, mainmodule)

 
                print toolcontext.format_h1("\n# MClasses metrics")
 
                var metrics = new MetricSet
 
                print toolcontext.format_h1("\n# MClasses metrics")
 
                var metrics = new MetricSet

-               metrics.register(new CNOA(mainmodule, model_view))
-               metrics.register(new CNOP(mainmodule, model_view))
-               metrics.register(new CNOC(mainmodule, model_view))
-               metrics.register(new CNOD(mainmodule, model_view))
-               metrics.register(new CDIT(mainmodule, model_view))
-               metrics.register(new CNBP(mainmodule, model_view))
-               metrics.register(new CNBA(mainmodule, model_view))
-               metrics.register(new CNBI(mainmodule, model_view))
-               metrics.register(new CNBM(mainmodule, model_view))
-               metrics.register(new CNBV(mainmodule, model_view))
-               metrics.register(new CNBIP(mainmodule, model_view))
-               metrics.register(new CNBRP(mainmodule, model_view))
-               metrics.register(new CNBHP(mainmodule, model_view))
+               metrics.register(new CNOA(model_view))
+               metrics.register(new CNOP(model_view))
+               metrics.register(new CNOC(model_view))
+               metrics.register(new CNOD(model_view))
+               metrics.register(new CDIT(model_view))
+               metrics.register(new CNBP(model_view))
+               metrics.register(new CNBA(model_view))
+               metrics.register(new CNBI(model_view))
+               metrics.register(new CNBM(model_view))
+               metrics.register(new CNBV(model_view))
+               metrics.register(new CNBIP(model_view))
+               metrics.register(new CNBRP(model_view))
+               metrics.register(new CNBHP(model_view))

 
                var mclasses = new HashSet[MClass]
                for mpackage in model.mpackages do
 
                var mclasses = new HashSet[MClass]
                for mpackage in model.mpackages do

@@ -92,9 +92,6 @@ abstract class MClassMetric
        super Metric
        redef type ELM: MClass
 
        super Metric
        redef type ELM: MClass
 

-       # Main module used for class linearization
-       var mainmodule: MModule
-

        # Model view used to collect and filter entities
        var model_view: ModelView
 end
        # Model view used to collect and filter entities
        var model_view: ModelView
 end

@@ -108,7 +105,7 @@ class CNOA
 
        redef fun collect(mclasses) do
                for mclass in mclasses do
 
        redef fun collect(mclasses) do
                for mclass in mclasses do

-                       values[mclass] = mclass.in_hierarchy(mainmodule).greaters.length - 1
+                       values[mclass] = mclass.in_hierarchy(model_view.mainmodule).greaters.length - 1

                end
        end
 end
                end
        end
 end

@@ -122,7 +119,7 @@ class CNOP
 
        redef fun collect(mclasses) do
                for mclass in mclasses do
 
        redef fun collect(mclasses) do
                for mclass in mclasses do

-                       values[mclass] = mclass.in_hierarchy(mainmodule).direct_greaters.length
+                       values[mclass] = mclass.in_hierarchy(model_view.mainmodule).direct_greaters.length

                end
        end
 end
                end
        end
 end

@@ -136,7 +133,7 @@ class CNOC
 
        redef fun collect(mclasses) do
                for mclass in mclasses do
 
        redef fun collect(mclasses) do
                for mclass in mclasses do

-                       values[mclass] = mclass.in_hierarchy(mainmodule).direct_smallers.length
+                       values[mclass] = mclass.in_hierarchy(model_view.mainmodule).direct_smallers.length

                end
        end
 end
                end
        end
 end

@@ -150,7 +147,7 @@ class CNOD
 
        redef fun collect(mclasses) do
                for mclass in mclasses do
 
        redef fun collect(mclasses) do
                for mclass in mclasses do

-                       values[mclass] = mclass.in_hierarchy(mainmodule).smallers.length - 1
+                       values[mclass] = mclass.in_hierarchy(model_view.mainmodule).smallers.length - 1

                end
        end
 end
                end
        end
 end

@@ -164,7 +161,7 @@ class CDIT
 
        redef fun collect(mclasses) do
                for mclass in mclasses do
 
        redef fun collect(mclasses) do
                for mclass in mclasses do

-                       values[mclass] = mclass.in_hierarchy(mainmodule).depth
+                       values[mclass] = mclass.in_hierarchy(model_view.mainmodule).depth

                end
        end
 end
                end
        end
 end

diff --git a/src/metrics/mendel_metrics.nit b/src/metrics/mendel_metrics.nit
index 5bd6f97..42b20ad 100644 (file)
--- a/src/metrics/mendel_metrics.nit
+++ b/src/metrics/mendel_metrics.nit
@@ -67,7 +67,8 @@ private class MendelMetricsPhase
                print toolcontext.format_h1("\n# Mendel metrics")
 
                var model = toolcontext.modelbuilder.model
                print toolcontext.format_h1("\n# Mendel metrics")
 
                var model = toolcontext.modelbuilder.model

-               var model_view = model.protected_view
+               var model_view = new ModelView(model, mainmodule)
+               model_view.min_visibility = protected_visibility

 
                var mclasses = new HashSet[MClass]
                for mclass in model_view.mclasses do
 
                var mclasses = new HashSet[MClass]
                for mclass in model_view.mclasses do

@@ -75,9 +76,9 @@ private class MendelMetricsPhase
                        mclasses.add(mclass)
                end
 
                        mclasses.add(mclass)
                end
 

-               var cnblp = new CNBLP(mainmodule, model_view)
-               var cnvi = new CNVI(mainmodule, model_view)
-               var cnvs = new CNVS(mainmodule, model_view)
+               var cnblp = new CNBLP(model_view)
+               var cnvi = new CNVI(model_view)
+               var cnvs = new CNVS(model_view)

 
                var metrics = new MetricSet
                metrics.register(cnblp, cnvi, cnvs)
 
                var metrics = new MetricSet
                metrics.register(cnblp, cnvi, cnvs)

@@ -140,7 +141,7 @@ class CBMS
        redef fun collect(mclasses) do
                for mclass in mclasses do
                        var totc = mclass.collect_accessible_mproperties(model_view).length
        redef fun collect(mclasses) do
                for mclass in mclasses do
                        var totc = mclass.collect_accessible_mproperties(model_view).length

-                       var ditc = mclass.in_hierarchy(mainmodule).depth
+                       var ditc = mclass.in_hierarchy(model_view.mainmodule).depth

                        values[mclass] = totc.to_f / (ditc + 1).to_f
                end
        end
                        values[mclass] = totc.to_f / (ditc + 1).to_f
                end
        end

@@ -173,10 +174,10 @@ class CNVI
        redef fun desc do return "class novelty index, contribution of the class to its branch in term of introductions"
 
        redef fun collect(mclasses) do
        redef fun desc do return "class novelty index, contribution of the class to its branch in term of introductions"
 
        redef fun collect(mclasses) do

-               var cbms = new CBMS(mainmodule, model_view)
+               var cbms = new CBMS(model_view)

                for mclass in mclasses do
                        # compute branch mean size
                for mclass in mclasses do
                        # compute branch mean size

-                       var parents = mclass.in_hierarchy(mainmodule).direct_greaters
+                       var parents = mclass.in_hierarchy(model_view.mainmodule).direct_greaters

                        if parents.length > 0 then
                                cbms.clear
                                cbms.collect(new HashSet[MClass].from(parents))
                        if parents.length > 0 then
                                cbms.clear
                                cbms.collect(new HashSet[MClass].from(parents))

@@ -199,7 +200,7 @@ class MNVI
        redef fun desc do return "module novelty index, contribution of the module to its branch in term of introductions"
 
        redef fun collect(mmodules) do
        redef fun desc do return "module novelty index, contribution of the module to its branch in term of introductions"
 
        redef fun collect(mmodules) do

-               var mbms = new MBMS(mainmodule, model_view)
+               var mbms = new MBMS(model_view)

                for mmodule in mmodules do
                        # compute branch mean size
                        var parents = mmodule.in_importation.direct_greaters
                for mmodule in mmodules do
                        # compute branch mean size
                        var parents = mmodule.in_importation.direct_greaters

@@ -226,7 +227,7 @@ class CNVS
        redef fun desc do return "class novelty score, importance of the contribution of the class to its branch"
 
        redef fun collect(mclasses) do
        redef fun desc do return "class novelty score, importance of the contribution of the class to its branch"
 
        redef fun collect(mclasses) do

-               var cnvi = new CNVI(mainmodule, model_view)
+               var cnvi = new CNVI(model_view)

                cnvi.collect(mclasses)
                for mclass in mclasses do
                        var locc = mclass.collect_local_mproperties(model_view).length
                cnvi.collect(mclasses)
                for mclass in mclasses do
                        var locc = mclass.collect_local_mproperties(model_view).length

@@ -244,7 +245,7 @@ class MNVS
        redef fun desc do return "module novelty score, importance of the contribution of the module to its branch"
 
        redef fun collect(mmodules) do
        redef fun desc do return "module novelty score, importance of the contribution of the module to its branch"
 
        redef fun collect(mmodules) do

-               var mnvi = new MNVI(mainmodule, model_view)
+               var mnvi = new MNVI(model_view)

                mnvi.collect(mmodules)
                for mmodule in mmodules do
                        var locc = mmodule.collect_intro_mclassdefs(model_view).length
                mnvi.collect(mmodules)
                for mmodule in mmodules do
                        var locc = mmodule.collect_intro_mclassdefs(model_view).length

diff --git a/src/metrics/method_analyze_metrics.nit b/src/metrics/method_analyze_metrics.nit
index 3402abf..73333a0 100644 (file)
--- a/src/metrics/method_analyze_metrics.nit
+++ b/src/metrics/method_analyze_metrics.nit
@@ -21,9 +21,9 @@ import nitsmell_toolcontext
 import mclassdef_collect
 
 
 import mclassdef_collect
 
 

-fun call_analyze_methods(mclassdef: MClassDef, model_builder: ModelBuilder): Array[MMethodDef] do
+fun call_analyze_methods(mclassdef: MClassDef, model_builder: ModelBuilder, view: ModelView): Array[MMethodDef] do

        var mmethoddefs = new Array[MMethodDef]
        var mmethoddefs = new Array[MMethodDef]

-       for m_prop in mclassdef.collect_intro_and_redef_mpropdefs(model_builder.model.private_view) do
+       for m_prop in mclassdef.collect_intro_and_redef_mpropdefs(view) do

                var n_prop = model_builder.mpropdef2node(m_prop)
                #Check if the property is a method definition
                if n_prop isa AMethPropdef and m_prop isa MMethodDef then
                var n_prop = model_builder.mpropdef2node(m_prop)
                #Check if the property is a method definition
                if n_prop isa AMethPropdef and m_prop isa MMethodDef then

diff --git a/src/metrics/mmodules_metrics.nit b/src/metrics/mmodules_metrics.nit
index 1e9d190..3a6227f 100644 (file)
--- a/src/metrics/mmodules_metrics.nit
+++ b/src/metrics/mmodules_metrics.nit
@@ -37,21 +37,21 @@ private class MModulesMetricsPhase
                out.mkdir
 
                var model = toolcontext.modelbuilder.model
                out.mkdir
 
                var model = toolcontext.modelbuilder.model

-               var model_view = model.private_view
+               var model_view = new ModelView(model, mainmodule)

 
                print toolcontext.format_h1("\n# MModules metrics")
 
                var metrics = new MetricSet
 
                print toolcontext.format_h1("\n# MModules metrics")
 
                var metrics = new MetricSet

-               metrics.register(new MNOA(mainmodule, model_view))
-               metrics.register(new MNOP(mainmodule, model_view))
-               metrics.register(new MNOC(mainmodule, model_view))
-               metrics.register(new MNOD(mainmodule, model_view))
-               metrics.register(new MDIT(mainmodule, model_view))
-               metrics.register(new MNBI(mainmodule, model_view))
-               metrics.register(new MNBR(mainmodule, model_view))
-               metrics.register(new MNBCC(mainmodule, model_view))
-               metrics.register(new MNBAC(mainmodule, model_view))
-               metrics.register(new MNBIC(mainmodule, model_view))
+               metrics.register(new MNOA(model_view))
+               metrics.register(new MNOP(model_view))
+               metrics.register(new MNOC(model_view))
+               metrics.register(new MNOD(model_view))
+               metrics.register(new MDIT(model_view))
+               metrics.register(new MNBI(model_view))
+               metrics.register(new MNBR(model_view))
+               metrics.register(new MNBCC(model_view))
+               metrics.register(new MNBAC(model_view))
+               metrics.register(new MNBIC(model_view))

 
                var mmodules = new HashSet[MModule]
                for mpackage in model.mpackages do
 
                var mmodules = new HashSet[MModule]
                for mpackage in model.mpackages do

@@ -85,9 +85,6 @@ abstract class MModuleMetric
        super Metric
        redef type ELM: MModule
 
        super Metric
        redef type ELM: MModule
 

-       # Main module used for linearization
-       var mainmodule: MModule
-

        # Model view used to collect and filter entities
        var model_view: ModelView
 end
        # Model view used to collect and filter entities
        var model_view: ModelView
 end

diff --git a/src/metrics/nullables_metrics.nit b/src/metrics/nullables_metrics.nit
index f88c3ba..81c4e52 100644 (file)
--- a/src/metrics/nullables_metrics.nit
+++ b/src/metrics/nullables_metrics.nit
@@ -40,11 +40,11 @@ private class NullablesMetricsPhase
                print toolcontext.format_h1("\n# Nullable metrics")
 
                var model = toolcontext.modelbuilder.model
                print toolcontext.format_h1("\n# Nullable metrics")
 
                var model = toolcontext.modelbuilder.model

-               var model_view = model.private_view
+               var model_view = new ModelView(model, mainmodule)

 
                var metrics = new MetricSet
 
                var metrics = new MetricSet

-               metrics.register(new CNBA(mainmodule, model_view))
-               metrics.register(new CNBNA(mainmodule, model_view))
+               metrics.register(new CNBA(model_view))
+               metrics.register(new CNBNA(model_view))

 
                var mclasses = new HashSet[MClass]
                for mpackage in model.mpackages do
 
                var mclasses = new HashSet[MClass]
                for mpackage in model.mpackages do

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
                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
 
                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]
                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)
                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
 
        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
                        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
 
        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
                        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
 
        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
                        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]
        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)
                        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
 
        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
                        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
 
        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
                        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
        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
                        analysis.run_analysis
                        for mmethod in analysis.live_methods do
                                for mdef in mmethod.mpropdefs do

@@ -351,13 +352,18 @@ end
 
 # rta redef
 
 
 # rta redef
 

-redef class RapidTypeAnalysis
+# Custom RTA analyzer
+class MetricsRapidTypeAnalysis
+       super RapidTypeAnalysis
+
+       # Model view used to linearize classes
+       var view: ModelView

 
        # Class Live Instances
 
        # 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
 
        # 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
 
        # Type Live Instances
        var tnli = new TNLI