lib: rename Counter::total into Counter::sum

[nit.git] / src / metrics / rta_metrics.nit

diff --git a/src/metrics/rta_metrics.nit b/src/metrics/rta_metrics.nit
index 4752396..820c2ef 100644 (file)
--- a/src/metrics/rta_metrics.nit
+++ b/src/metrics/rta_metrics.nit
@@ -40,10 +40,10 @@ redef class MType
        private var nlvt: Int = 0
        private var nlct: Int = 0
 
-       private fun is_user_defined: Bool do
+       private fun is_standard: Bool do
                var mtype = self
                if mtype isa MNullableType then mtype = mtype.mtype
-               return self.as(MClassType).mclass.is_user_defined
+               return self.as(MClassType).mclass.is_standard
        end
 
        private fun get_depth: Int do
@@ -93,7 +93,7 @@ do
                mtype.mclass.nlvt += 1
                mtype.mclass.live_types.add(mtype)
                if mtype isa MGenericType then nlvtg += 1
-               if mtype.is_user_defined then
+               if not mtype.is_standard then
                        nlvtudud += 1
                        if mtype isa MGenericType then nlvtgudud += 1
                else
@@ -103,12 +103,14 @@ do
        end
 
        for mtype in analysis.live_cast_types do
+               if mtype isa MNullableType then mtype = mtype.mtype
+               if not mtype isa MClassType then continue
                mtypes.add(mtype)
                nlct += 1
                mtype.mclass.nlct += 1
                mtype.mclass.cast_types.add(mtype)
                if mtype isa MGenericType then nlctg += 1
-               if mtype.is_user_defined then
+               if not mtype.is_standard then
                        nlctudud += 1
                        if mtype isa MGenericType then nlctgudud += 1
                else
@@ -118,44 +120,44 @@ do
        end
 
        # CSV generation
-       if modelbuilder.toolcontext.opt_generate_csv.value then
-               var summaryCSV = new CSVDocument(modelbuilder.toolcontext.output_dir.join_path("rta_sum_metrics.csv"))
+       if modelbuilder.toolcontext.opt_csv.value then
+               var summaryCSV = new CSVDocument
                summaryCSV.set_header("scope", "NLVT", "NLVTG", "NLCT", "NLVCTG")
                summaryCSV.add_line("global", nlvt, nlvtg, nlct, nlctg)
                summaryCSV.add_line("SLUD", nlvtslud, nlvtgslud, nlctslud, nlctgslud)
                summaryCSV.add_line("UDUD", nlvtudud, nlvtgudud, nlctudud, nlctgudud)
-               summaryCSV.save
+               summaryCSV.save(modelbuilder.toolcontext.output_dir.join_path("rta_sum_metrics.csv"))
 
-               var scalarCSV = new CSVDocument(modelbuilder.toolcontext.output_dir.join_path("rta_scalar_metrics.csv"))
-               var udscalarCSV = new CSVDocument(modelbuilder.toolcontext.output_dir.join_path("rta_ud_scalar_metrics.csv"))
+               var scalarCSV = new CSVDocument
+               var udscalarCSV = new CSVDocument
                scalarCSV.set_header("Type", "AGS", "DGS", "NLVT", "NLCT")
                udscalarCSV.set_header("Type", "AGS", "DGS", "NLVT", "NLCT")
 
                for mtype in mtypes do
                        var arity = 0
                        if mtype isa MGenericType then arity = mtype.arguments.length
-                       if mtype.is_user_defined then
+                       if not mtype.is_standard then
                                udscalarCSV.add_line(mtype, arity, mtype.get_depth, mtype.nlvt, mtype.nlct)
                        end
                        scalarCSV.add_line(mtype, arity, mtype.get_depth, mtype.nlvt, mtype.nlct)
                end
-               scalarCSV.save
-               udscalarCSV.save
+               scalarCSV.save(modelbuilder.toolcontext.output_dir.join_path("rta_scalar_metrics.csv"))
+               udscalarCSV.save(modelbuilder.toolcontext.output_dir.join_path("rta_ud_scalar_metrics.csv"))
 
-               scalarCSV = new CSVDocument(modelbuilder.toolcontext.output_dir.join_path("rta_scalar_class_metrics.csv"))
-               udscalarCSV = new CSVDocument(modelbuilder.toolcontext.output_dir.join_path("rta_ud_scalar_class_metrics.csv"))
+               scalarCSV = new CSVDocument
+               udscalarCSV = new CSVDocument
                scalarCSV.set_header("Class", "AGS", "NLVV", "NLVT")
                udscalarCSV.set_header("Class", "AGS", "NLVV", "inst")
 
                for mclass in modelbuilder.model.mclasses do
                        if not mclass.is_class or mclass.is_abstract then continue
-                       if mclass.is_user_defined then
+                       if not mclass.is_standard then
                                udscalarCSV.add_line(mclass.mclass_type, mclass.arity, mclass.live_types.length, mclass.nlvt)
                        end
                        scalarCSV.add_line(mclass.mclass_type, mclass.arity, mclass.live_types.length, mclass.nlvt)
                end
-               scalarCSV.save
-               udscalarCSV.save
+               scalarCSV.save(modelbuilder.toolcontext.output_dir.join_path("rta_scalar_class_metrics.csv"))
+               udscalarCSV.save(modelbuilder.toolcontext.output_dir.join_path("rta_ud_scalar_class_metrics.csv"))
        end
 
        print "--- RTA metrics ---"