X-Git-Url: http://nitlanguage.org

diff --git a/src/metrics/mclasses_metrics.nit b/src/metrics/mclasses_metrics.nit
index fabd573..158a448 100644
--- a/src/metrics/mclasses_metrics.nit
+++ b/src/metrics/mclasses_metrics.nit
@@ -18,8 +18,11 @@
 module mclasses_metrics
 
 import metrics_base
+import model::model_collect
 
 redef class ToolContext
+
+	# MClass related metrics phase
 	var mclasses_metrics_phase: Phase = new MClassesMetricsPhase(self, null)
 end
 
@@ -33,32 +36,33 @@ private class MClassesMetricsPhase
 		var out = "{toolcontext.opt_dir.value or else "metrics"}/mclasses"
 		out.mkdir
 
+		var model = toolcontext.modelbuilder.model
+		var filter = new ModelFilter(private_visibility)
+		var model_view = new ModelView(model, mainmodule, filter)
 
 		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))
-		#TODO metrics.register(new CNBI) # nb init
-		#TODO metrics.register(new CNBM) # nb methods
-		#TODO metrics.register(new CNBV) # nb vtypes
+		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 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
 
@@ -70,7 +74,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
@@ -79,15 +83,18 @@ 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
 
 # A metric about MClass
-interface MClassMetric
+abstract class MClassMetric
 	super Metric
 	redef type ELM: MClass
+
+	# Model view used to collect and filter entities
+	var model_view: ModelView
 end
 
 # Class Metric: Number of Ancestors
@@ -97,12 +104,9 @@ class CNOA
 	redef fun name do return "cnoa"
 	redef fun desc do return "number of ancestor classes"
 
-	var mainmodule: MModule
-	init(mainmodule: MModule) do self.mainmodule = mainmodule
-
 	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
@@ -114,12 +118,9 @@ class CNOP
 	redef fun name do return "cnop"
 	redef fun desc do return "number of parent classes"
 
-	var mainmodule: MModule
-	init(mainmodule: MModule) do self.mainmodule = mainmodule
-
 	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
@@ -131,12 +132,9 @@ class CNOC
 	redef fun name do return "cnoc"
 	redef fun desc do return "number of child classes"
 
-	var mainmodule: MModule
-	init(mainmodule: MModule) do self.mainmodule = mainmodule
-
 	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
@@ -148,12 +146,9 @@ class CNOD
 	redef fun name do return "cnod"
 	redef fun desc do return "number of descendant classes"
 
-	var mainmodule: MModule
-	init(mainmodule: MModule) do self.mainmodule = mainmodule
-
 	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
@@ -165,12 +160,9 @@ class CDIT
 	redef fun name do return "cdit"
 	redef fun desc do return "depth in class tree"
 
-	var mainmodule: MModule
-	init(mainmodule: MModule) do self.mainmodule = mainmodule
-
 	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
@@ -182,17 +174,9 @@ class CNBP
 	redef fun name do return "cnbp"
 	redef fun desc do return "number of accessible properties (inherited + local)"
 
-	var mainmodule: MModule
-	var min_visibility: MVisibility
-
-	init(mainmodule: MModule, min_visibility: MVisibility) do
-		self.mainmodule = mainmodule
-		self.min_visibility = min_visibility
-	end
-
 	redef fun collect(mclasses) do
 		for mclass in mclasses do
-			values[mclass] = mclass.all_mproperties(mainmodule, min_visibility).length
+			values[mclass] = mclass.collect_accessible_mproperties(model_view).length
 		end
 	end
 end
@@ -204,17 +188,51 @@ class CNBA
 	redef fun name do return "cnba"
 	redef fun desc do return "number of accessible attributes (inherited + local)"
 
-	var mainmodule: MModule
-	var min_visibility: MVisibility
+	redef fun collect(mclasses) do
+		for mclass in mclasses do
+			values[mclass] = mclass.collect_accessible_mattributes(model_view).length
+		end
+	end
+end
+
+# Class Metric: Number of MMethods
+class CNBM
+	super MClassMetric
+	super IntMetric
+	redef fun name do return "cnbm"
+	redef fun desc do return "number of accessible methods (inherited + local)"
+
+	redef fun collect(mclasses) do
+		for mclass in mclasses do
+			values[mclass] = mclass.collect_accessible_mmethods(model_view).length
+		end
+	end
+end
+
+# Class Metric: Number of Constructors
+class CNBI
+	super MClassMetric
+	super IntMetric
+	redef fun name do return "cnbi"
+	redef fun desc do return "number of accessible constructors (inherited + local)"
 
-	init(mainmodule: MModule, min_visibility: MVisibility) do
-		self.mainmodule = mainmodule
-		self.min_visibility = min_visibility
+	redef fun collect(mclasses) do
+		for mclass in mclasses do
+			values[mclass] = mclass.collect_accessible_inits(model_view).length
+		end
 	end
+end
+
+# Class Metric: Number of Virtual Types
+class CNBV
+	super MClassMetric
+	super IntMetric
+	redef fun name do return "cnbv"
+	redef fun desc do return "number of accessible virtual types (inherited + local)"
 
 	redef fun collect(mclasses) do
 		for mclass in mclasses do
-			values[mclass] = mclass.all_mattributes(mainmodule, min_visibility).length
+			values[mclass] = mclass.collect_accessible_vts(model_view).length
 		end
 	end
 end
@@ -226,17 +244,9 @@ class CNBIP
 	redef fun name do return "cnbip"
 	redef fun desc do return "number of introduced properties"
 
-	var mainmodule: MModule
-	var min_visibility: MVisibility
-
-	init(mainmodule: MModule, min_visibility: MVisibility) do
-		self.mainmodule = mainmodule
-		self.min_visibility = min_visibility
-	end
-
 	redef fun collect(mclasses) do
 		for mclass in mclasses do
-			values[mclass] = mclass.intro_mproperties(min_visibility).length
+			values[mclass] = mclass.collect_intro_mproperties(model_view).length
 		end
 	end
 end
@@ -248,17 +258,9 @@ class CNBRP
 	redef fun name do return "cnbrp"
 	redef fun desc do return "number of redefined properties"
 
-	var mainmodule: MModule
-	var min_visibility: MVisibility
-
-	init(mainmodule: MModule, min_visibility: MVisibility) do
-		self.mainmodule = mainmodule
-		self.min_visibility = min_visibility
-	end
-
 	redef fun collect(mclasses) do
 		for mclass in mclasses do
-			values[mclass] = mclass.redef_mproperties(min_visibility).length
+			values[mclass] = mclass.collect_redef_mproperties(model_view).length
 		end
 	end
 end
@@ -270,17 +272,9 @@ class CNBHP
 	redef fun name do return "cnbhp"
 	redef fun desc do return "number of inherited properties"
 
-	var mainmodule: MModule
-	var min_visibility: MVisibility
-
-	init(mainmodule: MModule, min_visibility: MVisibility) do
-		self.mainmodule = mainmodule
-		self.min_visibility = min_visibility
-	end
-
 	redef fun collect(mclasses) do
 		for mclass in mclasses do
-			values[mclass] = mclass.inherited_mproperties(mainmodule, min_visibility).length
+			values[mclass] = mclass.collect_inherited_mproperties(model_view).length
 		end
 	end
 end
@@ -292,17 +286,9 @@ class CNBLP
 	redef fun name do return "cnblp"
 	redef fun desc do return "number of local properties (intro + redef)"
 
-	var mainmodule: MModule
-	var min_visibility: MVisibility
-
-	init(mainmodule: MModule, min_visibility: MVisibility) do
-		self.mainmodule = mainmodule
-		self.min_visibility = min_visibility
-	end
-
 	redef fun collect(mclasses) do
 		for mclass in mclasses do
-			values[mclass] = mclass.local_mproperties(min_visibility).length
+			values[mclass] = mclass.collect_local_mproperties(model_view).length
 		end
 	end
 end