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

diff --git a/src/metrics/mclasses_metrics.nit b/src/metrics/mclasses_metrics.nit
index ffdf69c..0951d10 100644
--- a/src/metrics/mclasses_metrics.nit
+++ b/src/metrics/mclasses_metrics.nit
@@ -17,10 +17,8 @@
 # Collect common metrics about mclasses
 module mclasses_metrics
 
-import model
 import metrics_base
-import phase
-import frontend
+import model::model_collect
 
 redef class ToolContext
 	var mclasses_metrics_phase: Phase = new MClassesMetricsPhase(self, null)
@@ -36,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
 
@@ -73,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
@@ -82,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
@@ -186,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.all_mproperties(mainmodule, min_visibility).length
+			values[mclass] = mclass.collect_accessible_mproperties(model_view).length
 		end
 	end
 end
@@ -208,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.all_mattributes(mainmodule, min_visibility).length
+			values[mclass] = mclass.collect_accessible_mattributes(model_view).length
 		end
 	end
 end
@@ -230,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.intro_mproperties(min_visibility).length
+			values[mclass] = mclass.collect_intro_mproperties(model_view).length
 		end
 	end
 end
@@ -252,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.redef_mproperties(min_visibility).length
+			values[mclass] = mclass.collect_redef_mproperties(model_view).length
 		end
 	end
 end
@@ -274,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.inherited_mproperties(mainmodule, min_visibility).length
+			values[mclass] = mclass.collect_inherited_mproperties(model_view).length
 		end
 	end
 end
@@ -296,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.local_mproperties(min_visibility).length
+			values[mclass] = mclass.collect_local_mproperties(model_view).length
 		end
 	end
 end