From d60363d1124f0e6ae6a02795e7dd1ff17a028d32 Mon Sep 17 00:00:00 2001 From: OszkarSemerath Date: Sun, 17 Feb 2019 19:04:34 +0100 Subject: Removed unnecessary logging --- .../src/hu/bme/mit/inf/dslreasoner/ecore2logic/EClassMapper.xtend | 1 + .../src/hu/bme/mit/inf/dslreasoner/ecore2logic/EReferenceMapper.xtend | 2 ++ .../mit/inf/dslreasoner/logic/model/builder/LogicProblemBuilder.xtend | 3 +++ .../src/hu/bme/mit/inf/dslreasoner/viatra2logic/Viatra2Logic.xtend | 4 ++-- 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{ } for(c:classes) { for(s : c.ESuperTypes) { + //println('''«c.name» -> «s.name»''') Supertype(classMapperTrace.typeMap.get(c),classMapperTrace.typeMap.get(s)) } } 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{ } else { val sourceType = reference.EContainingClass val targetType = reference.EType as EClass + //val name = '''oppositeReference «reference.name» «sourceType.name»''' + //println(name) val assertion = Assertion('''oppositeReference «reference.name» «sourceType.name»''', Forall[ 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{ return relationReference } def private checkRelationCall(SymbolicValue value, Relation referredRelation) { +// if(value === null || referredRelation === null) { +// println("gebasz") +// } if(value.parameterSubstitutions.size != referredRelation.parameters.size) { throw new LogicProblemBuilderException( '''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 { } def dispatch TypeReference transformTypeReference(EClassTransitiveInstancesKey k,TracedOutput ecore2LogicTrace) { val c = k.wrappedKey - + if(this.ecore2Logic.allClassesInScope(ecore2LogicTrace.trace).toList.contains(c)) { return builder.toTypeReference(this.ecore2Logic.TypeofEClass(ecore2LogicTrace.trace,k.wrappedKey)) } else { @@ -490,7 +490,7 @@ class Viatra2Logic { } def dispatch TypeReference transformTypeReference(IInputKey k,TracedOutput ecore2LogicTrace) { - println(k) + //println(k) throw new IllegalArgumentException('''Unsupported type: «k.class.simpleName»''') } -- cgit v1.2.3-54-g00ecf