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

diff --git a/src/metrics/mmodules_metrics.nit b/src/metrics/mmodules_metrics.nit
index 335831c..1e9d190 100644
--- a/src/metrics/mmodules_metrics.nit
+++ b/src/metrics/mmodules_metrics.nit
@@ -18,8 +18,11 @@
 module mmodules_metrics
 
 import metrics_base
+import model::model_collect
 
 redef class ToolContext
+
+	# MModules related metrics phase
 	var mmodules_metrics_phase: Phase = new MModulesMetricsPhase(self, null)
 end
 
@@ -33,13 +36,23 @@ private class MModulesMetricsPhase
 		var out = "{toolcontext.opt_dir.value or else "metrics"}/mmodules"
 		out.mkdir
 
+		var model = toolcontext.modelbuilder.model
+		var model_view = model.private_view
+
 		print toolcontext.format_h1("\n# MModules metrics")
 
 		var metrics = new MetricSet
-		metrics.register(new MNOA, new MNOP, new MNOC, new MNOD, new MDIT)
-		metrics.register(new MNBI, new MNBR, new MNBCC, new MNBAC, new MNBIC)
+		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))
 
-		var model = toolcontext.modelbuilder.model
 		var mmodules = new HashSet[MModule]
 		for mpackage in model.mpackages do
 
@@ -53,7 +66,7 @@ private class MModulesMetricsPhase
 				metrics.clear
 				metrics.collect(new HashSet[MModule].from(mgroup.mmodules))
 				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 mmodules.is_empty then
@@ -62,15 +75,21 @@ private class MModulesMetricsPhase
 			metrics.clear
 			metrics.collect(mmodules)
 			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 MModule
-interface MModuleMetric
+abstract class MModuleMetric
 	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
 
 # Module Metric: Number of Ancestors
@@ -143,6 +162,25 @@ class MDIT
 	end
 end
 
+# Module Metric: Number of Accessible Definitions (of all kind)
+#
+# count all mclasses accessible by the module
+class MNBD
+	super MModuleMetric
+	super IntMetric
+	redef fun name do return "mnbd"
+	redef fun desc do return "number of definition accessibles in module"
+
+	redef fun collect(mmodules) do
+		for mmodule in mmodules do
+			values[mmodule] = 0
+			for a in mmodule.collect_ancestors(model_view) do
+				values[mmodule] += a.intro_mclasses.length
+			end
+		end
+	end
+end
+
 # Module Metric: Number of Introduction (of all kind)
 #
 # count all mclasses introduced by the module
@@ -250,5 +288,3 @@ class MNBEC
 		end
 	end
 end
-
-