3 files changed, 15 insertions, 3 deletions

diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic2ecore/src/hu/bme/mit/inf/dslreasoner/logic2ecore/Logic2Ecore.xtend b/Framework/hu.bme.mit.inf.dslreasoner.logic2ecore/src/hu/bme/mit/inf/dslreasoner/logic2ecore/Logic2Ecore.xtend
index 92deeae6..08c6b7b7 100644
--- a/Framework/hu.bme.mit.inf.dslreasoner.logic2ecore/src/hu/bme/mit/inf/dslreasoner/logic2ecore/Logic2Ecore.xtend
+++ b/Framework/hu.bme.mit.inf.dslreasoner.logic2ecore/src/hu/bme/mit/inf/dslreasoner/logic2ecore/Logic2Ecore.xtend
@@ -20,6 +20,8 @@ import org.eclipse.emf.ecore.EcorePackage
 import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.TermDescription

 import hu.bme.mit.inf.dslreasoner.logic.model.builder.LogicProblemBuilder

 import java.util.Map

+import org.eclipse.emf.ecore.EAttribute

+import java.math.BigDecimal

 

 class Logic2Ecore {

         val extension LogicStructureBuilder structureBuilder = new LogicStructureBuilder

@@ -92,7 +94,7 @@ class Logic2Ecore {
                                                                         list += l.key

                                                                 } else {

                                                                         try {

-                                                                                sourceObject.eSet(attributeType,l.key)

+                                                                                sourceObject.eSet(attributeType,translateType(attributeType.EAttributeType,l.key))

                                                                         } catch(Exception e) {

                                                                                 e.printStackTrace

                                                                         }

@@ -107,6 +109,16 @@ class Logic2Ecore {
                 return element2Object.values.root

         }

         

+        def translateType(EDataType type, Object value) {

+                if(type == EcorePackage.eINSTANCE.EFloat) {

+                        val bd = value as BigDecimal

+                        return bd.floatValue

+                } else if( type  == EcorePackage.eINSTANCE.EDouble ) {

+                        val bd = value as BigDecimal

+                        return bd.doubleValue

+                } else return value

+        }

+        

         

 //                                                      if(attributeType.EAttributeType.isSuperTypeOf(targetObject.eClass)) {

 //                                                              val expression = ecore2Logic.IsAttributeValue(forwardTrace,sourceElement,targetElement,attributeType)

diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/rules/RefinementRuleProvider.xtend b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/rules/RefinementRuleProvider.xtend
index f2efc87a..1e7f1d2b 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/rules/RefinementRuleProvider.xtend
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/rules/RefinementRuleProvider.xtend
@@ -184,7 +184,7 @@ class RefinementRuleProvider {
                                         if(containmentReferences.contains(relation)) {

                                                 val targetTypeInterpretation = getTypeInterpretation(i, relation, 1)

                                                 if(!(targetTypeInterpretation as PartialComplexTypeInterpretation).interpretationOf.isIsAbstract) {

-                                                        val inverseAnnotation = p.assertions.filter(InverseRelationAssertion).filter[it.inverseA === relation || it.inverseB === relation]

+                                                        val inverseAnnotation = p.annotations.filter(InverseRelationAssertion).filter[it.inverseA === relation || it.inverseB === relation]

                                                         if(!inverseAnnotation.empty) {

                                                                 val onlyInverseAnnotation = if(inverseAnnotation.head.inverseA===relation) {

                                                                         inverseAnnotation.head.inverseB

diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/visualisation/PartialInterpretation2Gml.xtend b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/visualisation/PartialInterpretation2Gml.xtend
index 2b42a8b1..190b5c94 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/visualisation/PartialInterpretation2Gml.xtend
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/visualisation/PartialInterpretation2Gml.xtend
@@ -107,7 +107,7 @@ class PartialInterpretation2Gml {
         }

         

         def protected transormTitle(DefinedElement object) {

-                if(object.name!= null)object.name

+                if(object.name!= null)object.name.replace("\"", "")

                 else "null"

         }