Refactoring: Renamed some features

BenchmarkInvocations -> TotalMethodInvocations

MethodIterationCounts -> MethodInvocations

core/src/main/kotlin/se/lth/cs/papicounters/EventSetBuilder.kt

@@ -29,11 +29,11 @@ class EventSetBuilder(val availableCounters : List<PAPICounter>) : FeatureVisito
         featureRatio.f2.accept(this)
     }
 
-    override fun visitMethodIterationCounts(methodIterationCounts: MethodIterationCounts) {
+    override fun visitMethodInvocations(methodInvocations: MethodInvocations) {
         // Do nothing
     }
 
-    override fun visitBenchmarkInvocations(benchmarkInvocations: BenchmarkInvocations) {
+    override fun visitTotalMethodInvocations(totalMethodInvocations: TotalMethodInvocations) {
         // Do nothing
     }
 

core/src/main/kotlin/se/lth/cs/util/FeatureVisitor.kt

@@ -11,9 +11,9 @@ interface FeatureVisitor {
 
     fun visitRatio(featureRatio: FeatureRatio)
 
-    fun visitMethodIterationCounts(methodIterationCounts: MethodIterationCounts)
+    fun visitFeatureSet(featureSet: FeatureSet)
 
-    fun visitBenchmarkInvocations(benchmarkInvocations: BenchmarkInvocations)
+    fun visitMethodInvocations(methodInvocations: MethodInvocations)
 
-    fun visitFeatureSet(featureSet: FeatureSet)
+    fun visitTotalMethodInvocations(totalMethodInvocations: TotalMethodInvocations)
 }
\ No newline at end of file

core/src/main/kotlin/se/lth/cs/util/Features.kt

@@ -94,13 +94,13 @@ class FeatureRatio(val f1 : Feature, val f2 : Feature) : Feature() {
     }
 }
 
-class MethodIterationCounts(val method : String) : Feature() {
+class MethodInvocations(val method : String) : Feature() {
     override fun featureType(): Type {
         return Type.SOFTWARE
     }
 
     override fun accept(visitor: FeatureVisitor) {
-        visitor.visitMethodIterationCounts(this)
+        visitor.visitMethodInvocations(this)
     }
 
     override fun toString(): String {
@@ -108,13 +108,13 @@ class MethodIterationCounts(val method : String) : Feature() {
     }
 }
 
-class BenchmarkInvocations() : Feature() {
+class TotalMethodInvocations() : Feature() {
     override fun featureType(): Type {
         return Type.SOFTWARE
     }
 
     override fun accept(visitor: FeatureVisitor) {
-        visitor.visitBenchmarkInvocations(this)
+        visitor.visitTotalMethodInvocations(this)
     }
 
     override fun toString(): String {
@@ -134,7 +134,7 @@ fun normalize(f : Feature, n : Feature): Feature {
 
 fun defaultNormalize(f : Feature) : Feature? {
     if (f.featureType() == Feature.Type.SOFTWARE) {
-        return normalize(f, BenchmarkInvocations())
+        return normalize(f, TotalMethodInvocations())
     }
 
     if (f.featureType() == Feature.Type.HARDWARE) {