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

of relevant primitive objects.

6 files changed, 133 insertions, 0 deletions

diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/LogiclanguageFactory.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/LogiclanguageFactory.java
index 0d438a05..f6977b13 100644
--- a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/LogiclanguageFactory.java
+++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/LogiclanguageFactory.java
@@ -382,6 +382,15 @@ public interface LogiclanguageFactory extends EFactory {
         InstanceOf createInstanceOf();

 

         /**

+         * Returns a new object of class '<em>String Type Reference</em>'.

+         * <!-- begin-user-doc -->

+         * <!-- end-user-doc -->

+         * @return a new object of class '<em>String Type Reference</em>'.

+         * @generated

+         */

+        StringTypeReference createStringTypeReference();

+

+        /**

          * Returns the package supported by this factory.

          * <!-- begin-user-doc -->

          * <!-- end-user-doc -->

diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/LogiclanguagePackage.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/LogiclanguagePackage.java
index 6965428b..d3a789e2 100644
--- a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/LogiclanguagePackage.java
+++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/LogiclanguagePackage.java
@@ -2563,6 +2563,35 @@ public interface LogiclanguagePackage extends EPackage {
 

 

         /**

+         * The meta object id for the '{@link hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl.StringTypeReferenceImpl <em>String Type Reference</em>}' class.

+         * <!-- begin-user-doc -->

+         * <!-- end-user-doc -->

+         * @see hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl.StringTypeReferenceImpl

+         * @see hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl.LogiclanguagePackageImpl#getStringTypeReference()

+         * @generated

+         */

+        int STRING_TYPE_REFERENCE = 55;

+

+        /**

+         * The number of structural features of the '<em>String Type Reference</em>' class.

+         * <!-- begin-user-doc -->

+         * <!-- end-user-doc -->

+         * @generated

+         * @ordered

+         */

+        int STRING_TYPE_REFERENCE_FEATURE_COUNT = PRIMITIVE_TYPE_REFERENCE_FEATURE_COUNT + 0;

+

+        /**

+         * The number of operations of the '<em>String Type Reference</em>' class.

+         * <!-- begin-user-doc -->

+         * <!-- end-user-doc -->

+         * @generated

+         * @ordered

+         */

+        int STRING_TYPE_REFERENCE_OPERATION_COUNT = PRIMITIVE_TYPE_REFERENCE_OPERATION_COUNT + 0;

+

+

+        /**

          * Returns the meta object for class '{@link hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Type <em>Type</em>}'.

          * <!-- begin-user-doc -->

          * <!-- end-user-doc -->

@@ -3773,6 +3802,16 @@ public interface LogiclanguagePackage extends EPackage {
         EReference getInstanceOf_Range();

 

         /**

+         * Returns the meta object for class '{@link hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.StringTypeReference <em>String Type Reference</em>}'.

+         * <!-- begin-user-doc -->

+         * <!-- end-user-doc -->

+         * @return the meta object for class '<em>String Type Reference</em>'.

+         * @see hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.StringTypeReference

+         * @generated

+         */

+        EClass getStringTypeReference();

+

+        /**

          * Returns the factory that creates the instances of the model.

          * <!-- begin-user-doc -->

          * <!-- end-user-doc -->

@@ -4825,6 +4864,16 @@ public interface LogiclanguagePackage extends EPackage {
                  */

                 EReference INSTANCE_OF__RANGE = eINSTANCE.getInstanceOf_Range();

 

+                /**

+                 * The meta object literal for the '{@link hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl.StringTypeReferenceImpl <em>String Type Reference</em>}' class.

+                 * <!-- begin-user-doc -->

+                 * <!-- end-user-doc -->

+                 * @see hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl.StringTypeReferenceImpl

+                 * @see hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl.LogiclanguagePackageImpl#getStringTypeReference()

+                 * @generated

+                 */

+                EClass STRING_TYPE_REFERENCE = eINSTANCE.getStringTypeReference();

+

         }

 

 } //LogiclanguagePackage

diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/LogiclanguageFactoryImpl.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/LogiclanguageFactoryImpl.java
index 876947e4..593e1fc0 100644
--- a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/LogiclanguageFactoryImpl.java
+++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/LogiclanguageFactoryImpl.java
@@ -96,6 +96,7 @@ public class LogiclanguageFactoryImpl extends EFactoryImpl implements Logiclangu
                         case LogiclanguagePackage.TYPE_DECLARATION: return createTypeDeclaration();

                         case LogiclanguagePackage.UNKNOWN_BECAUSE_UNINTERPRETED: return createUnknownBecauseUninterpreted();

                         case LogiclanguagePackage.INSTANCE_OF: return createInstanceOf();

+                        case LogiclanguagePackage.STRING_TYPE_REFERENCE: return createStringTypeReference();

                         default:

                                 throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");

                 }

@@ -506,6 +507,16 @@ public class LogiclanguageFactoryImpl extends EFactoryImpl implements Logiclangu
          * <!-- end-user-doc -->

          * @generated

          */

+        public StringTypeReference createStringTypeReference() {

+                StringTypeReferenceImpl stringTypeReference = new StringTypeReferenceImpl();

+                return stringTypeReference;

+        }

+

+        /**

+         * <!-- begin-user-doc -->

+         * <!-- end-user-doc -->

+         * @generated

+         */

         public LogiclanguagePackage getLogiclanguagePackage() {

                 return (LogiclanguagePackage)getEPackage();

         }

diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/LogiclanguagePackageImpl.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/LogiclanguagePackageImpl.java
index b73d679d..9628e3d7 100644
--- a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/LogiclanguagePackageImpl.java
+++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/LogiclanguagePackageImpl.java
@@ -48,6 +48,7 @@ import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.RealTypeReference;
 import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Relation;

 import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.RelationDeclaration;

 import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.RelationDefinition;

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

 import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.SymbolicDeclaration;

 import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.SymbolicValue;

 import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Term;

@@ -468,6 +469,13 @@ public class LogiclanguagePackageImpl extends EPackageImpl implements Logiclangu
         private EClass instanceOfEClass = null;

 

         /**

+         * <!-- begin-user-doc -->

+         * <!-- end-user-doc -->

+         * @generated

+         */

+        private EClass stringTypeReferenceEClass = null;

+

+        /**

          * Creates an instance of the model <b>Package</b>, registered with

          * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package

          * package URI value.

@@ -1576,6 +1584,15 @@ public class LogiclanguagePackageImpl extends EPackageImpl implements Logiclangu
          * <!-- end-user-doc -->

          * @generated

          */

+        public EClass getStringTypeReference() {

+                return stringTypeReferenceEClass;

+        }

+

+        /**

+         * <!-- begin-user-doc -->

+         * <!-- end-user-doc -->

+         * @generated

+         */

         public LogiclanguageFactory getLogiclanguageFactory() {

                 return (LogiclanguageFactory)getEFactoryInstance();

         }

@@ -1768,6 +1785,8 @@ public class LogiclanguagePackageImpl extends EPackageImpl implements Logiclangu
                 instanceOfEClass = createEClass(INSTANCE_OF);

                 createEReference(instanceOfEClass, INSTANCE_OF__VALUE);

                 createEReference(instanceOfEClass, INSTANCE_OF__RANGE);

+

+                stringTypeReferenceEClass = createEClass(STRING_TYPE_REFERENCE);

         }

 

         /**

@@ -1853,6 +1872,7 @@ public class LogiclanguagePackageImpl extends EPackageImpl implements Logiclangu
                 typeDeclarationEClass.getESuperTypes().add(this.getType());

                 unknownBecauseUninterpretedEClass.getESuperTypes().add(this.getTerm());

                 instanceOfEClass.getESuperTypes().add(this.getTerm());

+                stringTypeReferenceEClass.getESuperTypes().add(this.getPrimitiveTypeReference());

 

                 // Initialize classes, features, and operations; add parameters

                 initEClass(typeEClass, Type.class, "Type", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

@@ -2025,6 +2045,8 @@ public class LogiclanguagePackageImpl extends EPackageImpl implements Logiclangu
                 initEReference(getInstanceOf_Value(), this.getTerm(), null, "value", null, 1, 1, InstanceOf.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

                 initEReference(getInstanceOf_Range(), this.getTypeReference(), null, "range", null, 1, 1, InstanceOf.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

 

+                initEClass(stringTypeReferenceEClass, StringTypeReference.class, "StringTypeReference", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+

                 // Create resource

                 createResource(eNS_URI);

         }

diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/util/LogiclanguageAdapterFactory.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/util/LogiclanguageAdapterFactory.java
index a3372dc9..b056117f 100644
--- a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/util/LogiclanguageAdapterFactory.java
+++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/util/LogiclanguageAdapterFactory.java
@@ -288,6 +288,10 @@ public class LogiclanguageAdapterFactory extends AdapterFactoryImpl {
                                 return createInstanceOfAdapter();

                         }

                         @Override

+                        public Adapter caseStringTypeReference(StringTypeReference object) {

+                                return createStringTypeReferenceAdapter();

+                        }

+                        @Override

                         public Adapter defaultCase(EObject object) {

                                 return createEObjectAdapter();

                         }

@@ -1078,6 +1082,20 @@ public class LogiclanguageAdapterFactory extends AdapterFactoryImpl {
         }

 

         /**

+         * Creates a new adapter for an object of class '{@link hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.StringTypeReference <em>String Type Reference</em>}'.

+         * <!-- begin-user-doc -->

+         * This default implementation returns null so that we can easily ignore cases;

+         * it's useful to ignore a case when inheritance will catch all the cases anyway.

+         * <!-- end-user-doc -->

+         * @return the new adapter.

+         * @see hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.StringTypeReference

+         * @generated

+         */

+        public Adapter createStringTypeReferenceAdapter() {

+                return null;

+        }

+

+        /**

          * Creates a new adapter for the default case.

          * <!-- begin-user-doc -->

          * This default implementation returns null.

diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/util/LogiclanguageSwitch.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/util/LogiclanguageSwitch.java
index a2a1e10a..4a89a3d0 100644
--- a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/util/LogiclanguageSwitch.java
+++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/util/LogiclanguageSwitch.java
@@ -526,6 +526,15 @@ public class LogiclanguageSwitch<T> extends Switch<T> {
                                 if (result == null) result = defaultCase(theEObject);

                                 return result;

                         }

+                        case LogiclanguagePackage.STRING_TYPE_REFERENCE: {

+                                StringTypeReference stringTypeReference = (StringTypeReference)theEObject;

+                                T result = caseStringTypeReference(stringTypeReference);

+                                if (result == null) result = casePrimitiveTypeReference(stringTypeReference);

+                                if (result == null) result = caseTypeReference(stringTypeReference);

+                                if (result == null) result = caseTypeDescriptor(stringTypeReference);

+                                if (result == null) result = defaultCase(theEObject);

+                                return result;

+                        }

                         default: return defaultCase(theEObject);

                 }

         }

@@ -1356,6 +1365,21 @@ public class LogiclanguageSwitch<T> extends Switch<T> {
         }

 

         /**

+         * Returns the result of interpreting the object as an instance of '<em>String Type Reference</em>'.

+         * <!-- begin-user-doc -->

+         * This implementation returns null;

+         * returning a non-null result will terminate the switch.

+         * <!-- end-user-doc -->

+         * @param object the target of the switch.

+         * @return the result of interpreting the object as an instance of '<em>String Type Reference</em>'.

+         * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

+         * @generated

+         */

+        public T caseStringTypeReference(StringTypeReference object) {

+                return null;

+        }

+

+        /**

          * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.

          * <!-- begin-user-doc -->

          * This implementation returns null;