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

Signed-off-by: Alexandre Terrasa <alexandre@moz-code.org>

diff --git a/lib/counter.nit b/lib/counter.nit
index 1c2b9ed..df4beca 100644 (file)
--- a/lib/counter.nit
+++ b/lib/counter.nit
@@ -23,7 +23,7 @@ class Counter[E: Object]
        super Map[E, Int]
 
        # Total number of counted occurrences
-       var total: Int = 0
+       var sum: Int = 0
 
        private var map = new HashMap[E, Int]
 
@@ -39,9 +39,9 @@ class Counter[E: Object]
 
        redef fun []=(e: E, value: Int)
        do
-               total -= self[e]
+               sum -= self[e]
                self.map[e] = value
-               total += value
+               sum += value
        end
 
        redef fun keys do return map.keys
@@ -58,7 +58,7 @@ class Counter[E: Object]
        fun inc(e: E)
        do
                self.map[e] = self[e] + 1
-               total += 1
+               sum += 1
        end
 
        # Return an array of elements sorted by occurrences
@@ -85,15 +85,15 @@ class Counter[E: Object]
                if list.is_empty then return
                print " minimum value: {self[list.first]}"
                print " maximum value: {self[list.last]}"
-               print " total value: {self.total}"
-               print " average value: {div(self.total,list.length)}"
+               print " total value: {self.sum}"
+               print " average value: {div(self.sum,list.length)}"
                print " distribution:"
                var count = 0
                var sum = 0
                var limit = self[list.first]
                for t in list do
                        if self[t] > limit then
-                               print "  <={limit}: sub-population={count} ({div(count*100,list.length)}%); cumulated value={sum} ({div(sum*100,self.total)}%)"
+                               print "  <={limit}: sub-population={count} ({div(count*100,list.length)}%); cumulated value={sum} ({div(sum*100,self.sum)}%)"
                                count = 0
                                sum = 0
                                while self[t] > limit do
@@ -104,7 +104,7 @@ class Counter[E: Object]
                        count += 1
                        sum += self[t]
                end
-               print "  <={limit}: sub-population={count} ({div(count*100,list.length)}%); cumulated value={sum} ({div(sum*100,self.total)}%)"
+               print "  <={limit}: sub-population={count} ({div(count*100,list.length)}%); cumulated value={sum} ({div(sum*100,self.sum)}%)"
        end
 
        # Display up to `count` most used elements and `count` least used elements
@@ -117,13 +117,13 @@ class Counter[E: Object]
                if list.length <= count*2 then min = list.length
                for i in [0..min[ do
                        var t = list[list.length-i-1]
-                       print "  {element_to_s(t)}: {self[t]} ({div(self[t]*100,self.total)}%)"
+                       print "  {element_to_s(t)}: {self[t]} ({div(self[t]*100,self.sum)}%)"
                end
                if list.length <= count*2 then return
                print "  ..."
                for i in [0..min[ do
                        var t = list[min-i-1]
-                       print "  {element_to_s(t)}: {self[t]} ({div(self[t]*100,self.total)}%)"
+                       print "  {element_to_s(t)}: {self[t]} ({div(self[t]*100,self.sum)}%)"
                end
        end
 
@@ -156,11 +156,7 @@ class Counter[E: Object]
        # Values average
        fun avg: Float do
                if values.is_empty then return 0.0
-               var sum = 0
-               for value in map.values do
-                       sum += value
-               end
-               return sum.to_f / values.length.to_f
+               return (sum / values.length).to_f
        end
 
        # The standard derivation of the counter values
@@ -186,7 +182,7 @@ redef class POSet[E]
                var list = c.sort
                (new ComparableSorter[Int]).sort(list)
                for e in list do
-                       print " {e} -> {c[e]} times ({div(c[e]*100, c.total)}%)"
+                       print " {e} -> {c[e]} times ({div(c[e]*100, c.sum)}%)"
                end
        end
 

diff --git a/src/metrics/metrics_base.nit b/src/metrics/metrics_base.nit
index 14cd0ed..c1b2ee7 100644 (file)
--- a/src/metrics/metrics_base.nit
+++ b/src/metrics/metrics_base.nit
@@ -203,6 +203,8 @@ class IntMetric
 
        redef fun clear do values_cache.clear
 
+       fun sum: Int do return values_cache.sum
+
        # Return the couple with the highest value
        fun max: Couple[ELM, Int] do
                assert not values_cache.is_empty
@@ -238,6 +240,12 @@ class FloatMetric
 
        redef fun clear do values_cache.clear
 
+       fun sum: Float do
+               var sum = 0.0
+               for v in values.values do sum += v
+               return sum
+       end
+
        # Return the couple with the highest value
        fun max: Couple[ELM, Float] do
                assert not values.is_empty
@@ -268,10 +276,6 @@ class FloatMetric
 
        redef fun avg do
                if values.is_empty then return 0.0
-               var sum = 0.0
-               for value in values.values do
-                       sum += value
-               end
                return sum / values.length.to_f
        end
 

diff --git a/src/metrics/static_types_metrics.nit b/src/metrics/static_types_metrics.nit
index f467e98..29b3cfc 100644 (file)
--- a/src/metrics/static_types_metrics.nit
+++ b/src/metrics/static_types_metrics.nit
@@ -79,8 +79,8 @@ do
 
        # Display data
        print "--- Metrics of the explitic static types ---"
-       print "Total number of explicit static types: {typecount.total}"
-       if typecount.total == 0 then return
+       print "Total number of explicit static types: {typecount.sum}"
+       if typecount.sum == 0 then return
 
        print "Statistics of type usage:"
        typecount.print_summary