diff options
| author |  OszkarSemerath <oszka@SEMERATH-LAPTOP> | 2017-07-12 15:32:28 +0200 |
|---|---|---|
| committer | OszkarSemerath <oszka@SEMERATH-LAPTOP> | 2017-07-12 15:32:28 +0200 |
| commit | f7ec231232f5269764fc3bb951988eb5a0035335 (patch) | |
| tree | 90fdd82baa83d86775cc75a2861faf62bccc5224 | |
| parent | Changed naming convention in generated logic problems. (diff) | |
| download | VIATRA-Generator-f7ec231232f5269764fc3bb951988eb5a0035335.tar.gz VIATRA-Generator-f7ec231232f5269764fc3bb951988eb5a0035335.tar.zst VIATRA-Generator-f7ec231232f5269764fc3bb951988eb5a0035335.zip | |
The generated patterns follow the new naming convention.
3 files changed, 3 insertions, 3 deletions
diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/patterns/GenericTypeIndexer.xtend b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/patterns/GenericTypeIndexer.xtend index fbbd9fb5..23bdda35 100644 --- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/patterns/GenericTypeIndexer.xtend +++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/patterns/GenericTypeIndexer.xtend | |||
| @@ -189,6 +189,6 @@ class GenericTypeIndexer implements TypeIndexer { | |||
| 189 | '''find «patternName(type,modality)»(problem,interpretation,«variableName»);''' | 189 | '''find «patternName(type,modality)»(problem,interpretation,«variableName»);''' |
| 190 | } | 190 | } |
| 191 | public override referInstanceOf(EClass type, Modality modality, String variableName) { | 191 | public override referInstanceOf(EClass type, Modality modality, String variableName) { |
| 192 | '''find «modality.toString.toLowerCase»InstanceOf«base.canonizeName('''class «type.name»''')»(problem,interpretation,«variableName»);''' | 192 | '''find «modality.toString.toLowerCase»InstanceOf«base.canonizeName('''«type.name» class''')»(problem,interpretation,«variableName»);''' |
| 193 | } | 193 | } |
| 194 | } \ No newline at end of file | 194 | } \ No newline at end of file |
diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/patterns/PatternGenerator.xtend b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/patterns/PatternGenerator.xtend index 291b605b..05cda966 100644 --- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/patterns/PatternGenerator.xtend +++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/patterns/PatternGenerator.xtend | |||
| @@ -75,7 +75,7 @@ class PatternGenerator { | |||
| 75 | String targetVariable, | 75 | String targetVariable, |
| 76 | Modality modality) | 76 | Modality modality) |
| 77 | { | 77 | { |
| 78 | '''find «modality.name.toLowerCase»InRelation«canonizeName('''inreference «reference.name» «reference.EContainingClass.name»''') | 78 | '''find «modality.name.toLowerCase»InRelation«canonizeName('''«reference.name» reference «reference.EContainingClass.name»''') |
| 79 | »(problem,interpretation,«sourceVariable»,«targetVariable»);''' | 79 | »(problem,interpretation,«sourceVariable»,«targetVariable»);''' |
| 80 | } | 80 | } |
| 81 | 81 | ||
diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/patterns/TypeIndexerWithPreliminaryTypeAnalysis.xtend b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/patterns/TypeIndexerWithPreliminaryTypeAnalysis.xtend index 3c49c323..4e30ec78 100644 --- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/patterns/TypeIndexerWithPreliminaryTypeAnalysis.xtend +++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/patterns/TypeIndexerWithPreliminaryTypeAnalysis.xtend | |||
| @@ -92,6 +92,6 @@ class TypeIndexerWithPreliminaryTypeAnalysis implements TypeIndexer{ | |||
| 92 | '''find «patternName(type,modality)»(problem,interpretation,«variableName»);''' | 92 | '''find «patternName(type,modality)»(problem,interpretation,«variableName»);''' |
| 93 | } | 93 | } |
| 94 | public override referInstanceOf(EClass type, Modality modality, String variableName) { | 94 | public override referInstanceOf(EClass type, Modality modality, String variableName) { |
| 95 | '''find «modality.toString.toLowerCase»InstanceOf«base.canonizeName('''class «type.name»''')»(problem,interpretation,«variableName»);''' | 95 | '''find «modality.toString.toLowerCase»InstanceOf«base.canonizeName('''«type.name» class''')»(problem,interpretation,«variableName»);''' |
| 96 | } | 96 | } |
| 97 | } \ No newline at end of file | 97 | } \ No newline at end of file |