24 files changed, 423 insertions, 21 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 098cc15b..9d0c3fea 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
@@ -30,6 +30,7 @@ import org.eclipse.emf.ecore.EObject;
 *   <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#getMinNewElementsHeuristic <em>Min New Elements Heuristic</em>}</li>
 * </ul>
 *
 * @see hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialinterpretationPackage#getPartialInterpretation()
@@ -255,4 +256,27 @@ public interface PartialInterpretation extends EObject {
         */
        void setMaxNewElements(int value);
+        /**
+         * Returns the value of the '<em><b>Min New Elements Heuristic</b></em>' attribute.
+         * The default value is <code>"0"</code>.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the value of the '<em>Min New Elements Heuristic</em>' attribute.
+         * @see #setMinNewElementsHeuristic(int)
+         * @see hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialinterpretationPackage#getPartialInterpretation_MinNewElementsHeuristic()
+         * @model default="0" required="true"
+         * @generated
+         */
+        int getMinNewElementsHeuristic();
+        /**
+         * Sets the value of the '{@link hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialInterpretation#getMinNewElementsHeuristic <em>Min New Elements Heuristic</em>}' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @param value the new value of the '<em>Min New Elements Heuristic</em>' attribute.
+         * @see #getMinNewElementsHeuristic()
+         * @generated
+         */
+        void setMinNewElementsHeuristic(int value);
 } // PartialInterpretation
diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partialinterpretation/PartialinterpretationPackage.java b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partialinterpretation/PartialinterpretationPackage.java
index 4f34b9b7..f462ebe4 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partialinterpretation/PartialinterpretationPackage.java
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partialinterpretation/PartialinterpretationPackage.java
@@ -167,13 +167,22 @@ public interface PartialinterpretationPackage extends EPackage {
        int PARTIAL_INTERPRETATION__MAX_NEW_ELEMENTS = 10;
        /**
+         * The feature id for the '<em><b>Min New Elements Heuristic</b></em>' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int PARTIAL_INTERPRETATION__MIN_NEW_ELEMENTS_HEURISTIC = 11;
+        /**
         * The number of structural features of the '<em>Partial Interpretation</em>' class.
         * <!-- begin-user-doc -->
         * <!-- end-user-doc -->
         * @generated
         * @ordered
         */
-        int PARTIAL_INTERPRETATION_FEATURE_COUNT = 11;
+        int PARTIAL_INTERPRETATION_FEATURE_COUNT = 12;
        /**
         * The number of operations of the '<em>Partial Interpretation</em>' class.
@@ -913,13 +922,22 @@ public interface PartialinterpretationPackage extends EPackage {
        int SCOPE__TARGET_TYPE_INTERPRETATION = 2;
        /**
+         * The feature id for the '<em><b>Min New Elements Heuristic</b></em>' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int SCOPE__MIN_NEW_ELEMENTS_HEURISTIC = 3;
+        /**
         * The number of structural features of the '<em>Scope</em>' class.
         * <!-- begin-user-doc -->
         * <!-- end-user-doc -->
         * @generated
         * @ordered
         */
-        int SCOPE_FEATURE_COUNT = 3;
+        int SCOPE_FEATURE_COUNT = 4;
        /**
         * The number of operations of the '<em>Scope</em>' class.
@@ -1358,6 +1376,17 @@ public interface PartialinterpretationPackage extends EPackage {
        EAttribute getPartialInterpretation_MaxNewElements();
        /**
+         * Returns the meta object for the attribute '{@link hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialInterpretation#getMinNewElementsHeuristic <em>Min New Elements Heuristic</em>}'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the meta object for the attribute '<em>Min New Elements Heuristic</em>'.
+         * @see hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialInterpretation#getMinNewElementsHeuristic()
+         * @see #getPartialInterpretation()
+         * @generated
+         */
+        EAttribute getPartialInterpretation_MinNewElementsHeuristic();
+        /**
         * Returns the meta object for class '{@link hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialConstantInterpretation <em>Partial Constant Interpretation</em>}'.
         * <!-- begin-user-doc -->
         * <!-- end-user-doc -->
@@ -1750,6 +1779,17 @@ public interface PartialinterpretationPackage extends EPackage {
        EReference getScope_TargetTypeInterpretation();
        /**
+         * Returns the meta object for the attribute '{@link hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.Scope#getMinNewElementsHeuristic <em>Min New Elements Heuristic</em>}'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the meta object for the attribute '<em>Min New Elements Heuristic</em>'.
+         * @see hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.Scope#getMinNewElementsHeuristic()
+         * @see #getScope()
+         * @generated
+         */
+        EAttribute getScope_MinNewElementsHeuristic();
+        /**
         * Returns the meta object for class '{@link hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialPrimitiveInterpretation <em>Partial Primitive Interpretation</em>}'.
         * <!-- begin-user-doc -->
         * <!-- end-user-doc -->
@@ -1953,6 +1993,14 @@ public interface PartialinterpretationPackage extends EPackage {
                EAttribute PARTIAL_INTERPRETATION__MAX_NEW_ELEMENTS = eINSTANCE.getPartialInterpretation_MaxNewElements();
                /**
+                 * The meta object literal for the '<em><b>Min New Elements Heuristic</b></em>' attribute feature.
+                 * <!-- begin-user-doc -->
+                 * <!-- end-user-doc -->
+                 * @generated
+                 */
+                EAttribute PARTIAL_INTERPRETATION__MIN_NEW_ELEMENTS_HEURISTIC = eINSTANCE.getPartialInterpretation_MinNewElementsHeuristic();
+                /**
                 * The meta object literal for the '{@link hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.impl.PartialConstantInterpretationImpl <em>Partial Constant Interpretation</em>}' class.
                 * <!-- begin-user-doc -->
                 * <!-- end-user-doc -->
@@ -2279,6 +2327,14 @@ public interface PartialinterpretationPackage extends EPackage {
                EReference SCOPE__TARGET_TYPE_INTERPRETATION = eINSTANCE.getScope_TargetTypeInterpretation();
                /**
+                 * The meta object literal for the '<em><b>Min New Elements Heuristic</b></em>' attribute feature.
+                 * <!-- begin-user-doc -->
+                 * <!-- end-user-doc -->
+                 * @generated
+                 */
+                EAttribute SCOPE__MIN_NEW_ELEMENTS_HEURISTIC = eINSTANCE.getScope_MinNewElementsHeuristic();
+                /**
                 * The meta object literal for the '{@link hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.impl.PartialPrimitiveInterpretationImpl <em>Partial Primitive Interpretation</em>}' class.
                 * <!-- begin-user-doc -->
                 * <!-- end-user-doc -->
diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partialinterpretation/Scope.java b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partialinterpretation/Scope.java
index 155b9f00..a0b58615 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partialinterpretation/Scope.java
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partialinterpretation/Scope.java
@@ -16,6 +16,7 @@ import org.eclipse.emf.ecore.EObject;
 *   <li>{@link hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.Scope#getMinNewElements <em>Min New Elements</em>}</li>
 *   <li>{@link hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.Scope#getMaxNewElements <em>Max New Elements</em>}</li>
 *   <li>{@link hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.Scope#getTargetTypeInterpretation <em>Target Type Interpretation</em>}</li>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.Scope#getMinNewElementsHeuristic <em>Min New Elements Heuristic</em>}</li>
 * </ul>
 *
 * @see hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialinterpretationPackage#getScope()
@@ -105,4 +106,27 @@ public interface Scope extends EObject {
         */
        void setTargetTypeInterpretation(PartialTypeInterpratation value);
+        /**
+         * Returns the value of the '<em><b>Min New Elements Heuristic</b></em>' attribute.
+         * The default value is <code>"0"</code>.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the value of the '<em>Min New Elements Heuristic</em>' attribute.
+         * @see #setMinNewElementsHeuristic(int)
+         * @see hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialinterpretationPackage#getScope_MinNewElementsHeuristic()
+         * @model default="0" required="true"
+         * @generated
+         */
+        int getMinNewElementsHeuristic();
+        /**
+         * Sets the value of the '{@link hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.Scope#getMinNewElementsHeuristic <em>Min New Elements Heuristic</em>}' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @param value the new value of the '<em>Min New Elements Heuristic</em>' attribute.
+         * @see #getMinNewElementsHeuristic()
+         * @generated
+         */
+        void setMinNewElementsHeuristic(int value);
 } // Scope
diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partialinterpretation/impl/BinaryElementRelationLinkImpl.java b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partialinterpretation/impl/BinaryElementRelationLinkImpl.java
index f5efe02a..ca33dd65 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partialinterpretation/impl/BinaryElementRelationLinkImpl.java
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partialinterpretation/impl/BinaryElementRelationLinkImpl.java
@@ -73,6 +73,7 @@ public class BinaryElementRelationLinkImpl extends RelationLinkImpl implements B
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public DefinedElement getParam1() {
                if (param1 != null && param1.eIsProxy()) {
                        InternalEObject oldParam1 = (InternalEObject)param1;
@@ -99,6 +100,7 @@ public class BinaryElementRelationLinkImpl extends RelationLinkImpl implements B
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public void setParam1(DefinedElement newParam1) {
                DefinedElement oldParam1 = param1;
                param1 = newParam1;
@@ -111,6 +113,7 @@ public class BinaryElementRelationLinkImpl extends RelationLinkImpl implements B
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public DefinedElement getParam2() {
                if (param2 != null && param2.eIsProxy()) {
                        InternalEObject oldParam2 = (InternalEObject)param2;
@@ -137,6 +140,7 @@ public class BinaryElementRelationLinkImpl extends RelationLinkImpl implements B
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public void setParam2(DefinedElement newParam2) {
                DefinedElement oldParam2 = param2;
                param2 = newParam2;
diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partialinterpretation/impl/BooleanElementImpl.java b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partialinterpretation/impl/BooleanElementImpl.java
index e906e07d..5f12d9e4 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partialinterpretation/impl/BooleanElementImpl.java
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partialinterpretation/impl/BooleanElementImpl.java
@@ -69,6 +69,7 @@ public class BooleanElementImpl extends PrimitiveElementImpl implements BooleanE
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public boolean isValue() {
                return value;
        }
@@ -78,6 +79,7 @@ public class BooleanElementImpl extends PrimitiveElementImpl implements BooleanE
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public void setValue(boolean newValue) {
                boolean oldValue = value;
                value = newValue;
@@ -152,7 +154,7 @@ public class BooleanElementImpl extends PrimitiveElementImpl implements BooleanE
        public String toString() {
                if (eIsProxy()) return super.toString();
-                StringBuffer result = new StringBuffer(super.toString());
+                StringBuilder result = new StringBuilder(super.toString());
                result.append(" (value: ");
                result.append(value);
                result.append(')');
diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partialinterpretation/impl/IntegerElementImpl.java b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partialinterpretation/impl/IntegerElementImpl.java
index ef1a4b96..c8fbe1dd 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partialinterpretation/impl/IntegerElementImpl.java
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partialinterpretation/impl/IntegerElementImpl.java
@@ -69,6 +69,7 @@ public class IntegerElementImpl extends PrimitiveElementImpl implements IntegerE
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public int getValue() {
                return value;
        }
@@ -78,6 +79,7 @@ public class IntegerElementImpl extends PrimitiveElementImpl implements IntegerE
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public void setValue(int newValue) {
                int oldValue = value;
                value = newValue;
@@ -152,7 +154,7 @@ public class IntegerElementImpl extends PrimitiveElementImpl implements IntegerE
        public String toString() {
                if (eIsProxy()) return super.toString();
-                StringBuffer result = new StringBuffer(super.toString());
+                StringBuilder result = new StringBuilder(super.toString());
                result.append(" (value: ");
                result.append(value);
                result.append(')');
diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partialinterpretation/impl/NaryRelationLinkElementImpl.java b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partialinterpretation/impl/NaryRelationLinkElementImpl.java
index 749a03c5..c319a3f4 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partialinterpretation/impl/NaryRelationLinkElementImpl.java
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partialinterpretation/impl/NaryRelationLinkElementImpl.java
@@ -83,6 +83,7 @@ public class NaryRelationLinkElementImpl extends MinimalEObjectImpl.Container im
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public int getIndex() {
                return index;
        }
@@ -92,6 +93,7 @@ public class NaryRelationLinkElementImpl extends MinimalEObjectImpl.Container im
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public void setIndex(int newIndex) {
                int oldIndex = index;
                index = newIndex;
@@ -104,6 +106,7 @@ public class NaryRelationLinkElementImpl extends MinimalEObjectImpl.Container im
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public DefinedElement getParam() {
                if (param != null && param.eIsProxy()) {
                        InternalEObject oldParam = (InternalEObject)param;
@@ -130,6 +133,7 @@ public class NaryRelationLinkElementImpl extends MinimalEObjectImpl.Container im
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public void setParam(DefinedElement newParam) {
                DefinedElement oldParam = param;
                param = newParam;
@@ -215,7 +219,7 @@ public class NaryRelationLinkElementImpl extends MinimalEObjectImpl.Container im
        public String toString() {
                if (eIsProxy()) return super.toString();
-                StringBuffer result = new StringBuffer(super.toString());
+                StringBuilder result = new StringBuilder(super.toString());
                result.append(" (index: ");
                result.append(index);
                result.append(')');
diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partialinterpretation/impl/NaryRelationLinkImpl.java b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partialinterpretation/impl/NaryRelationLinkImpl.java
index f387ee06..9f7628cf 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partialinterpretation/impl/NaryRelationLinkImpl.java
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partialinterpretation/impl/NaryRelationLinkImpl.java
@@ -66,6 +66,7 @@ public class NaryRelationLinkImpl extends RelationLinkImpl implements NaryRelati
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public EList<NaryRelationLinkElement> getElements() {
                if (elements == null) {
                        elements = new EObjectContainmentEList<NaryRelationLinkElement>(NaryRelationLinkElement.class, this, PartialinterpretationPackage.NARY_RELATION_LINK__ELEMENTS);
diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partialinterpretation/impl/PartialComplexTypeInterpretationImpl.java b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partialinterpretation/impl/PartialComplexTypeInterpretationImpl.java
index 07ee282d..c00b4278 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partialinterpretation/impl/PartialComplexTypeInterpretationImpl.java
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partialinterpretation/impl/PartialComplexTypeInterpretationImpl.java
@@ -79,6 +79,7 @@ public class PartialComplexTypeInterpretationImpl extends PartialTypeInterpratat
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public EList<PartialComplexTypeInterpretation> getSupertypeInterpretation() {
                if (supertypeInterpretation == null) {
                        supertypeInterpretation = new EObjectResolvingEList<PartialComplexTypeInterpretation>(PartialComplexTypeInterpretation.class, this, PartialinterpretationPackage.PARTIAL_COMPLEX_TYPE_INTERPRETATION__SUPERTYPE_INTERPRETATION);
@@ -91,6 +92,7 @@ public class PartialComplexTypeInterpretationImpl extends PartialTypeInterpratat
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public TypeDeclaration getInterpretationOf() {
                if (interpretationOf != null && interpretationOf.eIsProxy()) {
                        InternalEObject oldInterpretationOf = (InternalEObject)interpretationOf;
@@ -117,6 +119,7 @@ public class PartialComplexTypeInterpretationImpl extends PartialTypeInterpratat
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public void setInterpretationOf(TypeDeclaration newInterpretationOf) {
                TypeDeclaration oldInterpretationOf = interpretationOf;
                interpretationOf = newInterpretationOf;
diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partialinterpretation/impl/PartialConstantInterpretationImpl.java b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partialinterpretation/impl/PartialConstantInterpretationImpl.java
index 81b2ce8d..6d51f0db 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partialinterpretation/impl/PartialConstantInterpretationImpl.java
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partialinterpretation/impl/PartialConstantInterpretationImpl.java
@@ -63,6 +63,7 @@ public class PartialConstantInterpretationImpl extends MinimalEObjectImpl.Contai
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public ConstantDeclaration getInterpretationOf() {
                if (interpretationOf != null && interpretationOf.eIsProxy()) {
                        InternalEObject oldInterpretationOf = (InternalEObject)interpretationOf;
@@ -89,6 +90,7 @@ public class PartialConstantInterpretationImpl extends MinimalEObjectImpl.Contai
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public void setInterpretationOf(ConstantDeclaration newInterpretationOf) {
                ConstantDeclaration oldInterpretationOf = interpretationOf;
                interpretationOf = newInterpretationOf;
diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partialinterpretation/impl/PartialFunctionInterpretationImpl.java b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partialinterpretation/impl/PartialFunctionInterpretationImpl.java
index 2d361e8e..855c4abc 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partialinterpretation/impl/PartialFunctionInterpretationImpl.java
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partialinterpretation/impl/PartialFunctionInterpretationImpl.java
@@ -63,6 +63,7 @@ public class PartialFunctionInterpretationImpl extends MinimalEObjectImpl.Contai
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public FunctionDeclaration getInterpretationOf() {
                if (interpretationOf != null && interpretationOf.eIsProxy()) {
                        InternalEObject oldInterpretationOf = (InternalEObject)interpretationOf;
@@ -89,6 +90,7 @@ public class PartialFunctionInterpretationImpl extends MinimalEObjectImpl.Contai
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public void setInterpretationOf(FunctionDeclaration newInterpretationOf) {
                FunctionDeclaration oldInterpretationOf = interpretationOf;
                interpretationOf = newInterpretationOf;
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 bce3e2e0..9afdd8d2 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
@@ -47,6 +47,7 @@ import org.eclipse.emf.ecore.util.InternalEList;
 *   <li>{@link hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.impl.PartialInterpretationImpl#getScopes <em>Scopes</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#getMinNewElementsHeuristic <em>Min New Elements Heuristic</em>}</li>
 * </ul>
 *
 * @generated
@@ -183,6 +184,26 @@ public class PartialInterpretationImpl extends MinimalEObjectImpl.Container impl
        protected int maxNewElements = MAX_NEW_ELEMENTS_EDEFAULT;
        /**
+         * The default value of the '{@link #getMinNewElementsHeuristic() <em>Min New Elements Heuristic</em>}' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getMinNewElementsHeuristic()
+         * @generated
+         * @ordered
+         */
+        protected static final int MIN_NEW_ELEMENTS_HEURISTIC_EDEFAULT = 0;
+        /**
+         * The cached value of the '{@link #getMinNewElementsHeuristic() <em>Min New Elements Heuristic</em>}' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getMinNewElementsHeuristic()
+         * @generated
+         * @ordered
+         */
+        protected int minNewElementsHeuristic = MIN_NEW_ELEMENTS_HEURISTIC_EDEFAULT;
+        /**
         * <!-- begin-user-doc -->
         * <!-- end-user-doc -->
         * @generated
@@ -206,6 +227,7 @@ public class PartialInterpretationImpl extends MinimalEObjectImpl.Container impl
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public LogicProblem getProblem() {
                if (problem != null && problem.eIsProxy()) {
                        InternalEObject oldProblem = (InternalEObject)problem;
@@ -232,6 +254,7 @@ public class PartialInterpretationImpl extends MinimalEObjectImpl.Container impl
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public void setProblem(LogicProblem newProblem) {
                LogicProblem oldProblem = problem;
                problem = newProblem;
@@ -244,6 +267,7 @@ public class PartialInterpretationImpl extends MinimalEObjectImpl.Container impl
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public EList<PartialConstantInterpretation> getPartialconstantinterpretation() {
                if (partialconstantinterpretation == null) {
                        partialconstantinterpretation = new EObjectContainmentEList<PartialConstantInterpretation>(PartialConstantInterpretation.class, this, PartialinterpretationPackage.PARTIAL_INTERPRETATION__PARTIALCONSTANTINTERPRETATION);
@@ -256,6 +280,7 @@ public class PartialInterpretationImpl extends MinimalEObjectImpl.Container impl
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public EList<PartialRelationInterpretation> getPartialrelationinterpretation() {
                if (partialrelationinterpretation == null) {
                        partialrelationinterpretation = new EObjectContainmentEList<PartialRelationInterpretation>(PartialRelationInterpretation.class, this, PartialinterpretationPackage.PARTIAL_INTERPRETATION__PARTIALRELATIONINTERPRETATION);
@@ -268,6 +293,7 @@ public class PartialInterpretationImpl extends MinimalEObjectImpl.Container impl
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public EList<PartialFunctionInterpretation> getPartialfunctioninterpretation() {
                if (partialfunctioninterpretation == null) {
                        partialfunctioninterpretation = new EObjectContainmentEList<PartialFunctionInterpretation>(PartialFunctionInterpretation.class, this, PartialinterpretationPackage.PARTIAL_INTERPRETATION__PARTIALFUNCTIONINTERPRETATION);
@@ -280,6 +306,7 @@ public class PartialInterpretationImpl extends MinimalEObjectImpl.Container impl
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public EList<DefinedElement> getNewElements() {
                if (newElements == null) {
                        newElements = new EObjectContainmentEList<DefinedElement>(DefinedElement.class, this, PartialinterpretationPackage.PARTIAL_INTERPRETATION__NEW_ELEMENTS);
@@ -292,6 +319,7 @@ public class PartialInterpretationImpl extends MinimalEObjectImpl.Container impl
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public EList<PartialTypeInterpratation> getPartialtypeinterpratation() {
                if (partialtypeinterpratation == null) {
                        partialtypeinterpratation = new EObjectContainmentEList<PartialTypeInterpratation>(PartialTypeInterpratation.class, this, PartialinterpretationPackage.PARTIAL_INTERPRETATION__PARTIALTYPEINTERPRATATION);
@@ -304,6 +332,7 @@ public class PartialInterpretationImpl extends MinimalEObjectImpl.Container impl
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public EList<DefinedElement> getOpenWorldElements() {
                if (openWorldElements == null) {
                        openWorldElements = new EObjectContainmentEList<DefinedElement>(DefinedElement.class, this, PartialinterpretationPackage.PARTIAL_INTERPRETATION__OPEN_WORLD_ELEMENTS);
@@ -316,6 +345,7 @@ public class PartialInterpretationImpl extends MinimalEObjectImpl.Container impl
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public LogicProblem getProblemConainer() {
                return problemConainer;
        }
@@ -340,6 +370,7 @@ public class PartialInterpretationImpl extends MinimalEObjectImpl.Container impl
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public void setProblemConainer(LogicProblem newProblemConainer) {
                if (newProblemConainer != problemConainer) {
                        NotificationChain msgs = null;
@@ -359,6 +390,7 @@ public class PartialInterpretationImpl extends MinimalEObjectImpl.Container impl
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public EList<Scope> getScopes() {
                if (scopes == null) {
                        scopes = new EObjectContainmentEList<Scope>(Scope.class, this, PartialinterpretationPackage.PARTIAL_INTERPRETATION__SCOPES);
@@ -371,6 +403,7 @@ public class PartialInterpretationImpl extends MinimalEObjectImpl.Container impl
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public int getMinNewElements() {
                return minNewElements;
        }
@@ -380,6 +413,7 @@ public class PartialInterpretationImpl extends MinimalEObjectImpl.Container impl
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public void setMinNewElements(int newMinNewElements) {
                int oldMinNewElements = minNewElements;
                minNewElements = newMinNewElements;
@@ -392,6 +426,7 @@ public class PartialInterpretationImpl extends MinimalEObjectImpl.Container impl
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public int getMaxNewElements() {
                return maxNewElements;
        }
@@ -401,6 +436,7 @@ public class PartialInterpretationImpl extends MinimalEObjectImpl.Container impl
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public void setMaxNewElements(int newMaxNewElements) {
                int oldMaxNewElements = maxNewElements;
                maxNewElements = newMaxNewElements;
@@ -414,6 +450,29 @@ public class PartialInterpretationImpl extends MinimalEObjectImpl.Container impl
         * @generated
         */
        @Override
+        public int getMinNewElementsHeuristic() {
+                return minNewElementsHeuristic;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void setMinNewElementsHeuristic(int newMinNewElementsHeuristic) {
+                int oldMinNewElementsHeuristic = minNewElementsHeuristic;
+                minNewElementsHeuristic = newMinNewElementsHeuristic;
+                if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET, PartialinterpretationPackage.PARTIAL_INTERPRETATION__MIN_NEW_ELEMENTS_HEURISTIC, oldMinNewElementsHeuristic, minNewElementsHeuristic));
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
        public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
                switch (featureID) {
                        case PartialinterpretationPackage.PARTIAL_INTERPRETATION__PARTIALCONSTANTINTERPRETATION:
@@ -467,6 +526,8 @@ public class PartialInterpretationImpl extends MinimalEObjectImpl.Container impl
                                return getMinNewElements();
                        case PartialinterpretationPackage.PARTIAL_INTERPRETATION__MAX_NEW_ELEMENTS:
                                return getMaxNewElements();
+                        case PartialinterpretationPackage.PARTIAL_INTERPRETATION__MIN_NEW_ELEMENTS_HEURISTIC:
+                                return getMinNewElementsHeuristic();
                }
                return super.eGet(featureID, resolve, coreType);
        }
@@ -520,6 +581,9 @@ public class PartialInterpretationImpl extends MinimalEObjectImpl.Container impl
                        case PartialinterpretationPackage.PARTIAL_INTERPRETATION__MAX_NEW_ELEMENTS:
                                setMaxNewElements((Integer)newValue);
                                return;
+                        case PartialinterpretationPackage.PARTIAL_INTERPRETATION__MIN_NEW_ELEMENTS_HEURISTIC:
+                                setMinNewElementsHeuristic((Integer)newValue);
+                                return;
                }
                super.eSet(featureID, newValue);
        }
@@ -565,6 +629,9 @@ public class PartialInterpretationImpl extends MinimalEObjectImpl.Container impl
                        case PartialinterpretationPackage.PARTIAL_INTERPRETATION__MAX_NEW_ELEMENTS:
                                setMaxNewElements(MAX_NEW_ELEMENTS_EDEFAULT);
                                return;
+                        case PartialinterpretationPackage.PARTIAL_INTERPRETATION__MIN_NEW_ELEMENTS_HEURISTIC:
+                                setMinNewElementsHeuristic(MIN_NEW_ELEMENTS_HEURISTIC_EDEFAULT);
+                                return;
                }
                super.eUnset(featureID);
        }
@@ -599,6 +666,8 @@ 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__MIN_NEW_ELEMENTS_HEURISTIC:
+                                return minNewElementsHeuristic != MIN_NEW_ELEMENTS_HEURISTIC_EDEFAULT;
                }
                return super.eIsSet(featureID);
        }
@@ -612,11 +681,13 @@ public class PartialInterpretationImpl extends MinimalEObjectImpl.Container impl
        public String toString() {
                if (eIsProxy()) return super.toString();
-                StringBuffer result = new StringBuffer(super.toString());
+                StringBuilder result = new StringBuilder(super.toString());
                result.append(" (minNewElements: ");
                result.append(minNewElements);
                result.append(", maxNewElements: ");
                result.append(maxNewElements);
+                result.append(", minNewElementsHeuristic: ");
+                result.append(minNewElementsHeuristic);
                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/PartialRelationInterpretationImpl.java b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partialinterpretation/impl/PartialRelationInterpretationImpl.java
index 71aef9af..7ad06504 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partialinterpretation/impl/PartialRelationInterpretationImpl.java
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partialinterpretation/impl/PartialRelationInterpretationImpl.java
@@ -106,6 +106,7 @@ public class PartialRelationInterpretationImpl extends MinimalEObjectImpl.Contai
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public RelationDeclaration getInterpretationOf() {
                if (interpretationOf != null && interpretationOf.eIsProxy()) {
                        InternalEObject oldInterpretationOf = (InternalEObject)interpretationOf;
@@ -132,6 +133,7 @@ public class PartialRelationInterpretationImpl extends MinimalEObjectImpl.Contai
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public void setInterpretationOf(RelationDeclaration newInterpretationOf) {
                RelationDeclaration oldInterpretationOf = interpretationOf;
                interpretationOf = newInterpretationOf;
@@ -144,6 +146,7 @@ public class PartialRelationInterpretationImpl extends MinimalEObjectImpl.Contai
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public EList<RelationLink> getRelationlinks() {
                if (relationlinks == null) {
                        relationlinks = new EObjectContainmentEList<RelationLink>(RelationLink.class, this, PartialinterpretationPackage.PARTIAL_RELATION_INTERPRETATION__RELATIONLINKS);
@@ -156,6 +159,7 @@ public class PartialRelationInterpretationImpl extends MinimalEObjectImpl.Contai
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public TypeReference getParam1() {
                if (param1 != null && param1.eIsProxy()) {
                        InternalEObject oldParam1 = (InternalEObject)param1;
@@ -182,6 +186,7 @@ public class PartialRelationInterpretationImpl extends MinimalEObjectImpl.Contai
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public void setParam1(TypeReference newParam1) {
                TypeReference oldParam1 = param1;
                param1 = newParam1;
@@ -194,6 +199,7 @@ public class PartialRelationInterpretationImpl extends MinimalEObjectImpl.Contai
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public TypeReference getParam2() {
                if (param2 != null && param2.eIsProxy()) {
                        InternalEObject oldParam2 = (InternalEObject)param2;
@@ -220,6 +226,7 @@ public class PartialRelationInterpretationImpl extends MinimalEObjectImpl.Contai
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public void setParam2(TypeReference newParam2) {
                TypeReference oldParam2 = param2;
                param2 = newParam2;
diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partialinterpretation/impl/PartialTypeInterpratationImpl.java b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partialinterpretation/impl/PartialTypeInterpratationImpl.java
index da9b1472..51eabd2c 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partialinterpretation/impl/PartialTypeInterpratationImpl.java
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partialinterpretation/impl/PartialTypeInterpratationImpl.java
@@ -76,6 +76,7 @@ public abstract class PartialTypeInterpratationImpl extends MinimalEObjectImpl.C
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public EList<DefinedElement> getElements() {
                if (elements == null) {
                        elements = new EObjectResolvingEList<DefinedElement>(DefinedElement.class, this, PartialinterpretationPackage.PARTIAL_TYPE_INTERPRATATION__ELEMENTS);
@@ -88,6 +89,7 @@ public abstract class PartialTypeInterpratationImpl extends MinimalEObjectImpl.C
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public EList<Scope> getScopes() {
                if (scopes == null) {
                        scopes = new EObjectWithInverseResolvingEList<Scope>(Scope.class, this, PartialinterpretationPackage.PARTIAL_TYPE_INTERPRATATION__SCOPES, PartialinterpretationPackage.SCOPE__TARGET_TYPE_INTERPRETATION);
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 af1db8a1..06ca4e37 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
@@ -84,6 +84,7 @@ public class PartialinterpretationFactoryImpl extends EFactoryImpl implements Pa
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public PartialInterpretation createPartialInterpretation() {
                PartialInterpretationImpl partialInterpretation = new PartialInterpretationImpl();
                return partialInterpretation;
@@ -94,6 +95,7 @@ public class PartialinterpretationFactoryImpl extends EFactoryImpl implements Pa
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public PartialConstantInterpretation createPartialConstantInterpretation() {
                PartialConstantInterpretationImpl partialConstantInterpretation = new PartialConstantInterpretationImpl();
                return partialConstantInterpretation;
@@ -104,6 +106,7 @@ public class PartialinterpretationFactoryImpl extends EFactoryImpl implements Pa
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public PartialRelationInterpretation createPartialRelationInterpretation() {
                PartialRelationInterpretationImpl partialRelationInterpretation = new PartialRelationInterpretationImpl();
                return partialRelationInterpretation;
@@ -114,6 +117,7 @@ public class PartialinterpretationFactoryImpl extends EFactoryImpl implements Pa
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public PartialFunctionInterpretation createPartialFunctionInterpretation() {
                PartialFunctionInterpretationImpl partialFunctionInterpretation = new PartialFunctionInterpretationImpl();
                return partialFunctionInterpretation;
@@ -124,6 +128,7 @@ public class PartialinterpretationFactoryImpl extends EFactoryImpl implements Pa
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public UnaryElementRelationLink createUnaryElementRelationLink() {
                UnaryElementRelationLinkImpl unaryElementRelationLink = new UnaryElementRelationLinkImpl();
                return unaryElementRelationLink;
@@ -134,6 +139,7 @@ public class PartialinterpretationFactoryImpl extends EFactoryImpl implements Pa
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public BinaryElementRelationLink createBinaryElementRelationLink() {
                BinaryElementRelationLinkImpl binaryElementRelationLink = new BinaryElementRelationLinkImpl();
                return binaryElementRelationLink;
@@ -144,6 +150,7 @@ public class PartialinterpretationFactoryImpl extends EFactoryImpl implements Pa
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public NaryRelationLink createNaryRelationLink() {
                NaryRelationLinkImpl naryRelationLink = new NaryRelationLinkImpl();
                return naryRelationLink;
@@ -154,6 +161,7 @@ public class PartialinterpretationFactoryImpl extends EFactoryImpl implements Pa
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public NaryRelationLinkElement createNaryRelationLinkElement() {
                NaryRelationLinkElementImpl naryRelationLinkElement = new NaryRelationLinkElementImpl();
                return naryRelationLinkElement;
@@ -164,6 +172,7 @@ public class PartialinterpretationFactoryImpl extends EFactoryImpl implements Pa
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public BooleanElement createBooleanElement() {
                BooleanElementImpl booleanElement = new BooleanElementImpl();
                return booleanElement;
@@ -174,6 +183,7 @@ public class PartialinterpretationFactoryImpl extends EFactoryImpl implements Pa
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public IntegerElement createIntegerElement() {
                IntegerElementImpl integerElement = new IntegerElementImpl();
                return integerElement;
@@ -184,6 +194,7 @@ public class PartialinterpretationFactoryImpl extends EFactoryImpl implements Pa
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public RealElement createRealElement() {
                RealElementImpl realElement = new RealElementImpl();
                return realElement;
@@ -194,6 +205,7 @@ public class PartialinterpretationFactoryImpl extends EFactoryImpl implements Pa
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public StringElement createStringElement() {
                StringElementImpl stringElement = new StringElementImpl();
                return stringElement;
@@ -204,6 +216,7 @@ public class PartialinterpretationFactoryImpl extends EFactoryImpl implements Pa
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public Scope createScope() {
                ScopeImpl scope = new ScopeImpl();
                return scope;
@@ -214,6 +227,7 @@ public class PartialinterpretationFactoryImpl extends EFactoryImpl implements Pa
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public PartialBooleanInterpretation createPartialBooleanInterpretation() {
                PartialBooleanInterpretationImpl partialBooleanInterpretation = new PartialBooleanInterpretationImpl();
                return partialBooleanInterpretation;
@@ -224,6 +238,7 @@ public class PartialinterpretationFactoryImpl extends EFactoryImpl implements Pa
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public PartialIntegerInterpretation createPartialIntegerInterpretation() {
                PartialIntegerInterpretationImpl partialIntegerInterpretation = new PartialIntegerInterpretationImpl();
                return partialIntegerInterpretation;
@@ -234,6 +249,7 @@ public class PartialinterpretationFactoryImpl extends EFactoryImpl implements Pa
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public PartialRealInterpretation createPartialRealInterpretation() {
                PartialRealInterpretationImpl partialRealInterpretation = new PartialRealInterpretationImpl();
                return partialRealInterpretation;
@@ -244,6 +260,7 @@ public class PartialinterpretationFactoryImpl extends EFactoryImpl implements Pa
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public PartialStringInterpretation createPartialStringInterpretation() {
                PartialStringInterpretationImpl partialStringInterpretation = new PartialStringInterpretationImpl();
                return partialStringInterpretation;
@@ -254,6 +271,7 @@ public class PartialinterpretationFactoryImpl extends EFactoryImpl implements Pa
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public PartialComplexTypeInterpretation createPartialComplexTypeInterpretation() {
                PartialComplexTypeInterpretationImpl partialComplexTypeInterpretation = new PartialComplexTypeInterpretationImpl();
                return partialComplexTypeInterpretation;
@@ -264,6 +282,7 @@ public class PartialinterpretationFactoryImpl extends EFactoryImpl implements Pa
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        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 a21dc306..1ea3a11d 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
@@ -227,7 +227,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
        /**
         * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
-         * 
+         *
         * <p>This method is used to initialize {@link PartialinterpretationPackage#eINSTANCE} when that field is accessed.
         * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
         * <!-- begin-user-doc -->
@@ -241,7 +241,8 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
                if (isInited) return (PartialinterpretationPackage)EPackage.Registry.INSTANCE.getEPackage(PartialinterpretationPackage.eNS_URI);
                // Obtain or create and register package
-                PartialinterpretationPackageImpl thePartialinterpretationPackage = (PartialinterpretationPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof PartialinterpretationPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new PartialinterpretationPackageImpl());
+                Object registeredPartialinterpretationPackage = EPackage.Registry.INSTANCE.get(eNS_URI);
+                PartialinterpretationPackageImpl thePartialinterpretationPackage = registeredPartialinterpretationPackage instanceof PartialinterpretationPackageImpl ? (PartialinterpretationPackageImpl)registeredPartialinterpretationPackage : new PartialinterpretationPackageImpl();
                isInited = true;
@@ -258,7 +259,6 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
                // Mark meta-data to indicate it can't be changed
                thePartialinterpretationPackage.freeze();
-  
                // Update the registry and return the package
                EPackage.Registry.INSTANCE.put(PartialinterpretationPackage.eNS_URI, thePartialinterpretationPackage);
                return thePartialinterpretationPackage;
@@ -269,6 +269,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public EClass getPartialInterpretation() {
                return partialInterpretationEClass;
        }
@@ -278,6 +279,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public EReference getPartialInterpretation_Problem() {
                return (EReference)partialInterpretationEClass.getEStructuralFeatures().get(0);
        }
@@ -287,6 +289,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public EReference getPartialInterpretation_Partialconstantinterpretation() {
                return (EReference)partialInterpretationEClass.getEStructuralFeatures().get(1);
        }
@@ -296,6 +299,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public EReference getPartialInterpretation_Partialrelationinterpretation() {
                return (EReference)partialInterpretationEClass.getEStructuralFeatures().get(2);
        }
@@ -305,6 +309,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public EReference getPartialInterpretation_Partialfunctioninterpretation() {
                return (EReference)partialInterpretationEClass.getEStructuralFeatures().get(3);
        }
@@ -314,6 +319,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public EReference getPartialInterpretation_NewElements() {
                return (EReference)partialInterpretationEClass.getEStructuralFeatures().get(4);
        }
@@ -323,6 +329,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public EReference getPartialInterpretation_Partialtypeinterpratation() {
                return (EReference)partialInterpretationEClass.getEStructuralFeatures().get(5);
        }
@@ -332,6 +339,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public EReference getPartialInterpretation_OpenWorldElements() {
                return (EReference)partialInterpretationEClass.getEStructuralFeatures().get(6);
        }
@@ -341,6 +349,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public EReference getPartialInterpretation_ProblemConainer() {
                return (EReference)partialInterpretationEClass.getEStructuralFeatures().get(7);
        }
@@ -350,6 +359,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public EReference getPartialInterpretation_Scopes() {
                return (EReference)partialInterpretationEClass.getEStructuralFeatures().get(8);
        }
@@ -359,6 +369,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public EAttribute getPartialInterpretation_MinNewElements() {
                return (EAttribute)partialInterpretationEClass.getEStructuralFeatures().get(9);
        }
@@ -368,6 +379,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public EAttribute getPartialInterpretation_MaxNewElements() {
                return (EAttribute)partialInterpretationEClass.getEStructuralFeatures().get(10);
        }
@@ -377,6 +389,17 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
+        public EAttribute getPartialInterpretation_MinNewElementsHeuristic() {
+                return (EAttribute)partialInterpretationEClass.getEStructuralFeatures().get(11);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
        public EClass getPartialConstantInterpretation() {
                return partialConstantInterpretationEClass;
        }
@@ -386,6 +409,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public EReference getPartialConstantInterpretation_InterpretationOf() {
                return (EReference)partialConstantInterpretationEClass.getEStructuralFeatures().get(0);
        }
@@ -395,6 +419,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public EClass getPartialRelationInterpretation() {
                return partialRelationInterpretationEClass;
        }
@@ -404,6 +429,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public EReference getPartialRelationInterpretation_InterpretationOf() {
                return (EReference)partialRelationInterpretationEClass.getEStructuralFeatures().get(0);
        }
@@ -413,6 +439,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public EReference getPartialRelationInterpretation_Relationlinks() {
                return (EReference)partialRelationInterpretationEClass.getEStructuralFeatures().get(1);
        }
@@ -422,6 +449,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public EReference getPartialRelationInterpretation_Param1() {
                return (EReference)partialRelationInterpretationEClass.getEStructuralFeatures().get(2);
        }
@@ -431,6 +459,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public EReference getPartialRelationInterpretation_Param2() {
                return (EReference)partialRelationInterpretationEClass.getEStructuralFeatures().get(3);
        }
@@ -440,6 +469,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public EClass getPartialFunctionInterpretation() {
                return partialFunctionInterpretationEClass;
        }
@@ -449,6 +479,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public EReference getPartialFunctionInterpretation_InterpretationOf() {
                return (EReference)partialFunctionInterpretationEClass.getEStructuralFeatures().get(0);
        }
@@ -458,6 +489,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public EClass getPartialTypeInterpratation() {
                return partialTypeInterpratationEClass;
        }
@@ -467,6 +499,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public EReference getPartialTypeInterpratation_Elements() {
                return (EReference)partialTypeInterpratationEClass.getEStructuralFeatures().get(0);
        }
@@ -476,6 +509,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public EReference getPartialTypeInterpratation_Scopes() {
                return (EReference)partialTypeInterpratationEClass.getEStructuralFeatures().get(1);
        }
@@ -485,6 +519,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public EClass getRelationLink() {
                return relationLinkEClass;
        }
@@ -494,6 +529,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public EClass getUnaryElementRelationLink() {
                return unaryElementRelationLinkEClass;
        }
@@ -503,6 +539,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public EReference getUnaryElementRelationLink_Param1() {
                return (EReference)unaryElementRelationLinkEClass.getEStructuralFeatures().get(0);
        }
@@ -512,6 +549,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public EClass getBinaryElementRelationLink() {
                return binaryElementRelationLinkEClass;
        }
@@ -521,6 +559,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public EReference getBinaryElementRelationLink_Param1() {
                return (EReference)binaryElementRelationLinkEClass.getEStructuralFeatures().get(0);
        }
@@ -530,6 +569,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public EReference getBinaryElementRelationLink_Param2() {
                return (EReference)binaryElementRelationLinkEClass.getEStructuralFeatures().get(1);
        }
@@ -539,6 +579,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public EClass getNaryRelationLink() {
                return naryRelationLinkEClass;
        }
@@ -548,6 +589,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public EReference getNaryRelationLink_Elements() {
                return (EReference)naryRelationLinkEClass.getEStructuralFeatures().get(0);
        }
@@ -557,6 +599,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public EClass getNaryRelationLinkElement() {
                return naryRelationLinkElementEClass;
        }
@@ -566,6 +609,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public EAttribute getNaryRelationLinkElement_Index() {
                return (EAttribute)naryRelationLinkElementEClass.getEStructuralFeatures().get(0);
        }
@@ -575,6 +619,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public EReference getNaryRelationLinkElement_Param() {
                return (EReference)naryRelationLinkElementEClass.getEStructuralFeatures().get(1);
        }
@@ -584,6 +629,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public EClass getPrimitiveElement() {
                return primitiveElementEClass;
        }
@@ -593,6 +639,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public EAttribute getPrimitiveElement_ValueSet() {
                return (EAttribute)primitiveElementEClass.getEStructuralFeatures().get(0);
        }
@@ -602,6 +649,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public EClass getBooleanElement() {
                return booleanElementEClass;
        }
@@ -611,6 +659,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public EAttribute getBooleanElement_Value() {
                return (EAttribute)booleanElementEClass.getEStructuralFeatures().get(0);
        }
@@ -620,6 +669,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public EClass getIntegerElement() {
                return integerElementEClass;
        }
@@ -629,6 +679,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public EAttribute getIntegerElement_Value() {
                return (EAttribute)integerElementEClass.getEStructuralFeatures().get(0);
        }
@@ -638,6 +689,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public EClass getRealElement() {
                return realElementEClass;
        }
@@ -647,6 +699,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public EAttribute getRealElement_Value() {
                return (EAttribute)realElementEClass.getEStructuralFeatures().get(0);
        }
@@ -656,6 +709,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public EClass getStringElement() {
                return stringElementEClass;
        }
@@ -665,6 +719,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public EAttribute getStringElement_Value() {
                return (EAttribute)stringElementEClass.getEStructuralFeatures().get(0);
        }
@@ -674,6 +729,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public EClass getScope() {
                return scopeEClass;
        }
@@ -683,6 +739,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public EAttribute getScope_MinNewElements() {
                return (EAttribute)scopeEClass.getEStructuralFeatures().get(0);
        }
@@ -692,6 +749,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public EAttribute getScope_MaxNewElements() {
                return (EAttribute)scopeEClass.getEStructuralFeatures().get(1);
        }
@@ -701,6 +759,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public EReference getScope_TargetTypeInterpretation() {
                return (EReference)scopeEClass.getEStructuralFeatures().get(2);
        }
@@ -710,6 +769,17 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
+        public EAttribute getScope_MinNewElementsHeuristic() {
+                return (EAttribute)scopeEClass.getEStructuralFeatures().get(3);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
        public EClass getPartialPrimitiveInterpretation() {
                return partialPrimitiveInterpretationEClass;
        }
@@ -719,6 +789,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public EClass getPartialBooleanInterpretation() {
                return partialBooleanInterpretationEClass;
        }
@@ -728,6 +799,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public EClass getPartialIntegerInterpretation() {
                return partialIntegerInterpretationEClass;
        }
@@ -737,6 +809,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public EClass getPartialRealInterpretation() {
                return partialRealInterpretationEClass;
        }
@@ -746,6 +819,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public EClass getPartialStringInterpretation() {
                return partialStringInterpretationEClass;
        }
@@ -755,6 +829,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public EClass getPartialComplexTypeInterpretation() {
                return partialComplexTypeInterpretationEClass;
        }
@@ -764,6 +839,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public EReference getPartialComplexTypeInterpretation_SupertypeInterpretation() {
                return (EReference)partialComplexTypeInterpretationEClass.getEStructuralFeatures().get(0);
        }
@@ -773,6 +849,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public EReference getPartialComplexTypeInterpretation_InterpretationOf() {
                return (EReference)partialComplexTypeInterpretationEClass.getEStructuralFeatures().get(1);
        }
@@ -782,6 +859,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public PartialinterpretationFactory getPartialinterpretationFactory() {
                return (PartialinterpretationFactory)getEFactoryInstance();
        }
@@ -817,6 +895,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
                createEReference(partialInterpretationEClass, PARTIAL_INTERPRETATION__SCOPES);
                createEAttribute(partialInterpretationEClass, PARTIAL_INTERPRETATION__MIN_NEW_ELEMENTS);
                createEAttribute(partialInterpretationEClass, PARTIAL_INTERPRETATION__MAX_NEW_ELEMENTS);
+                createEAttribute(partialInterpretationEClass, PARTIAL_INTERPRETATION__MIN_NEW_ELEMENTS_HEURISTIC);
                partialConstantInterpretationEClass = createEClass(PARTIAL_CONSTANT_INTERPRETATION);
                createEReference(partialConstantInterpretationEClass, PARTIAL_CONSTANT_INTERPRETATION__INTERPRETATION_OF);
@@ -869,6 +948,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
                createEAttribute(scopeEClass, SCOPE__MIN_NEW_ELEMENTS);
                createEAttribute(scopeEClass, SCOPE__MAX_NEW_ELEMENTS);
                createEReference(scopeEClass, SCOPE__TARGET_TYPE_INTERPRETATION);
+                createEAttribute(scopeEClass, SCOPE__MIN_NEW_ELEMENTS_HEURISTIC);
                partialPrimitiveInterpretationEClass = createEClass(PARTIAL_PRIMITIVE_INTERPRETATION);
@@ -945,6 +1025,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
                initEReference(getPartialInterpretation_Scopes(), this.getScope(), null, "scopes", 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", "-1", 1, 1, PartialInterpretation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+                initEAttribute(getPartialInterpretation_MinNewElementsHeuristic(), ecorePackage.getEInt(), "minNewElementsHeuristic", "0", 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);
@@ -997,6 +1078,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
                initEAttribute(getScope_MinNewElements(), ecorePackage.getEInt(), "minNewElements", "0", 1, 1, Scope.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
                initEAttribute(getScope_MaxNewElements(), ecorePackage.getEInt(), "maxNewElements", "-1", 1, 1, Scope.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
                initEReference(getScope_TargetTypeInterpretation(), this.getPartialTypeInterpratation(), this.getPartialTypeInterpratation_Scopes(), "targetTypeInterpretation", null, 1, 1, Scope.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+                initEAttribute(getScope_MinNewElementsHeuristic(), ecorePackage.getEInt(), "minNewElementsHeuristic", "0", 1, 1, Scope.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
                initEClass(partialPrimitiveInterpretationEClass, PartialPrimitiveInterpretation.class, "PartialPrimitiveInterpretation", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partialinterpretation/impl/PrimitiveElementImpl.java b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partialinterpretation/impl/PrimitiveElementImpl.java
index 29a1e1be..a8ef81b0 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partialinterpretation/impl/PrimitiveElementImpl.java
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partialinterpretation/impl/PrimitiveElementImpl.java
@@ -71,6 +71,7 @@ public abstract class PrimitiveElementImpl extends DefinedElementImpl implements
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public boolean isValueSet() {
                return valueSet;
        }
@@ -80,6 +81,7 @@ public abstract class PrimitiveElementImpl extends DefinedElementImpl implements
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public void setValueSet(boolean newValueSet) {
                boolean oldValueSet = valueSet;
                valueSet = newValueSet;
@@ -154,7 +156,7 @@ public abstract class PrimitiveElementImpl extends DefinedElementImpl implements
        public String toString() {
                if (eIsProxy()) return super.toString();
-                StringBuffer result = new StringBuffer(super.toString());
+                StringBuilder result = new StringBuilder(super.toString());
                result.append(" (valueSet: ");
                result.append(valueSet);
                result.append(')');
diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partialinterpretation/impl/RealElementImpl.java b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partialinterpretation/impl/RealElementImpl.java
index 0361a3e9..67cff5a2 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partialinterpretation/impl/RealElementImpl.java
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partialinterpretation/impl/RealElementImpl.java
@@ -71,6 +71,7 @@ public class RealElementImpl extends PrimitiveElementImpl implements RealElement
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public BigDecimal getValue() {
                return value;
        }
@@ -80,6 +81,7 @@ public class RealElementImpl extends PrimitiveElementImpl implements RealElement
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public void setValue(BigDecimal newValue) {
                BigDecimal oldValue = value;
                value = newValue;
@@ -154,7 +156,7 @@ public class RealElementImpl extends PrimitiveElementImpl implements RealElement
        public String toString() {
                if (eIsProxy()) return super.toString();
-                StringBuffer result = new StringBuffer(super.toString());
+                StringBuilder result = new StringBuilder(super.toString());
                result.append(" (value: ");
                result.append(value);
                result.append(')');
diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partialinterpretation/impl/ScopeImpl.java b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partialinterpretation/impl/ScopeImpl.java
index d8ade871..a1b6de35 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partialinterpretation/impl/ScopeImpl.java
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partialinterpretation/impl/ScopeImpl.java
@@ -26,6 +26,7 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
 *   <li>{@link hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.impl.ScopeImpl#getMinNewElements <em>Min New Elements</em>}</li>
 *   <li>{@link hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.impl.ScopeImpl#getMaxNewElements <em>Max New Elements</em>}</li>
 *   <li>{@link hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.impl.ScopeImpl#getTargetTypeInterpretation <em>Target Type Interpretation</em>}</li>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.impl.ScopeImpl#getMinNewElementsHeuristic <em>Min New Elements Heuristic</em>}</li>
 * </ul>
 *
 * @generated
@@ -82,6 +83,26 @@ public class ScopeImpl extends MinimalEObjectImpl.Container implements Scope {
        protected PartialTypeInterpratation targetTypeInterpretation;
        /**
+         * The default value of the '{@link #getMinNewElementsHeuristic() <em>Min New Elements Heuristic</em>}' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getMinNewElementsHeuristic()
+         * @generated
+         * @ordered
+         */
+        protected static final int MIN_NEW_ELEMENTS_HEURISTIC_EDEFAULT = 0;
+        /**
+         * The cached value of the '{@link #getMinNewElementsHeuristic() <em>Min New Elements Heuristic</em>}' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getMinNewElementsHeuristic()
+         * @generated
+         * @ordered
+         */
+        protected int minNewElementsHeuristic = MIN_NEW_ELEMENTS_HEURISTIC_EDEFAULT;
+        /**
         * <!-- begin-user-doc -->
         * <!-- end-user-doc -->
         * @generated
@@ -105,6 +126,7 @@ public class ScopeImpl extends MinimalEObjectImpl.Container implements Scope {
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public int getMinNewElements() {
                return minNewElements;
        }
@@ -114,6 +136,7 @@ public class ScopeImpl extends MinimalEObjectImpl.Container implements Scope {
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public void setMinNewElements(int newMinNewElements) {
                int oldMinNewElements = minNewElements;
                minNewElements = newMinNewElements;
@@ -126,6 +149,7 @@ public class ScopeImpl extends MinimalEObjectImpl.Container implements Scope {
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public int getMaxNewElements() {
                return maxNewElements;
        }
@@ -135,6 +159,7 @@ public class ScopeImpl extends MinimalEObjectImpl.Container implements Scope {
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public void setMaxNewElements(int newMaxNewElements) {
                int oldMaxNewElements = maxNewElements;
                maxNewElements = newMaxNewElements;
@@ -147,6 +172,7 @@ public class ScopeImpl extends MinimalEObjectImpl.Container implements Scope {
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public PartialTypeInterpratation getTargetTypeInterpretation() {
                if (targetTypeInterpretation != null && targetTypeInterpretation.eIsProxy()) {
                        InternalEObject oldTargetTypeInterpretation = (InternalEObject)targetTypeInterpretation;
@@ -188,6 +214,7 @@ public class ScopeImpl extends MinimalEObjectImpl.Container implements Scope {
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public void setTargetTypeInterpretation(PartialTypeInterpratation newTargetTypeInterpretation) {
                if (newTargetTypeInterpretation != targetTypeInterpretation) {
                        NotificationChain msgs = null;
@@ -208,6 +235,29 @@ public class ScopeImpl extends MinimalEObjectImpl.Container implements Scope {
         * @generated
         */
        @Override
+        public int getMinNewElementsHeuristic() {
+                return minNewElementsHeuristic;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void setMinNewElementsHeuristic(int newMinNewElementsHeuristic) {
+                int oldMinNewElementsHeuristic = minNewElementsHeuristic;
+                minNewElementsHeuristic = newMinNewElementsHeuristic;
+                if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET, PartialinterpretationPackage.SCOPE__MIN_NEW_ELEMENTS_HEURISTIC, oldMinNewElementsHeuristic, minNewElementsHeuristic));
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
        public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
                switch (featureID) {
                        case PartialinterpretationPackage.SCOPE__TARGET_TYPE_INTERPRETATION:
@@ -247,6 +297,8 @@ public class ScopeImpl extends MinimalEObjectImpl.Container implements Scope {
                        case PartialinterpretationPackage.SCOPE__TARGET_TYPE_INTERPRETATION:
                                if (resolve) return getTargetTypeInterpretation();
                                return basicGetTargetTypeInterpretation();
+                        case PartialinterpretationPackage.SCOPE__MIN_NEW_ELEMENTS_HEURISTIC:
+                                return getMinNewElementsHeuristic();
                }
                return super.eGet(featureID, resolve, coreType);
        }
@@ -268,6 +320,9 @@ public class ScopeImpl extends MinimalEObjectImpl.Container implements Scope {
                        case PartialinterpretationPackage.SCOPE__TARGET_TYPE_INTERPRETATION:
                                setTargetTypeInterpretation((PartialTypeInterpratation)newValue);
                                return;
+                        case PartialinterpretationPackage.SCOPE__MIN_NEW_ELEMENTS_HEURISTIC:
+                                setMinNewElementsHeuristic((Integer)newValue);
+                                return;
                }
                super.eSet(featureID, newValue);
        }
@@ -289,6 +344,9 @@ public class ScopeImpl extends MinimalEObjectImpl.Container implements Scope {
                        case PartialinterpretationPackage.SCOPE__TARGET_TYPE_INTERPRETATION:
                                setTargetTypeInterpretation((PartialTypeInterpratation)null);
                                return;
+                        case PartialinterpretationPackage.SCOPE__MIN_NEW_ELEMENTS_HEURISTIC:
+                                setMinNewElementsHeuristic(MIN_NEW_ELEMENTS_HEURISTIC_EDEFAULT);
+                                return;
                }
                super.eUnset(featureID);
        }
@@ -307,6 +365,8 @@ public class ScopeImpl extends MinimalEObjectImpl.Container implements Scope {
                                return maxNewElements != MAX_NEW_ELEMENTS_EDEFAULT;
                        case PartialinterpretationPackage.SCOPE__TARGET_TYPE_INTERPRETATION:
                                return targetTypeInterpretation != null;
+                        case PartialinterpretationPackage.SCOPE__MIN_NEW_ELEMENTS_HEURISTIC:
+                                return minNewElementsHeuristic != MIN_NEW_ELEMENTS_HEURISTIC_EDEFAULT;
                }
                return super.eIsSet(featureID);
        }
@@ -320,11 +380,13 @@ public class ScopeImpl extends MinimalEObjectImpl.Container implements Scope {
        public String toString() {
                if (eIsProxy()) return super.toString();
-                StringBuffer result = new StringBuffer(super.toString());
+                StringBuilder result = new StringBuilder(super.toString());
                result.append(" (minNewElements: ");
                result.append(minNewElements);
                result.append(", maxNewElements: ");
                result.append(maxNewElements);
+                result.append(", minNewElementsHeuristic: ");
+                result.append(minNewElementsHeuristic);
                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/StringElementImpl.java b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partialinterpretation/impl/StringElementImpl.java
index f207401d..0242c9b2 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partialinterpretation/impl/StringElementImpl.java
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partialinterpretation/impl/StringElementImpl.java
@@ -69,6 +69,7 @@ public class StringElementImpl extends PrimitiveElementImpl implements StringEle
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public String getValue() {
                return value;
        }
@@ -78,6 +79,7 @@ public class StringElementImpl extends PrimitiveElementImpl implements StringEle
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public void setValue(String newValue) {
                String oldValue = value;
                value = newValue;
@@ -152,7 +154,7 @@ public class StringElementImpl extends PrimitiveElementImpl implements StringEle
        public String toString() {
                if (eIsProxy()) return super.toString();
-                StringBuffer result = new StringBuffer(super.toString());
+                StringBuilder result = new StringBuilder(super.toString());
                result.append(" (value: ");
                result.append(value);
                result.append(')');
diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partialinterpretation/impl/UnaryElementRelationLinkImpl.java b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partialinterpretation/impl/UnaryElementRelationLinkImpl.java
index 2cb56323..e76a89b7 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partialinterpretation/impl/UnaryElementRelationLinkImpl.java
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partialinterpretation/impl/UnaryElementRelationLinkImpl.java
@@ -62,6 +62,7 @@ public class UnaryElementRelationLinkImpl extends RelationLinkImpl implements Un
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public DefinedElement getParam1() {
                if (param1 != null && param1.eIsProxy()) {
                        InternalEObject oldParam1 = (InternalEObject)param1;
@@ -88,6 +89,7 @@ public class UnaryElementRelationLinkImpl extends RelationLinkImpl implements Un
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public void setParam1(DefinedElement newParam1) {
                DefinedElement oldParam1 = param1;
                param1 = newParam1;
diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/model/PartialInterpretation.ecore b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/model/PartialInterpretation.ecore
index acf82a3f..47d54258 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/model/PartialInterpretation.ecore
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/model/PartialInterpretation.ecore
@@ -27,6 +27,9 @@
        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt" defaultValueLiteral="0"/>
    <eStructuralFeatures xsi:type="ecore:EAttribute" name="maxNewElements" lowerBound="1"
        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt" defaultValueLiteral="-1"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="minNewElementsHeuristic"
+        lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"
+        defaultValueLiteral="0"/>
  </eClassifiers>
  <eClassifiers xsi:type="ecore:EClass" name="PartialConstantInterpretation">
    <eStructuralFeatures xsi:type="ecore:EReference" name="interpretationOf" lowerBound="1"
@@ -92,6 +95,9 @@
        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt" defaultValueLiteral="-1"/>
    <eStructuralFeatures xsi:type="ecore:EReference" name="targetTypeInterpretation"
        lowerBound="1" eType="#//PartialTypeInterpratation" eOpposite="#//PartialTypeInterpratation/scopes"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="minNewElementsHeuristic"
+        lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"
+        defaultValueLiteral="0"/>
  </eClassifiers>
  <eClassifiers xsi:type="ecore:EClass" name="PartialPrimitiveInterpretation" abstract="true"
      eSuperTypes="#//PartialTypeInterpratation"/>
diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/model/PartialInterpretation.genmodel b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/model/PartialInterpretation.genmodel
index 2ac0a4f3..daeaf594 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/model/PartialInterpretation.genmodel
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/model/PartialInterpretation.genmodel
@@ -18,7 +18,10 @@
      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference PartialInterpretation.ecore#//PartialInterpretation/partialtypeinterpratation"/>
      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference PartialInterpretation.ecore#//PartialInterpretation/openWorldElements"/>
      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference PartialInterpretation.ecore#//PartialInterpretation/problemConainer"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference PartialInterpretation.ecore#//PartialInterpretation/scope"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference PartialInterpretation.ecore#//PartialInterpretation/scopes"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute PartialInterpretation.ecore#//PartialInterpretation/minNewElements"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute PartialInterpretation.ecore#//PartialInterpretation/maxNewElements"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute PartialInterpretation.ecore#//PartialInterpretation/minNewElementsHeuristic"/>
    </genClasses>
    <genClasses ecoreClass="PartialInterpretation.ecore#//PartialConstantInterpretation">
      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference PartialInterpretation.ecore#//PartialConstantInterpretation/interpretationOf"/>
@@ -33,9 +36,8 @@
      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference PartialInterpretation.ecore#//PartialFunctionInterpretation/interpretationOf"/>
    </genClasses>
    <genClasses ecoreClass="PartialInterpretation.ecore#//PartialTypeInterpratation">
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference PartialInterpretation.ecore#//PartialTypeInterpratation/interpretationOf"/>
      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference PartialInterpretation.ecore#//PartialTypeInterpratation/elements"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference PartialInterpretation.ecore#//PartialTypeInterpratation/supertypeInterpretation"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference PartialInterpretation.ecore#//PartialTypeInterpratation/scopes"/>
    </genClasses>
    <genClasses image="false" ecoreClass="PartialInterpretation.ecore#//RelationLink"/>
    <genClasses ecoreClass="PartialInterpretation.ecore#//UnaryElementRelationLink">
@@ -50,6 +52,7 @@
    </genClasses>
    <genClasses ecoreClass="PartialInterpretation.ecore#//NaryRelationLinkElement">
      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute PartialInterpretation.ecore#//NaryRelationLinkElement/index"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference PartialInterpretation.ecore#//NaryRelationLinkElement/param"/>
    </genClasses>
    <genClasses image="false" ecoreClass="PartialInterpretation.ecore#//PrimitiveElement">
      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute PartialInterpretation.ecore#//PrimitiveElement/valueSet"/>
@@ -70,11 +73,16 @@
      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute PartialInterpretation.ecore#//Scope/minNewElements"/>
      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute PartialInterpretation.ecore#//Scope/maxNewElements"/>
      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference PartialInterpretation.ecore#//Scope/targetTypeInterpretation"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute PartialInterpretation.ecore#//Scope/minNewElementsHeuristic"/>
    </genClasses>
    <genClasses image="false" ecoreClass="PartialInterpretation.ecore#//PartialPrimitiveInterpretation"/>
    <genClasses ecoreClass="PartialInterpretation.ecore#//PartialBooleanInterpretation"/>
    <genClasses ecoreClass="PartialInterpretation.ecore#//PartialIntegerInterpretation"/>
    <genClasses ecoreClass="PartialInterpretation.ecore#//PartialRealInterpretation"/>
    <genClasses ecoreClass="PartialInterpretation.ecore#//PartialStringInterpretation"/>
+    <genClasses ecoreClass="PartialInterpretation.ecore#//PartialComplexTypeInterpretation">
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference PartialInterpretation.ecore#//PartialComplexTypeInterpretation/supertypeInterpretation"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference PartialInterpretation.ecore#//PartialComplexTypeInterpretation/interpretationOf"/>
+    </genClasses>
  </genPackages>
 </genmodel:GenModel>
diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretation2logic/InstanceModel2PartialInterpretation.xtend b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretation2logic/InstanceModel2PartialInterpretation.xtend
index 8aaaacb5..cb5b587f 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretation2logic/InstanceModel2PartialInterpretation.xtend
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretation2logic/InstanceModel2PartialInterpretation.xtend
@@ -1,5 +1,6 @@
 package hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretation2logic
+import com.google.common.collect.ImmutableList
 import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2Logic
 import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2Logic_Trace
 import hu.bme.mit.inf.dslreasoner.logic.model.builder.TracedOutput
@@ -12,18 +13,18 @@ import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.Par
 import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.Problem2PartialInterpretationTrace
 import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialRelationInterpretation
 import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialinterpretationFactory
+import java.math.BigDecimal
 import java.util.HashMap
+import java.util.HashSet
 import java.util.List
 import java.util.Map
+import java.util.Set
 import org.eclipse.emf.common.util.Enumerator
+import org.eclipse.emf.ecore.EAttribute
 import org.eclipse.emf.ecore.EObject
 import org.eclipse.emf.ecore.resource.Resource
 import static extension hu.bme.mit.inf.dslreasoner.util.CollectionsUtil.*
-import java.util.HashSet
-import java.util.Set
-import java.math.BigDecimal
-import org.eclipse.emf.ecore.EAttribute
 class InstanceModel2PartialInterpretation {
        val extension LogiclanguageFactory factory = LogiclanguageFactory.eINSTANCE
@@ -36,7 +37,19 @@ class InstanceModel2PartialInterpretation {
                Resource resource,
                boolean withID) 
        {
-                val objects = resource.allContents.toList
+                val objectsBuilder = ImmutableList.builder
+                val treeIterator = resource.allContents
+                val referencesUsed = ecore2Logic.allReferencesInScope(metamodelTranslationResult.trace).toSet
+                while (treeIterator.hasNext) {
+                        val object = treeIterator.next
+                        val containingReference = object.eContainmentFeature
+                        if (containingReference === null || referencesUsed.contains(containingReference)) {
+                                objectsBuilder.add(object)
+                        } else {
+                                treeIterator.prune
+                        }
+                }
+                val objects = objectsBuilder.build
                return transform(metamodelTranslationResult,objects,withID)
        }