Merge branch 'master' into hypergraphs

1 files changed, 7 insertions, 1 deletions

diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/EclipseBasedProgressMonitor.xtend b/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/EclipseBasedProgressMonitor.xtend
index 624e75a5..be35b64a 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/EclipseBasedProgressMonitor.xtend
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/EclipseBasedProgressMonitor.xtend
@@ -9,9 +9,15 @@ class EclipseBasedProgressMonitor extends SolverProgressMonitor{
         public new(IProgressMonitor internalMonitor) {

                 this.internalMonitor = internalMonitor

         }

+        var double currentDouble = 0.0

+        var int currentInt = 0

         

         override protected processWorked(double amount) {

-                internalMonitor.worked((amount*1000).intValue)

+                val newDouble = currentDouble+amount

+                val newInt = (newDouble*1000).intValue

+                internalMonitor.worked(newInt-currentInt)

+                currentDouble = newDouble

+                currentInt = newInt

         }

         

         override isCancelled() {