{@link hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialInterpretation#getMinNewElements Min New Elements}
*
{@link hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialInterpretation#getMaxNewElements Max New Elements}
+ *
{@link hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialInterpretation#getMinNewElementsHeuristic Min New Elements Heuristic}
*
*
* @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 'Min New Elements Heuristic' attribute.
+ * The default value is "0".
+ *
+ *
+ * @return the value of the 'Min New Elements Heuristic' 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 Min New Elements Heuristic}' attribute.
+ *
+ *
+ * @param value the new value of the 'Min New Elements Heuristic' 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
@@ -166,6 +166,15 @@ public interface PartialinterpretationPackage extends EPackage {
*/
int PARTIAL_INTERPRETATION__MAX_NEW_ELEMENTS = 10;
+ /**
+ * The feature id for the 'Min New Elements Heuristic' attribute.
+ *
+ *
+ * @generated
+ * @ordered
+ */
+ int PARTIAL_INTERPRETATION__MIN_NEW_ELEMENTS_HEURISTIC = 11;
+
/**
* The number of structural features of the 'Partial Interpretation' class.
*
@@ -173,7 +182,7 @@ public interface PartialinterpretationPackage extends EPackage {
* @generated
* @ordered
*/
- int PARTIAL_INTERPRETATION_FEATURE_COUNT = 11;
+ int PARTIAL_INTERPRETATION_FEATURE_COUNT = 12;
/**
* The number of operations of the 'Partial Interpretation' class.
@@ -912,6 +921,15 @@ public interface PartialinterpretationPackage extends EPackage {
*/
int SCOPE__TARGET_TYPE_INTERPRETATION = 2;
+ /**
+ * The feature id for the 'Min New Elements Heuristic' attribute.
+ *
+ *
+ * @generated
+ * @ordered
+ */
+ int SCOPE__MIN_NEW_ELEMENTS_HEURISTIC = 3;
+
/**
* The number of structural features of the 'Scope' class.
*
@@ -919,7 +937,7 @@ public interface PartialinterpretationPackage extends EPackage {
* @generated
* @ordered
*/
- int SCOPE_FEATURE_COUNT = 3;
+ int SCOPE_FEATURE_COUNT = 4;
/**
* The number of operations of the 'Scope' class.
@@ -1357,6 +1375,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 Min New Elements Heuristic}'.
+ *
+ *
+ * @return the meta object for the attribute 'Min New Elements Heuristic'.
+ * @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 Partial Constant Interpretation}'.
*
@@ -1749,6 +1778,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 Min New Elements Heuristic}'.
+ *
+ *
+ * @return the meta object for the attribute 'Min New Elements Heuristic'.
+ * @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 Partial Primitive Interpretation}'.
*
@@ -1952,6 +1992,14 @@ public interface PartialinterpretationPackage extends EPackage {
*/
EAttribute PARTIAL_INTERPRETATION__MAX_NEW_ELEMENTS = eINSTANCE.getPartialInterpretation_MaxNewElements();
+ /**
+ * The meta object literal for the 'Min New Elements Heuristic' attribute feature.
+ *
+ *
+ * @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 Partial Constant Interpretation}' class.
*
@@ -2278,6 +2326,14 @@ public interface PartialinterpretationPackage extends EPackage {
*/
EReference SCOPE__TARGET_TYPE_INTERPRETATION = eINSTANCE.getScope_TargetTypeInterpretation();
+ /**
+ * The meta object literal for the 'Min New Elements Heuristic' attribute feature.
+ *
+ *
+ * @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 Partial Primitive Interpretation}' class.
*
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;
*
{@link hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.Scope#getMinNewElements Min New Elements}
*
{@link hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.Scope#getMaxNewElements Max New Elements}
*
{@link hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.Scope#getTargetTypeInterpretation Target Type Interpretation}
+ *
{@link hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.Scope#getMinNewElementsHeuristic Min New Elements Heuristic}
*
*
* @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 'Min New Elements Heuristic' attribute.
+ * The default value is "0".
+ *
+ *
+ * @return the value of the 'Min New Elements Heuristic' 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 Min New Elements Heuristic}' attribute.
+ *
+ *
+ * @param value the new value of the 'Min New Elements Heuristic' 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
*
* @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
*
* @generated
*/
+ @Override
public void setParam1(DefinedElement newParam1) {
DefinedElement oldParam1 = param1;
param1 = newParam1;
@@ -111,6 +113,7 @@ public class BinaryElementRelationLinkImpl extends RelationLinkImpl implements B
*
* @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
*
* @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
*
* @generated
*/
+ @Override
public boolean isValue() {
return value;
}
@@ -78,6 +79,7 @@ public class BooleanElementImpl extends PrimitiveElementImpl implements BooleanE
*
* @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
*
* @generated
*/
+ @Override
public int getValue() {
return value;
}
@@ -78,6 +79,7 @@ public class IntegerElementImpl extends PrimitiveElementImpl implements IntegerE
*
* @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
*
* @generated
*/
+ @Override
public int getIndex() {
return index;
}
@@ -92,6 +93,7 @@ public class NaryRelationLinkElementImpl extends MinimalEObjectImpl.Container im
*
* @generated
*/
+ @Override
public void setIndex(int newIndex) {
int oldIndex = index;
index = newIndex;
@@ -104,6 +106,7 @@ public class NaryRelationLinkElementImpl extends MinimalEObjectImpl.Container im
*
* @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
*
* @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
*
* @generated
*/
+ @Override
public EList getElements() {
if (elements == null) {
elements = new EObjectContainmentEList(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
*
* @generated
*/
+ @Override
public EList getSupertypeInterpretation() {
if (supertypeInterpretation == null) {
supertypeInterpretation = new EObjectResolvingEList(PartialComplexTypeInterpretation.class, this, PartialinterpretationPackage.PARTIAL_COMPLEX_TYPE_INTERPRETATION__SUPERTYPE_INTERPRETATION);
@@ -91,6 +92,7 @@ public class PartialComplexTypeInterpretationImpl extends PartialTypeInterpratat
*
* @generated
*/
+ @Override
public TypeDeclaration getInterpretationOf() {
if (interpretationOf != null && interpretationOf.eIsProxy()) {
InternalEObject oldInterpretationOf = (InternalEObject)interpretationOf;
@@ -117,6 +119,7 @@ public class PartialComplexTypeInterpretationImpl extends PartialTypeInterpratat
*
* @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
*
* @generated
*/
+ @Override
public ConstantDeclaration getInterpretationOf() {
if (interpretationOf != null && interpretationOf.eIsProxy()) {
InternalEObject oldInterpretationOf = (InternalEObject)interpretationOf;
@@ -89,6 +90,7 @@ public class PartialConstantInterpretationImpl extends MinimalEObjectImpl.Contai
*
* @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
*
* @generated
*/
+ @Override
public FunctionDeclaration getInterpretationOf() {
if (interpretationOf != null && interpretationOf.eIsProxy()) {
InternalEObject oldInterpretationOf = (InternalEObject)interpretationOf;
@@ -89,6 +90,7 @@ public class PartialFunctionInterpretationImpl extends MinimalEObjectImpl.Contai
*
* @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;
*
{@link hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.impl.PartialInterpretationImpl#getMinNewElements Min New Elements}
*
{@link hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.impl.PartialInterpretationImpl#getMaxNewElements Max New Elements}
+ *
{@link hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.impl.PartialInterpretationImpl#getMinNewElementsHeuristic Min New Elements Heuristic}
*
*
* @generated
@@ -182,6 +183,26 @@ public class PartialInterpretationImpl extends MinimalEObjectImpl.Container impl
*/
protected int maxNewElements = MAX_NEW_ELEMENTS_EDEFAULT;
+ /**
+ * The default value of the '{@link #getMinNewElementsHeuristic() Min New Elements Heuristic}' attribute.
+ *
+ *
+ * @see #getMinNewElementsHeuristic()
+ * @generated
+ * @ordered
+ */
+ protected static final int MIN_NEW_ELEMENTS_HEURISTIC_EDEFAULT = 0;
+
+ /**
+ * The cached value of the '{@link #getMinNewElementsHeuristic() Min New Elements Heuristic}' attribute.
+ *
+ *
+ * @see #getMinNewElementsHeuristic()
+ * @generated
+ * @ordered
+ */
+ protected int minNewElementsHeuristic = MIN_NEW_ELEMENTS_HEURISTIC_EDEFAULT;
+
/**
*
*
@@ -206,6 +227,7 @@ public class PartialInterpretationImpl extends MinimalEObjectImpl.Container impl
*
* @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
*
* @generated
*/
+ @Override
public void setProblem(LogicProblem newProblem) {
LogicProblem oldProblem = problem;
problem = newProblem;
@@ -244,6 +267,7 @@ public class PartialInterpretationImpl extends MinimalEObjectImpl.Container impl
*
* @generated
*/
+ @Override
public EList getPartialconstantinterpretation() {
if (partialconstantinterpretation == null) {
partialconstantinterpretation = new EObjectContainmentEList(PartialConstantInterpretation.class, this, PartialinterpretationPackage.PARTIAL_INTERPRETATION__PARTIALCONSTANTINTERPRETATION);
@@ -256,6 +280,7 @@ public class PartialInterpretationImpl extends MinimalEObjectImpl.Container impl
*
* @generated
*/
+ @Override
public EList getPartialrelationinterpretation() {
if (partialrelationinterpretation == null) {
partialrelationinterpretation = new EObjectContainmentEList(PartialRelationInterpretation.class, this, PartialinterpretationPackage.PARTIAL_INTERPRETATION__PARTIALRELATIONINTERPRETATION);
@@ -268,6 +293,7 @@ public class PartialInterpretationImpl extends MinimalEObjectImpl.Container impl
*
* @generated
*/
+ @Override
public EList getPartialfunctioninterpretation() {
if (partialfunctioninterpretation == null) {
partialfunctioninterpretation = new EObjectContainmentEList(PartialFunctionInterpretation.class, this, PartialinterpretationPackage.PARTIAL_INTERPRETATION__PARTIALFUNCTIONINTERPRETATION);
@@ -280,6 +306,7 @@ public class PartialInterpretationImpl extends MinimalEObjectImpl.Container impl
*
* @generated
*/
+ @Override
public EList getNewElements() {
if (newElements == null) {
newElements = new EObjectContainmentEList(DefinedElement.class, this, PartialinterpretationPackage.PARTIAL_INTERPRETATION__NEW_ELEMENTS);
@@ -292,6 +319,7 @@ public class PartialInterpretationImpl extends MinimalEObjectImpl.Container impl
*
* @generated
*/
+ @Override
public EList getPartialtypeinterpratation() {
if (partialtypeinterpratation == null) {
partialtypeinterpratation = new EObjectContainmentEList(PartialTypeInterpratation.class, this, PartialinterpretationPackage.PARTIAL_INTERPRETATION__PARTIALTYPEINTERPRATATION);
@@ -304,6 +332,7 @@ public class PartialInterpretationImpl extends MinimalEObjectImpl.Container impl
*
* @generated
*/
+ @Override
public EList getOpenWorldElements() {
if (openWorldElements == null) {
openWorldElements = new EObjectContainmentEList(DefinedElement.class, this, PartialinterpretationPackage.PARTIAL_INTERPRETATION__OPEN_WORLD_ELEMENTS);
@@ -316,6 +345,7 @@ public class PartialInterpretationImpl extends MinimalEObjectImpl.Container impl
*
* @generated
*/
+ @Override
public LogicProblem getProblemConainer() {
return problemConainer;
}
@@ -340,6 +370,7 @@ public class PartialInterpretationImpl extends MinimalEObjectImpl.Container impl
*
* @generated
*/
+ @Override
public void setProblemConainer(LogicProblem newProblemConainer) {
if (newProblemConainer != problemConainer) {
NotificationChain msgs = null;
@@ -359,6 +390,7 @@ public class PartialInterpretationImpl extends MinimalEObjectImpl.Container impl
*
* @generated
*/
+ @Override
public EList getScopes() {
if (scopes == null) {
scopes = new EObjectContainmentEList(Scope.class, this, PartialinterpretationPackage.PARTIAL_INTERPRETATION__SCOPES);
@@ -371,6 +403,7 @@ public class PartialInterpretationImpl extends MinimalEObjectImpl.Container impl
*
* @generated
*/
+ @Override
public int getMinNewElements() {
return minNewElements;
}
@@ -380,6 +413,7 @@ public class PartialInterpretationImpl extends MinimalEObjectImpl.Container impl
*
* @generated
*/
+ @Override
public void setMinNewElements(int newMinNewElements) {
int oldMinNewElements = minNewElements;
minNewElements = newMinNewElements;
@@ -392,6 +426,7 @@ public class PartialInterpretationImpl extends MinimalEObjectImpl.Container impl
*
* @generated
*/
+ @Override
public int getMaxNewElements() {
return maxNewElements;
}
@@ -401,6 +436,7 @@ public class PartialInterpretationImpl extends MinimalEObjectImpl.Container impl
*
* @generated
*/
+ @Override
public void setMaxNewElements(int newMaxNewElements) {
int oldMaxNewElements = maxNewElements;
maxNewElements = newMaxNewElements;
@@ -408,6 +444,29 @@ public class PartialInterpretationImpl extends MinimalEObjectImpl.Container impl
eNotify(new ENotificationImpl(this, Notification.SET, PartialinterpretationPackage.PARTIAL_INTERPRETATION__MAX_NEW_ELEMENTS, oldMaxNewElements, maxNewElements));
}
+ /**
+ *
+ *
+ * @generated
+ */
+ @Override
+ public int getMinNewElementsHeuristic() {
+ return minNewElementsHeuristic;
+ }
+
+ /**
+ *
+ *
+ * @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));
+ }
+
/**
*
*
@@ -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
*
* @generated
*/
+ @Override
public RelationDeclaration getInterpretationOf() {
if (interpretationOf != null && interpretationOf.eIsProxy()) {
InternalEObject oldInterpretationOf = (InternalEObject)interpretationOf;
@@ -132,6 +133,7 @@ public class PartialRelationInterpretationImpl extends MinimalEObjectImpl.Contai
*
* @generated
*/
+ @Override
public void setInterpretationOf(RelationDeclaration newInterpretationOf) {
RelationDeclaration oldInterpretationOf = interpretationOf;
interpretationOf = newInterpretationOf;
@@ -144,6 +146,7 @@ public class PartialRelationInterpretationImpl extends MinimalEObjectImpl.Contai
*
* @generated
*/
+ @Override
public EList getRelationlinks() {
if (relationlinks == null) {
relationlinks = new EObjectContainmentEList(RelationLink.class, this, PartialinterpretationPackage.PARTIAL_RELATION_INTERPRETATION__RELATIONLINKS);
@@ -156,6 +159,7 @@ public class PartialRelationInterpretationImpl extends MinimalEObjectImpl.Contai
*
* @generated
*/
+ @Override
public TypeReference getParam1() {
if (param1 != null && param1.eIsProxy()) {
InternalEObject oldParam1 = (InternalEObject)param1;
@@ -182,6 +186,7 @@ public class PartialRelationInterpretationImpl extends MinimalEObjectImpl.Contai
*
* @generated
*/
+ @Override
public void setParam1(TypeReference newParam1) {
TypeReference oldParam1 = param1;
param1 = newParam1;
@@ -194,6 +199,7 @@ public class PartialRelationInterpretationImpl extends MinimalEObjectImpl.Contai
*
* @generated
*/
+ @Override
public TypeReference getParam2() {
if (param2 != null && param2.eIsProxy()) {
InternalEObject oldParam2 = (InternalEObject)param2;
@@ -220,6 +226,7 @@ public class PartialRelationInterpretationImpl extends MinimalEObjectImpl.Contai
*
* @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
*
* @generated
*/
+ @Override
public EList getElements() {
if (elements == null) {
elements = new EObjectResolvingEList(DefinedElement.class, this, PartialinterpretationPackage.PARTIAL_TYPE_INTERPRATATION__ELEMENTS);
@@ -88,6 +89,7 @@ public abstract class PartialTypeInterpratationImpl extends MinimalEObjectImpl.C
*
* @generated
*/
+ @Override
public EList getScopes() {
if (scopes == null) {
scopes = new EObjectWithInverseResolvingEList(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
*
* @generated
*/
+ @Override
public PartialInterpretation createPartialInterpretation() {
PartialInterpretationImpl partialInterpretation = new PartialInterpretationImpl();
return partialInterpretation;
@@ -94,6 +95,7 @@ public class PartialinterpretationFactoryImpl extends EFactoryImpl implements Pa
*
* @generated
*/
+ @Override
public PartialConstantInterpretation createPartialConstantInterpretation() {
PartialConstantInterpretationImpl partialConstantInterpretation = new PartialConstantInterpretationImpl();
return partialConstantInterpretation;
@@ -104,6 +106,7 @@ public class PartialinterpretationFactoryImpl extends EFactoryImpl implements Pa
*
* @generated
*/
+ @Override
public PartialRelationInterpretation createPartialRelationInterpretation() {
PartialRelationInterpretationImpl partialRelationInterpretation = new PartialRelationInterpretationImpl();
return partialRelationInterpretation;
@@ -114,6 +117,7 @@ public class PartialinterpretationFactoryImpl extends EFactoryImpl implements Pa
*
* @generated
*/
+ @Override
public PartialFunctionInterpretation createPartialFunctionInterpretation() {
PartialFunctionInterpretationImpl partialFunctionInterpretation = new PartialFunctionInterpretationImpl();
return partialFunctionInterpretation;
@@ -124,6 +128,7 @@ public class PartialinterpretationFactoryImpl extends EFactoryImpl implements Pa
*
* @generated
*/
+ @Override
public UnaryElementRelationLink createUnaryElementRelationLink() {
UnaryElementRelationLinkImpl unaryElementRelationLink = new UnaryElementRelationLinkImpl();
return unaryElementRelationLink;
@@ -134,6 +139,7 @@ public class PartialinterpretationFactoryImpl extends EFactoryImpl implements Pa
*
* @generated
*/
+ @Override
public BinaryElementRelationLink createBinaryElementRelationLink() {
BinaryElementRelationLinkImpl binaryElementRelationLink = new BinaryElementRelationLinkImpl();
return binaryElementRelationLink;
@@ -144,6 +150,7 @@ public class PartialinterpretationFactoryImpl extends EFactoryImpl implements Pa
*
* @generated
*/
+ @Override
public NaryRelationLink createNaryRelationLink() {
NaryRelationLinkImpl naryRelationLink = new NaryRelationLinkImpl();
return naryRelationLink;
@@ -154,6 +161,7 @@ public class PartialinterpretationFactoryImpl extends EFactoryImpl implements Pa
*
* @generated
*/
+ @Override
public NaryRelationLinkElement createNaryRelationLinkElement() {
NaryRelationLinkElementImpl naryRelationLinkElement = new NaryRelationLinkElementImpl();
return naryRelationLinkElement;
@@ -164,6 +172,7 @@ public class PartialinterpretationFactoryImpl extends EFactoryImpl implements Pa
*
* @generated
*/
+ @Override
public BooleanElement createBooleanElement() {
BooleanElementImpl booleanElement = new BooleanElementImpl();
return booleanElement;
@@ -174,6 +183,7 @@ public class PartialinterpretationFactoryImpl extends EFactoryImpl implements Pa
*
* @generated
*/
+ @Override
public IntegerElement createIntegerElement() {
IntegerElementImpl integerElement = new IntegerElementImpl();
return integerElement;
@@ -184,6 +194,7 @@ public class PartialinterpretationFactoryImpl extends EFactoryImpl implements Pa
*
* @generated
*/
+ @Override
public RealElement createRealElement() {
RealElementImpl realElement = new RealElementImpl();
return realElement;
@@ -194,6 +205,7 @@ public class PartialinterpretationFactoryImpl extends EFactoryImpl implements Pa
*
* @generated
*/
+ @Override
public StringElement createStringElement() {
StringElementImpl stringElement = new StringElementImpl();
return stringElement;
@@ -204,6 +216,7 @@ public class PartialinterpretationFactoryImpl extends EFactoryImpl implements Pa
*
* @generated
*/
+ @Override
public Scope createScope() {
ScopeImpl scope = new ScopeImpl();
return scope;
@@ -214,6 +227,7 @@ public class PartialinterpretationFactoryImpl extends EFactoryImpl implements Pa
*
* @generated
*/
+ @Override
public PartialBooleanInterpretation createPartialBooleanInterpretation() {
PartialBooleanInterpretationImpl partialBooleanInterpretation = new PartialBooleanInterpretationImpl();
return partialBooleanInterpretation;
@@ -224,6 +238,7 @@ public class PartialinterpretationFactoryImpl extends EFactoryImpl implements Pa
*
* @generated
*/
+ @Override
public PartialIntegerInterpretation createPartialIntegerInterpretation() {
PartialIntegerInterpretationImpl partialIntegerInterpretation = new PartialIntegerInterpretationImpl();
return partialIntegerInterpretation;
@@ -234,6 +249,7 @@ public class PartialinterpretationFactoryImpl extends EFactoryImpl implements Pa
*
* @generated
*/
+ @Override
public PartialRealInterpretation createPartialRealInterpretation() {
PartialRealInterpretationImpl partialRealInterpretation = new PartialRealInterpretationImpl();
return partialRealInterpretation;
@@ -244,6 +260,7 @@ public class PartialinterpretationFactoryImpl extends EFactoryImpl implements Pa
*
* @generated
*/
+ @Override
public PartialStringInterpretation createPartialStringInterpretation() {
PartialStringInterpretationImpl partialStringInterpretation = new PartialStringInterpretationImpl();
return partialStringInterpretation;
@@ -254,6 +271,7 @@ public class PartialinterpretationFactoryImpl extends EFactoryImpl implements Pa
*
* @generated
*/
+ @Override
public PartialComplexTypeInterpretation createPartialComplexTypeInterpretation() {
PartialComplexTypeInterpretationImpl partialComplexTypeInterpretation = new PartialComplexTypeInterpretationImpl();
return partialComplexTypeInterpretation;
@@ -264,6 +282,7 @@ public class PartialinterpretationFactoryImpl extends EFactoryImpl implements Pa
*
* @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 Package for this model, and for any others upon which it depends.
- *
+ *
*
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.
*
@@ -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
*
* @generated
*/
+ @Override
public EClass getPartialInterpretation() {
return partialInterpretationEClass;
}
@@ -278,6 +279,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
*
* @generated
*/
+ @Override
public EReference getPartialInterpretation_Problem() {
return (EReference)partialInterpretationEClass.getEStructuralFeatures().get(0);
}
@@ -287,6 +289,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
*
* @generated
*/
+ @Override
public EReference getPartialInterpretation_Partialconstantinterpretation() {
return (EReference)partialInterpretationEClass.getEStructuralFeatures().get(1);
}
@@ -296,6 +299,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
*
* @generated
*/
+ @Override
public EReference getPartialInterpretation_Partialrelationinterpretation() {
return (EReference)partialInterpretationEClass.getEStructuralFeatures().get(2);
}
@@ -305,6 +309,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
*
* @generated
*/
+ @Override
public EReference getPartialInterpretation_Partialfunctioninterpretation() {
return (EReference)partialInterpretationEClass.getEStructuralFeatures().get(3);
}
@@ -314,6 +319,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
*
* @generated
*/
+ @Override
public EReference getPartialInterpretation_NewElements() {
return (EReference)partialInterpretationEClass.getEStructuralFeatures().get(4);
}
@@ -323,6 +329,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
*
* @generated
*/
+ @Override
public EReference getPartialInterpretation_Partialtypeinterpratation() {
return (EReference)partialInterpretationEClass.getEStructuralFeatures().get(5);
}
@@ -332,6 +339,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
*
* @generated
*/
+ @Override
public EReference getPartialInterpretation_OpenWorldElements() {
return (EReference)partialInterpretationEClass.getEStructuralFeatures().get(6);
}
@@ -341,6 +349,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
*
* @generated
*/
+ @Override
public EReference getPartialInterpretation_ProblemConainer() {
return (EReference)partialInterpretationEClass.getEStructuralFeatures().get(7);
}
@@ -350,6 +359,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
*
* @generated
*/
+ @Override
public EReference getPartialInterpretation_Scopes() {
return (EReference)partialInterpretationEClass.getEStructuralFeatures().get(8);
}
@@ -359,6 +369,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
*
* @generated
*/
+ @Override
public EAttribute getPartialInterpretation_MinNewElements() {
return (EAttribute)partialInterpretationEClass.getEStructuralFeatures().get(9);
}
@@ -368,6 +379,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
*
* @generated
*/
+ @Override
public EAttribute getPartialInterpretation_MaxNewElements() {
return (EAttribute)partialInterpretationEClass.getEStructuralFeatures().get(10);
}
@@ -377,6 +389,17 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
*
* @generated
*/
+ @Override
+ public EAttribute getPartialInterpretation_MinNewElementsHeuristic() {
+ return (EAttribute)partialInterpretationEClass.getEStructuralFeatures().get(11);
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ @Override
public EClass getPartialConstantInterpretation() {
return partialConstantInterpretationEClass;
}
@@ -386,6 +409,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
*
* @generated
*/
+ @Override
public EReference getPartialConstantInterpretation_InterpretationOf() {
return (EReference)partialConstantInterpretationEClass.getEStructuralFeatures().get(0);
}
@@ -395,6 +419,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
*
* @generated
*/
+ @Override
public EClass getPartialRelationInterpretation() {
return partialRelationInterpretationEClass;
}
@@ -404,6 +429,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
*
* @generated
*/
+ @Override
public EReference getPartialRelationInterpretation_InterpretationOf() {
return (EReference)partialRelationInterpretationEClass.getEStructuralFeatures().get(0);
}
@@ -413,6 +439,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
*
* @generated
*/
+ @Override
public EReference getPartialRelationInterpretation_Relationlinks() {
return (EReference)partialRelationInterpretationEClass.getEStructuralFeatures().get(1);
}
@@ -422,6 +449,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
*
* @generated
*/
+ @Override
public EReference getPartialRelationInterpretation_Param1() {
return (EReference)partialRelationInterpretationEClass.getEStructuralFeatures().get(2);
}
@@ -431,6 +459,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
*
* @generated
*/
+ @Override
public EReference getPartialRelationInterpretation_Param2() {
return (EReference)partialRelationInterpretationEClass.getEStructuralFeatures().get(3);
}
@@ -440,6 +469,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
*
* @generated
*/
+ @Override
public EClass getPartialFunctionInterpretation() {
return partialFunctionInterpretationEClass;
}
@@ -449,6 +479,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
*
* @generated
*/
+ @Override
public EReference getPartialFunctionInterpretation_InterpretationOf() {
return (EReference)partialFunctionInterpretationEClass.getEStructuralFeatures().get(0);
}
@@ -458,6 +489,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
*
* @generated
*/
+ @Override
public EClass getPartialTypeInterpratation() {
return partialTypeInterpratationEClass;
}
@@ -467,6 +499,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
*
* @generated
*/
+ @Override
public EReference getPartialTypeInterpratation_Elements() {
return (EReference)partialTypeInterpratationEClass.getEStructuralFeatures().get(0);
}
@@ -476,6 +509,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
*
* @generated
*/
+ @Override
public EReference getPartialTypeInterpratation_Scopes() {
return (EReference)partialTypeInterpratationEClass.getEStructuralFeatures().get(1);
}
@@ -485,6 +519,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
*
* @generated
*/
+ @Override
public EClass getRelationLink() {
return relationLinkEClass;
}
@@ -494,6 +529,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
*
* @generated
*/
+ @Override
public EClass getUnaryElementRelationLink() {
return unaryElementRelationLinkEClass;
}
@@ -503,6 +539,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
*
* @generated
*/
+ @Override
public EReference getUnaryElementRelationLink_Param1() {
return (EReference)unaryElementRelationLinkEClass.getEStructuralFeatures().get(0);
}
@@ -512,6 +549,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
*
* @generated
*/
+ @Override
public EClass getBinaryElementRelationLink() {
return binaryElementRelationLinkEClass;
}
@@ -521,6 +559,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
*
* @generated
*/
+ @Override
public EReference getBinaryElementRelationLink_Param1() {
return (EReference)binaryElementRelationLinkEClass.getEStructuralFeatures().get(0);
}
@@ -530,6 +569,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
*
* @generated
*/
+ @Override
public EReference getBinaryElementRelationLink_Param2() {
return (EReference)binaryElementRelationLinkEClass.getEStructuralFeatures().get(1);
}
@@ -539,6 +579,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
*
* @generated
*/
+ @Override
public EClass getNaryRelationLink() {
return naryRelationLinkEClass;
}
@@ -548,6 +589,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
*
* @generated
*/
+ @Override
public EReference getNaryRelationLink_Elements() {
return (EReference)naryRelationLinkEClass.getEStructuralFeatures().get(0);
}
@@ -557,6 +599,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
*
* @generated
*/
+ @Override
public EClass getNaryRelationLinkElement() {
return naryRelationLinkElementEClass;
}
@@ -566,6 +609,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
*
* @generated
*/
+ @Override
public EAttribute getNaryRelationLinkElement_Index() {
return (EAttribute)naryRelationLinkElementEClass.getEStructuralFeatures().get(0);
}
@@ -575,6 +619,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
*
* @generated
*/
+ @Override
public EReference getNaryRelationLinkElement_Param() {
return (EReference)naryRelationLinkElementEClass.getEStructuralFeatures().get(1);
}
@@ -584,6 +629,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
*
* @generated
*/
+ @Override
public EClass getPrimitiveElement() {
return primitiveElementEClass;
}
@@ -593,6 +639,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
*
* @generated
*/
+ @Override
public EAttribute getPrimitiveElement_ValueSet() {
return (EAttribute)primitiveElementEClass.getEStructuralFeatures().get(0);
}
@@ -602,6 +649,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
*
* @generated
*/
+ @Override
public EClass getBooleanElement() {
return booleanElementEClass;
}
@@ -611,6 +659,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
*
* @generated
*/
+ @Override
public EAttribute getBooleanElement_Value() {
return (EAttribute)booleanElementEClass.getEStructuralFeatures().get(0);
}
@@ -620,6 +669,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
*
* @generated
*/
+ @Override
public EClass getIntegerElement() {
return integerElementEClass;
}
@@ -629,6 +679,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
*
* @generated
*/
+ @Override
public EAttribute getIntegerElement_Value() {
return (EAttribute)integerElementEClass.getEStructuralFeatures().get(0);
}
@@ -638,6 +689,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
*
* @generated
*/
+ @Override
public EClass getRealElement() {
return realElementEClass;
}
@@ -647,6 +699,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
*
* @generated
*/
+ @Override
public EAttribute getRealElement_Value() {
return (EAttribute)realElementEClass.getEStructuralFeatures().get(0);
}
@@ -656,6 +709,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
*
* @generated
*/
+ @Override
public EClass getStringElement() {
return stringElementEClass;
}
@@ -665,6 +719,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
*
* @generated
*/
+ @Override
public EAttribute getStringElement_Value() {
return (EAttribute)stringElementEClass.getEStructuralFeatures().get(0);
}
@@ -674,6 +729,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
*
* @generated
*/
+ @Override
public EClass getScope() {
return scopeEClass;
}
@@ -683,6 +739,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
*
* @generated
*/
+ @Override
public EAttribute getScope_MinNewElements() {
return (EAttribute)scopeEClass.getEStructuralFeatures().get(0);
}
@@ -692,6 +749,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
*
* @generated
*/
+ @Override
public EAttribute getScope_MaxNewElements() {
return (EAttribute)scopeEClass.getEStructuralFeatures().get(1);
}
@@ -701,6 +759,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
*
* @generated
*/
+ @Override
public EReference getScope_TargetTypeInterpretation() {
return (EReference)scopeEClass.getEStructuralFeatures().get(2);
}
@@ -710,6 +769,17 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
*
* @generated
*/
+ @Override
+ public EAttribute getScope_MinNewElementsHeuristic() {
+ return (EAttribute)scopeEClass.getEStructuralFeatures().get(3);
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ @Override
public EClass getPartialPrimitiveInterpretation() {
return partialPrimitiveInterpretationEClass;
}
@@ -719,6 +789,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
*
* @generated
*/
+ @Override
public EClass getPartialBooleanInterpretation() {
return partialBooleanInterpretationEClass;
}
@@ -728,6 +799,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
*
* @generated
*/
+ @Override
public EClass getPartialIntegerInterpretation() {
return partialIntegerInterpretationEClass;
}
@@ -737,6 +809,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
*
* @generated
*/
+ @Override
public EClass getPartialRealInterpretation() {
return partialRealInterpretationEClass;
}
@@ -746,6 +819,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
*
* @generated
*/
+ @Override
public EClass getPartialStringInterpretation() {
return partialStringInterpretationEClass;
}
@@ -755,6 +829,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
*
* @generated
*/
+ @Override
public EClass getPartialComplexTypeInterpretation() {
return partialComplexTypeInterpretationEClass;
}
@@ -764,6 +839,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
*
* @generated
*/
+ @Override
public EReference getPartialComplexTypeInterpretation_SupertypeInterpretation() {
return (EReference)partialComplexTypeInterpretationEClass.getEStructuralFeatures().get(0);
}
@@ -773,6 +849,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
*
* @generated
*/
+ @Override
public EReference getPartialComplexTypeInterpretation_InterpretationOf() {
return (EReference)partialComplexTypeInterpretationEClass.getEStructuralFeatures().get(1);
}
@@ -782,6 +859,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
*
* @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
*
* @generated
*/
+ @Override
public boolean isValueSet() {
return valueSet;
}
@@ -80,6 +81,7 @@ public abstract class PrimitiveElementImpl extends DefinedElementImpl implements
*
* @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
*
* @generated
*/
+ @Override
public BigDecimal getValue() {
return value;
}
@@ -80,6 +81,7 @@ public class RealElementImpl extends PrimitiveElementImpl implements RealElement
*
* @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;
*
{@link hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.impl.ScopeImpl#getMinNewElements Min New Elements}
*
{@link hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.impl.ScopeImpl#getMaxNewElements Max New Elements}
*
{@link hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.impl.ScopeImpl#getTargetTypeInterpretation Target Type Interpretation}
+ *
{@link hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.impl.ScopeImpl#getMinNewElementsHeuristic Min New Elements Heuristic}
*
*
* @generated
@@ -81,6 +82,26 @@ public class ScopeImpl extends MinimalEObjectImpl.Container implements Scope {
*/
protected PartialTypeInterpratation targetTypeInterpretation;
+ /**
+ * The default value of the '{@link #getMinNewElementsHeuristic() Min New Elements Heuristic}' attribute.
+ *
+ *
+ * @see #getMinNewElementsHeuristic()
+ * @generated
+ * @ordered
+ */
+ protected static final int MIN_NEW_ELEMENTS_HEURISTIC_EDEFAULT = 0;
+
+ /**
+ * The cached value of the '{@link #getMinNewElementsHeuristic() Min New Elements Heuristic}' attribute.
+ *
+ *
+ * @see #getMinNewElementsHeuristic()
+ * @generated
+ * @ordered
+ */
+ protected int minNewElementsHeuristic = MIN_NEW_ELEMENTS_HEURISTIC_EDEFAULT;
+
/**
*
*
@@ -105,6 +126,7 @@ public class ScopeImpl extends MinimalEObjectImpl.Container implements Scope {
*
* @generated
*/
+ @Override
public int getMinNewElements() {
return minNewElements;
}
@@ -114,6 +136,7 @@ public class ScopeImpl extends MinimalEObjectImpl.Container implements Scope {
*
* @generated
*/
+ @Override
public void setMinNewElements(int newMinNewElements) {
int oldMinNewElements = minNewElements;
minNewElements = newMinNewElements;
@@ -126,6 +149,7 @@ public class ScopeImpl extends MinimalEObjectImpl.Container implements Scope {
*
* @generated
*/
+ @Override
public int getMaxNewElements() {
return maxNewElements;
}
@@ -135,6 +159,7 @@ public class ScopeImpl extends MinimalEObjectImpl.Container implements Scope {
*
* @generated
*/
+ @Override
public void setMaxNewElements(int newMaxNewElements) {
int oldMaxNewElements = maxNewElements;
maxNewElements = newMaxNewElements;
@@ -147,6 +172,7 @@ public class ScopeImpl extends MinimalEObjectImpl.Container implements Scope {
*
* @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 {
*
* @generated
*/
+ @Override
public void setTargetTypeInterpretation(PartialTypeInterpratation newTargetTypeInterpretation) {
if (newTargetTypeInterpretation != targetTypeInterpretation) {
NotificationChain msgs = null;
@@ -202,6 +229,29 @@ public class ScopeImpl extends MinimalEObjectImpl.Container implements Scope {
eNotify(new ENotificationImpl(this, Notification.SET, PartialinterpretationPackage.SCOPE__TARGET_TYPE_INTERPRETATION, newTargetTypeInterpretation, newTargetTypeInterpretation));
}
+ /**
+ *
+ *
+ * @generated
+ */
+ @Override
+ public int getMinNewElementsHeuristic() {
+ return minNewElementsHeuristic;
+ }
+
+ /**
+ *
+ *
+ * @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));
+ }
+
/**
*
*
@@ -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
*
* @generated
*/
+ @Override
public String getValue() {
return value;
}
@@ -78,6 +79,7 @@ public class StringElementImpl extends PrimitiveElementImpl implements StringEle
*
* @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
*
* @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
*
* @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"/>
+
+
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 @@
-
+
+
+
+
@@ -33,9 +36,8 @@
-
-
+
@@ -50,6 +52,7 @@
+
@@ -70,11 +73,16 @@
+
+
+
+
+
diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/neighbourhood/Descriptor.xtend b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/neighbourhood/Descriptor.xtend
index c7c1ad77..e4bdb086 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/neighbourhood/Descriptor.xtend
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/neighbourhood/Descriptor.xtend
@@ -60,6 +60,10 @@ import org.eclipse.xtend2.lib.StringConcatenationClient
return this.dataHash.hashCode
}
+ override equals(Object other) {
+ other.class == LocalNodeDescriptor && (other as AbstractNodeDescriptor).hashCode == hashCode
+ }
+
override protected prettyPrint() {
'''(«dataHash»)[«IF id !== null»id = "«id»"«IF types === null || !types.empty», «ENDIF»«ENDIF»«IF types === null»TYPES = null«ELSE»«FOR type : types SEPARATOR ", "»«type»«ENDFOR»«ENDIF»]'''
}
@@ -143,6 +147,10 @@ import org.eclipse.xtend2.lib.StringConcatenationClient
return this.dataHash.hashCode
}
+ override equals(Object other) {
+ other.class == FurtherNodeDescriptor && (other as AbstractNodeDescriptor).hashCode == hashCode
+ }
+
override prettyPrint() {
'''
(«dataHash»)[
diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/neighbourhood/NeighbourhoodOptions.xtend b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/neighbourhood/NeighbourhoodOptions.xtend
index efc89803..c6e03f75 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/neighbourhood/NeighbourhoodOptions.xtend
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/neighbourhood/NeighbourhoodOptions.xtend
@@ -7,12 +7,12 @@ import org.eclipse.xtend.lib.annotations.Data
@Data
class NeighbourhoodOptions {
- public static val FixPointRage = -1
+ public static val FixPointRange = -1
public static val GraphWidthRange = -2
public static val FullParallels = Integer.MAX_VALUE
public static val MaxNumbers = Integer.MAX_VALUE
- public static val DEFAULT = new NeighbourhoodOptions(GraphWidthRange, FullParallels, MaxNumbers, null, null)
+ public static val DEFAULT = new NeighbourhoodOptions(FixPointRange, FullParallels, MaxNumbers, null, null)
val int range
val int parallels
diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/neighbourhood/PartialInterpretation2Hash.xtend b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/neighbourhood/PartialInterpretation2Hash.xtend
index d474877d..ddf7d712 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/neighbourhood/PartialInterpretation2Hash.xtend
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/neighbourhood/PartialInterpretation2Hash.xtend
@@ -5,7 +5,7 @@ import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.DefinedElement
class PartialInterpretation2Hash extends PartialInterpretation2NeighbourhoodRepresentation{
- protected new() {
+ new() {
super(false, true)
}
diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/neighbourhood/PartialInterpretation2NeighbourhoodRepresentation.xtend b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/neighbourhood/PartialInterpretation2NeighbourhoodRepresentation.xtend
index a0382e8e..3048167e 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/neighbourhood/PartialInterpretation2NeighbourhoodRepresentation.xtend
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/neighbourhood/PartialInterpretation2NeighbourhoodRepresentation.xtend
@@ -25,7 +25,7 @@ abstract class PartialInterpretation2NeighbourhoodRepresentation nodeRepresentations = null
- var Map extends AbstractNodeDescriptor, Integer> modelRepresentation = null
+class NeighbourhoodBasedHashStateCoderFactory extends AbstractNeighbourhoodBasedStateCoderFactory {
+ new() {
+ }
new(NeighbourhoodOptions options) {
super(options)
}
+ override protected doCreateStateCoder(NeighbourhoodOptions options) {
+ new NeighbourhoodBasedPartialInterpretationStateCoder(new PartialInterpretation2Hash, options)
+ }
+}
+
+class NeighbourhoodBasedPartialInterpretationStateCoder extends AbstractNeighbourhoodBasedPartialInterpretationStateCoder {
+ val PartialInterpretation2NeighbourhoodRepresentation calculator
+ var Map nodeRepresentations = null
+ var ModelRep modelRepresentation = null
+
+ new(PartialInterpretation2NeighbourhoodRepresentation calculator, NeighbourhoodOptions options) {
+ super(options)
+ this.calculator = calculator
+ }
+
override protected isRefreshNeeded() {
nodeRepresentations === null || modelRepresentation === null
}
diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/ViatraReasoner.xtend b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/ViatraReasoner.xtend
index 1abde0a8..aa02cd30 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/ViatraReasoner.xtend
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/ViatraReasoner.xtend
@@ -12,12 +12,15 @@ import hu.bme.mit.inf.dslreasoner.logic.model.logicproblem.LogicproblemPackage
import hu.bme.mit.inf.dslreasoner.logic.model.logicresult.LogicresultFactory
import hu.bme.mit.inf.dslreasoner.logic.model.logicresult.ModelResult
import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.ModelGenerationMethodProvider
+import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.cardinality.ScopePropagatorStrategy
import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.PartialInterpretationInitialiser
import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialInterpretation
import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialinterpretationPackage
import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.statecoder.AbstractNeighbourhoodBasedStateCoderFactory
import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.statecoder.IdentifierBasedStateCoderFactory
+import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.statecoder.NeighbourhoodBasedHashStateCoderFactory
import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.statecoder.PairwiseNeighbourhoodBasedStateCoderFactory
+import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.dse.BasicScopeGlobalConstraint
import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.dse.BestFirstStrategyForModelGeneration
import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.dse.DiversityChecker
import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.dse.InconsistentScopeGlobalConstraint
@@ -39,7 +42,6 @@ import org.eclipse.viatra.dse.api.DesignSpaceExplorer
import org.eclipse.viatra.dse.api.DesignSpaceExplorer.DseLoggingLevel
import org.eclipse.viatra.dse.solutionstore.SolutionStore
import org.eclipse.viatra.dse.statecode.IStateCoderFactory
-import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.statecoder.NeighbourhoodBasedStateCoderFactory
class ViatraReasoner extends LogicReasoner {
val PartialInterpretationInitialiser initialiser = new PartialInterpretationInitialiser()
@@ -71,6 +73,11 @@ class ViatraReasoner extends LogicReasoner {
workspace.writeModel(emptySolution, "init.partialmodel")
}
emptySolution.problemConainer = problem
+ var BasicScopeGlobalConstraint basicScopeGlobalConstraint = null
+ if (viatraConfig.scopePropagatorStrategy == ScopePropagatorStrategy.None) {
+ basicScopeGlobalConstraint = new BasicScopeGlobalConstraint(emptySolution)
+ emptySolution.scopes.clear
+ }
val method = modelGenerationMethodProvider.createModelGenerationMethod(
problem,
@@ -79,11 +86,12 @@ class ViatraReasoner extends LogicReasoner {
viatraConfig.nameNewElements,
viatraConfig.typeInferenceMethod,
viatraConfig.scopePropagatorStrategy,
+ viatraConfig.hints,
viatraConfig.documentationLevel
)
dse.addObjective(new ModelGenerationCompositeObjective(
- new ScopeObjective,
+ basicScopeGlobalConstraint ?: new ScopeObjective,
method.unfinishedMultiplicities.map[new UnfinishedMultiplicityObjective(it)],
wf2ObjectiveConverter.createCompletenessObjective(method.unfinishedWF)
))
@@ -132,6 +140,9 @@ class ViatraReasoner extends LogicReasoner {
dse.addGlobalConstraint(wf2ObjectiveConverter.createInvalidationGlobalConstraint(method.invalidWF))
dse.addGlobalConstraint(new SurelyViolatedObjectiveGlobalConstraint(solutionSaver))
dse.addGlobalConstraint(new InconsistentScopeGlobalConstraint)
+ if (basicScopeGlobalConstraint !== null) {
+ dse.addGlobalConstraint(basicScopeGlobalConstraint)
+ }
for (additionalConstraint : viatraConfig.searchSpaceConstraints.additionalGlobalConstraints) {
dse.addGlobalConstraint(additionalConstraint.apply(method))
}
@@ -140,7 +151,7 @@ class ViatraReasoner extends LogicReasoner {
val IStateCoderFactory statecoder = switch (viatraConfig.stateCoderStrategy) {
case Neighbourhood:
- new NeighbourhoodBasedStateCoderFactory
+ new NeighbourhoodBasedHashStateCoderFactory
case PairwiseNeighbourhood:
new PairwiseNeighbourhoodBasedStateCoderFactory
default:
@@ -215,10 +226,18 @@ class ViatraReasoner extends LogicReasoner {
it.name = "Decisions"
it.value = method.statistics.decisionsTried
]
+ it.entries += createIntStatisticEntry => [
+ it.name = "Transformations"
+ it.value = method.statistics.transformationInvocations
+ ]
it.entries += createIntStatisticEntry => [
it.name = "ScopePropagations"
it.value = method.statistics.scopePropagatorInvocations
]
+ it.entries += createIntStatisticEntry => [
+ it.name = "ScopePropagationsSolverCalls"
+ it.value = method.statistics.scopePropagatorSolverInvocations
+ ]
if (diversityChecker.isActive) {
it.entries += createIntStatisticEntry => [
it.name = "SolutionDiversityCheckTime"
diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/ViatraReasonerConfiguration.xtend b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/ViatraReasonerConfiguration.xtend
index a5f42a5f..6f38d261 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/ViatraReasonerConfiguration.xtend
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/ViatraReasonerConfiguration.xtend
@@ -16,6 +16,7 @@ import java.util.LinkedList
import java.util.List
import java.util.Set
import org.eclipse.xtext.xbase.lib.Functions.Function1
+import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.cardinality.LinearTypeConstraintHint
enum StateCoderStrategy {
Neighbourhood,
@@ -56,6 +57,8 @@ class ViatraReasonerConfiguration extends LogicSolverConfiguration {
public var ScopePropagatorStrategy scopePropagatorStrategy = new ScopePropagatorStrategy.Polyhedral(
PolyhedralScopePropagatorConstraints.Relational, PolyhedralScopePropagatorSolver.Clp)
+
+ public var List hints = newArrayList
public var List costObjectives = newArrayList
}
diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/dse/BasicScopeGlobalConstraint.xtend b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/dse/BasicScopeGlobalConstraint.xtend
new file mode 100644
index 00000000..67f447ed
--- /dev/null
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/dse/BasicScopeGlobalConstraint.xtend
@@ -0,0 +1,103 @@
+package hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.dse
+
+import com.google.common.collect.ImmutableList
+import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialInterpretation
+import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialTypeInterpratation
+import java.util.Comparator
+import java.util.List
+import org.eclipse.viatra.dse.base.ThreadContext
+import org.eclipse.viatra.dse.objectives.Comparators
+import org.eclipse.viatra.dse.objectives.IGlobalConstraint
+import org.eclipse.viatra.dse.objectives.IObjective
+import org.eclipse.xtend.lib.annotations.FinalFieldsConstructor
+
+class BasicScopeGlobalConstraint implements IGlobalConstraint, IObjective {
+ val PartialInterpretation p
+ val List assertions
+
+ new(PartialInterpretation p) {
+ this.p = p
+ assertions = ImmutableList.copyOf(p.scopes.map [
+ val currentSize = targetTypeInterpretation.elements.size
+ val minElements = minNewElements + currentSize
+ val maxElements = if (maxNewElements < 0) {
+ -1
+ } else {
+ maxNewElements + currentSize
+ }
+ new ScopeAssertion(minElements, maxElements, targetTypeInterpretation)
+ ])
+ }
+
+ override init(ThreadContext context) {
+ if (context.model != p) {
+ throw new IllegalArgumentException(
+ "Partial model must be passed to the constructor of BasicScopeGlobalConstraint")
+ }
+ }
+
+ override checkGlobalConstraint(ThreadContext context) {
+ assertions.forall[upperBoundSatisfied]
+ }
+
+ override getFitness(ThreadContext context) {
+ var double fitness = p.minNewElements
+ for (assertion : assertions) {
+ if (!assertion.lowerBoundSatisfied) {
+ fitness += 1
+ }
+ }
+ fitness
+ }
+
+ override satisifiesHardObjective(Double fitness) {
+ fitness <= 0.01
+ }
+
+ override BasicScopeGlobalConstraint createNew() {
+ this
+ }
+
+ override getName() {
+ class.name
+ }
+
+ override getComparator() {
+ Comparators.LOWER_IS_BETTER
+ }
+
+ override getLevel() {
+ 2
+ }
+
+ override isHardObjective() {
+ true
+ }
+
+ override setComparator(Comparator comparator) {
+ throw new UnsupportedOperationException
+ }
+
+ override setLevel(int level) {
+ throw new UnsupportedOperationException
+ }
+
+ @FinalFieldsConstructor
+ private static class ScopeAssertion {
+ val int lowerBound
+ val int upperBound
+ val PartialTypeInterpratation typeDefinitions
+
+ private def getCount() {
+ typeDefinitions.elements.size
+ }
+
+ private def isLowerBoundSatisfied() {
+ count >= lowerBound
+ }
+
+ private def isUpperBoundSatisfied() {
+ upperBound < 0 || count <= upperBound
+ }
+ }
+}
diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/dse/BestFirstStrategyForModelGeneration.java b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/dse/BestFirstStrategyForModelGeneration.java
index 5af7fc69..081e48fa 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/dse/BestFirstStrategyForModelGeneration.java
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/dse/BestFirstStrategyForModelGeneration.java
@@ -255,7 +255,7 @@ public class BestFirstStrategyForModelGeneration implements IStrategy {
activationIds = new ArrayList