Renaming some configuration concepts

4 files changed, 5 insertions, 4 deletions

diff --git a/Application/hu.bme.mit.inf.dslreasoner.application.ui/.gitignore b/Application/hu.bme.mit.inf.dslreasoner.application.ui/.gitignore
index ae3c1726..1a9ea807 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application.ui/.gitignore
+++ b/Application/hu.bme.mit.inf.dslreasoner.application.ui/.gitignore
@@ -1 +1,2 @@
 /bin/
+/xtend-gen/*
\ No newline at end of file
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/.gitignore b/Application/hu.bme.mit.inf.dslreasoner.application/.gitignore
index 3197db31..1a9ea807 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/.gitignore
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/.gitignore
@@ -1,2 +1,2 @@
 /bin/
-/xtend-gen/
\ No newline at end of file
+/xtend-gen/*
\ No newline at end of file
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;
 AllPatternEntry: 'package' package = [viatra::PatternModel|QualifiedName] ('excluding' '{' exclusuion += PatternElement (',' exclusuion += PatternElement)* '}')?;

 PatternElement: (package =[viatra::PatternModel|QualifiedName] '::')? pattern = [viatra::Pattern];

 

-GraphPatternDeclaration: 'patterns' name = ID specification = PatternSpecification;

+GraphPatternDeclaration: 'constraints' name = ID specification = PatternSpecification;

 GraphPatternReference: referred = [GraphPatternDeclaration];

 GraphPattern: GraphPatternReference|PatternSpecification;

 

@@ -159,7 +159,7 @@ GenerationTask:  'generate' {GenerationTask} '{'(
                 // domain

                 ('metamodel' '=' metamodel = Metamodel)? &

                 ('partial-model'  '=' partialModel = PartialModel)? &

-                ('patterns'  '=' patterns = GraphPattern)? &

+                ('constraints'  '=' patterns = GraphPattern)? &

                 

                 // model set

                 ('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 {
                                                         val vis1 = new PartialInterpretation2Gml

                                                         val gml = vis1.transform(representation)

                                                         outputWorkspaceForRun.writeText('''model«IF runs>1»_«run»«ENDIF»_«interpretationIndex+1».gml''',gml)

-                                                        if(representation.newElements.size + representation.problem.elements.size < 150) {

+                                                        if(false && representation.newElements.size + representation.problem.elements.size < 150) {

                                                                 val vis2 = new GraphvizVisualisation

                                                                 val dot = vis2.visualiseConcretization(representation)

                                                                 dot.writeToFile(outputWorkspaceForRun,'''model«IF runs>1»_«run»«ENDIF»_«interpretationIndex+1»''')