From 5cd18cb8d335439a04ca1955b1eaa46928e2744d Mon Sep 17 00:00:00 2001
From: Philipp Spohr <spohr.philipp@web.de>
Date: Wed, 6 Sep 2017 18:46:36 +0200
Subject: [PATCH] Cosmetic and fix for wrong gap
---
.../java/de/hhu/ba/yoshikoWrapper/core/AlgorithmTask.java | 2 +-
src/main/java/de/hhu/ba/yoshikoWrapper/core/Util.java | 7 +++++++
.../java/de/hhu/ba/yoshikoWrapper/gui/ResultPanel.java | 2 +-
src/main/resources/YoshikoStrings.properties | 2 +-
4 files changed, 10 insertions(+), 3 deletions(-)
create mode 100644 src/main/java/de/hhu/ba/yoshikoWrapper/core/Util.java
diff --git a/src/main/java/de/hhu/ba/yoshikoWrapper/core/AlgorithmTask.java b/src/main/java/de/hhu/ba/yoshikoWrapper/core/AlgorithmTask.java
index e810450..a79b9ad 100644
--- a/src/main/java/de/hhu/ba/yoshikoWrapper/core/AlgorithmTask.java
+++ b/src/main/java/de/hhu/ba/yoshikoWrapper/core/AlgorithmTask.java
@@ -152,7 +152,7 @@ public class AlgorithmTask extends AbstractTask {
@Override
public void updateGap(double gap) {
- taskMonitor.setStatusMessage(LocalizationManager.get("currentGap")+": "+gap*100+"%");
+ taskMonitor.setStatusMessage(LocalizationManager.get("currentGap")+": "+Util.twoDecimals.format(gap)+"%");
}
}
diff --git a/src/main/java/de/hhu/ba/yoshikoWrapper/core/Util.java b/src/main/java/de/hhu/ba/yoshikoWrapper/core/Util.java
new file mode 100644
index 0000000..99fed80
--- /dev/null
+++ b/src/main/java/de/hhu/ba/yoshikoWrapper/core/Util.java
@@ -0,0 +1,7 @@
+package de.hhu.ba.yoshikoWrapper.core;
+
+import java.text.DecimalFormat;
+
+public class Util {
+ final static DecimalFormat twoDecimals =new DecimalFormat("0.00");
+}
diff --git a/src/main/java/de/hhu/ba/yoshikoWrapper/gui/ResultPanel.java b/src/main/java/de/hhu/ba/yoshikoWrapper/gui/ResultPanel.java
index 2148dde..0f551cf 100644
--- a/src/main/java/de/hhu/ba/yoshikoWrapper/gui/ResultPanel.java
+++ b/src/main/java/de/hhu/ba/yoshikoWrapper/gui/ResultPanel.java
@@ -88,7 +88,7 @@ public class ResultPanel extends JPanel implements CytoPanelComponent{
marker.add(new JLabel(
LocalizationManager.get("instance")+" "+i+" "+
LocalizationManager.get("gap")+": "+
- (100*result.flags.getInstances().get(i))+"%")
+ ((int)(100*result.flags.getInstances().get(i)))+"%")
);
}
}
diff --git a/src/main/resources/YoshikoStrings.properties b/src/main/resources/YoshikoStrings.properties
index 8c05e37..463f1f8 100644
--- a/src/main/resources/YoshikoStrings.properties
+++ b/src/main/resources/YoshikoStrings.properties
@@ -57,7 +57,7 @@ continueTimeout = The ILP has exceeded the given time limit. Do you want to cont
timeoutTitle = Timeout
incompleteResult = This run yielded no usable result!
optimal = Optimal Solution
-notOptimal = Not Optimal Solution
+notOptimal = Non-Optimal Solution
ilpMarker = ILP Properties
timeoutMarker = Timed Out
instance = Instance
--
GitLab