Support for double and string attributes

4 files changed, 167 insertions, 56 deletions

diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/model/logiclanguage.aird b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/model/logiclanguage.aird
index 4c0c5b13..16247fdd 100644
--- a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/model/logiclanguage.aird
+++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/model/logiclanguage.aird
@@ -7273,6 +7273,12 @@
             <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>

           </endLabelStyleDescription>

         </computedStyleDescriptions>

+        <computedStyleDescriptions xmi:type="style:BundledImageDescription" xmi:id="_fCSyIHuWEeeCn_RNMwgEBg" labelExpression="service:render" labelAlignment="LEFT" tooltipExpression="service:renderTooltip" sizeComputationExpression="1">

+          <borderColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>

+          <labelFormat>bold</labelFormat>

+          <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>

+          <color xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>

+        </computedStyleDescriptions>

       </data>

     </ownedAnnotationEntries>

     <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_l6XRjbdnEeau1vMV3Bsx4w" source="GMF_DIAGRAMS">

@@ -7289,6 +7295,10 @@
         <children xmi:type="notation:Node" xmi:id="_l6XR7LdnEeau1vMV3Bsx4w" type="2003" element="_l6ZIH7dnEeau1vMV3Bsx4w">

           <children xmi:type="notation:Node" xmi:id="_l6XR7bdnEeau1vMV3Bsx4w" type="5007"/>

           <children xmi:type="notation:Node" xmi:id="_l6XR7rdnEeau1vMV3Bsx4w" type="7004">

+            <children xmi:type="notation:Node" xmi:id="_SzhvMHuWEeeCn_RNMwgEBg" type="3010" element="_SyqzkHuWEeeCn_RNMwgEBg">

+              <styles xmi:type="notation:FontStyle" xmi:id="_SzhvMXuWEeeCn_RNMwgEBg" fontName="Segoe UI" fontHeight="8"/>

+              <layoutConstraint xmi:type="notation:Location" xmi:id="_SzhvMnuWEeeCn_RNMwgEBg"/>

+            </children>

             <styles xmi:type="notation:SortingStyle" xmi:id="_l6XR77dnEeau1vMV3Bsx4w"/>

             <styles xmi:type="notation:FilteringStyle" xmi:id="_l6XR8LdnEeau1vMV3Bsx4w"/>

           </children>

@@ -7315,7 +7325,7 @@
             <styles xmi:type="notation:FilteringStyle" xmi:id="_l6XSAbdnEeau1vMV3Bsx4w"/>

           </children>

           <styles xmi:type="notation:ShapeStyle" xmi:id="_l6XSArdnEeau1vMV3Bsx4w" fontName="Segoe UI" fontHeight="8"/>

-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6XSA7dnEeau1vMV3Bsx4w" x="1165" y="455"/>

+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6XSA7dnEeau1vMV3Bsx4w" x="1165" y="455" height="53"/>

         </children>

         <children xmi:type="notation:Node" xmi:id="_l6XSBLdnEeau1vMV3Bsx4w" type="2003" element="_l6ZIJ7dnEeau1vMV3Bsx4w">

           <children xmi:type="notation:Node" xmi:id="_l6XSBbdnEeau1vMV3Bsx4w" type="5007"/>

@@ -7328,7 +7338,7 @@
             <styles xmi:type="notation:FilteringStyle" xmi:id="_l6XSC7dnEeau1vMV3Bsx4w"/>

           </children>

           <styles xmi:type="notation:ShapeStyle" xmi:id="_l6XSDLdnEeau1vMV3Bsx4w" fontName="Segoe UI" fontHeight="8"/>

-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6XSDbdnEeau1vMV3Bsx4w" x="981" y="460"/>

+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6XSDbdnEeau1vMV3Bsx4w" x="981" y="460" height="53"/>

         </children>

         <children xmi:type="notation:Node" xmi:id="_l6XSDrdnEeau1vMV3Bsx4w" type="2003" element="_l6ZIK7dnEeau1vMV3Bsx4w">

           <children xmi:type="notation:Node" xmi:id="_l6XSD7dnEeau1vMV3Bsx4w" type="5007"/>

@@ -7341,7 +7351,7 @@
             <styles xmi:type="notation:FilteringStyle" xmi:id="_l6XSFbdnEeau1vMV3Bsx4w"/>

           </children>

           <styles xmi:type="notation:ShapeStyle" xmi:id="_l6XSFrdnEeau1vMV3Bsx4w" fontName="Segoe UI" fontHeight="8"/>

-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6XSF7dnEeau1vMV3Bsx4w" x="835" y="454"/>

+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6XSF7dnEeau1vMV3Bsx4w" x="835" y="454" height="53"/>

         </children>

         <children xmi:type="notation:Node" xmi:id="_l6XSGLdnEeau1vMV3Bsx4w" type="2003" element="_l6ZIL7dnEeau1vMV3Bsx4w">

           <children xmi:type="notation:Node" xmi:id="_l6XSGbdnEeau1vMV3Bsx4w" type="5007"/>

@@ -7404,7 +7414,7 @@
             <styles xmi:type="notation:FilteringStyle" xmi:id="_l6XSRrdnEeau1vMV3Bsx4w"/>

           </children>

           <styles xmi:type="notation:ShapeStyle" xmi:id="_l6XSR7dnEeau1vMV3Bsx4w" fontName="Segoe UI" fontHeight="8"/>

-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6XSSLdnEeau1vMV3Bsx4w" x="-460" y="650"/>

+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6XSSLdnEeau1vMV3Bsx4w" x="-460" y="650" height="44"/>

         </children>

         <children xmi:type="notation:Node" xmi:id="_l6XSSbdnEeau1vMV3Bsx4w" type="2003" element="_l6ZIPbdnEeau1vMV3Bsx4w">

           <children xmi:type="notation:Node" xmi:id="_l6XSSrdnEeau1vMV3Bsx4w" type="5007"/>

@@ -7422,7 +7432,7 @@
             <styles xmi:type="notation:FilteringStyle" xmi:id="_l6XSVLdnEeau1vMV3Bsx4w"/>

           </children>

           <styles xmi:type="notation:ShapeStyle" xmi:id="_l6XSVbdnEeau1vMV3Bsx4w" fontName="Segoe UI" fontHeight="8"/>

-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6XSVrdnEeau1vMV3Bsx4w" x="-610" y="650"/>

+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6XSVrdnEeau1vMV3Bsx4w" x="-610" y="650" height="44"/>

         </children>

         <children xmi:type="notation:Node" xmi:id="_l6XSV7dnEeau1vMV3Bsx4w" type="2003" element="_l6ZIQbdnEeau1vMV3Bsx4w">

           <children xmi:type="notation:Node" xmi:id="_l6XSWLdnEeau1vMV3Bsx4w" type="5007"/>

@@ -7431,7 +7441,7 @@
             <styles xmi:type="notation:FilteringStyle" xmi:id="_l6XSW7dnEeau1vMV3Bsx4w"/>

           </children>

           <styles xmi:type="notation:ShapeStyle" xmi:id="_l6XSXLdnEeau1vMV3Bsx4w" fontName="Segoe UI" fontHeight="8"/>

-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6XSXbdnEeau1vMV3Bsx4w" x="-280" y="650"/>

+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6XSXbdnEeau1vMV3Bsx4w" x="-280" y="650" height="44"/>

         </children>

         <children xmi:type="notation:Node" xmi:id="_l6XSXrdnEeau1vMV3Bsx4w" type="2003" element="_l6ZIQ7dnEeau1vMV3Bsx4w">

           <children xmi:type="notation:Node" xmi:id="_l6XSX7dnEeau1vMV3Bsx4w" type="5007"/>

@@ -7595,6 +7605,19 @@
           <styles xmi:type="notation:ShapeStyle" xmi:id="_JfwFgbd8Eeau1vMV3Bsx4w" fontName="Segoe UI" fontHeight="8" italic="true"/>

           <layoutConstraint xmi:type="notation:Bounds" xmi:id="_JfwFgrd8Eeau1vMV3Bsx4w" x="1845" y="585"/>

         </children>

+        <children xmi:type="notation:Node" xmi:id="_Xh-bUHuWEeeCn_RNMwgEBg" type="2003" element="_XgmiUHuWEeeCn_RNMwgEBg">

+          <children xmi:type="notation:Node" xmi:id="_Xh_CYHuWEeeCn_RNMwgEBg" type="5007"/>

+          <children xmi:type="notation:Node" xmi:id="_Xh_pcHuWEeeCn_RNMwgEBg" type="7004">

+            <children xmi:type="notation:Node" xmi:id="_bt_IwHuWEeeCn_RNMwgEBg" type="3010" element="_bsTGsHuWEeeCn_RNMwgEBg">

+              <styles xmi:type="notation:FontStyle" xmi:id="_bt_IwXuWEeeCn_RNMwgEBg" fontColor="2697711" fontName="Segoe UI" fontHeight="8"/>

+              <layoutConstraint xmi:type="notation:Location" xmi:id="_bt_IwnuWEeeCn_RNMwgEBg"/>

+            </children>

+            <styles xmi:type="notation:SortingStyle" xmi:id="_Xh_pcXuWEeeCn_RNMwgEBg"/>

+            <styles xmi:type="notation:FilteringStyle" xmi:id="_Xh_pcnuWEeeCn_RNMwgEBg"/>

+          </children>

+          <styles xmi:type="notation:ShapeStyle" xmi:id="_Xh-bUXuWEeeCn_RNMwgEBg" fontName="Segoe UI" fontHeight="8"/>

+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Xh-bUnuWEeeCn_RNMwgEBg" x="1085" y="519" width="120" height="54"/>

+        </children>

         <styles xmi:type="notation:DiagramStyle" xmi:id="_l6X5OrdnEeau1vMV3Bsx4w"/>

         <edges xmi:type="notation:Edge" xmi:id="_l6X5a7dnEeau1vMV3Bsx4w" type="4001" element="_l6Zt6bdnEeau1vMV3Bsx4w" source="_l6XR7LdnEeau1vMV3Bsx4w" target="_l6XR27dnEeau1vMV3Bsx4w">

           <children xmi:type="notation:Node" xmi:id="_l6X5bLdnEeau1vMV3Bsx4w" type="6001">

@@ -8556,6 +8579,38 @@
           <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Bo5d8LqxEeau1vMV3Bsx4w" id="(0.5,0.0)"/>

           <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Bo5d8bqxEeau1vMV3Bsx4w" id="(0.5,1.0)"/>

         </edges>

+        <edges xmi:type="notation:Edge" xmi:id="_SzmAoHuWEeeCn_RNMwgEBg" type="4001" element="_SzZzYHuWEeeCn_RNMwgEBg" source="_l6XSGLdnEeau1vMV3Bsx4w" target="_l6X43LdnEeau1vMV3Bsx4w">

+          <children xmi:type="notation:Node" xmi:id="_SzmApHuWEeeCn_RNMwgEBg" type="6001">

+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SzmApXuWEeeCn_RNMwgEBg" y="-10"/>

+          </children>

+          <children xmi:type="notation:Node" xmi:id="_SzmnsHuWEeeCn_RNMwgEBg" type="6002">

+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SzmnsXuWEeeCn_RNMwgEBg" y="10"/>

+          </children>

+          <children xmi:type="notation:Node" xmi:id="_SzmnsnuWEeeCn_RNMwgEBg" type="6003">

+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Szmns3uWEeeCn_RNMwgEBg" y="10"/>

+          </children>

+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_SzmAoXuWEeeCn_RNMwgEBg" routing="Tree"/>

+          <styles xmi:type="notation:FontStyle" xmi:id="_SzmAonuWEeeCn_RNMwgEBg" fontName="Segoe UI" fontHeight="8"/>

+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_SzmAo3uWEeeCn_RNMwgEBg" points="[1760, 440, 1760, 440]$[2855, -1, 2855, -1]"/>

+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_SznOwHuWEeeCn_RNMwgEBg" id="(0.5,0.5)"/>

+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_SznOwXuWEeeCn_RNMwgEBg" id="(0.5,1.0)"/>

+        </edges>

+        <edges xmi:type="notation:Edge" xmi:id="_zFvSUHuWEeeCn_RNMwgEBg" type="4001" element="_zEk0sHuWEeeCn_RNMwgEBg" source="_Xh-bUHuWEeeCn_RNMwgEBg" target="_l6XR87dnEeau1vMV3Bsx4w">

+          <children xmi:type="notation:Node" xmi:id="_zFv5YHuWEeeCn_RNMwgEBg" type="6001">

+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zFv5YXuWEeeCn_RNMwgEBg" y="-10"/>

+          </children>

+          <children xmi:type="notation:Node" xmi:id="_zFv5YnuWEeeCn_RNMwgEBg" type="6002">

+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zFv5Y3uWEeeCn_RNMwgEBg" y="10"/>

+          </children>

+          <children xmi:type="notation:Node" xmi:id="_zFwgcHuWEeeCn_RNMwgEBg" type="6003">

+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zFwgcXuWEeeCn_RNMwgEBg" y="10"/>

+          </children>

+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_zFvSUXuWEeeCn_RNMwgEBg" routing="Tree"/>

+          <styles xmi:type="notation:FontStyle" xmi:id="_zFvSUnuWEeeCn_RNMwgEBg" fontName="Segoe UI" fontHeight="8"/>

+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_zFvSU3uWEeeCn_RNMwgEBg" points="[0, 0, 202, 250]$[-202, -250, 0, 0]"/>

+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zFwgcnuWEeeCn_RNMwgEBg" id="(0.5932203389830508,0.0)"/>

+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zFwgc3uWEeeCn_RNMwgEBg" id="(0.5,1.0)"/>

+        </edges>

       </data>

     </ownedAnnotationEntries>

     <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_l6ZIGbdnEeau1vMV3Bsx4w" name="Term" tooltipText="" outgoingEdges="_l6ZufbdnEeau1vMV3Bsx4w" incomingEdges="_l6Zt6bdnEeau1vMV3Bsx4w _l6Zt9bdnEeau1vMV3Bsx4w _l6Zt-bdnEeau1vMV3Bsx4w _l6Zt_bdnEeau1vMV3Bsx4w _l6ZuAbdnEeau1vMV3Bsx4w _l6ZuBbdnEeau1vMV3Bsx4w _l6ZuCbdnEeau1vMV3Bsx4w _l6ZuDbdnEeau1vMV3Bsx4w _l6ZuEbdnEeau1vMV3Bsx4w _l6ZuFbdnEeau1vMV3Bsx4w _l6ZuGbdnEeau1vMV3Bsx4w _l6ZuHbdnEeau1vMV3Bsx4w _l6ZuIbdnEeau1vMV3Bsx4w _l6ZuJbdnEeau1vMV3Bsx4w _l6ZuKbdnEeau1vMV3Bsx4w _l6ZuLbdnEeau1vMV3Bsx4w _l6ZuMbdnEeau1vMV3Bsx4w _l6ZuNbdnEeau1vMV3Bsx4w _l6ZuObdnEeau1vMV3Bsx4w _l6ZuPbdnEeau1vMV3Bsx4w _l6ZuQbdnEeau1vMV3Bsx4w _l6ZuRbdnEeau1vMV3Bsx4w _l6ZuhbdnEeau1vMV3Bsx4w _l6ZuibdnEeau1vMV3Bsx4w _l6ZunbdnEeau1vMV3Bsx4w _l6ZuqbdnEeau1vMV3Bsx4w _l6ZuwbdnEeau1vMV3Bsx4w _l6Zu3bdnEeau1vMV3Bsx4w _l6ZvHbdnEeau1vMV3Bsx4w _l6ZvIbdnEeau1vMV3Bsx4w _l6ZvJbdnEeau1vMV3Bsx4w _l6ZvKbdnEeau1vMV3Bsx4w _l6ZvZ7dnEeau1vMV3Bsx4w _kQZhsLd1Eeau1vMV3Bsx4w _BoaVwLqxEeau1vMV3Bsx4w" width="12" height="10">

@@ -8577,8 +8632,16 @@
         <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>

       </ownedStyle>

       <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>

+      <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_SyqzkHuWEeeCn_RNMwgEBg" name=" symbolicReference : SymbolicDeclaration" tooltipText="">

+        <target xmi:type="ecore:EReference" href="logiclanguage.ecore#//SymbolicValue/symbolicReference"/>

+        <semanticElements xmi:type="ecore:EReference" href="logiclanguage.ecore#//SymbolicValue/symbolicReference"/>

+        <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_SysowHuWEeeCn_RNMwgEBg" labelAlignment="LEFT" color="114,159,207">

+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EReferenceNode']/@style"/>

+        </ownedStyle>

+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EReferenceNode']"/>

+      </ownedElements>

     </ownedDiagramElements>

-    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_l6ZIIbdnEeau1vMV3Bsx4w" name="AtomicTerm" tooltipText="" outgoingEdges="_l6ZuibdnEeau1vMV3Bsx4w" incomingEdges="_l6ZujbdnEeau1vMV3Bsx4w _l6ZukbdnEeau1vMV3Bsx4w _l6ZulbdnEeau1vMV3Bsx4w" width="12" height="10">

+    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_l6ZIIbdnEeau1vMV3Bsx4w" name="AtomicTerm" tooltipText="" outgoingEdges="_l6ZuibdnEeau1vMV3Bsx4w" incomingEdges="_l6ZujbdnEeau1vMV3Bsx4w _l6ZukbdnEeau1vMV3Bsx4w _l6ZulbdnEeau1vMV3Bsx4w _zEk0sHuWEeeCn_RNMwgEBg" width="12" height="10">

       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//AtomicTerm"/>

       <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//AtomicTerm"/>

       <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>

@@ -8600,8 +8663,8 @@
       <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_l6ZIJbdnEeau1vMV3Bsx4w" name="value : EInt" tooltipText="">

         <target xmi:type="ecore:EAttribute" href="logiclanguage.ecore#//IntLiteral/value"/>

         <semanticElements xmi:type="ecore:EAttribute" href="logiclanguage.ecore#//IntLiteral/value"/>

-        <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_l6ZIJrdnEeau1vMV3Bsx4w" labelAlignment="LEFT">

-          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>

+        <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_geTdIHuWEeeCn_RNMwgEBg" labelAlignment="LEFT" description="_fCSyIHuWEeeCn_RNMwgEBg">

+          <labelFormat>bold</labelFormat>

         </ownedStyle>

         <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>

       </ownedElements>

@@ -8619,8 +8682,8 @@
       <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_l6ZIKbdnEeau1vMV3Bsx4w" name="value : EBoolean = false" tooltipText="">

         <target xmi:type="ecore:EAttribute" href="logiclanguage.ecore#//BoolLiteral/value"/>

         <semanticElements xmi:type="ecore:EAttribute" href="logiclanguage.ecore#//BoolLiteral/value"/>

-        <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_l6ZIKrdnEeau1vMV3Bsx4w" labelAlignment="LEFT">

-          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>

+        <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_g7P30HuWEeeCn_RNMwgEBg" labelAlignment="LEFT" description="_fCSyIHuWEeeCn_RNMwgEBg">

+          <labelFormat>bold</labelFormat>

         </ownedStyle>

         <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>

       </ownedElements>

@@ -8638,13 +8701,13 @@
       <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_l6ZILbdnEeau1vMV3Bsx4w" name="value : EBigDecimal" tooltipText="">

         <target xmi:type="ecore:EAttribute" href="logiclanguage.ecore#//RealLiteral/value"/>

         <semanticElements xmi:type="ecore:EAttribute" href="logiclanguage.ecore#//RealLiteral/value"/>

-        <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_l6ZILrdnEeau1vMV3Bsx4w" labelAlignment="LEFT">

-          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>

+        <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_hXV98HuWEeeCn_RNMwgEBg" labelAlignment="LEFT" description="_fCSyIHuWEeeCn_RNMwgEBg">

+          <labelFormat>bold</labelFormat>

         </ownedStyle>

         <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>

       </ownedElements>

     </ownedDiagramElements>

-    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_l6ZIL7dnEeau1vMV3Bsx4w" name="Variable" tooltipText="" outgoingEdges="_JfkfULd8Eeau1vMV3Bsx4w" incomingEdges="_l6Zt8bdnEeau1vMV3Bsx4w" width="12" height="10">

+    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_l6ZIL7dnEeau1vMV3Bsx4w" name="Variable" tooltipText="" outgoingEdges="_JfkfULd8Eeau1vMV3Bsx4w _SzZzYHuWEeeCn_RNMwgEBg" incomingEdges="_l6Zt8bdnEeau1vMV3Bsx4w" width="12" height="10">

       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//Variable"/>

       <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//Variable"/>

       <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>

@@ -8883,7 +8946,7 @@
       </ownedStyle>

       <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>

     </ownedDiagramElements>

-    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_l6Ztz7dnEeau1vMV3Bsx4w" name="TermDescription" tooltipText="" incomingEdges="_l6ZufbdnEeau1vMV3Bsx4w" width="12" height="10">

+    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_l6Ztz7dnEeau1vMV3Bsx4w" name="TermDescription" tooltipText="" incomingEdges="_l6ZufbdnEeau1vMV3Bsx4w _SzZzYHuWEeeCn_RNMwgEBg" width="12" height="10">

       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//TermDescription"/>

       <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//TermDescription"/>

       <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>

@@ -9680,6 +9743,49 @@
       </ownedStyle>

       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>

     </ownedDiagramElements>

+    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_SzZzYHuWEeeCn_RNMwgEBg" sourceNode="_l6ZIL7dnEeau1vMV3Bsx4w" targetNode="_l6Ztz7dnEeau1vMV3Bsx4w">

+      <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//Variable"/>

+      <semanticElements xmi:type="ecore:EGenericType" href="logiclanguage.ecore#//Variable/@eGenericSuperTypes.0"/>

+      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_SzaacHuWEeeCn_RNMwgEBg" lineStyle="dash" targetArrow="InputClosedArrow" routingStyle="tree">

+        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@conditionnalStyles.0/@style"/>

+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_SzaacXuWEeeCn_RNMwgEBg" showIcon="false">

+          <labelFormat>italic</labelFormat>

+        </beginLabelStyle>

+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_SzaacnuWEeeCn_RNMwgEBg" showIcon="false"/>

+      </ownedStyle>

+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>

+    </ownedDiagramElements>

+    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_XgmiUHuWEeeCn_RNMwgEBg" name="StringLiteral" tooltipText="" outgoingEdges="_zEk0sHuWEeeCn_RNMwgEBg" width="12" height="10">

+      <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//StringLiteral"/>

+      <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//StringLiteral"/>

+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>

+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>

+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>

+      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_fCIaEHuWEeeCn_RNMwgEBg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">

+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>

+      </ownedStyle>

+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>

+      <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_bsTGsHuWEeeCn_RNMwgEBg" name="value : EString" tooltipText="">

+        <target xmi:type="ecore:EAttribute" href="logiclanguage.ecore#//StringLiteral/value"/>

+        <semanticElements xmi:type="ecore:EAttribute" href="logiclanguage.ecore#//StringLiteral/value"/>

+        <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_fCTZMHuWEeeCn_RNMwgEBg" labelAlignment="LEFT" description="_fCSyIHuWEeeCn_RNMwgEBg">

+          <labelFormat>bold</labelFormat>

+        </ownedStyle>

+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>

+      </ownedElements>

+    </ownedDiagramElements>

+    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_zEk0sHuWEeeCn_RNMwgEBg" sourceNode="_XgmiUHuWEeeCn_RNMwgEBg" targetNode="_l6ZIIbdnEeau1vMV3Bsx4w">

+      <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//StringLiteral"/>

+      <semanticElements xmi:type="ecore:EGenericType" href="logiclanguage.ecore#//StringLiteral/@eGenericSuperTypes.0"/>

+      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_zEmC0HuWEeeCn_RNMwgEBg" targetArrow="InputClosedArrow" routingStyle="tree">

+        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>

+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_zEmC0XuWEeeCn_RNMwgEBg" showIcon="false">

+          <labelFormat>italic</labelFormat>

+        </beginLabelStyle>

+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_zEmC0nuWEeeCn_RNMwgEBg" showIcon="false"/>

+      </ownedStyle>

+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>

+    </ownedDiagramElements>

     <description xmi:type="description_1:DiagramDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']"/>

     <filterVariableHistory xmi:type="diagram:FilterVariableHistory" xmi:id="_l6Zva7dnEeau1vMV3Bsx4w"/>

     <activatedLayers xmi:type="description_1:Layer" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer"/>

diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/model/logiclanguage.ecore b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/model/logiclanguage.ecore
index 6a64a986..bf42e9b9 100644
--- a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/model/logiclanguage.ecore
+++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/model/logiclanguage.ecore
@@ -49,13 +49,13 @@
   </eClassifiers>

   <eClassifiers xsi:type="ecore:EClass" name="AtomicTerm" abstract="true" eSuperTypes="#//Term"/>

   <eClassifiers xsi:type="ecore:EClass" name="IntLiteral" eSuperTypes="#//AtomicTerm">

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>

   </eClassifiers>

   <eClassifiers xsi:type="ecore:EClass" name="BoolLiteral" eSuperTypes="#//AtomicTerm">

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

   </eClassifiers>

   <eClassifiers xsi:type="ecore:EClass" name="RealLiteral" eSuperTypes="#//AtomicTerm">

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBigDecimal"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBigDecimal"/>

   </eClassifiers>

   <eClassifiers xsi:type="ecore:EClass" name="Variable" eSuperTypes="#//SymbolicDeclaration">

     <eStructuralFeatures xsi:type="ecore:EReference" name="range" lowerBound="1" eType="#//TypeReference"

@@ -201,4 +201,7 @@
         containment="true"/>

   </eClassifiers>

   <eClassifiers xsi:type="ecore:EClass" name="StringTypeReference" eSuperTypes="#//PrimitiveTypeReference"/>

+  <eClassifiers xsi:type="ecore:EClass" name="StringLiteral" eSuperTypes="#//AtomicTerm">

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

+  </eClassifiers>

 </ecore:EPackage>

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 aa59836c..905859eb 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
@@ -27,6 +27,7 @@ interface LogicModelInterpretation{
          * <tr><td>Boolean literal </td><td>Boolean </td></tr>

          * <tr><td>Integer literal </td><td>Integer </td></tr>

          * <tr><td>Real literal </td><td>BigDecimal </td></tr>

+         * <tr><td>String literal </td><td>String </td></tr>

          * </table></p>

          * @param function The target function to be interpreted.

          * @param parameterSubstitution The array of the substituted parameters encoded as defined in the table.

@@ -41,6 +42,7 @@ interface LogicModelInterpretation{
          * <tr><td>Boolean literal </td><td>Boolean </td></tr>

          * <tr><td>Integer literal </td><td>Integer </td></tr>

          * <tr><td>Real literal </td><td>BigDecimal </td></tr>

+         * <tr><td>String literal </td><td>String </td></tr>

          * </table></p>

          * @param relation The target relation to be interpreted.

          * @param parameterSubstitution The array of the substituted parameters encoded as defined in the table.

@@ -55,6 +57,7 @@ interface LogicModelInterpretation{
          * <tr><td>Boolean literal </td><td>Boolean </td></tr>

          * <tr><td>Integer literal </td><td>Integer </td></tr>

          * <tr><td>Real literal </td><td>BigDecimal </td></tr>

+         * <tr><td>String literal </td><td>String </td></tr>

          * </table></p>

          * @param constant The target constant to be interpreted.

          * @return The value of the constant encoded as specified in the table.

diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/src/hu/bme/mit/inf/dslreasoner/logic/model/builder/LogicStructureBuilder.xtend b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/src/hu/bme/mit/inf/dslreasoner/logic/model/builder/LogicStructureBuilder.xtend
index 760aa8b8..42f85a2d 100644
--- a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/src/hu/bme/mit/inf/dslreasoner/logic/model/builder/LogicStructureBuilder.xtend
+++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/src/hu/bme/mit/inf/dslreasoner/logic/model/builder/LogicStructureBuilder.xtend
@@ -55,6 +55,10 @@ import org.eclipse.xtend.lib.annotations.Data
 

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

 import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.InstanceOf

+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.TypeReference

+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.BoolTypeReference

+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.RealTypeReference

+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.StringTypeReference

 

 @Data class InterpretationValidationResult {

         val List<String> problems;

@@ -381,14 +385,28 @@ class LogicStructureBuilder{
                                 return (left as Number).asInteger == (right as Number).asInteger

                         }

                 } else return left.equals(right)

-        }       

+        }

 

-        def allIntegers(LogicModelInterpretation interpretation) {

-                if(interpretation.minimalInteger <= interpretation.maximalInteger) {

-                        (interpretation.minimalInteger .. interpretation.maximalInteger).map[asInteger]

-                } else return emptySet

+        private dispatch def allObjects(LogicModelInterpretation interpretation, ComplexTypeReference type) {

+                return interpretation.getElements(type.referred)

+        }

+        private dispatch def allObjects(LogicModelInterpretation interpretation, BoolTypeReference type) {

+                return #[true,false]

+        }

+        private dispatch def allObjects(LogicModelInterpretation interpretation, IntTypeReference type) {

+                return interpretation.allIntegersInStructure

+        }

+        private dispatch def allObjects(LogicModelInterpretation interpretation, RealTypeReference type) {

+                return interpretation.allRealsInStructure

+        }

+        private dispatch def allObjects(LogicModelInterpretation interpretation, StringTypeReference type) {

+                return interpretation.allStringsInStructure

+        }

+        private dispatch def allObjects(LogicModelInterpretation interpretation, TypeReference type) {

+                throw new UnsupportedOperationException('''Unknown type :«type.class.simpleName»!''')

         }

         

+        

         def private boolean executeExists(

                 Term expression,

                 LogicModelInterpretation interpretation,

@@ -401,23 +419,13 @@ class LogicStructureBuilder{
                 }

                 else {

                         val unfoldedVariable = variablesToBind.head

-                        val possibleValuesType = unfoldedVariable.range

-                        if(possibleValuesType instanceof ComplexTypeReference) {

-                                return this.getElements(interpretation,possibleValuesType.referred).exists[newBinding |

-                                        executeExists(

-                                        expression,

-                                        interpretation,

-                                        new HashMap(variableBinding) => [put(unfoldedVariable,newBinding)],

-                                        variablesToBind.subList(1,variablesToBind.size))]

-                        } else if(possibleValuesType instanceof IntTypeReference) {

-                                return interpretation.allIntegers.exists[newBinding |

-                                        executeExists(

-                                        expression,

-                                        interpretation,

-                                        new HashMap(variableBinding) => [put(unfoldedVariable,newBinding)],

-                                        variablesToBind.subList(1,variablesToBind.size))]

-                        }

-                        else throw new UnsupportedOperationException('''Quantifying over type "«possibleValuesType»" is unsupported.''')

+                        val possibleValues = interpretation.allObjects(unfoldedVariable.range)

+                        return possibleValues.exists[newBinding |

+                                executeExists(

+                                expression,

+                                interpretation,

+                                new HashMap(variableBinding) => [put(unfoldedVariable,newBinding)],

+                                variablesToBind.subList(1,variablesToBind.size))]

                 }

         }

         

@@ -432,22 +440,13 @@ class LogicStructureBuilder{
                 }

                 else {

                         val unfoldedVariable = variablesToBind.head

-                        val possibleValuesType = unfoldedVariable.range

-                        if(possibleValuesType instanceof ComplexTypeReference) {

-                                return this.getElements(interpretation,possibleValuesType.referred).forall[newBinding |

-                                        executeForall(

-                                        expression,

-                                        interpretation,

-                                        new HashMap(variableBinding) => [put(unfoldedVariable,newBinding)],

-                                        variablesToBind.subList(1,variablesToBind.size))]

-                        } else if(possibleValuesType instanceof IntTypeReference) {

-                                return interpretation.allIntegers.forall[newBinding |

-                                        executeForall(

-                                        expression,

-                                        interpretation,

-                                        new HashMap(variableBinding) => [put(unfoldedVariable,newBinding)],

-                                        variablesToBind.subList(1,variablesToBind.size))]

-                        } else throw new UnsupportedOperationException('''Quantifying over type "«possibleValuesType»" is unsupported.''')

+                        val possibleValues = interpretation.allObjects(unfoldedVariable.range)

+                        return possibleValues.forall[newBinding |

+                                executeForall(

+                                expression,

+                                interpretation,

+                                new HashMap(variableBinding) => [put(unfoldedVariable,newBinding)],

+                                variablesToBind.subList(1,variablesToBind.size))]

                 }

         }

 }
\ No newline at end of file