added String to the logic problem, and representations returns the set

of relevant primitive objects.

1 files changed, 21 insertions, 4 deletions

diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/src/hu/bme/mit/inf/dslreasoner/logic/model/builder/LogicModelInterpretation.xtend b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/src/hu/bme/mit/inf/dslreasoner/logic/model/builder/LogicModelInterpretation.xtend
index a2d30b1b..aa59836c 100644
--- a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/src/hu/bme/mit/inf/dslreasoner/logic/model/builder/LogicModelInterpretation.xtend
+++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/src/hu/bme/mit/inf/dslreasoner/logic/model/builder/LogicModelInterpretation.xtend
@@ -10,6 +10,8 @@ import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.TypeDefinition
 import java.util.List

 

 import static extension hu.bme.mit.inf.dslreasoner.util.CollectionsUtil.*

+import java.util.SortedSet

+import java.math.BigDecimal

 

 interface LogicModelInterpretation{

         

@@ -58,8 +60,19 @@ interface LogicModelInterpretation{
          * @return The value of the constant encoded as specified in the table.

          */

         def Object getInterpretation(ConstantDeclaration constant)

-        def int getMinimalInteger()

-        def int getMaximalInteger()

+        

+        /**

+         * Returns all integers relevant to the logic structure. Not all integer is necessarily used.

+         */

+        def SortedSet<Integer> getAllIntegersInStructure()

+        /**

+         * Returns all real numbers relevant to the logic structure. Not all integer is necessarily used.

+         */

+         def SortedSet<BigDecimal> getAllRealsInStructure()

+         /**

+         * Returns all string values relevant to the logic structure. Not all integer is necessarily used.

+         */

+         def SortedSet<String> getAllStringsInStructure()

 }

 

 class Uninterpreted implements LogicModelInterpretation {

@@ -92,11 +105,15 @@ class Uninterpreted implements LogicModelInterpretation {
                 throw new UnsupportedOperationException("The interpteration is unknown.")

         }

         

-        override getMinimalInteger() {

+        override getAllIntegersInStructure() {

+                throw new UnsupportedOperationException("The interpteration is unknown.")

+        }

+        

+        override getAllRealsInStructure() {

                 throw new UnsupportedOperationException("The interpteration is unknown.")

         }

         

-        override getMaximalInteger() {

+        override getAllStringsInStructure() {

                 throw new UnsupportedOperationException("The interpteration is unknown.")

         }

 }
\ No newline at end of file