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 e8104501a6ccd712cb1862fb9aa28634664bf329..a79b9ad75a5c619b7cb2b554c3161ab70b43c6c0 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 0000000000000000000000000000000000000000..99fed80a0b0afc81e67528eab09e678ea3b50cda --- /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 2148ddeb54104d545a6518b5417854f646be22c8..0f551cfce2e807028443d3f512843e08e905689f 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 8c05e37ac593283ac71e8636c0509cf244ab7263..463f1f8a69cfda78149454dc194be29e71e2825b 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