diff options
author | OszkarSemerath <oszkar.semerath@gmail.com> | 2018-03-24 19:01:26 -0400 |
---|---|---|
committer | OszkarSemerath <oszkar.semerath@gmail.com> | 2018-03-24 19:01:26 -0400 |
commit | 3650e45220d906fe3e5411578341d5b133a16673 (patch) | |
tree | 3ebaa9e6432946bf2acf81e1374db50bfa0e18f7 /Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner | |
parent | Rebooting Z3 solver Containment vs Inheritance still has a bug (diff) | |
download | VIATRA-Generator-3650e45220d906fe3e5411578341d5b133a16673.tar.gz VIATRA-Generator-3650e45220d906fe3e5411578341d5b133a16673.tar.zst VIATRA-Generator-3650e45220d906fe3e5411578341d5b133a16673.zip |
Renaming some configuration concepts
Diffstat (limited to 'Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner')
2 files changed, 3 insertions, 3 deletions
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/ApplicationConfiguration.xtext b/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/ApplicationConfiguration.xtext index 29e9f9d6..2361d965 100644 --- a/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/ApplicationConfiguration.xtext +++ b/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/ApplicationConfiguration.xtext | |||
@@ -84,7 +84,7 @@ PatternEntry: PatternElement | AllPatternEntry; | |||
84 | AllPatternEntry: 'package' package = [viatra::PatternModel|QualifiedName] ('excluding' '{' exclusuion += PatternElement (',' exclusuion += PatternElement)* '}')?; | 84 | AllPatternEntry: 'package' package = [viatra::PatternModel|QualifiedName] ('excluding' '{' exclusuion += PatternElement (',' exclusuion += PatternElement)* '}')?; |
85 | PatternElement: (package =[viatra::PatternModel|QualifiedName] '::')? pattern = [viatra::Pattern]; | 85 | PatternElement: (package =[viatra::PatternModel|QualifiedName] '::')? pattern = [viatra::Pattern]; |
86 | 86 | ||
87 | GraphPatternDeclaration: 'patterns' name = ID specification = PatternSpecification; | 87 | GraphPatternDeclaration: 'constraints' name = ID specification = PatternSpecification; |
88 | GraphPatternReference: referred = [GraphPatternDeclaration]; | 88 | GraphPatternReference: referred = [GraphPatternDeclaration]; |
89 | GraphPattern: GraphPatternReference|PatternSpecification; | 89 | GraphPattern: GraphPatternReference|PatternSpecification; |
90 | 90 | ||
@@ -159,7 +159,7 @@ GenerationTask: 'generate' {GenerationTask} '{'( | |||
159 | // domain | 159 | // domain |
160 | ('metamodel' '=' metamodel = Metamodel)? & | 160 | ('metamodel' '=' metamodel = Metamodel)? & |
161 | ('partial-model' '=' partialModel = PartialModel)? & | 161 | ('partial-model' '=' partialModel = PartialModel)? & |
162 | ('patterns' '=' patterns = GraphPattern)? & | 162 | ('constraints' '=' patterns = GraphPattern)? & |
163 | 163 | ||
164 | // model set | 164 | // model set |
165 | ('scope' '=' scope = Scope)? & | 165 | ('scope' '=' scope = Scope)? & |
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..5506d762 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 | |||
@@ -198,7 +198,7 @@ class GenerationTaskExecutor { | |||
198 | val vis1 = new PartialInterpretation2Gml | 198 | val vis1 = new PartialInterpretation2Gml |
199 | val gml = vis1.transform(representation) | 199 | val gml = vis1.transform(representation) |
200 | outputWorkspaceForRun.writeText('''model«IF runs>1»_«run»«ENDIF»_«interpretationIndex+1».gml''',gml) | 200 | outputWorkspaceForRun.writeText('''model«IF runs>1»_«run»«ENDIF»_«interpretationIndex+1».gml''',gml) |
201 | if(representation.newElements.size + representation.problem.elements.size < 150) { | 201 | if(false && representation.newElements.size + representation.problem.elements.size < 150) { |
202 | val vis2 = new GraphvizVisualisation | 202 | val vis2 = new GraphvizVisualisation |
203 | val dot = vis2.visualiseConcretization(representation) | 203 | val dot = vis2.visualiseConcretization(representation) |
204 | dot.writeToFile(outputWorkspaceForRun,'''model«IF runs>1»_«run»«ENDIF»_«interpretationIndex+1»''') | 204 | dot.writeToFile(outputWorkspaceForRun,'''model«IF runs>1»_«run»«ENDIF»_«interpretationIndex+1»''') |