Implemented review suggestions

theodolite/src/main/kotlin/theodolite/execution/TheodoliteExecutor.kt

@@ -128,12 +128,21 @@ class TheodoliteExecutor(
                 config.searchStrategy.benchmarkExecutor.results,
                 "${resultsFolder}exp${this.config.executionId}-result"
             )
-            // Create expXYZ_demand.csv file
+            // Create expXYZ_demand.csv file or expXYZ_capacity.csv depending on metric
+            when(config.metric) {
+                Metric.DEMAND ->
                     ioHandler.writeToCSVFile(
                         "${resultsFolder}exp${this.config.executionId}_demand",
-                calculateDemandMetric(config.loads, config.searchStrategy.benchmarkExecutor.results),
+                        calculateMetric(config.loads, config.searchStrategy.benchmarkExecutor.results),
                         listOf("load","resources")
                     )
+                Metric.CAPACITY ->
+                    ioHandler.writeToCSVFile(
+                        "${resultsFolder}exp${this.config.executionId}_capacity",
+                        calculateMetric(config.resources, config.searchStrategy.benchmarkExecutor.results),
+                        listOf("resource", "loads")
+                    )
+            }
         }
         kubernetesBenchmark.teardownInfrastructure()
     }
@@ -148,8 +157,8 @@ class TheodoliteExecutor(
         return executionID
     }
 
-    private fun calculateDemandMetric(loads: List<Int>, results: Results): List<List<String>> {
-        return loads.map { listOf(it.toString(), results.getOptYDimensionValue(it).toString()) }
+    private fun calculateMetric(xValues: List<Int>, results: Results): List<List<String>> {
+        return xValues.map { listOf(it.toString(), results.getOptYDimensionValue(it).toString()) }
     }
 
 }

theodolite/src/main/kotlin/theodolite/strategies/searchstrategy/InitialGuessSearchStrategy.kt

@@ -19,12 +19,7 @@ class InitialGuessSearchStrategy(benchmarkExecutor: BenchmarkExecutor, guessStra
 
     override fun findSuitableResource(load: Int, resources: List<Int>): Int? {
 
-        if(resources.isEmpty()) {
-            logger.info { "You need to specify resources to be checked for the InitialGuessSearchStrategy to work." }
-            return null
-        }
-
-        if(guessStrategy == null){
+        if(this.guessStrategy == null){
             logger.info { "Your InitialGuessSearchStrategy doesn't have a GuessStrategy. This is not supported." }
             return null
         }
@@ -88,12 +83,7 @@ class InitialGuessSearchStrategy(benchmarkExecutor: BenchmarkExecutor, guessStra
 
     override fun findSuitableLoad(resource: Int, loads: List<Int>): Int?{
 
-        if(loads.isEmpty()) {
-            logger.info { "You need to specify resources to be checked for the InitialGuessSearchStrategy to work." }
-            return null
-        }
-
-        if(guessStrategy == null){
+        if(this.guessStrategy == null){
             logger.info { "Your InitialGuessSearchStrategy doesn't have a GuessStrategy. This is not supported." }
             return null
         }

theodolite/src/main/kotlin/theodolite/strategies/searchstrategy/SearchStrategy.kt

@@ -27,15 +27,14 @@ abstract class SearchStrategy(val benchmarkExecutor: BenchmarkExecutor, val gues
      */
     fun applySearchStrategyByMetric(loads: List<Int>, resources: List<Int>, metric: Metric) {
 
-        if (metric.value == "demand") {
-            // demand metric
+        when(metric) {
+            Metric.DEMAND ->
                 for (load in loads) {
                     if (benchmarkExecutor.run.get()) {
                         this.findSuitableResource(load, resources)
                     }
                 }
-        } else {
-            // capacity metric
+            Metric.CAPACITY ->
                 for (resource in resources) {
                     if (benchmarkExecutor.run.get()) {
                         this.findSuitableLoad(resource, loads)

theodolite/src/main/kotlin/theodolite/util/Results.kt

@@ -27,25 +27,25 @@ class Results (val metric: Metric) {
     fun setResult(experiment: Pair<Int, Int>, successful: Boolean) {
         this.results[experiment] = successful
 
-        if(metric.value == "demand" && optInstances.containsKey(experiment.first)){
-
+        when (metric) {
+            Metric.DEMAND ->
+                if (optInstances.containsKey(experiment.first)) {
                     if(optInstances[experiment.first]!! > experiment.second) {
                         optInstances[experiment.first] = experiment.second
                     }
-        }
-        else if(metric.value == "demand" && !optInstances.containsKey(experiment.first)){
+                } else {
                     if(!successful){
                         optInstances[experiment.first] = Int.MAX_VALUE
                     }else {
                         optInstances[experiment.first] = experiment.second
                     }
                 }
-        else if(metric.value == "capacity" && optInstances.containsKey(experiment.second)){
+            Metric.CAPACITY ->
+                if (optInstances.containsKey(experiment.second)) {
                     if (optInstances[experiment.second]!! < experiment.first){
                         optInstances[experiment.second] = experiment.first
                     }
-        }
-        else if(metric.value == "capacity" && !optInstances.containsKey(experiment.second)){
+                } else {
                     if(!successful){
                         optInstances[experiment.second] = Int.MIN_VALUE
                     } else {
@@ -53,6 +53,7 @@ class Results (val metric: Metric) {
                     }
                 }
         }
+    }
 
     /**
      * Get the result for an experiment.