Updated partial model representation handling

2 files changed, 18 insertions, 2 deletions

diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/statecoder/IdentifierBasedStateCoderFactory.xtend b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/statecoder/IdentifierBasedStateCoderFactory.xtend
index c421ace6..f55a501a 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/statecoder/IdentifierBasedStateCoderFactory.xtend
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/statecoder/IdentifierBasedStateCoderFactory.xtend
@@ -18,6 +18,8 @@ import org.eclipse.viatra.dse.statecode.IStateCoderFactory
 import org.eclipse.viatra.query.runtime.api.IPatternMatch

 import org.eclipse.xtend.lib.annotations.Accessors

 import org.eclipse.xtend.lib.annotations.Data

+import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialPrimitiveInterpretation

+import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialComplexTypeInterpretation

 

 class IdentifierBasedStateCoderFactory implements IStateCoderFactory{

         

@@ -116,7 +118,13 @@ class IdentifierBasedStateCoder implements IStateCoder{
                 } else if(element instanceof PartialRelationInterpretation) {

                         return element.interpretationOf.name.hashCode

                 } else if(element instanceof PartialTypeInterpratation) {

-                        return element.interpretationOf.name.hashCode

+                        if(element instanceof PartialPrimitiveInterpretation) {

+                                element.class.simpleName.hashCode

+                        } else if (element instanceof PartialComplexTypeInterpretation){

+                                return element.interpretationOf.name.hashCode

+                        } else {

+                                throw new UnsupportedOperationException('''Unsupported type: «element.class.simpleName»''')

+                        }

                 } else {

                         println(element)

                         throw new UnsupportedOperationException('''Unsupported type: «element.class.simpleName»''')

diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/statecoder/NeighbourhoodBasedStateCoderFactory.xtend b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/statecoder/NeighbourhoodBasedStateCoderFactory.xtend
index 5fb85b0c..65a8207e 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/statecoder/NeighbourhoodBasedStateCoderFactory.xtend
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/statecoder/NeighbourhoodBasedStateCoderFactory.xtend
@@ -30,6 +30,8 @@ import java.util.Set
 import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.TypeDeclaration
 import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.RelationDeclaration
 import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.neighbourhood.PartialInterpretation2NeighbourhoodRepresentation
+import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialComplexTypeInterpretation
+import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialPrimitiveInterpretation
 
 class NeighbourhoodBasedStateCoderFactory implements IStateCoderFactory {
         val List<NeighbourhoodBasedPartialInterpretationStateCoder> statecoders = new LinkedList
@@ -142,7 +144,13 @@ class NeighbourhoodBasedPartialInterpretationStateCoder implements IStateCoder{
                 } else if(o instanceof PartialRelationInterpretation) {
                         return o.interpretationOf.name
                 } else if(o instanceof PartialTypeInterpratation) {
-                        return o.interpretationOf.name
+                        if(o instanceof PartialPrimitiveInterpretation) {
+                                o.class.simpleName.hashCode
+                        } else if (o instanceof PartialComplexTypeInterpretation){
+                                return o.interpretationOf.name.hashCode
+                        } else {
+                                throw new UnsupportedOperationException('''Unsupported type: «o.class.simpleName»''')
+                        }
                 } else {
                         throw new UnsupportedOperationException('''Unsupported type: «o.class.simpleName»''')
                 }