Added separate symbolic objects to all primitive objects

2 files changed, 141 insertions, 0 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 4b7061ce..dd744606 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
@@ -59,6 +59,9 @@ import org.eclipse.emf.ecore.util.InternalEList;
  *   <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>

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

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

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

  * </ul>

  *

  * @generated

@@ -295,6 +298,36 @@ public class PartialInterpretationImpl extends MinimalEObjectImpl.Container impl
         protected int maxNewStrings = MAX_NEW_STRINGS_EDEFAULT;

 

         /**

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

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

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

+         * @see #getNewStrings()

+         * @generated

+         * @ordered

+         */

+        protected EList<StringElement> newStrings;

+

+        /**

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

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

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

+         * @see #getNewReals()

+         * @generated

+         * @ordered

+         */

+        protected EList<RealElement> newReals;

+

+        /**

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

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

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

+         * @see #getNewIntegers()

+         * @generated

+         * @ordered

+         */

+        protected EList<IntegerElement> newIntegers;

+

+        /**

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

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

          * @generated

@@ -636,6 +669,42 @@ public class PartialInterpretationImpl extends MinimalEObjectImpl.Container impl
          * <!-- end-user-doc -->

          * @generated

          */

+        public EList<StringElement> getNewStrings() {

+                if (newStrings == null) {

+                        newStrings = new EObjectContainmentEList<StringElement>(StringElement.class, this, PartialinterpretationPackage.PARTIAL_INTERPRETATION__NEW_STRINGS);

+                }

+                return newStrings;

+        }

+

+        /**

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

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

+         * @generated

+         */

+        public EList<RealElement> getNewReals() {

+                if (newReals == null) {

+                        newReals = new EObjectContainmentEList<RealElement>(RealElement.class, this, PartialinterpretationPackage.PARTIAL_INTERPRETATION__NEW_REALS);

+                }

+                return newReals;

+        }

+

+        /**

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

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

+         * @generated

+         */

+        public EList<IntegerElement> getNewIntegers() {

+                if (newIntegers == null) {

+                        newIntegers = new EObjectContainmentEList<IntegerElement>(IntegerElement.class, this, PartialinterpretationPackage.PARTIAL_INTERPRETATION__NEW_INTEGERS);

+                }

+                return newIntegers;

+        }

+

+        /**

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

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

+         * @generated

+         */

         @Override

         public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

                 switch (featureID) {

@@ -663,6 +732,12 @@ public class PartialInterpretationImpl extends MinimalEObjectImpl.Container impl
                                 return ((InternalEList<?>)getIntegerelements()).basicRemove(otherEnd, msgs);

                         case PartialinterpretationPackage.PARTIAL_INTERPRETATION__BOOLEANELEMENTS:

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

+                        case PartialinterpretationPackage.PARTIAL_INTERPRETATION__NEW_STRINGS:

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

+                        case PartialinterpretationPackage.PARTIAL_INTERPRETATION__NEW_REALS:

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

+                        case PartialinterpretationPackage.PARTIAL_INTERPRETATION__NEW_INTEGERS:

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

                 }

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

         }

@@ -712,6 +787,12 @@ public class PartialInterpretationImpl extends MinimalEObjectImpl.Container impl
                                 return getMaxNewReals();

                         case PartialinterpretationPackage.PARTIAL_INTERPRETATION__MAX_NEW_STRINGS:

                                 return getMaxNewStrings();

+                        case PartialinterpretationPackage.PARTIAL_INTERPRETATION__NEW_STRINGS:

+                                return getNewStrings();

+                        case PartialinterpretationPackage.PARTIAL_INTERPRETATION__NEW_REALS:

+                                return getNewReals();

+                        case PartialinterpretationPackage.PARTIAL_INTERPRETATION__NEW_INTEGERS:

+                                return getNewIntegers();

                 }

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

         }

@@ -790,6 +871,18 @@ public class PartialInterpretationImpl extends MinimalEObjectImpl.Container impl
                         case PartialinterpretationPackage.PARTIAL_INTERPRETATION__MAX_NEW_STRINGS:

                                 setMaxNewStrings((Integer)newValue);

                                 return;

+                        case PartialinterpretationPackage.PARTIAL_INTERPRETATION__NEW_STRINGS:

+                                getNewStrings().clear();

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

+                                return;

+                        case PartialinterpretationPackage.PARTIAL_INTERPRETATION__NEW_REALS:

+                                getNewReals().clear();

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

+                                return;

+                        case PartialinterpretationPackage.PARTIAL_INTERPRETATION__NEW_INTEGERS:

+                                getNewIntegers().clear();

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

+                                return;

                 }

                 super.eSet(featureID, newValue);

         }

@@ -856,6 +949,15 @@ public class PartialInterpretationImpl extends MinimalEObjectImpl.Container impl
                         case PartialinterpretationPackage.PARTIAL_INTERPRETATION__MAX_NEW_STRINGS:

                                 setMaxNewStrings(MAX_NEW_STRINGS_EDEFAULT);

                                 return;

+                        case PartialinterpretationPackage.PARTIAL_INTERPRETATION__NEW_STRINGS:

+                                getNewStrings().clear();

+                                return;

+                        case PartialinterpretationPackage.PARTIAL_INTERPRETATION__NEW_REALS:

+                                getNewReals().clear();

+                                return;

+                        case PartialinterpretationPackage.PARTIAL_INTERPRETATION__NEW_INTEGERS:

+                                getNewIntegers().clear();

+                                return;

                 }

                 super.eUnset(featureID);

         }

@@ -904,6 +1006,12 @@ public class PartialInterpretationImpl extends MinimalEObjectImpl.Container impl
                                 return maxNewReals != MAX_NEW_REALS_EDEFAULT;

                         case PartialinterpretationPackage.PARTIAL_INTERPRETATION__MAX_NEW_STRINGS:

                                 return maxNewStrings != MAX_NEW_STRINGS_EDEFAULT;

+                        case PartialinterpretationPackage.PARTIAL_INTERPRETATION__NEW_STRINGS:

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

+                        case PartialinterpretationPackage.PARTIAL_INTERPRETATION__NEW_REALS:

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

+                        case PartialinterpretationPackage.PARTIAL_INTERPRETATION__NEW_INTEGERS:

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

                 }

                 return super.eIsSet(featureID);

         }

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 9493cc9a..6e0d4051 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
@@ -384,6 +384,33 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
          * <!-- end-user-doc -->

          * @generated

          */

+        public EReference getPartialInterpretation_NewStrings() {

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

+        }

+

+        /**

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

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

+         * @generated

+         */

+        public EReference getPartialInterpretation_NewReals() {

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

+        }

+

+        /**

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

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

+         * @generated

+         */

+        public EReference getPartialInterpretation_NewIntegers() {

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

+        }

+

+        /**

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

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

+         * @generated

+         */

         public EClass getPartialConstantInterpretation() {

                 return partialConstantInterpretationEClass;

         }

@@ -723,6 +750,9 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
                 createEAttribute(partialInterpretationEClass, PARTIAL_INTERPRETATION__MAX_NEW_INTEGERS);

                 createEAttribute(partialInterpretationEClass, PARTIAL_INTERPRETATION__MAX_NEW_REALS);

                 createEAttribute(partialInterpretationEClass, PARTIAL_INTERPRETATION__MAX_NEW_STRINGS);

+                createEReference(partialInterpretationEClass, PARTIAL_INTERPRETATION__NEW_STRINGS);

+                createEReference(partialInterpretationEClass, PARTIAL_INTERPRETATION__NEW_REALS);

+                createEReference(partialInterpretationEClass, PARTIAL_INTERPRETATION__NEW_INTEGERS);

 

                 partialConstantInterpretationEClass = createEClass(PARTIAL_CONSTANT_INTERPRETATION);

                 createEReference(partialConstantInterpretationEClass, PARTIAL_CONSTANT_INTERPRETATION__INTERPRETATION_OF);

@@ -833,6 +863,9 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
                 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);

+                initEReference(getPartialInterpretation_NewStrings(), this.getStringElement(), null, "newStrings", 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_NewReals(), this.getRealElement(), null, "newReals", 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_NewIntegers(), this.getIntegerElement(), null, "newIntegers", null, 0, -1, PartialInterpretation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, 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);