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

diff --git a/src/metrics/mclasses_metrics.nit b/src/metrics/mclasses_metrics.nit
index 0951d10..2404a38 100644
--- a/src/metrics/mclasses_metrics.nit
+++ b/src/metrics/mclasses_metrics.nit
@@ -21,6 +21,8 @@ import metrics_base
 import model::model_collect
 
 redef class ToolContext
+
+	# MClass related metrics phase
 	var mclasses_metrics_phase: Phase = new MClassesMetricsPhase(self, null)
 end
 
@@ -35,24 +37,24 @@ private class MClassesMetricsPhase
 		out.mkdir
 
 		var model = toolcontext.modelbuilder.model
-		var model_view = model.private_view
+		var filter = new ModelFilter(private_visibility)
 
 		print toolcontext.format_h1("\n# MClasses metrics")
 
 		var metrics = new MetricSet
-		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, 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
+		metrics.register(new CNOA(model, mainmodule, filter))
+		metrics.register(new CNOP(model, mainmodule, filter))
+		metrics.register(new CNOC(model, mainmodule, filter))
+		metrics.register(new CNOD(model, mainmodule, filter))
+		metrics.register(new CDIT(model, mainmodule, filter))
+		metrics.register(new CNBP(model, mainmodule, filter))
+		metrics.register(new CNBA(model, mainmodule, filter))
+		metrics.register(new CNBI(model, mainmodule, filter))
+		metrics.register(new CNBM(model, mainmodule, filter))
+		metrics.register(new CNBV(model, mainmodule, filter))
+		metrics.register(new CNBIP(model, mainmodule, filter))
+		metrics.register(new CNBRP(model, mainmodule, filter))
+		metrics.register(new CNBHP(model, mainmodule, filter))
 
 		var mclasses = new HashSet[MClass]
 		for mpackage in model.mpackages do
@@ -86,9 +88,18 @@ private class MClassesMetricsPhase
 end
 
 # A metric about MClass
-interface MClassMetric
+abstract class MClassMetric
 	super Metric
 	redef type ELM: MClass
+
+	# Model used to collect and filter entities
+	var model: Model
+
+	# Mainmodule for class linearization
+	var mainmodule: MModule
+
+	# Filter to apply
+	var filter: nullable ModelFilter
 end
 
 # Class Metric: Number of Ancestors
@@ -98,9 +109,6 @@ 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
@@ -115,9 +123,6 @@ 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
@@ -132,9 +137,6 @@ 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
@@ -149,9 +151,6 @@ 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
@@ -166,9 +165,6 @@ 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
@@ -183,17 +179,9 @@ class CNBP
 	redef fun name do return "cnbp"
 	redef fun desc do return "number of accessible properties (inherited + local)"
 
-	var mainmodule: MModule
-	var model_view: ModelView
-
-	init(mainmodule: MModule, model_view: ModelView) do
-		self.mainmodule = mainmodule
-		self.model_view = model_view
-	end
-
 	redef fun collect(mclasses) do
 		for mclass in mclasses do
-			values[mclass] = mclass.collect_accessible_mproperties(model_view).length
+			values[mclass] = mclass.collect_accessible_mproperties(mainmodule, filter).length
 		end
 	end
 end
@@ -205,17 +193,51 @@ class CNBA
 	redef fun name do return "cnba"
 	redef fun desc do return "number of accessible attributes (inherited + local)"
 
-	var mainmodule: MModule
-	var model_view: ModelView
+	redef fun collect(mclasses) do
+		for mclass in mclasses do
+			values[mclass] = mclass.collect_accessible_mattributes(mainmodule, filter).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(mainmodule, filter).length
+		end
+	end
+end
 
-	init(mainmodule: MModule, model_view: ModelView) do
-		self.mainmodule = mainmodule
-		self.model_view = model_view
+# 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)"
+
+	redef fun collect(mclasses) do
+		for mclass in mclasses do
+			values[mclass] = mclass.collect_accessible_inits(mainmodule, filter).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.collect_accessible_mattributes(model_view).length
+			values[mclass] = mclass.collect_accessible_vts(mainmodule, filter).length
 		end
 	end
 end
@@ -227,17 +249,9 @@ class CNBIP
 	redef fun name do return "cnbip"
 	redef fun desc do return "number of introduced properties"
 
-	var mainmodule: MModule
-	var model_view: ModelView
-
-	init(mainmodule: MModule, model_view: ModelView) do
-		self.mainmodule = mainmodule
-		self.model_view = model_view
-	end
-
 	redef fun collect(mclasses) do
 		for mclass in mclasses do
-			values[mclass] = mclass.collect_intro_mproperties(model_view).length
+			values[mclass] = mclass.collect_intro_mproperties(filter).length
 		end
 	end
 end
@@ -249,17 +263,9 @@ class CNBRP
 	redef fun name do return "cnbrp"
 	redef fun desc do return "number of redefined properties"
 
-	var mainmodule: MModule
-	var model_view: ModelView
-
-	init(mainmodule: MModule, model_view: ModelView) do
-		self.mainmodule = mainmodule
-		self.model_view = model_view
-	end
-
 	redef fun collect(mclasses) do
 		for mclass in mclasses do
-			values[mclass] = mclass.collect_redef_mproperties(model_view).length
+			values[mclass] = mclass.collect_redef_mproperties(filter).length
 		end
 	end
 end
@@ -271,17 +277,9 @@ class CNBHP
 	redef fun name do return "cnbhp"
 	redef fun desc do return "number of inherited properties"
 
-	var mainmodule: MModule
-	var model_view: ModelView
-
-	init(mainmodule: MModule, model_view: ModelView) do
-		self.mainmodule = mainmodule
-		self.model_view = model_view
-	end
-
 	redef fun collect(mclasses) do
 		for mclass in mclasses do
-			values[mclass] = mclass.collect_inherited_mproperties(model_view).length
+			values[mclass] = mclass.collect_inherited_mproperties(mainmodule, filter).length
 		end
 	end
 end
@@ -293,17 +291,9 @@ class CNBLP
 	redef fun name do return "cnblp"
 	redef fun desc do return "number of local properties (intro + redef)"
 
-	var mainmodule: MModule
-	var model_view: ModelView
-
-	init(mainmodule: MModule, model_view: ModelView) do
-		self.mainmodule = mainmodule
-		self.model_view = model_view
-	end
-
 	redef fun collect(mclasses) do
 		for mclass in mclasses do
-			values[mclass] = mclass.collect_local_mproperties(model_view).length
+			values[mclass] = mclass.collect_local_mproperties(filter).length
 		end
 	end
 end