From d798ba384e2fd04908bb967997dd904e50df1253 Mon Sep 17 00:00:00 2001 From: Marcel Becker <stu117960@mail.uni-kiel.de> Date: Tue, 1 Feb 2022 14:26:46 +0100 Subject: [PATCH] Removed LoadDimension Usage after Merging from Master --- .../main/kotlin/theodolite/execution/TheodoliteExecutor.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/theodolite/src/main/kotlin/theodolite/execution/TheodoliteExecutor.kt b/theodolite/src/main/kotlin/theodolite/execution/TheodoliteExecutor.kt index dec1a1308..8664ea034 100644 --- a/theodolite/src/main/kotlin/theodolite/execution/TheodoliteExecutor.kt +++ b/theodolite/src/main/kotlin/theodolite/execution/TheodoliteExecutor.kt @@ -144,7 +144,7 @@ class TheodoliteExecutor( // Create expXYZ_demand.csv file ioHandler.writeToCSVFile( "${resultsFolder}exp${this.config.executionId}_demand", - calculateDemandMetric(config.loads, config.compositeStrategy.benchmarkExecutor.results), + calculateDemandMetric(config.loads, config.searchStrategy.benchmarkExecutor.results), listOf("load","resources") ) } @@ -161,8 +161,8 @@ class TheodoliteExecutor( return executionID } - private fun calculateDemandMetric(loadDimensions: List<LoadDimension>, results: Results): List<List<String>> { - return loadDimensions.map { listOf(it.get().toString(), results.getMinRequiredInstances(it).get().toString()) } + private fun calculateDemandMetric(loads: List<Int>, results: Results): List<List<String>> { + return loads.map { listOf(it.toString(), results.getMinRequiredInstances(it).toString()) } } } -- GitLab