diff --git a/theodolite/src/main/kotlin/theodolite/strategies/searchstrategy/BinarySearch.kt b/theodolite/src/main/kotlin/theodolite/strategies/searchstrategy/BinarySearch.kt index ba7ac45537cd9292a3cf5bab0ddc1fbe3451d11c..28e8194c699cd074026c8cb7e6f3ce4ec347023b 100644 --- a/theodolite/src/main/kotlin/theodolite/strategies/searchstrategy/BinarySearch.kt +++ b/theodolite/src/main/kotlin/theodolite/strategies/searchstrategy/BinarySearch.kt @@ -14,7 +14,6 @@ private val logger = KotlinLogging.logger {} */ class BinarySearch(benchmarkExecutor: BenchmarkExecutor) : SearchStrategy(benchmarkExecutor) { override fun findSuitableResource(load: LoadDimension, resources: List<Resource>): Resource? { - val result = binarySearch(load, resources, 0, resources.size - 1) if (result == -1) { return null diff --git a/theodolite/src/main/kotlin/theodolite/strategies/searchstrategy/FullSearch.kt b/theodolite/src/main/kotlin/theodolite/strategies/searchstrategy/FullSearch.kt index acdf6eab9658458c3c02a2daf87607425dcc9c1a..cb0dd2d8ab528e42e8290f59f26c8b9b32f384c7 100644 --- a/theodolite/src/main/kotlin/theodolite/strategies/searchstrategy/FullSearch.kt +++ b/theodolite/src/main/kotlin/theodolite/strategies/searchstrategy/FullSearch.kt @@ -18,7 +18,6 @@ private val logger = KotlinLogging.logger {} class FullSearch(benchmarkExecutor: BenchmarkExecutor) : SearchStrategy(benchmarkExecutor) { override fun findSuitableResource(load: LoadDimension, resources: List<Resource>): Resource? { - var minimalSuitableResources: Resource? = null for (res in resources) { logger.info { "Running experiment with load '${load.get()}' and resources '${res.get()}'" } diff --git a/theodolite/src/main/kotlin/theodolite/strategies/searchstrategy/GuessStrategy.kt b/theodolite/src/main/kotlin/theodolite/strategies/searchstrategy/GuessStrategy.kt index e2a961167cc6b0c193a819d1953e303c7adc6afa..786a3baf159e94841c1f76c696f030718e8f768f 100644 --- a/theodolite/src/main/kotlin/theodolite/strategies/searchstrategy/GuessStrategy.kt +++ b/theodolite/src/main/kotlin/theodolite/strategies/searchstrategy/GuessStrategy.kt @@ -2,7 +2,6 @@ package theodolite.strategies.searchstrategy import io.quarkus.runtime.annotations.RegisterForReflection import theodolite.util.Resource -import theodolite.util.Results /** * Base class for the implementation of Guess strategies. Guess strategies are strategies to determine the resource diff --git a/theodolite/src/main/kotlin/theodolite/strategies/searchstrategy/InitialGuessSearchStrategy.kt b/theodolite/src/main/kotlin/theodolite/strategies/searchstrategy/InitialGuessSearchStrategy.kt index 43ccdf7352d74ca2e9c918bca5a55d8e51b2da6a..d97fb62cc9d37dd50122199e5d089c491784e511 100644 --- a/theodolite/src/main/kotlin/theodolite/strategies/searchstrategy/InitialGuessSearchStrategy.kt +++ b/theodolite/src/main/kotlin/theodolite/strategies/searchstrategy/InitialGuessSearchStrategy.kt @@ -14,6 +14,7 @@ private val logger = KotlinLogging.logger {} * * @param benchmarkExecutor Benchmark executor which runs the individual benchmarks. * @param guessStrategy Strategy that provides us with a guess for the first resource amount. + * @param results current results of all previously performed benchmarks. */ class InitialGuessSearchStrategy(benchmarkExecutor: BenchmarkExecutor, guessStrategy: GuessStrategy, results: Results) : SearchStrategy(benchmarkExecutor, guessStrategy, results) { diff --git a/theodolite/src/main/kotlin/theodolite/strategies/searchstrategy/LinearSearch.kt b/theodolite/src/main/kotlin/theodolite/strategies/searchstrategy/LinearSearch.kt index f860f2496be05e12cb26dee4abebef7449482d36..85deaf6fa75437199bfc560404eb5b40bb4a986a 100644 --- a/theodolite/src/main/kotlin/theodolite/strategies/searchstrategy/LinearSearch.kt +++ b/theodolite/src/main/kotlin/theodolite/strategies/searchstrategy/LinearSearch.kt @@ -15,13 +15,11 @@ private val logger = KotlinLogging.logger {} class LinearSearch(benchmarkExecutor: BenchmarkExecutor) : SearchStrategy(benchmarkExecutor) { override fun findSuitableResource(load: LoadDimension, resources: List<Resource>): Resource? { - for (res in resources) { logger.info { "Running experiment with load '${load.get()}' and resources '${res.get()}'" } if (this.benchmarkExecutor.runExperiment(load, res)) return res } - return null } } diff --git a/theodolite/src/main/kotlin/theodolite/strategies/searchstrategy/SearchStrategy.kt b/theodolite/src/main/kotlin/theodolite/strategies/searchstrategy/SearchStrategy.kt index 357b1d22a03731a68527e926204a49db060dc0b9..97c723f2cfe459081cbb327f6860e48319c8f4f1 100644 --- a/theodolite/src/main/kotlin/theodolite/strategies/searchstrategy/SearchStrategy.kt +++ b/theodolite/src/main/kotlin/theodolite/strategies/searchstrategy/SearchStrategy.kt @@ -11,6 +11,7 @@ import theodolite.util.Results * * @param benchmarkExecutor Benchmark executor which runs the individual benchmarks. * @param guessStrategy Guess strategy for the initial resource amount in case the InitialGuessStrategy is selected. + * @param results the [Results] object. */ @RegisterForReflection abstract class SearchStrategy(val benchmarkExecutor: BenchmarkExecutor, val guessStrategy: GuessStrategy? = null, @@ -20,7 +21,6 @@ abstract class SearchStrategy(val benchmarkExecutor: BenchmarkExecutor, val gues * * @param load the [LoadDimension] to be tested. * @param resources List of all possible [Resource]s. - * @param lastLowestResource Previous resource demand needed for the given load. * * @return suitable resource for the specified load, or null if no suitable resource exists. */