1 files changed, 38 insertions, 238 deletions

diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partialinterpretation/PartialInterpretation.java b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partialinterpretation/PartialInterpretation.java
index d0f77a52..098cc15b 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partialinterpretation/PartialInterpretation.java
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partialinterpretation/PartialInterpretation.java
@@ -25,21 +25,11 @@ import org.eclipse.emf.ecore.EObject;
  *   <li>{@link hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialInterpretation#getPartialfunctioninterpretation <em>Partialfunctioninterpretation</em>}</li>

  *   <li>{@link hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialInterpretation#getNewElements <em>New Elements</em>}</li>

  *   <li>{@link hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialInterpretation#getPartialtypeinterpratation <em>Partialtypeinterpratation</em>}</li>

+ *   <li>{@link hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialInterpretation#getOpenWorldElements <em>Open World Elements</em>}</li>

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

+ *   <li>{@link hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialInterpretation#getScopes <em>Scopes</em>}</li>

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

  * </ul>

  *

  * @see hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialinterpretationPackage#getPartialInterpretation()

@@ -154,74 +144,20 @@ public interface PartialInterpretation extends EObject {
         EList<PartialTypeInterpratation> getPartialtypeinterpratation();

 

         /**

-         * Returns the value of the '<em><b>Min New Elements</b></em>' attribute.

-         * The default value is <code>"0"</code>.

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

-         * <p>

-         * If the meaning of the '<em>Min New Elements</em>' attribute isn't clear,

-         * there really should be more of a description here...

-         * </p>

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

-         * @return the value of the '<em>Min New Elements</em>' attribute.

-         * @see #setMinNewElements(int)

-         * @see hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialinterpretationPackage#getPartialInterpretation_MinNewElements()

-         * @model default="0" id="true" required="true"

-         * @generated

-         */

-        int getMinNewElements();

-

-        /**

-         * Sets the value of the '{@link hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialInterpretation#getMinNewElements <em>Min New Elements</em>}' attribute.

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

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

-         * @param value the new value of the '<em>Min New Elements</em>' attribute.

-         * @see #getMinNewElements()

-         * @generated

-         */

-        void setMinNewElements(int value);

-

-        /**

-         * Returns the value of the '<em><b>Max New Elements</b></em>' attribute.

-         * The default value is <code>"0"</code>.

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

-         * <p>

-         * If the meaning of the '<em>Max New Elements</em>' attribute isn't clear,

-         * there really should be more of a description here...

-         * </p>

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

-         * @return the value of the '<em>Max New Elements</em>' attribute.

-         * @see #setMaxNewElements(int)

-         * @see hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialinterpretationPackage#getPartialInterpretation_MaxNewElements()

-         * @model default="0" required="true"

-         * @generated

-         */

-        int getMaxNewElements();

-

-        /**

-         * Sets the value of the '{@link hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialInterpretation#getMaxNewElements <em>Max New Elements</em>}' attribute.

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

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

-         * @param value the new value of the '<em>Max New Elements</em>' attribute.

-         * @see #getMaxNewElements()

-         * @generated

-         */

-        void setMaxNewElements(int value);

-

-        /**

-         * Returns the value of the '<em><b>Open World Element Prototypes</b></em>' containment reference list.

+         * Returns the value of the '<em><b>Open World Elements</b></em>' containment reference list.

          * The list contents are of type {@link hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.DefinedElement}.

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

          * <p>

-         * If the meaning of the '<em>Open World Element Prototypes</em>' containment reference list isn't clear,

+         * If the meaning of the '<em>Open World Elements</em>' containment reference list isn't clear,

          * there really should be more of a description here...

          * </p>

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

-         * @return the value of the '<em>Open World Element Prototypes</em>' containment reference list.

-         * @see hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialinterpretationPackage#getPartialInterpretation_OpenWorldElementPrototypes()

+         * @return the value of the '<em>Open World Elements</em>' containment reference list.

+         * @see hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialinterpretationPackage#getPartialInterpretation_OpenWorldElements()

          * @model containment="true"

          * @generated

          */

-        EList<DefinedElement> getOpenWorldElementPrototypes();

+        EList<DefinedElement> getOpenWorldElements();

 

         /**

          * Returns the value of the '<em><b>Problem Conainer</b></em>' containment reference.

@@ -250,209 +186,73 @@ public interface PartialInterpretation extends EObject {
         void setProblemConainer(LogicProblem value);

 

         /**

-         * Returns the value of the '<em><b>Stringelement</b></em>' containment reference list.

-         * The list contents are of type {@link hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.StringElement}.

+         * Returns the value of the '<em><b>Scopes</b></em>' containment reference list.

+         * The list contents are of type {@link hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.Scope}.

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

          * <p>

-         * If the meaning of the '<em>Stringelement</em>' containment reference list isn't clear,

+         * If the meaning of the '<em>Scopes</em>' containment reference list isn't clear,

          * there really should be more of a description here...

          * </p>

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

-         * @return the value of the '<em>Stringelement</em>' containment reference list.

-         * @see hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialinterpretationPackage#getPartialInterpretation_Stringelement()

+         * @return the value of the '<em>Scopes</em>' containment reference list.

+         * @see hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialinterpretationPackage#getPartialInterpretation_Scopes()

          * @model containment="true"

          * @generated

          */

-        EList<StringElement> getStringelement();

+        EList<Scope> getScopes();

 

         /**

-         * Returns the value of the '<em><b>Stringelements</b></em>' containment reference list.

-         * The list contents are of type {@link hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.StringElement}.

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

-         * <p>

-         * If the meaning of the '<em>Stringelements</em>' containment reference list isn't clear,

-         * there really should be more of a description here...

-         * </p>

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

-         * @return the value of the '<em>Stringelements</em>' containment reference list.

-         * @see hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialinterpretationPackage#getPartialInterpretation_Stringelements()

-         * @model containment="true"

-         * @generated

-         */

-        EList<StringElement> getStringelements();

-

-        /**

-         * Returns the value of the '<em><b>Realelements</b></em>' containment reference list.

-         * The list contents are of type {@link hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.RealElement}.

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

-         * <p>

-         * If the meaning of the '<em>Realelements</em>' containment reference list isn't clear,

-         * there really should be more of a description here...

-         * </p>

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

-         * @return the value of the '<em>Realelements</em>' containment reference list.

-         * @see hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialinterpretationPackage#getPartialInterpretation_Realelements()

-         * @model containment="true"

-         * @generated

-         */

-        EList<RealElement> getRealelements();

-

-        /**

-         * Returns the value of the '<em><b>Integerelements</b></em>' containment reference list.

-         * The list contents are of type {@link hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.IntegerElement}.

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

-         * <p>

-         * If the meaning of the '<em>Integerelements</em>' containment reference list isn't clear,

-         * there really should be more of a description here...

-         * </p>

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

-         * @return the value of the '<em>Integerelements</em>' containment reference list.

-         * @see hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialinterpretationPackage#getPartialInterpretation_Integerelements()

-         * @model containment="true"

-         * @generated

-         */

-        EList<IntegerElement> getIntegerelements();

-

-        /**

-         * Returns the value of the '<em><b>Booleanelements</b></em>' containment reference list.

-         * The list contents are of type {@link hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.BooleanElement}.

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

-         * <p>

-         * If the meaning of the '<em>Booleanelements</em>' containment reference list isn't clear,

-         * there really should be more of a description here...

-         * </p>

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

-         * @return the value of the '<em>Booleanelements</em>' containment reference list.

-         * @see hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialinterpretationPackage#getPartialInterpretation_Booleanelements()

-         * @model containment="true"

-         * @generated

-         */

-        EList<BooleanElement> getBooleanelements();

-

-        /**

-         * Returns the value of the '<em><b>Max New Integers</b></em>' attribute.

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

-         * <p>

-         * If the meaning of the '<em>Max New Integers</em>' attribute isn't clear,

-         * there really should be more of a description here...

-         * </p>

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

-         * @return the value of the '<em>Max New Integers</em>' attribute.

-         * @see #setMaxNewIntegers(int)

-         * @see hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialinterpretationPackage#getPartialInterpretation_MaxNewIntegers()

-         * @model required="true"

-         * @generated

-         */

-        int getMaxNewIntegers();

-

-        /**

-         * Sets the value of the '{@link hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialInterpretation#getMaxNewIntegers <em>Max New Integers</em>}' attribute.

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

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

-         * @param value the new value of the '<em>Max New Integers</em>' attribute.

-         * @see #getMaxNewIntegers()

-         * @generated

-         */

-        void setMaxNewIntegers(int value);

-

-        /**

-         * Returns the value of the '<em><b>Max New Reals</b></em>' attribute.

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

-         * <p>

-         * If the meaning of the '<em>Max New Reals</em>' attribute isn't clear,

-         * there really should be more of a description here...

-         * </p>

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

-         * @return the value of the '<em>Max New Reals</em>' attribute.

-         * @see #setMaxNewReals(int)

-         * @see hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialinterpretationPackage#getPartialInterpretation_MaxNewReals()

-         * @model required="true"

-         * @generated

-         */

-        int getMaxNewReals();

-

-        /**

-         * Sets the value of the '{@link hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialInterpretation#getMaxNewReals <em>Max New Reals</em>}' attribute.

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

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

-         * @param value the new value of the '<em>Max New Reals</em>' attribute.

-         * @see #getMaxNewReals()

-         * @generated

-         */

-        void setMaxNewReals(int value);

-

-        /**

-         * Returns the value of the '<em><b>Max New Strings</b></em>' attribute.

+         * Returns the value of the '<em><b>Min New Elements</b></em>' attribute.

+         * The default value is <code>"0"</code>.

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

          * <p>

-         * If the meaning of the '<em>Max New Strings</em>' attribute isn't clear,

+         * If the meaning of the '<em>Min New Elements</em>' attribute isn't clear,

          * there really should be more of a description here...

          * </p>

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

-         * @return the value of the '<em>Max New Strings</em>' attribute.

-         * @see #setMaxNewStrings(int)

-         * @see hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialinterpretationPackage#getPartialInterpretation_MaxNewStrings()

-         * @model required="true"

+         * @return the value of the '<em>Min New Elements</em>' attribute.

+         * @see #setMinNewElements(int)

+         * @see hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialinterpretationPackage#getPartialInterpretation_MinNewElements()

+         * @model default="0" required="true"

          * @generated

          */

-        int getMaxNewStrings();

+        int getMinNewElements();

 

         /**

-         * Sets the value of the '{@link hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialInterpretation#getMaxNewStrings <em>Max New Strings</em>}' attribute.

+         * Sets the value of the '{@link hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialInterpretation#getMinNewElements <em>Min New Elements</em>}' attribute.

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

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

-         * @param value the new value of the '<em>Max New Strings</em>' attribute.

-         * @see #getMaxNewStrings()

-         * @generated

-         */

-        void setMaxNewStrings(int value);

-

-        /**

-         * Returns the value of the '<em><b>New Strings</b></em>' containment reference list.

-         * The list contents are of type {@link hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.StringElement}.

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

-         * <p>

-         * If the meaning of the '<em>New Strings</em>' containment reference list isn't clear,

-         * there really should be more of a description here...

-         * </p>

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

-         * @return the value of the '<em>New Strings</em>' containment reference list.

-         * @see hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialinterpretationPackage#getPartialInterpretation_NewStrings()

-         * @model containment="true"

+         * @param value the new value of the '<em>Min New Elements</em>' attribute.

+         * @see #getMinNewElements()

          * @generated

          */

-        EList<StringElement> getNewStrings();

+        void setMinNewElements(int value);

 

         /**

-         * Returns the value of the '<em><b>New Reals</b></em>' containment reference list.

-         * The list contents are of type {@link hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.RealElement}.

+         * Returns the value of the '<em><b>Max New Elements</b></em>' attribute.

+         * The default value is <code>"-1"</code>.

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

          * <p>

-         * If the meaning of the '<em>New Reals</em>' containment reference list isn't clear,

+         * If the meaning of the '<em>Max New Elements</em>' attribute isn't clear,

          * there really should be more of a description here...

          * </p>

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

-         * @return the value of the '<em>New Reals</em>' containment reference list.

-         * @see hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialinterpretationPackage#getPartialInterpretation_NewReals()

-         * @model containment="true"

+         * @return the value of the '<em>Max New Elements</em>' attribute.

+         * @see #setMaxNewElements(int)

+         * @see hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialinterpretationPackage#getPartialInterpretation_MaxNewElements()

+         * @model default="-1" required="true"

          * @generated

          */

-        EList<RealElement> getNewReals();

+        int getMaxNewElements();

 

         /**

-         * Returns the value of the '<em><b>New Integers</b></em>' containment reference list.

-         * The list contents are of type {@link hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.IntegerElement}.

+         * Sets the value of the '{@link hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialInterpretation#getMaxNewElements <em>Max New Elements</em>}' attribute.

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

-         * <p>

-         * If the meaning of the '<em>New Integers</em>' containment reference list isn't clear,

-         * there really should be more of a description here...

-         * </p>

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

-         * @return the value of the '<em>New Integers</em>' containment reference list.

-         * @see hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialinterpretationPackage#getPartialInterpretation_NewIntegers()

-         * @model containment="true"

+         * @param value the new value of the '<em>Max New Elements</em>' attribute.

+         * @see #getMaxNewElements()

          * @generated

          */

-        EList<IntegerElement> getNewIntegers();

+        void setMaxNewElements(int value);

 

 } // PartialInterpretation