aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar OszkarSemerath <oszkar.semerath@gmail.com>2019-02-17 19:04:34 +0100
committerLibravatar OszkarSemerath <oszkar.semerath@gmail.com>2019-02-17 19:04:34 +0100
commitd60363d1124f0e6ae6a02795e7dd1ff17a028d32 (patch)
tree19e68547634b12f06f75f6929b007fdc18cb5595
parentRemoved visualisation test (diff)
downloadVIATRA-Generator-d60363d1124f0e6ae6a02795e7dd1ff17a028d32.tar.gz
VIATRA-Generator-d60363d1124f0e6ae6a02795e7dd1ff17a028d32.tar.zst
VIATRA-Generator-d60363d1124f0e6ae6a02795e7dd1ff17a028d32.zip
Removed unnecessary logging
-rw-r--r--Framework/hu.bme.mit.inf.dslreasoner.ecore2logic/src/hu/bme/mit/inf/dslreasoner/ecore2logic/EClassMapper.xtend1
-rw-r--r--Framework/hu.bme.mit.inf.dslreasoner.ecore2logic/src/hu/bme/mit/inf/dslreasoner/ecore2logic/EReferenceMapper.xtend2
-rw-r--r--Framework/hu.bme.mit.inf.dslreasoner.logic.model/src/hu/bme/mit/inf/dslreasoner/logic/model/builder/LogicProblemBuilder.xtend3
-rw-r--r--Framework/hu.bme.mit.inf.dslreasoner.viatra2logic/src/hu/bme/mit/inf/dslreasoner/viatra2logic/Viatra2Logic.xtend4
4 files changed, 8 insertions, 2 deletions
diff --git a/Framework/hu.bme.mit.inf.dslreasoner.ecore2logic/src/hu/bme/mit/inf/dslreasoner/ecore2logic/EClassMapper.xtend b/Framework/hu.bme.mit.inf.dslreasoner.ecore2logic/src/hu/bme/mit/inf/dslreasoner/ecore2logic/EClassMapper.xtend
index 82abd252..9c774dd9 100644
--- a/Framework/hu.bme.mit.inf.dslreasoner.ecore2logic/src/hu/bme/mit/inf/dslreasoner/ecore2logic/EClassMapper.xtend
+++ b/Framework/hu.bme.mit.inf.dslreasoner.ecore2logic/src/hu/bme/mit/inf/dslreasoner/ecore2logic/EClassMapper.xtend
@@ -31,6 +31,7 @@ class EClassMapper_AllElementAsObject implements EClassMapper{
31 } 31 }
32 for(c:classes) { 32 for(c:classes) {
33 for(s : c.ESuperTypes) { 33 for(s : c.ESuperTypes) {
34 //println('''«c.name» -> «s.name»''')
34 Supertype(classMapperTrace.typeMap.get(c),classMapperTrace.typeMap.get(s)) 35 Supertype(classMapperTrace.typeMap.get(c),classMapperTrace.typeMap.get(s))
35 } 36 }
36 } 37 }
diff --git a/Framework/hu.bme.mit.inf.dslreasoner.ecore2logic/src/hu/bme/mit/inf/dslreasoner/ecore2logic/EReferenceMapper.xtend b/Framework/hu.bme.mit.inf.dslreasoner.ecore2logic/src/hu/bme/mit/inf/dslreasoner/ecore2logic/EReferenceMapper.xtend
index 4eb78bc6..179690dd 100644
--- a/Framework/hu.bme.mit.inf.dslreasoner.ecore2logic/src/hu/bme/mit/inf/dslreasoner/ecore2logic/EReferenceMapper.xtend
+++ b/Framework/hu.bme.mit.inf.dslreasoner.ecore2logic/src/hu/bme/mit/inf/dslreasoner/ecore2logic/EReferenceMapper.xtend
@@ -124,6 +124,8 @@ class EReferenceMapper_RelationsOverTypes implements EReferenceMapper{
124 } else { 124 } else {
125 val sourceType = reference.EContainingClass 125 val sourceType = reference.EContainingClass
126 val targetType = reference.EType as EClass 126 val targetType = reference.EType as EClass
127 //val name = '''oppositeReference «reference.name» «sourceType.name»'''
128 //println(name)
127 val assertion = Assertion('''oppositeReference «reference.name» «sourceType.name»''', 129 val assertion = Assertion('''oppositeReference «reference.name» «sourceType.name»''',
128 Forall[ 130 Forall[
129 val src = addVar('''src''', trace.TypeofEClass(sourceType)) 131 val src = addVar('''src''', trace.TypeofEClass(sourceType))
diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/src/hu/bme/mit/inf/dslreasoner/logic/model/builder/LogicProblemBuilder.xtend b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/src/hu/bme/mit/inf/dslreasoner/logic/model/builder/LogicProblemBuilder.xtend
index b3b7da5a..f6bd9541 100644
--- a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/src/hu/bme/mit/inf/dslreasoner/logic/model/builder/LogicProblemBuilder.xtend
+++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/src/hu/bme/mit/inf/dslreasoner/logic/model/builder/LogicProblemBuilder.xtend
@@ -557,6 +557,9 @@ public class LogicProblemBuilder{
557 return relationReference 557 return relationReference
558 } 558 }
559 def private checkRelationCall(SymbolicValue value, Relation referredRelation) { 559 def private checkRelationCall(SymbolicValue value, Relation referredRelation) {
560// if(value === null || referredRelation === null) {
561// println("gebasz")
562// }
560 if(value.parameterSubstitutions.size != referredRelation.parameters.size) { 563 if(value.parameterSubstitutions.size != referredRelation.parameters.size) {
561 throw new LogicProblemBuilderException( 564 throw new LogicProblemBuilderException(
562 '''The relation "«referredRelation.name»" called has «referredRelation.parameters.size» parameters but it is called with «value.parameterSubstitutions.size»!''') 565 '''The relation "«referredRelation.name»" called has «referredRelation.parameters.size» parameters but it is called with «value.parameterSubstitutions.size»!''')
diff --git a/Framework/hu.bme.mit.inf.dslreasoner.viatra2logic/src/hu/bme/mit/inf/dslreasoner/viatra2logic/Viatra2Logic.xtend b/Framework/hu.bme.mit.inf.dslreasoner.viatra2logic/src/hu/bme/mit/inf/dslreasoner/viatra2logic/Viatra2Logic.xtend
index 8a0ff3b3..3b828170 100644
--- a/Framework/hu.bme.mit.inf.dslreasoner.viatra2logic/src/hu/bme/mit/inf/dslreasoner/viatra2logic/Viatra2Logic.xtend
+++ b/Framework/hu.bme.mit.inf.dslreasoner.viatra2logic/src/hu/bme/mit/inf/dslreasoner/viatra2logic/Viatra2Logic.xtend
@@ -472,7 +472,7 @@ class Viatra2Logic {
472 } 472 }
473 def dispatch TypeReference transformTypeReference(EClassTransitiveInstancesKey k,TracedOutput<LogicProblem, Ecore2Logic_Trace> ecore2LogicTrace) { 473 def dispatch TypeReference transformTypeReference(EClassTransitiveInstancesKey k,TracedOutput<LogicProblem, Ecore2Logic_Trace> ecore2LogicTrace) {
474 val c = k.wrappedKey 474 val c = k.wrappedKey
475 475
476 if(this.ecore2Logic.allClassesInScope(ecore2LogicTrace.trace).toList.contains(c)) { 476 if(this.ecore2Logic.allClassesInScope(ecore2LogicTrace.trace).toList.contains(c)) {
477 return builder.toTypeReference(this.ecore2Logic.TypeofEClass(ecore2LogicTrace.trace,k.wrappedKey)) 477 return builder.toTypeReference(this.ecore2Logic.TypeofEClass(ecore2LogicTrace.trace,k.wrappedKey))
478 } else { 478 } else {
@@ -490,7 +490,7 @@ class Viatra2Logic {
490 } 490 }
491 491
492 def dispatch TypeReference transformTypeReference(IInputKey k,TracedOutput<LogicProblem, Ecore2Logic_Trace> ecore2LogicTrace) { 492 def dispatch TypeReference transformTypeReference(IInputKey k,TracedOutput<LogicProblem, Ecore2Logic_Trace> ecore2LogicTrace) {
493 println(k) 493 //println(k)
494 throw new IllegalArgumentException('''Unsupported type: «k.class.simpleName»''') 494 throw new IllegalArgumentException('''Unsupported type: «k.class.simpleName»''')
495 } 495 }
496 496