From 4ea2b034bbe3a9fba269285ba40ee1b40eb2c39b Mon Sep 17 00:00:00 2001
From: "stu126940@mail.uni-kiel.de" <stu126940@mail.uni-kiel.de>
Date: Wed, 3 Feb 2021 17:56:31 +0100
Subject: [PATCH] apply review (clean up)
---
.../strategies/restriction/RestrictionStrategy.kt | 2 +-
.../theodolite/strategies/searchstrategy/BinarySearch.kt | 9 ++++-----
2 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/theodolite-quarkus/src/main/kotlin/theodolite/strategies/restriction/RestrictionStrategy.kt b/theodolite-quarkus/src/main/kotlin/theodolite/strategies/restriction/RestrictionStrategy.kt
index 60a6eccfb..5bef38aaf 100644
--- a/theodolite-quarkus/src/main/kotlin/theodolite/strategies/restriction/RestrictionStrategy.kt
+++ b/theodolite-quarkus/src/main/kotlin/theodolite/strategies/restriction/RestrictionStrategy.kt
@@ -5,5 +5,5 @@ import theodolite.util.LoadDimension
import theodolite.util.Resource
abstract class RestrictionStrategy(val results: Results) {
- public abstract fun next(load: LoadDimension, resources: List<Resource>): List<Resource>;
+ public abstract fun next(load: LoadDimension, resources: List<Resource>): List<Resource>
}
\ No newline at end of file
diff --git a/theodolite-quarkus/src/main/kotlin/theodolite/strategies/searchstrategy/BinarySearch.kt b/theodolite-quarkus/src/main/kotlin/theodolite/strategies/searchstrategy/BinarySearch.kt
index a1e1c8f3f..1aaab229c 100644
--- a/theodolite-quarkus/src/main/kotlin/theodolite/strategies/searchstrategy/BinarySearch.kt
+++ b/theodolite-quarkus/src/main/kotlin/theodolite/strategies/searchstrategy/BinarySearch.kt
@@ -20,21 +20,20 @@ class BinarySearch(benchmarkExecutor: BenchmarkExecutor, results: Results) : Sea
throw IllegalArgumentException()
}
if (lower == upper ) {
- if (this.benchmarkExecutor.runExperiment(load, resources[lower])) return lower;
+ if (this.benchmarkExecutor.runExperiment(load, resources[lower])) return lower
else {
if (lower + 1 == resources.size) return - 1
- return lower + 1;
+ return lower + 1
}
} else {
- // (true, true), (false, true), (false, false) // (false, false, false, true, false, true, false, true)
val mid = (upper + lower) / 2
if (this.benchmarkExecutor.runExperiment(load, resources[mid])) {
if (mid == lower) {
return lower
}
- return search(load, resources, lower, mid - 1 );
+ return search(load, resources, lower, mid - 1 )
} else {
- return search(load, resources, mid + 1 , upper);
+ return search(load, resources, mid + 1 , upper)
}
}
}
--
GitLab