diff options
author | OszkarSemerath <oszkar.semerath@gmail.com> | 2018-05-10 18:52:50 +0200 |
---|---|---|
committer | OszkarSemerath <oszkar.semerath@gmail.com> | 2018-05-10 18:52:50 +0200 |
commit | f3001344053444ba93c8e26a306ca24bc04aaefa (patch) | |
tree | 9adb484345d0afce7b0166f55cef609da9628503 /Application | |
parent | Regenerated Application Configuration Language (diff) | |
download | VIATRA-Generator-f3001344053444ba93c8e26a306ca24bc04aaefa.tar.gz VIATRA-Generator-f3001344053444ba93c8e26a306ca24bc04aaefa.tar.zst VIATRA-Generator-f3001344053444ba93c8e26a306ca24bc04aaefa.zip |
Renamed
Diffstat (limited to 'Application')
2 files changed, 22 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 new file mode 100644 index 00000000..624e75a5 --- /dev/null +++ b/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/EclipseBasedProgressMonitor.xtend | |||
@@ -0,0 +1,21 @@ | |||
1 | package hu.bme.mit.inf.dslreasoner.application.execution | ||
2 | |||
3 | import hu.bme.mit.inf.dslreasoner.logic.model.builder.SolverProgressMonitor | ||
4 | import org.eclipse.core.runtime.IProgressMonitor | ||
5 | |||
6 | class EclipseBasedProgressMonitor extends SolverProgressMonitor{ | ||
7 | val IProgressMonitor internalMonitor | ||
8 | |||
9 | public new(IProgressMonitor internalMonitor) { | ||
10 | this.internalMonitor = internalMonitor | ||
11 | } | ||
12 | |||
13 | override protected processWorked(double amount) { | ||
14 | internalMonitor.worked((amount*1000).intValue) | ||
15 | } | ||
16 | |||
17 | override isCancelled() { | ||
18 | super.isCancelled() || internalMonitor.isCanceled | ||
19 | } | ||
20 | |||
21 | } \ No newline at end of file | ||
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/GenerationTaskExecutor.xtend b/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/GenerationTaskExecutor.xtend index 2cbfc20d..95a5d03f 100644 --- a/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/GenerationTaskExecutor.xtend +++ b/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/GenerationTaskExecutor.xtend | |||
@@ -164,7 +164,7 @@ class GenerationTaskExecutor { | |||
164 | 164 | ||
165 | // 6.2 For each run, the configuration and the workspace is adjusted | 165 | // 6.2 For each run, the configuration and the workspace is adjusted |
166 | solverLoader.setRunIndex(solverConfig,configurationMap,run,console) | 166 | solverLoader.setRunIndex(solverConfig,configurationMap,run,console) |
167 | solverConfig.progressMonitor = new EclipseProgressMonitor(monitor) | 167 | solverConfig.progressMonitor = new EclipseBasedProgressMonitor(monitor) |
168 | val reasonerWorkspaceForRun = if(runs > 1) { | 168 | val reasonerWorkspaceForRun = if(runs > 1) { |
169 | reasonerWorkspace.subWorkspace('''run«run»''',"") => [initAndClear] | 169 | reasonerWorkspace.subWorkspace('''run«run»''',"") => [initAndClear] |
170 | } else { | 170 | } else { |