diff options
author | Kristóf Marussy <kris7topher@gmail.com> | 2019-08-22 20:43:03 +0200 |
---|---|---|
committer | Kristóf Marussy <kris7topher@gmail.com> | 2019-08-22 20:43:03 +0200 |
commit | be4fbe4fb10a27dd07d4139c1962af7c0de436ea (patch) | |
tree | 1379b3b81e2db9a48ac5032e900f33fdbde8c609 | |
parent | Measurements WIP (diff) | |
download | VIATRA-Generator-be4fbe4fb10a27dd07d4139c1962af7c0de436ea.tar.gz VIATRA-Generator-be4fbe4fb10a27dd07d4139c1962af7c0de436ea.tar.zst VIATRA-Generator-be4fbe4fb10a27dd07d4139c1962af7c0de436ea.zip |
Measurements WIP
24 files changed, 31 insertions, 33 deletions
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application.ide/xtend-gen/hu/bme/mit/inf/dslreasoner/application/ide/.ApplicationConfigurationIdeModule.xtendbin b/Application/hu.bme.mit.inf.dslreasoner.application.ide/xtend-gen/hu/bme/mit/inf/dslreasoner/application/ide/.ApplicationConfigurationIdeModule.xtendbin index 22db4093..47676d41 100644 --- a/Application/hu.bme.mit.inf.dslreasoner.application.ide/xtend-gen/hu/bme/mit/inf/dslreasoner/application/ide/.ApplicationConfigurationIdeModule.xtendbin +++ b/Application/hu.bme.mit.inf.dslreasoner.application.ide/xtend-gen/hu/bme/mit/inf/dslreasoner/application/ide/.ApplicationConfigurationIdeModule.xtendbin | |||
Binary files differ | |||
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application.ide/xtend-gen/hu/bme/mit/inf/dslreasoner/application/ide/.ApplicationConfigurationIdeSetup.xtendbin b/Application/hu.bme.mit.inf.dslreasoner.application.ide/xtend-gen/hu/bme/mit/inf/dslreasoner/application/ide/.ApplicationConfigurationIdeSetup.xtendbin index 3ad5d167..e477a075 100644 --- a/Application/hu.bme.mit.inf.dslreasoner.application.ide/xtend-gen/hu/bme/mit/inf/dslreasoner/application/ide/.ApplicationConfigurationIdeSetup.xtendbin +++ b/Application/hu.bme.mit.inf.dslreasoner.application.ide/xtend-gen/hu/bme/mit/inf/dslreasoner/application/ide/.ApplicationConfigurationIdeSetup.xtendbin | |||
Binary files differ | |||
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/ApplicationConfigurationStandaloneRuntimeModule.xtend b/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/ApplicationConfigurationStandaloneRuntimeModule.xtend index 2738dfff..55e01a4f 100644 --- a/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/ApplicationConfigurationStandaloneRuntimeModule.xtend +++ b/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/ApplicationConfigurationStandaloneRuntimeModule.xtend | |||
@@ -50,4 +50,4 @@ class ApplicationConfigurationStandaloneRuntimeModule extends AbstractApplicatio | |||
50 | // def Class<? extends ITargetPlatformMetamodelLoader> bindITargetPlatformMetamodelLoader() { | 50 | // def Class<? extends ITargetPlatformMetamodelLoader> bindITargetPlatformMetamodelLoader() { |
51 | // TargetPlatformMetamodelsIndex | 51 | // TargetPlatformMetamodelsIndex |
52 | // } | 52 | // } |
53 | } \ No newline at end of file | 53 | } |
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 be35b64a..df25151c 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 | |||
@@ -24,4 +24,4 @@ class EclipseBasedProgressMonitor extends SolverProgressMonitor{ | |||
24 | super.isCancelled() || internalMonitor.isCanceled | 24 | super.isCancelled() || internalMonitor.isCanceled |
25 | } | 25 | } |
26 | 26 | ||
27 | } \ No newline at end of file | 27 | } |
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 807d217a..1ee69827 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 | |||
@@ -304,7 +304,7 @@ class GenerationTaskExecutor { | |||
304 | console.flushStatistics | 304 | console.flushStatistics |
305 | console.writeMessage("Model generation finished") | 305 | console.writeMessage("Model generation finished") |
306 | } catch(Exception e) { | 306 | } catch(Exception e) { |
307 | console.writeError(''' | 307 | console.writeError(''' |
308 | Error occured («e.class.simpleName»): «e.message» | 308 | Error occured («e.class.simpleName»): «e.message» |
309 | «FOR s : e.stackTrace SEPARATOR "\n"» «s»«ENDFOR»''') | 309 | «FOR s : e.stackTrace SEPARATOR "\n"» «s»«ENDFOR»''') |
310 | } | 310 | } |
@@ -350,4 +350,4 @@ class GenerationTaskExecutor { | |||
350 | return false | 350 | return false |
351 | } | 351 | } |
352 | } | 352 | } |
353 | } \ No newline at end of file | 353 | } |
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/MetamodelLoader.xtend b/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/MetamodelLoader.xtend index 5e7f84f0..626329dc 100644 --- a/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/MetamodelLoader.xtend +++ b/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/MetamodelLoader.xtend | |||
@@ -120,4 +120,4 @@ class MetamodelLoader { | |||
120 | // } | 120 | // } |
121 | // return res | 121 | // return res |
122 | // } | 122 | // } |
123 | } \ No newline at end of file | 123 | } |
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/NullWorkspace.xtend b/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/NullWorkspace.xtend index 05081581..5e656e8f 100644 --- a/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/NullWorkspace.xtend +++ b/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/NullWorkspace.xtend | |||
@@ -59,4 +59,4 @@ class NullWorkspace extends ReasonerWorkspace{ | |||
59 | throw new UnsupportedOperationException(message) | 59 | throw new UnsupportedOperationException(message) |
60 | } | 60 | } |
61 | override refreshFile(String name) { } | 61 | override refreshFile(String name) { } |
62 | } \ No newline at end of file | 62 | } |
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/PatternLanguageWithRSModule.xtend b/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/PatternLanguageWithRSModule.xtend index 1269ec1f..3e598dd6 100644 --- a/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/PatternLanguageWithRSModule.xtend +++ b/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/PatternLanguageWithRSModule.xtend | |||
@@ -43,4 +43,4 @@ class PatternLanguageWithRSModule extends EMFPatternLanguageRuntimeModule{ | |||
43 | override Class<? extends ITypeInferrer> bindITypeInferrer() { | 43 | override Class<? extends ITypeInferrer> bindITypeInferrer() { |
44 | return EMFTypeInferrer; | 44 | return EMFTypeInferrer; |
45 | } | 45 | } |
46 | } \ No newline at end of file | 46 | } |
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/PatternLanguageWithRSSetup.xtend b/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/PatternLanguageWithRSSetup.xtend index dd5af673..c209cde5 100644 --- a/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/PatternLanguageWithRSSetup.xtend +++ b/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/PatternLanguageWithRSSetup.xtend | |||
@@ -12,4 +12,4 @@ class PatternLanguageWithRSSetup extends EMFPatternLanguageStandaloneSetup{ | |||
12 | override Injector createInjector() { | 12 | override Injector createInjector() { |
13 | return Guice::createInjector(new PatternLanguageWithRSModule()); | 13 | return Guice::createInjector(new PatternLanguageWithRSModule()); |
14 | } | 14 | } |
15 | } \ No newline at end of file | 15 | } |
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/QueryLoader.xtend b/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/QueryLoader.xtend index cfc91143..5a73845d 100644 --- a/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/QueryLoader.xtend +++ b/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/QueryLoader.xtend | |||
@@ -144,4 +144,4 @@ class QueryLoader { | |||
144 | } | 144 | } |
145 | return res | 145 | return res |
146 | } | 146 | } |
147 | } \ No newline at end of file | 147 | } |
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/ScopeLoader.xtend b/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/ScopeLoader.xtend index dcaf74cd..6d6ad85e 100644 --- a/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/ScopeLoader.xtend +++ b/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/ScopeLoader.xtend | |||
@@ -220,4 +220,4 @@ class ScopeLoader { | |||
220 | else return specification.exactNumber | 220 | else return specification.exactNumber |
221 | } | 221 | } |
222 | 222 | ||
223 | } \ No newline at end of file | 223 | } |
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/ScriptConsole.xtend b/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/ScriptConsole.xtend index 0f89ba1e..2ce86a78 100644 --- a/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/ScriptConsole.xtend +++ b/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/ScriptConsole.xtend | |||
@@ -88,7 +88,7 @@ abstract class ScriptConsole { | |||
88 | 88 | ||
89 | def writeStatistics(LinkedHashMap<String, ? extends Object> statistics) { | 89 | def writeStatistics(LinkedHashMap<String, ? extends Object> statistics) { |
90 | if (statisticsWorkspace !== null) { | 90 | if (statisticsWorkspace !== null) { |
91 | val message = ''' | 91 | val message = ''' |
92 | «FOR key : statistics.keySet SEPARATOR delimier»«key»«ENDFOR» | 92 | «FOR key : statistics.keySet SEPARATOR delimier»«key»«ENDFOR» |
93 | «FOR value : statistics.values SEPARATOR delimier»«value»«ENDFOR»''' | 93 | «FOR value : statistics.values SEPARATOR delimier»«value»«ENDFOR»''' |
94 | statisticsWorkspace.writeText(statisticsFileName, message); | 94 | statisticsWorkspace.writeText(statisticsFileName, message); |
@@ -104,11 +104,11 @@ abstract class ScriptConsole { | |||
104 | 104 | ||
105 | def flushStatistics() { | 105 | def flushStatistics() { |
106 | if (statisticsWorkspace !== null) { | 106 | if (statisticsWorkspace !== null) { |
107 | val message = ''' | 107 | val message = ''' |
108 | «FOR key : statisticsHeaderBuffer SEPARATOR delimier»«key»«ENDFOR» | 108 | «FOR key : statisticsHeaderBuffer SEPARATOR delimier»«key»«ENDFOR» |
109 | «FOR line : statisticsDataBuffer» | 109 | «FOR line : statisticsDataBuffer» |
110 | «FOR key : statisticsHeaderBuffer SEPARATOR delimier»«IF line.containsKey(key)»«line.get(key)»«ELSE»«empty»«ENDIF»«ENDFOR» | 110 | «FOR key : statisticsHeaderBuffer SEPARATOR delimier»«IF line.containsKey(key)»«line.get(key)»«ELSE»«empty»«ENDIF»«ENDFOR» |
111 | «ENDFOR» | 111 | «ENDFOR» |
112 | ''' | 112 | ''' |
113 | statisticsWorkspace.writeText(statisticsFileName, message); | 113 | statisticsWorkspace.writeText(statisticsFileName, message); |
114 | statisticsHeaderBuffer.clear | 114 | statisticsHeaderBuffer.clear |
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/ScriptExecutor.xtend b/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/ScriptExecutor.xtend index 25036df6..3941179a 100644 --- a/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/ScriptExecutor.xtend +++ b/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/ScriptExecutor.xtend | |||
@@ -250,4 +250,4 @@ class ScriptExecutor { | |||
250 | } | 250 | } |
251 | } | 251 | } |
252 | } | 252 | } |
253 | } \ No newline at end of file | 253 | } |
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/StandaloneScriptExecutor.xtend b/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/StandaloneScriptExecutor.xtend index 4ed57903..42be3ed7 100644 --- a/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/StandaloneScriptExecutor.xtend +++ b/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/StandaloneScriptExecutor.xtend | |||
@@ -71,11 +71,11 @@ class StandaloneScriptExecutor { | |||
71 | throw new IllegalArgumentException(message) | 71 | throw new IllegalArgumentException(message) |
72 | } | 72 | } |
73 | } else { | 73 | } else { |
74 | val message = ''' | 74 | val message = ''' |
75 | The Configuration Script contains «errors.size» error«IF errors.size>1»s«ENDIF»: | 75 | The Configuration Script contains «errors.size» error«IF errors.size>1»s«ENDIF»: |
76 | «FOR error : errors» | 76 | «FOR error : errors» |
77 | «"\t"»«error.message» | 77 | «"\t"»«error.message» |
78 | «ENDFOR» | 78 | «ENDFOR» |
79 | ''' | 79 | ''' |
80 | throw new IllegalArgumentException(message) | 80 | throw new IllegalArgumentException(message) |
81 | } | 81 | } |
@@ -98,4 +98,4 @@ class StandaloneScriptExecutor { | |||
98 | return e.message | 98 | return e.message |
99 | } | 99 | } |
100 | } | 100 | } |
101 | } \ No newline at end of file | 101 | } |
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/util/ApplicationConfigurationParser.xtend b/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/util/ApplicationConfigurationParser.xtend index ea738c5a..0d11bd31 100644 --- a/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/util/ApplicationConfigurationParser.xtend +++ b/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/util/ApplicationConfigurationParser.xtend | |||
@@ -15,4 +15,4 @@ class ApplicationConfigurationParser { | |||
15 | throw new IllegalArgumentException('''Content is not an ConfigurationScript! (got: «content.class.simpleName»)''') | 15 | throw new IllegalArgumentException('''Content is not an ConfigurationScript! (got: «content.class.simpleName»)''') |
16 | } | 16 | } |
17 | } | 17 | } |
18 | } \ No newline at end of file | 18 | } |
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/validation/MetamodelValidator.xtend b/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/validation/MetamodelValidator.xtend index fccc433a..f736f6ba 100644 --- a/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/validation/MetamodelValidator.xtend +++ b/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/validation/MetamodelValidator.xtend | |||
@@ -73,4 +73,4 @@ class MetamodelValidator { | |||
73 | } | 73 | } |
74 | } | 74 | } |
75 | } | 75 | } |
76 | } \ No newline at end of file | 76 | } |
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/validation/QueryAndMetamodelValidator.xtend b/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/validation/QueryAndMetamodelValidator.xtend index e5488e50..7d79bbbb 100644 --- a/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/validation/QueryAndMetamodelValidator.xtend +++ b/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/validation/QueryAndMetamodelValidator.xtend | |||
@@ -49,4 +49,4 @@ class QueryAndMetamodelValidator { | |||
49 | ].flatten.filter(ENamedElement) | 49 | ].flatten.filter(ENamedElement) |
50 | ].flatten | 50 | ].flatten |
51 | } | 51 | } |
52 | } \ No newline at end of file | 52 | } |
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/valueconverter/ApplicationConfigurationValueConverterService.xtend b/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/valueconverter/ApplicationConfigurationValueConverterService.xtend index 433f7148..840ffb09 100644 --- a/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/valueconverter/ApplicationConfigurationValueConverterService.xtend +++ b/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/valueconverter/ApplicationConfigurationValueConverterService.xtend | |||
@@ -11,4 +11,4 @@ class ApplicationConfigurationValueConverterService extends DefaultTerminalConve | |||
11 | def IValueConverter<String> QualifiedName() { | 11 | def IValueConverter<String> QualifiedName() { |
12 | converter2 | 12 | converter2 |
13 | } | 13 | } |
14 | } \ No newline at end of file | 14 | } |
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/.project b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/.project index e594a173..16db5fc5 100644 --- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/.project +++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/.project | |||
@@ -32,7 +32,6 @@ | |||
32 | </buildCommand> | 32 | </buildCommand> |
33 | </buildSpec> | 33 | </buildSpec> |
34 | <natures> | 34 | <natures> |
35 | <nature>org.eclipse.sirius.nature.modelingproject</nature> | ||
36 | <nature>org.eclipse.jdt.core.javanature</nature> | 35 | <nature>org.eclipse.jdt.core.javanature</nature> |
37 | <nature>org.eclipse.pde.PluginNature</nature> | 36 | <nature>org.eclipse.pde.PluginNature</nature> |
38 | <nature>org.eclipse.viatra.query.projectnature</nature> | 37 | <nature>org.eclipse.viatra.query.projectnature</nature> |
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/representations.aird b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/representations.aird deleted file mode 100644 index efa8e366..00000000 --- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/representations.aird +++ /dev/null | |||
@@ -1,2 +0,0 @@ | |||
1 | <?xml version="1.0" encoding="UTF-8"?> | ||
2 | <viewpoint:DAnalysis xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:viewpoint="http://www.eclipse.org/sirius/1.1.0" uid="_HbzhML6wEemt9IEpCgcgZA" version="14.1.0.201810161215"/> | ||
diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/cardinality/RelationConstraintCalculator.xtend b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/cardinality/RelationConstraintCalculator.xtend index 013e53e1..c92260ea 100644 --- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/cardinality/RelationConstraintCalculator.xtend +++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/cardinality/RelationConstraintCalculator.xtend | |||
@@ -44,7 +44,7 @@ class RelationMultiplicityConstraint { | |||
44 | } | 44 | } |
45 | 45 | ||
46 | def constrainsUnrepairable() { | 46 | def constrainsUnrepairable() { |
47 | constrainsUnfinished && canHaveMultipleSourcesPerTarget | 47 | constrainsUnfinished && canHaveMultipleSourcesPerTarget && false |
48 | } | 48 | } |
49 | 49 | ||
50 | def constrainsRemainingInverse() { | 50 | def constrainsRemainingInverse() { |
diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/dse/PartialModelAsLogicInterpretation.xtend b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/dse/PartialModelAsLogicInterpretation.xtend index f61c7333..b63bfe8b 100644 --- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/dse/PartialModelAsLogicInterpretation.xtend +++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/dse/PartialModelAsLogicInterpretation.xtend | |||
@@ -163,4 +163,4 @@ class PartialModelAsLogicInterpretation implements LogicModelInterpretation{ | |||
163 | override getAllStringsInStructure() { | 163 | override getAllStringsInStructure() { |
164 | new TreeSet(this.stringForwardTrace.keySet) | 164 | new TreeSet(this.stringForwardTrace.keySet) |
165 | } | 165 | } |
166 | } \ No newline at end of file | 166 | } |
diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/dse/ScopeObjective.xtend b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/dse/ScopeObjective.xtend index e7967b00..69a734f8 100644 --- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/dse/ScopeObjective.xtend +++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/dse/ScopeObjective.xtend | |||
@@ -41,4 +41,4 @@ class ScopeObjective implements IObjective{ | |||
41 | throw new UnsupportedOperationException("TODO: auto-generated method stub") | 41 | throw new UnsupportedOperationException("TODO: auto-generated method stub") |
42 | } | 42 | } |
43 | override getLevel() { 2 } | 43 | override getLevel() { 2 } |
44 | } \ No newline at end of file | 44 | } |
diff --git a/Tests/hu.bme.mit.inf.dslreasoner.run/configs/Yakindu_useful_ViatraSolver_polyhedral_typeHierarchy_Clp.json b/Tests/hu.bme.mit.inf.dslreasoner.run/configs/Yakindu_useful_ViatraSolver_polyhedral_typeHierarchy_Clp.json index 5f8a01b1..b4d51684 100644 --- a/Tests/hu.bme.mit.inf.dslreasoner.run/configs/Yakindu_useful_ViatraSolver_polyhedral_typeHierarchy_Clp.json +++ b/Tests/hu.bme.mit.inf.dslreasoner.run/configs/Yakindu_useful_ViatraSolver_polyhedral_typeHierarchy_Clp.json | |||
@@ -3,14 +3,15 @@ | |||
3 | "outputPath": "outputModels", | 3 | "outputPath": "outputModels", |
4 | "timeout": 1200, | 4 | "timeout": 1200, |
5 | "saveModels": false, | 5 | "saveModels": false, |
6 | "saveTemporaryFiles": true, | ||
6 | "warmupIterations": 0, | 7 | "warmupIterations": 0, |
7 | "iterations": 5, | 8 | "iterations": 5, |
8 | "domain": "Yakindu", | 9 | "domain": "Yakindu", |
9 | "scope": "quantiles", | 10 | "scope": "none", |
10 | "sizes": [100], | 11 | "sizes": [100], |
11 | "solver": "ViatraSolver", | 12 | "solver": "ViatraSolver", |
12 | "scopePropagator": "polyhedral", | 13 | "scopePropagator": "polyhedral", |
13 | "propagatedConstraints": "hints", | 14 | "propagatedConstraints": "hints", |
14 | "polyhedronSolver": "Clp", | 15 | "polyhedronSolver": "Clp", |
15 | "scopeHeuristic": "basic" | 16 | "scopeHeuristic": "polyhedral" |
16 | } | 17 | } |