Added primitive types to the model code

3 files changed, 664 insertions, 51 deletions

diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partialinterpretation/impl/PartialInterpretationImpl.java b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partialinterpretation/impl/PartialInterpretationImpl.java
index 09690c79..4b7061ce 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partialinterpretation/impl/PartialInterpretationImpl.java
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partialinterpretation/impl/PartialInterpretationImpl.java
@@ -6,6 +6,8 @@ import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.DefinedElement;
 

 import hu.bme.mit.inf.dslreasoner.logic.model.logicproblem.LogicProblem;

 

+import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.BooleanElement;

+import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.IntegerElement;

 import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialConstantInterpretation;

 import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialFunctionInterpretation;

 import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialInterpretation;

@@ -13,6 +15,8 @@ import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.par
 import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialTypeInterpratation;

 import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialinterpretationPackage;

 

+import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.RealElement;

+import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.StringElement;

 import java.util.Collection;

 

 import org.eclipse.emf.common.notify.Notification;

@@ -45,8 +49,16 @@ import org.eclipse.emf.ecore.util.InternalEList;
  *   <li>{@link hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.impl.PartialInterpretationImpl#getPartialtypeinterpratation <em>Partialtypeinterpratation</em>}</li>

  *   <li>{@link hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.impl.PartialInterpretationImpl#getMinNewElements <em>Min New Elements</em>}</li>

  *   <li>{@link hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.impl.PartialInterpretationImpl#getMaxNewElements <em>Max New Elements</em>}</li>

- *   <li>{@link hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.impl.PartialInterpretationImpl#getOpenWorldElementPrototype <em>Open World Element Prototype</em>}</li>

+ *   <li>{@link hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.impl.PartialInterpretationImpl#getOpenWorldElementPrototypes <em>Open World Element Prototypes</em>}</li>

  *   <li>{@link hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.impl.PartialInterpretationImpl#getProblemConainer <em>Problem Conainer</em>}</li>

+ *   <li>{@link hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.impl.PartialInterpretationImpl#getStringelement <em>Stringelement</em>}</li>

+ *   <li>{@link hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.impl.PartialInterpretationImpl#getStringelements <em>Stringelements</em>}</li>

+ *   <li>{@link hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.impl.PartialInterpretationImpl#getRealelements <em>Realelements</em>}</li>

+ *   <li>{@link hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.impl.PartialInterpretationImpl#getIntegerelements <em>Integerelements</em>}</li>

+ *   <li>{@link hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.impl.PartialInterpretationImpl#getBooleanelements <em>Booleanelements</em>}</li>

+ *   <li>{@link hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.impl.PartialInterpretationImpl#getMaxNewIntegers <em>Max New Integers</em>}</li>

+ *   <li>{@link hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.impl.PartialInterpretationImpl#getMaxNewReals <em>Max New Reals</em>}</li>

+ *   <li>{@link hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.impl.PartialInterpretationImpl#getMaxNewStrings <em>Max New Strings</em>}</li>

  * </ul>

  *

  * @generated

@@ -153,14 +165,14 @@ public class PartialInterpretationImpl extends MinimalEObjectImpl.Container impl
         protected int maxNewElements = MAX_NEW_ELEMENTS_EDEFAULT;

 

         /**

-         * The cached value of the '{@link #getOpenWorldElementPrototype() <em>Open World Element Prototype</em>}' containment reference.

+         * The cached value of the '{@link #getOpenWorldElementPrototypes() <em>Open World Element Prototypes</em>}' containment reference list.

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

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

-         * @see #getOpenWorldElementPrototype()

+         * @see #getOpenWorldElementPrototypes()

          * @generated

          * @ordered

          */

-        protected DefinedElement openWorldElementPrototype;

+        protected EList<DefinedElement> openWorldElementPrototypes;

 

         /**

          * The cached value of the '{@link #getProblemConainer() <em>Problem Conainer</em>}' containment reference.

@@ -173,6 +185,116 @@ public class PartialInterpretationImpl extends MinimalEObjectImpl.Container impl
         protected LogicProblem problemConainer;

 

         /**

+         * The cached value of the '{@link #getStringelement() <em>Stringelement</em>}' containment reference list.

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

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

+         * @see #getStringelement()

+         * @generated

+         * @ordered

+         */

+        protected EList<StringElement> stringelement;

+

+        /**

+         * The cached value of the '{@link #getStringelements() <em>Stringelements</em>}' containment reference list.

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

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

+         * @see #getStringelements()

+         * @generated

+         * @ordered

+         */

+        protected EList<StringElement> stringelements;

+

+        /**

+         * The cached value of the '{@link #getRealelements() <em>Realelements</em>}' containment reference list.

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

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

+         * @see #getRealelements()

+         * @generated

+         * @ordered

+         */

+        protected EList<RealElement> realelements;

+

+        /**

+         * The cached value of the '{@link #getIntegerelements() <em>Integerelements</em>}' containment reference list.

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

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

+         * @see #getIntegerelements()

+         * @generated

+         * @ordered

+         */

+        protected EList<IntegerElement> integerelements;

+

+        /**

+         * The cached value of the '{@link #getBooleanelements() <em>Booleanelements</em>}' containment reference list.

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

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

+         * @see #getBooleanelements()

+         * @generated

+         * @ordered

+         */

+        protected EList<BooleanElement> booleanelements;

+

+        /**

+         * The default value of the '{@link #getMaxNewIntegers() <em>Max New Integers</em>}' attribute.

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

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

+         * @see #getMaxNewIntegers()

+         * @generated

+         * @ordered

+         */

+        protected static final int MAX_NEW_INTEGERS_EDEFAULT = 0;

+

+        /**

+         * The cached value of the '{@link #getMaxNewIntegers() <em>Max New Integers</em>}' attribute.

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

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

+         * @see #getMaxNewIntegers()

+         * @generated

+         * @ordered

+         */

+        protected int maxNewIntegers = MAX_NEW_INTEGERS_EDEFAULT;

+

+        /**

+         * The default value of the '{@link #getMaxNewReals() <em>Max New Reals</em>}' attribute.

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

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

+         * @see #getMaxNewReals()

+         * @generated

+         * @ordered

+         */

+        protected static final int MAX_NEW_REALS_EDEFAULT = 0;

+

+        /**

+         * The cached value of the '{@link #getMaxNewReals() <em>Max New Reals</em>}' attribute.

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

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

+         * @see #getMaxNewReals()

+         * @generated

+         * @ordered

+         */

+        protected int maxNewReals = MAX_NEW_REALS_EDEFAULT;

+

+        /**

+         * The default value of the '{@link #getMaxNewStrings() <em>Max New Strings</em>}' attribute.

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

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

+         * @see #getMaxNewStrings()

+         * @generated

+         * @ordered

+         */

+        protected static final int MAX_NEW_STRINGS_EDEFAULT = 0;

+

+        /**

+         * The cached value of the '{@link #getMaxNewStrings() <em>Max New Strings</em>}' attribute.

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

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

+         * @see #getMaxNewStrings()

+         * @generated

+         * @ordered

+         */

+        protected int maxNewStrings = MAX_NEW_STRINGS_EDEFAULT;

+

+        /**

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

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

          * @generated

@@ -336,8 +458,20 @@ public class PartialInterpretationImpl extends MinimalEObjectImpl.Container impl
          * <!-- end-user-doc -->

          * @generated

          */

-        public DefinedElement getOpenWorldElementPrototype() {

-                return openWorldElementPrototype;

+        public EList<DefinedElement> getOpenWorldElementPrototypes() {

+                if (openWorldElementPrototypes == null) {

+                        openWorldElementPrototypes = new EObjectContainmentEList<DefinedElement>(DefinedElement.class, this, PartialinterpretationPackage.PARTIAL_INTERPRETATION__OPEN_WORLD_ELEMENT_PROTOTYPES);

+                }

+                return openWorldElementPrototypes;

+        }

+

+        /**

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

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

+         * @generated

+         */

+        public LogicProblem getProblemConainer() {

+                return problemConainer;

         }

 

         /**

@@ -345,11 +479,11 @@ public class PartialInterpretationImpl extends MinimalEObjectImpl.Container impl
          * <!-- end-user-doc -->

          * @generated

          */

-        public NotificationChain basicSetOpenWorldElementPrototype(DefinedElement newOpenWorldElementPrototype, NotificationChain msgs) {

-                DefinedElement oldOpenWorldElementPrototype = openWorldElementPrototype;

-                openWorldElementPrototype = newOpenWorldElementPrototype;

+        public NotificationChain basicSetProblemConainer(LogicProblem newProblemConainer, NotificationChain msgs) {

+                LogicProblem oldProblemConainer = problemConainer;

+                problemConainer = newProblemConainer;

                 if (eNotificationRequired()) {

-                        ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, PartialinterpretationPackage.PARTIAL_INTERPRETATION__OPEN_WORLD_ELEMENT_PROTOTYPE, oldOpenWorldElementPrototype, newOpenWorldElementPrototype);

+                        ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, PartialinterpretationPackage.PARTIAL_INTERPRETATION__PROBLEM_CONAINER, oldProblemConainer, newProblemConainer);

                         if (msgs == null) msgs = notification; else msgs.add(notification);

                 }

                 return msgs;

@@ -360,18 +494,18 @@ public class PartialInterpretationImpl extends MinimalEObjectImpl.Container impl
          * <!-- end-user-doc -->

          * @generated

          */

-        public void setOpenWorldElementPrototype(DefinedElement newOpenWorldElementPrototype) {

-                if (newOpenWorldElementPrototype != openWorldElementPrototype) {

+        public void setProblemConainer(LogicProblem newProblemConainer) {

+                if (newProblemConainer != problemConainer) {

                         NotificationChain msgs = null;

-                        if (openWorldElementPrototype != null)

-                                msgs = ((InternalEObject)openWorldElementPrototype).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - PartialinterpretationPackage.PARTIAL_INTERPRETATION__OPEN_WORLD_ELEMENT_PROTOTYPE, null, msgs);

-                        if (newOpenWorldElementPrototype != null)

-                                msgs = ((InternalEObject)newOpenWorldElementPrototype).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - PartialinterpretationPackage.PARTIAL_INTERPRETATION__OPEN_WORLD_ELEMENT_PROTOTYPE, null, msgs);

-                        msgs = basicSetOpenWorldElementPrototype(newOpenWorldElementPrototype, msgs);

+                        if (problemConainer != null)

+                                msgs = ((InternalEObject)problemConainer).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - PartialinterpretationPackage.PARTIAL_INTERPRETATION__PROBLEM_CONAINER, null, msgs);

+                        if (newProblemConainer != null)

+                                msgs = ((InternalEObject)newProblemConainer).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - PartialinterpretationPackage.PARTIAL_INTERPRETATION__PROBLEM_CONAINER, null, msgs);

+                        msgs = basicSetProblemConainer(newProblemConainer, msgs);

                         if (msgs != null) msgs.dispatch();

                 }

                 else if (eNotificationRequired())

-                        eNotify(new ENotificationImpl(this, Notification.SET, PartialinterpretationPackage.PARTIAL_INTERPRETATION__OPEN_WORLD_ELEMENT_PROTOTYPE, newOpenWorldElementPrototype, newOpenWorldElementPrototype));

+                        eNotify(new ENotificationImpl(this, Notification.SET, PartialinterpretationPackage.PARTIAL_INTERPRETATION__PROBLEM_CONAINER, newProblemConainer, newProblemConainer));

         }

 

         /**

@@ -379,8 +513,11 @@ public class PartialInterpretationImpl extends MinimalEObjectImpl.Container impl
          * <!-- end-user-doc -->

          * @generated

          */

-        public LogicProblem getProblemConainer() {

-                return problemConainer;

+        public EList<StringElement> getStringelement() {

+                if (stringelement == null) {

+                        stringelement = new EObjectContainmentEList<StringElement>(StringElement.class, this, PartialinterpretationPackage.PARTIAL_INTERPRETATION__STRINGELEMENT);

+                }

+                return stringelement;

         }

 

         /**

@@ -388,14 +525,11 @@ public class PartialInterpretationImpl extends MinimalEObjectImpl.Container impl
          * <!-- end-user-doc -->

          * @generated

          */

-        public NotificationChain basicSetProblemConainer(LogicProblem newProblemConainer, NotificationChain msgs) {

-                LogicProblem oldProblemConainer = problemConainer;

-                problemConainer = newProblemConainer;

-                if (eNotificationRequired()) {

-                        ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, PartialinterpretationPackage.PARTIAL_INTERPRETATION__PROBLEM_CONAINER, oldProblemConainer, newProblemConainer);

-                        if (msgs == null) msgs = notification; else msgs.add(notification);

+        public EList<StringElement> getStringelements() {

+                if (stringelements == null) {

+                        stringelements = new EObjectContainmentEList<StringElement>(StringElement.class, this, PartialinterpretationPackage.PARTIAL_INTERPRETATION__STRINGELEMENTS);

                 }

-                return msgs;

+                return stringelements;

         }

 

         /**

@@ -403,18 +537,98 @@ public class PartialInterpretationImpl extends MinimalEObjectImpl.Container impl
          * <!-- end-user-doc -->

          * @generated

          */

-        public void setProblemConainer(LogicProblem newProblemConainer) {

-                if (newProblemConainer != problemConainer) {

-                        NotificationChain msgs = null;

-                        if (problemConainer != null)

-                                msgs = ((InternalEObject)problemConainer).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - PartialinterpretationPackage.PARTIAL_INTERPRETATION__PROBLEM_CONAINER, null, msgs);

-                        if (newProblemConainer != null)

-                                msgs = ((InternalEObject)newProblemConainer).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - PartialinterpretationPackage.PARTIAL_INTERPRETATION__PROBLEM_CONAINER, null, msgs);

-                        msgs = basicSetProblemConainer(newProblemConainer, msgs);

-                        if (msgs != null) msgs.dispatch();

+        public EList<RealElement> getRealelements() {

+                if (realelements == null) {

+                        realelements = new EObjectContainmentEList<RealElement>(RealElement.class, this, PartialinterpretationPackage.PARTIAL_INTERPRETATION__REALELEMENTS);

                 }

-                else if (eNotificationRequired())

-                        eNotify(new ENotificationImpl(this, Notification.SET, PartialinterpretationPackage.PARTIAL_INTERPRETATION__PROBLEM_CONAINER, newProblemConainer, newProblemConainer));

+                return realelements;

+        }

+

+        /**

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

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

+         * @generated

+         */

+        public EList<IntegerElement> getIntegerelements() {

+                if (integerelements == null) {

+                        integerelements = new EObjectContainmentEList<IntegerElement>(IntegerElement.class, this, PartialinterpretationPackage.PARTIAL_INTERPRETATION__INTEGERELEMENTS);

+                }

+                return integerelements;

+        }

+

+        /**

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

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

+         * @generated

+         */

+        public EList<BooleanElement> getBooleanelements() {

+                if (booleanelements == null) {

+                        booleanelements = new EObjectContainmentEList<BooleanElement>(BooleanElement.class, this, PartialinterpretationPackage.PARTIAL_INTERPRETATION__BOOLEANELEMENTS);

+                }

+                return booleanelements;

+        }

+

+        /**

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

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

+         * @generated

+         */

+        public int getMaxNewIntegers() {

+                return maxNewIntegers;

+        }

+

+        /**

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

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

+         * @generated

+         */

+        public void setMaxNewIntegers(int newMaxNewIntegers) {

+                int oldMaxNewIntegers = maxNewIntegers;

+                maxNewIntegers = newMaxNewIntegers;

+                if (eNotificationRequired())

+                        eNotify(new ENotificationImpl(this, Notification.SET, PartialinterpretationPackage.PARTIAL_INTERPRETATION__MAX_NEW_INTEGERS, oldMaxNewIntegers, maxNewIntegers));

+        }

+

+        /**

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

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

+         * @generated

+         */

+        public int getMaxNewReals() {

+                return maxNewReals;

+        }

+

+        /**

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

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

+         * @generated

+         */

+        public void setMaxNewReals(int newMaxNewReals) {

+                int oldMaxNewReals = maxNewReals;

+                maxNewReals = newMaxNewReals;

+                if (eNotificationRequired())

+                        eNotify(new ENotificationImpl(this, Notification.SET, PartialinterpretationPackage.PARTIAL_INTERPRETATION__MAX_NEW_REALS, oldMaxNewReals, maxNewReals));

+        }

+

+        /**

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

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

+         * @generated

+         */

+        public int getMaxNewStrings() {

+                return maxNewStrings;

+        }

+

+        /**

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

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

+         * @generated

+         */

+        public void setMaxNewStrings(int newMaxNewStrings) {

+                int oldMaxNewStrings = maxNewStrings;

+                maxNewStrings = newMaxNewStrings;

+                if (eNotificationRequired())

+                        eNotify(new ENotificationImpl(this, Notification.SET, PartialinterpretationPackage.PARTIAL_INTERPRETATION__MAX_NEW_STRINGS, oldMaxNewStrings, maxNewStrings));

         }

 

         /**

@@ -435,10 +649,20 @@ public class PartialInterpretationImpl extends MinimalEObjectImpl.Container impl
                                 return ((InternalEList<?>)getNewElements()).basicRemove(otherEnd, msgs);

                         case PartialinterpretationPackage.PARTIAL_INTERPRETATION__PARTIALTYPEINTERPRATATION:

                                 return ((InternalEList<?>)getPartialtypeinterpratation()).basicRemove(otherEnd, msgs);

-                        case PartialinterpretationPackage.PARTIAL_INTERPRETATION__OPEN_WORLD_ELEMENT_PROTOTYPE:

-                                return basicSetOpenWorldElementPrototype(null, msgs);

+                        case PartialinterpretationPackage.PARTIAL_INTERPRETATION__OPEN_WORLD_ELEMENT_PROTOTYPES:

+                                return ((InternalEList<?>)getOpenWorldElementPrototypes()).basicRemove(otherEnd, msgs);

                         case PartialinterpretationPackage.PARTIAL_INTERPRETATION__PROBLEM_CONAINER:

                                 return basicSetProblemConainer(null, msgs);

+                        case PartialinterpretationPackage.PARTIAL_INTERPRETATION__STRINGELEMENT:

+                                return ((InternalEList<?>)getStringelement()).basicRemove(otherEnd, msgs);

+                        case PartialinterpretationPackage.PARTIAL_INTERPRETATION__STRINGELEMENTS:

+                                return ((InternalEList<?>)getStringelements()).basicRemove(otherEnd, msgs);

+                        case PartialinterpretationPackage.PARTIAL_INTERPRETATION__REALELEMENTS:

+                                return ((InternalEList<?>)getRealelements()).basicRemove(otherEnd, msgs);

+                        case PartialinterpretationPackage.PARTIAL_INTERPRETATION__INTEGERELEMENTS:

+                                return ((InternalEList<?>)getIntegerelements()).basicRemove(otherEnd, msgs);

+                        case PartialinterpretationPackage.PARTIAL_INTERPRETATION__BOOLEANELEMENTS:

+                                return ((InternalEList<?>)getBooleanelements()).basicRemove(otherEnd, msgs);

                 }

                 return super.eInverseRemove(otherEnd, featureID, msgs);

         }

@@ -468,10 +692,26 @@ public class PartialInterpretationImpl extends MinimalEObjectImpl.Container impl
                                 return getMinNewElements();

                         case PartialinterpretationPackage.PARTIAL_INTERPRETATION__MAX_NEW_ELEMENTS:

                                 return getMaxNewElements();

-                        case PartialinterpretationPackage.PARTIAL_INTERPRETATION__OPEN_WORLD_ELEMENT_PROTOTYPE:

-                                return getOpenWorldElementPrototype();

+                        case PartialinterpretationPackage.PARTIAL_INTERPRETATION__OPEN_WORLD_ELEMENT_PROTOTYPES:

+                                return getOpenWorldElementPrototypes();

                         case PartialinterpretationPackage.PARTIAL_INTERPRETATION__PROBLEM_CONAINER:

                                 return getProblemConainer();

+                        case PartialinterpretationPackage.PARTIAL_INTERPRETATION__STRINGELEMENT:

+                                return getStringelement();

+                        case PartialinterpretationPackage.PARTIAL_INTERPRETATION__STRINGELEMENTS:

+                                return getStringelements();

+                        case PartialinterpretationPackage.PARTIAL_INTERPRETATION__REALELEMENTS:

+                                return getRealelements();

+                        case PartialinterpretationPackage.PARTIAL_INTERPRETATION__INTEGERELEMENTS:

+                                return getIntegerelements();

+                        case PartialinterpretationPackage.PARTIAL_INTERPRETATION__BOOLEANELEMENTS:

+                                return getBooleanelements();

+                        case PartialinterpretationPackage.PARTIAL_INTERPRETATION__MAX_NEW_INTEGERS:

+                                return getMaxNewIntegers();

+                        case PartialinterpretationPackage.PARTIAL_INTERPRETATION__MAX_NEW_REALS:

+                                return getMaxNewReals();

+                        case PartialinterpretationPackage.PARTIAL_INTERPRETATION__MAX_NEW_STRINGS:

+                                return getMaxNewStrings();

                 }

                 return super.eGet(featureID, resolve, coreType);

         }

@@ -514,12 +754,42 @@ public class PartialInterpretationImpl extends MinimalEObjectImpl.Container impl
                         case PartialinterpretationPackage.PARTIAL_INTERPRETATION__MAX_NEW_ELEMENTS:

                                 setMaxNewElements((Integer)newValue);

                                 return;

-                        case PartialinterpretationPackage.PARTIAL_INTERPRETATION__OPEN_WORLD_ELEMENT_PROTOTYPE:

-                                setOpenWorldElementPrototype((DefinedElement)newValue);

+                        case PartialinterpretationPackage.PARTIAL_INTERPRETATION__OPEN_WORLD_ELEMENT_PROTOTYPES:

+                                getOpenWorldElementPrototypes().clear();

+                                getOpenWorldElementPrototypes().addAll((Collection<? extends DefinedElement>)newValue);

                                 return;

                         case PartialinterpretationPackage.PARTIAL_INTERPRETATION__PROBLEM_CONAINER:

                                 setProblemConainer((LogicProblem)newValue);

                                 return;

+                        case PartialinterpretationPackage.PARTIAL_INTERPRETATION__STRINGELEMENT:

+                                getStringelement().clear();

+                                getStringelement().addAll((Collection<? extends StringElement>)newValue);

+                                return;

+                        case PartialinterpretationPackage.PARTIAL_INTERPRETATION__STRINGELEMENTS:

+                                getStringelements().clear();

+                                getStringelements().addAll((Collection<? extends StringElement>)newValue);

+                                return;

+                        case PartialinterpretationPackage.PARTIAL_INTERPRETATION__REALELEMENTS:

+                                getRealelements().clear();

+                                getRealelements().addAll((Collection<? extends RealElement>)newValue);

+                                return;

+                        case PartialinterpretationPackage.PARTIAL_INTERPRETATION__INTEGERELEMENTS:

+                                getIntegerelements().clear();

+                                getIntegerelements().addAll((Collection<? extends IntegerElement>)newValue);

+                                return;

+                        case PartialinterpretationPackage.PARTIAL_INTERPRETATION__BOOLEANELEMENTS:

+                                getBooleanelements().clear();

+                                getBooleanelements().addAll((Collection<? extends BooleanElement>)newValue);

+                                return;

+                        case PartialinterpretationPackage.PARTIAL_INTERPRETATION__MAX_NEW_INTEGERS:

+                                setMaxNewIntegers((Integer)newValue);

+                                return;

+                        case PartialinterpretationPackage.PARTIAL_INTERPRETATION__MAX_NEW_REALS:

+                                setMaxNewReals((Integer)newValue);

+                                return;

+                        case PartialinterpretationPackage.PARTIAL_INTERPRETATION__MAX_NEW_STRINGS:

+                                setMaxNewStrings((Integer)newValue);

+                                return;

                 }

                 super.eSet(featureID, newValue);

         }

@@ -556,12 +826,36 @@ public class PartialInterpretationImpl extends MinimalEObjectImpl.Container impl
                         case PartialinterpretationPackage.PARTIAL_INTERPRETATION__MAX_NEW_ELEMENTS:

                                 setMaxNewElements(MAX_NEW_ELEMENTS_EDEFAULT);

                                 return;

-                        case PartialinterpretationPackage.PARTIAL_INTERPRETATION__OPEN_WORLD_ELEMENT_PROTOTYPE:

-                                setOpenWorldElementPrototype((DefinedElement)null);

+                        case PartialinterpretationPackage.PARTIAL_INTERPRETATION__OPEN_WORLD_ELEMENT_PROTOTYPES:

+                                getOpenWorldElementPrototypes().clear();

                                 return;

                         case PartialinterpretationPackage.PARTIAL_INTERPRETATION__PROBLEM_CONAINER:

                                 setProblemConainer((LogicProblem)null);

                                 return;

+                        case PartialinterpretationPackage.PARTIAL_INTERPRETATION__STRINGELEMENT:

+                                getStringelement().clear();

+                                return;

+                        case PartialinterpretationPackage.PARTIAL_INTERPRETATION__STRINGELEMENTS:

+                                getStringelements().clear();

+                                return;

+                        case PartialinterpretationPackage.PARTIAL_INTERPRETATION__REALELEMENTS:

+                                getRealelements().clear();

+                                return;

+                        case PartialinterpretationPackage.PARTIAL_INTERPRETATION__INTEGERELEMENTS:

+                                getIntegerelements().clear();

+                                return;

+                        case PartialinterpretationPackage.PARTIAL_INTERPRETATION__BOOLEANELEMENTS:

+                                getBooleanelements().clear();

+                                return;

+                        case PartialinterpretationPackage.PARTIAL_INTERPRETATION__MAX_NEW_INTEGERS:

+                                setMaxNewIntegers(MAX_NEW_INTEGERS_EDEFAULT);

+                                return;

+                        case PartialinterpretationPackage.PARTIAL_INTERPRETATION__MAX_NEW_REALS:

+                                setMaxNewReals(MAX_NEW_REALS_EDEFAULT);

+                                return;

+                        case PartialinterpretationPackage.PARTIAL_INTERPRETATION__MAX_NEW_STRINGS:

+                                setMaxNewStrings(MAX_NEW_STRINGS_EDEFAULT);

+                                return;

                 }

                 super.eUnset(featureID);

         }

@@ -590,10 +884,26 @@ public class PartialInterpretationImpl extends MinimalEObjectImpl.Container impl
                                 return minNewElements != MIN_NEW_ELEMENTS_EDEFAULT;

                         case PartialinterpretationPackage.PARTIAL_INTERPRETATION__MAX_NEW_ELEMENTS:

                                 return maxNewElements != MAX_NEW_ELEMENTS_EDEFAULT;

-                        case PartialinterpretationPackage.PARTIAL_INTERPRETATION__OPEN_WORLD_ELEMENT_PROTOTYPE:

-                                return openWorldElementPrototype != null;

+                        case PartialinterpretationPackage.PARTIAL_INTERPRETATION__OPEN_WORLD_ELEMENT_PROTOTYPES:

+                                return openWorldElementPrototypes != null && !openWorldElementPrototypes.isEmpty();

                         case PartialinterpretationPackage.PARTIAL_INTERPRETATION__PROBLEM_CONAINER:

                                 return problemConainer != null;

+                        case PartialinterpretationPackage.PARTIAL_INTERPRETATION__STRINGELEMENT:

+                                return stringelement != null && !stringelement.isEmpty();

+                        case PartialinterpretationPackage.PARTIAL_INTERPRETATION__STRINGELEMENTS:

+                                return stringelements != null && !stringelements.isEmpty();

+                        case PartialinterpretationPackage.PARTIAL_INTERPRETATION__REALELEMENTS:

+                                return realelements != null && !realelements.isEmpty();

+                        case PartialinterpretationPackage.PARTIAL_INTERPRETATION__INTEGERELEMENTS:

+                                return integerelements != null && !integerelements.isEmpty();

+                        case PartialinterpretationPackage.PARTIAL_INTERPRETATION__BOOLEANELEMENTS:

+                                return booleanelements != null && !booleanelements.isEmpty();

+                        case PartialinterpretationPackage.PARTIAL_INTERPRETATION__MAX_NEW_INTEGERS:

+                                return maxNewIntegers != MAX_NEW_INTEGERS_EDEFAULT;

+                        case PartialinterpretationPackage.PARTIAL_INTERPRETATION__MAX_NEW_REALS:

+                                return maxNewReals != MAX_NEW_REALS_EDEFAULT;

+                        case PartialinterpretationPackage.PARTIAL_INTERPRETATION__MAX_NEW_STRINGS:

+                                return maxNewStrings != MAX_NEW_STRINGS_EDEFAULT;

                 }

                 return super.eIsSet(featureID);

         }

@@ -612,6 +922,12 @@ public class PartialInterpretationImpl extends MinimalEObjectImpl.Container impl
                 result.append(minNewElements);

                 result.append(", maxNewElements: ");

                 result.append(maxNewElements);

+                result.append(", maxNewIntegers: ");

+                result.append(maxNewIntegers);

+                result.append(", maxNewReals: ");

+                result.append(maxNewReals);

+                result.append(", maxNewStrings: ");

+                result.append(maxNewStrings);

                 result.append(')');

                 return result.toString();

         }

diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partialinterpretation/impl/PartialinterpretationFactoryImpl.java b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partialinterpretation/impl/PartialinterpretationFactoryImpl.java
index 99ab7830..ebd70a97 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partialinterpretation/impl/PartialinterpretationFactoryImpl.java
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partialinterpretation/impl/PartialinterpretationFactoryImpl.java
@@ -65,6 +65,10 @@ public class PartialinterpretationFactoryImpl extends EFactoryImpl implements Pa
                         case PartialinterpretationPackage.BINARY_ELEMENT_RELATION_LINK: return createBinaryElementRelationLink();

                         case PartialinterpretationPackage.NARY_RELATION_LINK: return createNaryRelationLink();

                         case PartialinterpretationPackage.NARY_RELATION_LINK_ELEMENT: return createNaryRelationLinkElement();

+                        case PartialinterpretationPackage.BOOLEAN_ELEMENT: return createBooleanElement();

+                        case PartialinterpretationPackage.INTEGER_ELEMENT: return createIntegerElement();

+                        case PartialinterpretationPackage.REAL_ELEMENT: return createRealElement();

+                        case PartialinterpretationPackage.STRING_ELEMENT: return createStringElement();

                         default:

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

                 }

@@ -165,6 +169,46 @@ public class PartialinterpretationFactoryImpl extends EFactoryImpl implements Pa
          * <!-- end-user-doc -->

          * @generated

          */

+        public BooleanElement createBooleanElement() {

+                BooleanElementImpl booleanElement = new BooleanElementImpl();

+                return booleanElement;

+        }

+

+        /**

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

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

+         * @generated

+         */

+        public IntegerElement createIntegerElement() {

+                IntegerElementImpl integerElement = new IntegerElementImpl();

+                return integerElement;

+        }

+

+        /**

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

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

+         * @generated

+         */

+        public RealElement createRealElement() {

+                RealElementImpl realElement = new RealElementImpl();

+                return realElement;

+        }

+

+        /**

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

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

+         * @generated

+         */

+        public StringElement createStringElement() {

+                StringElementImpl stringElement = new StringElementImpl();

+                return stringElement;

+        }

+

+        /**

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

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

+         * @generated

+         */

         public PartialinterpretationPackage getPartialinterpretationPackage() {

                 return (PartialinterpretationPackage)getEPackage();

         }

diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partialinterpretation/impl/PartialinterpretationPackageImpl.java b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partialinterpretation/impl/PartialinterpretationPackageImpl.java
index 65d73721..9493cc9a 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partialinterpretation/impl/PartialinterpretationPackageImpl.java
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partialinterpretation/impl/PartialinterpretationPackageImpl.java
@@ -7,6 +7,8 @@ import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.LogiclanguagePackage
 import hu.bme.mit.inf.dslreasoner.logic.model.logicproblem.LogicproblemPackage;

 

 import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.BinaryElementRelationLink;

+import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.BooleanElement;

+import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.IntegerElement;

 import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.NaryRelationLink;

 import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.NaryRelationLinkElement;

 import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialConstantInterpretation;

@@ -16,7 +18,10 @@ import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.par
 import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialTypeInterpratation;

 import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialinterpretationFactory;

 import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialinterpretationPackage;

+import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PrimitiveElement;

+import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.RealElement;

 import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.RelationLink;

+import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.StringElement;

 import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.UnaryElementRelationLink;

 

 import org.eclipse.emf.ecore.EAttribute;

@@ -104,6 +109,41 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
         private EClass naryRelationLinkElementEClass = null;

 

         /**

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

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

+         * @generated

+         */

+        private EClass primitiveElementEClass = null;

+

+        /**

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

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

+         * @generated

+         */

+        private EClass booleanElementEClass = null;

+

+        /**

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

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

+         * @generated

+         */

+        private EClass integerElementEClass = null;

+

+        /**

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

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

+         * @generated

+         */

+        private EClass realElementEClass = null;

+

+        /**

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

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

+         * @generated

+         */

+        private EClass stringElementEClass = 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.

@@ -254,7 +294,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
          * <!-- end-user-doc -->

          * @generated

          */

-        public EReference getPartialInterpretation_OpenWorldElementPrototype() {

+        public EReference getPartialInterpretation_OpenWorldElementPrototypes() {

                 return (EReference)partialInterpretationEClass.getEStructuralFeatures().get(8);

         }

 

@@ -272,6 +312,78 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
          * <!-- end-user-doc -->

          * @generated

          */

+        public EReference getPartialInterpretation_Stringelement() {

+                return (EReference)partialInterpretationEClass.getEStructuralFeatures().get(10);

+        }

+

+        /**

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

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

+         * @generated

+         */

+        public EReference getPartialInterpretation_Stringelements() {

+                return (EReference)partialInterpretationEClass.getEStructuralFeatures().get(11);

+        }

+

+        /**

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

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

+         * @generated

+         */

+        public EReference getPartialInterpretation_Realelements() {

+                return (EReference)partialInterpretationEClass.getEStructuralFeatures().get(12);

+        }

+

+        /**

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

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

+         * @generated

+         */

+        public EReference getPartialInterpretation_Integerelements() {

+                return (EReference)partialInterpretationEClass.getEStructuralFeatures().get(13);

+        }

+

+        /**

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

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

+         * @generated

+         */

+        public EReference getPartialInterpretation_Booleanelements() {

+                return (EReference)partialInterpretationEClass.getEStructuralFeatures().get(14);

+        }

+

+        /**

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

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

+         * @generated

+         */

+        public EAttribute getPartialInterpretation_MaxNewIntegers() {

+                return (EAttribute)partialInterpretationEClass.getEStructuralFeatures().get(15);

+        }

+

+        /**

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

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

+         * @generated

+         */

+        public EAttribute getPartialInterpretation_MaxNewReals() {

+                return (EAttribute)partialInterpretationEClass.getEStructuralFeatures().get(16);

+        }

+

+        /**

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

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

+         * @generated

+         */

+        public EAttribute getPartialInterpretation_MaxNewStrings() {

+                return (EAttribute)partialInterpretationEClass.getEStructuralFeatures().get(17);

+        }

+

+        /**

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

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

+         * @generated

+         */

         public EClass getPartialConstantInterpretation() {

                 return partialConstantInterpretationEClass;

         }

@@ -479,6 +591,96 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
          * <!-- end-user-doc -->

          * @generated

          */

+        public EClass getPrimitiveElement() {

+                return primitiveElementEClass;

+        }

+

+        /**

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

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

+         * @generated

+         */

+        public EAttribute getPrimitiveElement_ValueSet() {

+                return (EAttribute)primitiveElementEClass.getEStructuralFeatures().get(0);

+        }

+

+        /**

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

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

+         * @generated

+         */

+        public EClass getBooleanElement() {

+                return booleanElementEClass;

+        }

+

+        /**

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

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

+         * @generated

+         */

+        public EAttribute getBooleanElement_Value() {

+                return (EAttribute)booleanElementEClass.getEStructuralFeatures().get(0);

+        }

+

+        /**

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

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

+         * @generated

+         */

+        public EClass getIntegerElement() {

+                return integerElementEClass;

+        }

+

+        /**

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

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

+         * @generated

+         */

+        public EAttribute getIntegerElement_Value() {

+                return (EAttribute)integerElementEClass.getEStructuralFeatures().get(0);

+        }

+

+        /**

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

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

+         * @generated

+         */

+        public EClass getRealElement() {

+                return realElementEClass;

+        }

+

+        /**

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

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

+         * @generated

+         */

+        public EAttribute getRealElement_Value() {

+                return (EAttribute)realElementEClass.getEStructuralFeatures().get(0);

+        }

+

+        /**

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

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

+         * @generated

+         */

+        public EClass getStringElement() {

+                return stringElementEClass;

+        }

+

+        /**

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

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

+         * @generated

+         */

+        public EAttribute getStringElement_Value() {

+                return (EAttribute)stringElementEClass.getEStructuralFeatures().get(0);

+        }

+

+        /**

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

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

+         * @generated

+         */

         public PartialinterpretationFactory getPartialinterpretationFactory() {

                 return (PartialinterpretationFactory)getEFactoryInstance();

         }

@@ -511,8 +713,16 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
                 createEReference(partialInterpretationEClass, PARTIAL_INTERPRETATION__PARTIALTYPEINTERPRATATION);

                 createEAttribute(partialInterpretationEClass, PARTIAL_INTERPRETATION__MIN_NEW_ELEMENTS);

                 createEAttribute(partialInterpretationEClass, PARTIAL_INTERPRETATION__MAX_NEW_ELEMENTS);

-                createEReference(partialInterpretationEClass, PARTIAL_INTERPRETATION__OPEN_WORLD_ELEMENT_PROTOTYPE);

+                createEReference(partialInterpretationEClass, PARTIAL_INTERPRETATION__OPEN_WORLD_ELEMENT_PROTOTYPES);

                 createEReference(partialInterpretationEClass, PARTIAL_INTERPRETATION__PROBLEM_CONAINER);

+                createEReference(partialInterpretationEClass, PARTIAL_INTERPRETATION__STRINGELEMENT);

+                createEReference(partialInterpretationEClass, PARTIAL_INTERPRETATION__STRINGELEMENTS);

+                createEReference(partialInterpretationEClass, PARTIAL_INTERPRETATION__REALELEMENTS);

+                createEReference(partialInterpretationEClass, PARTIAL_INTERPRETATION__INTEGERELEMENTS);

+                createEReference(partialInterpretationEClass, PARTIAL_INTERPRETATION__BOOLEANELEMENTS);

+                createEAttribute(partialInterpretationEClass, PARTIAL_INTERPRETATION__MAX_NEW_INTEGERS);

+                createEAttribute(partialInterpretationEClass, PARTIAL_INTERPRETATION__MAX_NEW_REALS);

+                createEAttribute(partialInterpretationEClass, PARTIAL_INTERPRETATION__MAX_NEW_STRINGS);

 

                 partialConstantInterpretationEClass = createEClass(PARTIAL_CONSTANT_INTERPRETATION);

                 createEReference(partialConstantInterpretationEClass, PARTIAL_CONSTANT_INTERPRETATION__INTERPRETATION_OF);

@@ -545,6 +755,21 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
 

                 naryRelationLinkElementEClass = createEClass(NARY_RELATION_LINK_ELEMENT);

                 createEAttribute(naryRelationLinkElementEClass, NARY_RELATION_LINK_ELEMENT__INDEX);

+

+                primitiveElementEClass = createEClass(PRIMITIVE_ELEMENT);

+                createEAttribute(primitiveElementEClass, PRIMITIVE_ELEMENT__VALUE_SET);

+

+                booleanElementEClass = createEClass(BOOLEAN_ELEMENT);

+                createEAttribute(booleanElementEClass, BOOLEAN_ELEMENT__VALUE);

+

+                integerElementEClass = createEClass(INTEGER_ELEMENT);

+                createEAttribute(integerElementEClass, INTEGER_ELEMENT__VALUE);

+

+                realElementEClass = createEClass(REAL_ELEMENT);

+                createEAttribute(realElementEClass, REAL_ELEMENT__VALUE);

+

+                stringElementEClass = createEClass(STRING_ELEMENT);

+                createEAttribute(stringElementEClass, STRING_ELEMENT__VALUE);

         }

 

         /**

@@ -582,6 +807,11 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
                 unaryElementRelationLinkEClass.getESuperTypes().add(this.getRelationLink());

                 binaryElementRelationLinkEClass.getESuperTypes().add(this.getRelationLink());

                 naryRelationLinkEClass.getESuperTypes().add(this.getRelationLink());

+                primitiveElementEClass.getESuperTypes().add(theLogiclanguagePackage.getDefinedElement());

+                booleanElementEClass.getESuperTypes().add(this.getPrimitiveElement());

+                integerElementEClass.getESuperTypes().add(this.getPrimitiveElement());

+                realElementEClass.getESuperTypes().add(this.getPrimitiveElement());

+                stringElementEClass.getESuperTypes().add(this.getPrimitiveElement());

 

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

                 initEClass(partialInterpretationEClass, PartialInterpretation.class, "PartialInterpretation", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

@@ -593,8 +823,16 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
                 initEReference(getPartialInterpretation_Partialtypeinterpratation(), this.getPartialTypeInterpratation(), null, "partialtypeinterpratation", null, 0, -1, PartialInterpretation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

                 initEAttribute(getPartialInterpretation_MinNewElements(), ecorePackage.getEInt(), "minNewElements", "0", 1, 1, PartialInterpretation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

                 initEAttribute(getPartialInterpretation_MaxNewElements(), ecorePackage.getEInt(), "maxNewElements", "0", 1, 1, PartialInterpretation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-                initEReference(getPartialInterpretation_OpenWorldElementPrototype(), theLogiclanguagePackage.getDefinedElement(), null, "openWorldElementPrototype", null, 1, 1, PartialInterpretation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+                initEReference(getPartialInterpretation_OpenWorldElementPrototypes(), theLogiclanguagePackage.getDefinedElement(), null, "openWorldElementPrototypes", null, 1, -1, PartialInterpretation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

                 initEReference(getPartialInterpretation_ProblemConainer(), theLogicproblemPackage.getLogicProblem(), null, "problemConainer", null, 0, 1, PartialInterpretation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+                initEReference(getPartialInterpretation_Stringelement(), this.getStringElement(), null, "stringelement", null, 0, -1, PartialInterpretation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+                initEReference(getPartialInterpretation_Stringelements(), this.getStringElement(), null, "stringelements", null, 0, -1, PartialInterpretation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+                initEReference(getPartialInterpretation_Realelements(), this.getRealElement(), null, "realelements", null, 0, -1, PartialInterpretation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+                initEReference(getPartialInterpretation_Integerelements(), this.getIntegerElement(), null, "integerelements", null, 0, -1, PartialInterpretation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+                initEReference(getPartialInterpretation_Booleanelements(), this.getBooleanElement(), null, "booleanelements", null, 0, -1, PartialInterpretation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+                initEAttribute(getPartialInterpretation_MaxNewIntegers(), ecorePackage.getEInt(), "maxNewIntegers", null, 1, 1, PartialInterpretation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+                initEAttribute(getPartialInterpretation_MaxNewReals(), ecorePackage.getEInt(), "maxNewReals", null, 1, 1, PartialInterpretation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+                initEAttribute(getPartialInterpretation_MaxNewStrings(), ecorePackage.getEInt(), "maxNewStrings", null, 1, 1, PartialInterpretation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

 

                 initEClass(partialConstantInterpretationEClass, PartialConstantInterpretation.class, "PartialConstantInterpretation", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

                 initEReference(getPartialConstantInterpretation_InterpretationOf(), theLogiclanguagePackage.getConstantDeclaration(), null, "interpretationOf", null, 1, 1, PartialConstantInterpretation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

@@ -628,6 +866,21 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
                 initEClass(naryRelationLinkElementEClass, NaryRelationLinkElement.class, "NaryRelationLinkElement", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

                 initEAttribute(getNaryRelationLinkElement_Index(), ecorePackage.getEInt(), "index", null, 0, 1, NaryRelationLinkElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

 

+                initEClass(primitiveElementEClass, PrimitiveElement.class, "PrimitiveElement", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+                initEAttribute(getPrimitiveElement_ValueSet(), ecorePackage.getEBoolean(), "valueSet", null, 1, 1, PrimitiveElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+

+                initEClass(booleanElementEClass, BooleanElement.class, "BooleanElement", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+                initEAttribute(getBooleanElement_Value(), ecorePackage.getEBoolean(), "value", null, 1, 1, BooleanElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+

+                initEClass(integerElementEClass, IntegerElement.class, "IntegerElement", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+                initEAttribute(getIntegerElement_Value(), ecorePackage.getEInt(), "value", null, 1, 1, IntegerElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+

+                initEClass(realElementEClass, RealElement.class, "RealElement", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+                initEAttribute(getRealElement_Value(), ecorePackage.getEBigDecimal(), "value", null, 1, 1, RealElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+

+                initEClass(stringElementEClass, StringElement.class, "StringElement", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+                initEAttribute(getStringElement_Value(), ecorePackage.getEString(), "value", null, 1, 1, StringElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+

                 // Create resource

                 createResource(eNS_URI);

         }