From 9531bbafc1877d8a8bc45018bae7ed88dbd8e073 Mon Sep 17 00:00:00 2001
From: Marcel Becker <stu117960@mail.uni-kiel.de>
Date: Mon, 28 Mar 2022 11:59:52 +0200
Subject: [PATCH] Fixed bug with setResult()
---
.../main/kotlin/theodolite/util/Results.kt | 30 +++++++++----------
1 file changed, 15 insertions(+), 15 deletions(-)
diff --git a/theodolite/src/main/kotlin/theodolite/util/Results.kt b/theodolite/src/main/kotlin/theodolite/util/Results.kt
index b255ec73c..418ac50f2 100644
--- a/theodolite/src/main/kotlin/theodolite/util/Results.kt
+++ b/theodolite/src/main/kotlin/theodolite/util/Results.kt
@@ -29,28 +29,28 @@ class Results (val metric: Metric) {
when (metric) {
Metric.DEMAND ->
- if (optInstances.containsKey(experiment.first)) {
- if(optInstances[experiment.first]!! > experiment.second) {
- optInstances[experiment.first] = experiment.second
- }
- } else {
- if(!successful){
- optInstances[experiment.first] = Int.MAX_VALUE
- }else {
+ if (successful) {
+ if (optInstances.containsKey(experiment.first)) {
+ if (optInstances[experiment.first]!! > experiment.second) {
+ optInstances[experiment.first] = experiment.second
+ }
+ } else {
optInstances[experiment.first] = experiment.second
}
+ } else if (!optInstances.containsKey(experiment.first)) {
+ optInstances[experiment.first] = Int.MAX_VALUE
}
Metric.CAPACITY ->
- if (optInstances.containsKey(experiment.second)) {
- if (optInstances[experiment.second]!! < experiment.first){
- optInstances[experiment.second] = experiment.first
- }
- } else {
- if(!successful){
- optInstances[experiment.second] = Int.MIN_VALUE
+ if (successful) {
+ if (optInstances.containsKey(experiment.second)) {
+ if (optInstances[experiment.second]!! < experiment.first) {
+ optInstances[experiment.second] = experiment.first
+ }
} else {
optInstances[experiment.second] = experiment.first
}
+ } else if (!optInstances.containsKey(experiment.second)) {
+ optInstances[experiment.second] = Int.MIN_VALUE
}
}
}
--
GitLab