1 files changed, 59 insertions, 3 deletions
diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/dse/PartialModelAsLogicInterpretation.xtend b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/dse/PartialModelAsLogicInterpretation.xtend
index b63bfe8b..cfd11816 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/dse/PartialModelAsLogicInterpretation.xtend
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/dse/PartialModelAsLogicInterpretation.xtend
@@ -153,14 +153,70 @@ class PartialModelAsLogicInterpretation implements LogicModelInterpretation{
        }
        
        override getAllIntegersInStructure() {
-                new TreeSet(this.integerForwardTrace.keySet)
+                new TreeSet(allIntegersWithInterpretation.values)
+        }
+        
+        override getAllIntegersWithInterpretation() {
+                val builder = new HashMap
+                for (entry : integerForwardTrace.entrySet) {
+                        builder.put(entry.value, entry.key)
+                }
+                for (element : partialInterpretation.newElements) {
+                        if (element instanceof IntegerElement) {
+                                builder.put(element, element.value)
+                        }
+                }
+                builder
        }
        
        override getAllRealsInStructure() {
-                new TreeSet(this.realForwardTrace.keySet)
+                new TreeSet(allRealsWithInterpretation.values)
+        }
+        
+        override getAllRealsWithInterpretation() {
+                val builder = new HashMap
+                for (entry : realForwardTrace.entrySet) {
+                        builder.put(entry.value, entry.key)
+                }
+                for (element : partialInterpretation.newElements) {
+                        if (element instanceof RealElement) {
+                                builder.put(element, element.value)
+                        }
+                }
+                builder
        }
        
        override getAllStringsInStructure() {
-                new TreeSet(this.stringForwardTrace.keySet)
+                new TreeSet(allStringsWithInterpretation.values)
+        }
+        
+        override getAllStringsWithInterpretation() {
+                val builder = new HashMap
+                for (entry : stringForwardTrace.entrySet) {
+                        builder.put(entry.value, entry.key)
+                }
+                for (element : partialInterpretation.newElements) {
+                        if (element instanceof StringElement) {
+                                builder.put(element, element.value)
+                        }
+                }
+                builder
+        }
+        
+        override getAllBooleansInStructure() {
+                new TreeSet(allBooleansWithInterpretation.values)
+        }
+        
+        override getAllBooleansWithInterpretation() {
+                val builder = new HashMap
+                for (entry : booleanForwardTrace.entrySet) {
+                        builder.put(entry.value, entry.key)
+                }
+                for (element : partialInterpretation.newElements) {
+                        if (element instanceof BooleanElement) {
+                                builder.put(element, element.value)
+                        }
+                }
+                builder
        }
 }

diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/dse/PartialModelAsLogicInterpretation.xtend b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/dse/PartialModelAsLogicInterpretation.xtend index b63bfe8b..cfd11816 100644 --- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/dse/PartialModelAsLogicInterpretation.xtend +++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/dse/PartialModelAsLogicInterpretation.xtend
@@ -153,14 +153,70 @@ class PartialModelAsLogicInterpretation implements LogicModelInterpretation{
153	}	153	}
154		154
155	override getAllIntegersInStructure() {	155	override getAllIntegersInStructure() {
156	new TreeSet(this.integerForwardTrace.keySet)	156	new TreeSet(allIntegersWithInterpretation.values)
		157	}
		158
		159	override getAllIntegersWithInterpretation() {
		160	val builder = new HashMap
		161	for (entry : integerForwardTrace.entrySet) {
		162	builder.put(entry.value, entry.key)
		163	}
		164	for (element : partialInterpretation.newElements) {
		165	if (element instanceof IntegerElement) {
		166	builder.put(element, element.value)
		167	}
		168	}
		169	builder
157	}	170	}
158		171
159	override getAllRealsInStructure() {	172	override getAllRealsInStructure() {
160	new TreeSet(this.realForwardTrace.keySet)	173	new TreeSet(allRealsWithInterpretation.values)
		174	}
		175
		176	override getAllRealsWithInterpretation() {
		177	val builder = new HashMap
		178	for (entry : realForwardTrace.entrySet) {
		179	builder.put(entry.value, entry.key)
		180	}
		181	for (element : partialInterpretation.newElements) {
		182	if (element instanceof RealElement) {
		183	builder.put(element, element.value)
		184	}
		185	}
		186	builder
161	}	187	}
162		188
163	override getAllStringsInStructure() {	189	override getAllStringsInStructure() {
164	new TreeSet(this.stringForwardTrace.keySet)	190	new TreeSet(allStringsWithInterpretation.values)
		191	}
		192
		193	override getAllStringsWithInterpretation() {
		194	val builder = new HashMap
		195	for (entry : stringForwardTrace.entrySet) {
		196	builder.put(entry.value, entry.key)
		197	}
		198	for (element : partialInterpretation.newElements) {
		199	if (element instanceof StringElement) {
		200	builder.put(element, element.value)
		201	}
		202	}
		203	builder
		204	}
		205
		206	override getAllBooleansInStructure() {
		207	new TreeSet(allBooleansWithInterpretation.values)
		208	}
		209
		210	override getAllBooleansWithInterpretation() {
		211	val builder = new HashMap
		212	for (entry : booleanForwardTrace.entrySet) {
		213	builder.put(entry.value, entry.key)
		214	}
		215	for (element : partialInterpretation.newElements) {
		216	if (element instanceof BooleanElement) {
		217	builder.put(element, element.value)
		218	}
		219	}
		220	builder
165	}	221	}
166	}	222	}