diff --git a/edu.kit.ipd.descartes.mm.applicationlevel/model/applicationlevel.genmodel b/edu.kit.ipd.descartes.mm.applicationlevel/model/applicationlevel.genmodel
index 3c5abcc2cc5629a72c8524b05591b8f4cc97a99e..37cef457cbc3af9c10ff161228efcff7060ed65c 100644
--- a/edu.kit.ipd.descartes.mm.applicationlevel/model/applicationlevel.genmodel
+++ b/edu.kit.ipd.descartes.mm.applicationlevel/model/applicationlevel.genmodel
@@ -40,7 +40,6 @@
</genEnums>
<genClasses image="false" ecoreClass="functions.ecore#//Expression"/>
<genClasses ecoreClass="functions.ecore#//ExplicitDescription">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute functions.ecore#//ExplicitDescription/specification"/>
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference functions.ecore#//ExplicitDescription/expression"/>
</genClasses>
<genClasses ecoreClass="functions.ecore#//Function">
@@ -84,7 +83,6 @@
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference functions.ecore#//Power/exponent"/>
</genClasses>
<genClasses ecoreClass="functions.ecore#//RandomVariable">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute functions.ecore#//RandomVariable/specification"/>
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference functions.ecore#//RandomVariable/probFunction"/>
</genClasses>
<genClasses image="false" ecoreClass="functions.ecore#//ProbabilityFunction"/>
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel/model/functions.ecore b/edu.kit.ipd.descartes.mm.applicationlevel/model/functions.ecore
index 05068a7de61baadb0d256d096f1fd4b259095244..8f6b814195d36de82becc4fb46f784fd3b259497 100644
--- a/edu.kit.ipd.descartes.mm.applicationlevel/model/functions.ecore
+++ b/edu.kit.ipd.descartes.mm.applicationlevel/model/functions.ecore
@@ -8,7 +8,6 @@
</eAnnotations>
<eClassifiers xsi:type="ecore:EClass" name="Expression" abstract="true"/>
<eClassifiers xsi:type="ecore:EClass" name="ExplicitDescription">
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="specification" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="expression" eType="#//Expression"
containment="true"/>
</eClassifiers>
@@ -90,7 +89,6 @@
containment="true"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="RandomVariable">
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="specification" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="probFunction" eType="#//ProbabilityFunction"
containment="true"/>
</eClassifiers>
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel/model/functions.ecore.oclinecore b/edu.kit.ipd.descartes.mm.applicationlevel/model/functions.ecore.oclinecore
index 937022f027d6e190511a1e1fdb0c98edabb57e86..d865d4e938ea1bf317255775c3b3dbf07797f0e2 100644
--- a/edu.kit.ipd.descartes.mm.applicationlevel/model/functions.ecore.oclinecore
+++ b/edu.kit.ipd.descartes.mm.applicationlevel/model/functions.ecore.oclinecore
@@ -8,7 +8,6 @@ package functions : functions = 'http://www.descartes-research.net/metamodel/fun
abstract class Expression;
class ExplicitDescription {
- attribute specification : String[0..1];
property expression : Expression[0..1] {composes};
}
@@ -93,7 +92,6 @@ package functions : functions = 'http://www.descartes-research.net/metamodel/fun
--#########################################################
class RandomVariable {
- attribute specification : String[0..1];
property probFunction : ProbabilityFunction[0..1] {composes};
}
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel/src/edu/kit/ipd/descartes/mm/applicationlevel/functions/ExplicitDescription.java b/edu.kit.ipd.descartes.mm.applicationlevel/src/edu/kit/ipd/descartes/mm/applicationlevel/functions/ExplicitDescription.java
index 69e118659d93203d809e6d21dd6dbb73fc4f0118..9f6f4b59910d15da6302fef13b55fe8ca5d5d3fc 100644
--- a/edu.kit.ipd.descartes.mm.applicationlevel/src/edu/kit/ipd/descartes/mm/applicationlevel/functions/ExplicitDescription.java
+++ b/edu.kit.ipd.descartes.mm.applicationlevel/src/edu/kit/ipd/descartes/mm/applicationlevel/functions/ExplicitDescription.java
@@ -13,7 +13,6 @@ import org.eclipse.emf.ecore.EObject;
* <p>
* The following features are supported:
* <ul>
- * <li>{@link edu.kit.ipd.descartes.mm.applicationlevel.functions.ExplicitDescription#getSpecification <em>Specification</em>}</li>
* <li>{@link edu.kit.ipd.descartes.mm.applicationlevel.functions.ExplicitDescription#getExpression <em>Expression</em>}</li>
* </ul>
* </p>
@@ -23,32 +22,6 @@ import org.eclipse.emf.ecore.EObject;
* @generated
*/
public interface ExplicitDescription extends EObject {
- /**
- * Returns the value of the '<em><b>Specification</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Specification</em>' attribute isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Specification</em>' attribute.
- * @see #setSpecification(String)
- * @see edu.kit.ipd.descartes.mm.applicationlevel.functions.FunctionsPackage#getExplicitDescription_Specification()
- * @model
- * @generated
- */
- String getSpecification();
-
- /**
- * Sets the value of the '{@link edu.kit.ipd.descartes.mm.applicationlevel.functions.ExplicitDescription#getSpecification <em>Specification</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Specification</em>' attribute.
- * @see #getSpecification()
- * @generated
- */
- void setSpecification(String value);
-
/**
* Returns the value of the '<em><b>Expression</b></em>' containment reference.
* <!-- begin-user-doc -->
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel/src/edu/kit/ipd/descartes/mm/applicationlevel/functions/FunctionsPackage.java b/edu.kit.ipd.descartes.mm.applicationlevel/src/edu/kit/ipd/descartes/mm/applicationlevel/functions/FunctionsPackage.java
index aefccab02ee1f3f4a40b1142bdbb7cbaa278c896..614bc06e3b59b3a8e0cc53313187134a96cc16ed 100644
--- a/edu.kit.ipd.descartes.mm.applicationlevel/src/edu/kit/ipd/descartes/mm/applicationlevel/functions/FunctionsPackage.java
+++ b/edu.kit.ipd.descartes.mm.applicationlevel/src/edu/kit/ipd/descartes/mm/applicationlevel/functions/FunctionsPackage.java
@@ -87,15 +87,6 @@ public interface FunctionsPackage extends EPackage {
*/
int EXPLICIT_DESCRIPTION = 1;
- /**
- * The feature id for the '<em><b>Specification</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int EXPLICIT_DESCRIPTION__SPECIFICATION = 0;
-
/**
* The feature id for the '<em><b>Expression</b></em>' containment reference.
* <!-- begin-user-doc -->
@@ -103,7 +94,7 @@ public interface FunctionsPackage extends EPackage {
* @generated
* @ordered
*/
- int EXPLICIT_DESCRIPTION__EXPRESSION = 1;
+ int EXPLICIT_DESCRIPTION__EXPRESSION = 0;
/**
* The number of structural features of the '<em>Explicit Description</em>' class.
@@ -112,7 +103,7 @@ public interface FunctionsPackage extends EPackage {
* @generated
* @ordered
*/
- int EXPLICIT_DESCRIPTION_FEATURE_COUNT = 2;
+ int EXPLICIT_DESCRIPTION_FEATURE_COUNT = 1;
/**
* The meta object id for the '{@link edu.kit.ipd.descartes.mm.applicationlevel.functions.impl.AtomImpl <em>Atom</em>}' class.
@@ -503,15 +494,6 @@ public interface FunctionsPackage extends EPackage {
*/
int RANDOM_VARIABLE = 12;
- /**
- * The feature id for the '<em><b>Specification</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int RANDOM_VARIABLE__SPECIFICATION = 0;
-
/**
* The feature id for the '<em><b>Prob Function</b></em>' containment reference.
* <!-- begin-user-doc -->
@@ -519,7 +501,7 @@ public interface FunctionsPackage extends EPackage {
* @generated
* @ordered
*/
- int RANDOM_VARIABLE__PROB_FUNCTION = 1;
+ int RANDOM_VARIABLE__PROB_FUNCTION = 0;
/**
* The number of structural features of the '<em>Random Variable</em>' class.
@@ -528,7 +510,7 @@ public interface FunctionsPackage extends EPackage {
* @generated
* @ordered
*/
- int RANDOM_VARIABLE_FEATURE_COUNT = 2;
+ int RANDOM_VARIABLE_FEATURE_COUNT = 1;
/**
* The meta object id for the '{@link edu.kit.ipd.descartes.mm.applicationlevel.functions.impl.ProbabilityFunctionImpl <em>Probability Function</em>}' class.
@@ -1207,17 +1189,6 @@ public interface FunctionsPackage extends EPackage {
*/
EClass getExplicitDescription();
- /**
- * Returns the meta object for the attribute '{@link edu.kit.ipd.descartes.mm.applicationlevel.functions.ExplicitDescription#getSpecification <em>Specification</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Specification</em>'.
- * @see edu.kit.ipd.descartes.mm.applicationlevel.functions.ExplicitDescription#getSpecification()
- * @see #getExplicitDescription()
- * @generated
- */
- EAttribute getExplicitDescription_Specification();
-
/**
* Returns the meta object for the containment reference '{@link edu.kit.ipd.descartes.mm.applicationlevel.functions.ExplicitDescription#getExpression <em>Expression</em>}'.
* <!-- begin-user-doc -->
@@ -1570,17 +1541,6 @@ public interface FunctionsPackage extends EPackage {
*/
EClass getRandomVariable();
- /**
- * Returns the meta object for the attribute '{@link edu.kit.ipd.descartes.mm.applicationlevel.functions.RandomVariable#getSpecification <em>Specification</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Specification</em>'.
- * @see edu.kit.ipd.descartes.mm.applicationlevel.functions.RandomVariable#getSpecification()
- * @see #getRandomVariable()
- * @generated
- */
- EAttribute getRandomVariable_Specification();
-
/**
* Returns the meta object for the containment reference '{@link edu.kit.ipd.descartes.mm.applicationlevel.functions.RandomVariable#getProbFunction <em>Prob Function</em>}'.
* <!-- begin-user-doc -->
@@ -2136,14 +2096,6 @@ public interface FunctionsPackage extends EPackage {
*/
EClass EXPLICIT_DESCRIPTION = eINSTANCE.getExplicitDescription();
- /**
- * The meta object literal for the '<em><b>Specification</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute EXPLICIT_DESCRIPTION__SPECIFICATION = eINSTANCE.getExplicitDescription_Specification();
-
/**
* The meta object literal for the '<em><b>Expression</b></em>' containment reference feature.
* <!-- begin-user-doc -->
@@ -2430,14 +2382,6 @@ public interface FunctionsPackage extends EPackage {
*/
EClass RANDOM_VARIABLE = eINSTANCE.getRandomVariable();
- /**
- * The meta object literal for the '<em><b>Specification</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute RANDOM_VARIABLE__SPECIFICATION = eINSTANCE.getRandomVariable_Specification();
-
/**
* The meta object literal for the '<em><b>Prob Function</b></em>' containment reference feature.
* <!-- begin-user-doc -->
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel/src/edu/kit/ipd/descartes/mm/applicationlevel/functions/RandomVariable.java b/edu.kit.ipd.descartes.mm.applicationlevel/src/edu/kit/ipd/descartes/mm/applicationlevel/functions/RandomVariable.java
index cade47f413711168f8d76ebed25e5e8c61ce3f18..ef0c67762a588b8d498be3b0840bcc8c492f13d2 100644
--- a/edu.kit.ipd.descartes.mm.applicationlevel/src/edu/kit/ipd/descartes/mm/applicationlevel/functions/RandomVariable.java
+++ b/edu.kit.ipd.descartes.mm.applicationlevel/src/edu/kit/ipd/descartes/mm/applicationlevel/functions/RandomVariable.java
@@ -13,7 +13,6 @@ import org.eclipse.emf.ecore.EObject;
* <p>
* The following features are supported:
* <ul>
- * <li>{@link edu.kit.ipd.descartes.mm.applicationlevel.functions.RandomVariable#getSpecification <em>Specification</em>}</li>
* <li>{@link edu.kit.ipd.descartes.mm.applicationlevel.functions.RandomVariable#getProbFunction <em>Prob Function</em>}</li>
* </ul>
* </p>
@@ -23,32 +22,6 @@ import org.eclipse.emf.ecore.EObject;
* @generated
*/
public interface RandomVariable extends EObject {
- /**
- * Returns the value of the '<em><b>Specification</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Specification</em>' attribute isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Specification</em>' attribute.
- * @see #setSpecification(String)
- * @see edu.kit.ipd.descartes.mm.applicationlevel.functions.FunctionsPackage#getRandomVariable_Specification()
- * @model
- * @generated
- */
- String getSpecification();
-
- /**
- * Sets the value of the '{@link edu.kit.ipd.descartes.mm.applicationlevel.functions.RandomVariable#getSpecification <em>Specification</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Specification</em>' attribute.
- * @see #getSpecification()
- * @generated
- */
- void setSpecification(String value);
-
/**
* Returns the value of the '<em><b>Prob Function</b></em>' containment reference.
* <!-- begin-user-doc -->
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel/src/edu/kit/ipd/descartes/mm/applicationlevel/functions/impl/ExplicitDescriptionImpl.java b/edu.kit.ipd.descartes.mm.applicationlevel/src/edu/kit/ipd/descartes/mm/applicationlevel/functions/impl/ExplicitDescriptionImpl.java
index c62c21d9d21e557f8dbc00dba668c79573432ba4..a9481ce635b80d23a64498e7b88c45e0aff59d3d 100644
--- a/edu.kit.ipd.descartes.mm.applicationlevel/src/edu/kit/ipd/descartes/mm/applicationlevel/functions/impl/ExplicitDescriptionImpl.java
+++ b/edu.kit.ipd.descartes.mm.applicationlevel/src/edu/kit/ipd/descartes/mm/applicationlevel/functions/impl/ExplicitDescriptionImpl.java
@@ -23,7 +23,6 @@ import org.eclipse.emf.ecore.impl.EObjectImpl;
* <p>
* The following features are implemented:
* <ul>
- * <li>{@link edu.kit.ipd.descartes.mm.applicationlevel.functions.impl.ExplicitDescriptionImpl#getSpecification <em>Specification</em>}</li>
* <li>{@link edu.kit.ipd.descartes.mm.applicationlevel.functions.impl.ExplicitDescriptionImpl#getExpression <em>Expression</em>}</li>
* </ul>
* </p>
@@ -31,26 +30,6 @@ import org.eclipse.emf.ecore.impl.EObjectImpl;
* @generated
*/
public class ExplicitDescriptionImpl extends EObjectImpl implements ExplicitDescription {
- /**
- * The default value of the '{@link #getSpecification() <em>Specification</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getSpecification()
- * @generated
- * @ordered
- */
- protected static final String SPECIFICATION_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getSpecification() <em>Specification</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getSpecification()
- * @generated
- * @ordered
- */
- protected String specification = SPECIFICATION_EDEFAULT;
-
/**
* The cached value of the '{@link #getExpression() <em>Expression</em>}' containment reference.
* <!-- begin-user-doc -->
@@ -80,27 +59,6 @@ public class ExplicitDescriptionImpl extends EObjectImpl implements ExplicitDesc
return FunctionsPackage.Literals.EXPLICIT_DESCRIPTION;
}
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getSpecification() {
- return specification;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setSpecification(String newSpecification) {
- String oldSpecification = specification;
- specification = newSpecification;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, FunctionsPackage.EXPLICIT_DESCRIPTION__SPECIFICATION, oldSpecification, specification));
- }
-
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -166,8 +124,6 @@ public class ExplicitDescriptionImpl extends EObjectImpl implements ExplicitDesc
@Override
public Object eGet(int featureID, boolean resolve, boolean coreType) {
switch (featureID) {
- case FunctionsPackage.EXPLICIT_DESCRIPTION__SPECIFICATION:
- return getSpecification();
case FunctionsPackage.EXPLICIT_DESCRIPTION__EXPRESSION:
return getExpression();
}
@@ -182,9 +138,6 @@ public class ExplicitDescriptionImpl extends EObjectImpl implements ExplicitDesc
@Override
public void eSet(int featureID, Object newValue) {
switch (featureID) {
- case FunctionsPackage.EXPLICIT_DESCRIPTION__SPECIFICATION:
- setSpecification((String)newValue);
- return;
case FunctionsPackage.EXPLICIT_DESCRIPTION__EXPRESSION:
setExpression((Expression)newValue);
return;
@@ -200,9 +153,6 @@ public class ExplicitDescriptionImpl extends EObjectImpl implements ExplicitDesc
@Override
public void eUnset(int featureID) {
switch (featureID) {
- case FunctionsPackage.EXPLICIT_DESCRIPTION__SPECIFICATION:
- setSpecification(SPECIFICATION_EDEFAULT);
- return;
case FunctionsPackage.EXPLICIT_DESCRIPTION__EXPRESSION:
setExpression((Expression)null);
return;
@@ -218,28 +168,10 @@ public class ExplicitDescriptionImpl extends EObjectImpl implements ExplicitDesc
@Override
public boolean eIsSet(int featureID) {
switch (featureID) {
- case FunctionsPackage.EXPLICIT_DESCRIPTION__SPECIFICATION:
- return SPECIFICATION_EDEFAULT == null ? specification != null : !SPECIFICATION_EDEFAULT.equals(specification);
case FunctionsPackage.EXPLICIT_DESCRIPTION__EXPRESSION:
return expression != null;
}
return super.eIsSet(featureID);
}
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public String toString() {
- if (eIsProxy()) return super.toString();
-
- StringBuffer result = new StringBuffer(super.toString());
- result.append(" (specification: ");
- result.append(specification);
- result.append(')');
- return result.toString();
- }
-
} //ExplicitDescriptionImpl
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel/src/edu/kit/ipd/descartes/mm/applicationlevel/functions/impl/FunctionsPackageImpl.java b/edu.kit.ipd.descartes.mm.applicationlevel/src/edu/kit/ipd/descartes/mm/applicationlevel/functions/impl/FunctionsPackageImpl.java
index e1f08004ed5d2aa878a2aa86255850c954b4e1d1..d52e6dccfb2519ea758c7e1cab7b3743b3d23e4f 100644
--- a/edu.kit.ipd.descartes.mm.applicationlevel/src/edu/kit/ipd/descartes/mm/applicationlevel/functions/impl/FunctionsPackageImpl.java
+++ b/edu.kit.ipd.descartes.mm.applicationlevel/src/edu/kit/ipd/descartes/mm/applicationlevel/functions/impl/FunctionsPackageImpl.java
@@ -447,22 +447,13 @@ public class FunctionsPackageImpl extends EPackageImpl implements FunctionsPacka
return explicitDescriptionEClass;
}
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getExplicitDescription_Specification() {
- return (EAttribute)explicitDescriptionEClass.getEStructuralFeatures().get(0);
- }
-
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
public EReference getExplicitDescription_Expression() {
- return (EReference)explicitDescriptionEClass.getEStructuralFeatures().get(1);
+ return (EReference)explicitDescriptionEClass.getEStructuralFeatures().get(0);
}
/**
@@ -753,22 +744,13 @@ public class FunctionsPackageImpl extends EPackageImpl implements FunctionsPacka
return randomVariableEClass;
}
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getRandomVariable_Specification() {
- return (EAttribute)randomVariableEClass.getEStructuralFeatures().get(0);
- }
-
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
public EReference getRandomVariable_ProbFunction() {
- return (EReference)randomVariableEClass.getEStructuralFeatures().get(1);
+ return (EReference)randomVariableEClass.getEStructuralFeatures().get(0);
}
/**
@@ -1234,7 +1216,6 @@ public class FunctionsPackageImpl extends EPackageImpl implements FunctionsPacka
expressionEClass = createEClass(EXPRESSION);
explicitDescriptionEClass = createEClass(EXPLICIT_DESCRIPTION);
- createEAttribute(explicitDescriptionEClass, EXPLICIT_DESCRIPTION__SPECIFICATION);
createEReference(explicitDescriptionEClass, EXPLICIT_DESCRIPTION__EXPRESSION);
functionEClass = createEClass(FUNCTION);
@@ -1279,7 +1260,6 @@ public class FunctionsPackageImpl extends EPackageImpl implements FunctionsPacka
createEReference(powerEClass, POWER__EXPONENT);
randomVariableEClass = createEClass(RANDOM_VARIABLE);
- createEAttribute(randomVariableEClass, RANDOM_VARIABLE__SPECIFICATION);
createEReference(randomVariableEClass, RANDOM_VARIABLE__PROB_FUNCTION);
probabilityFunctionEClass = createEClass(PROBABILITY_FUNCTION);
@@ -1417,7 +1397,6 @@ public class FunctionsPackageImpl extends EPackageImpl implements FunctionsPacka
initEClass(expressionEClass, Expression.class, "Expression", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEClass(explicitDescriptionEClass, ExplicitDescription.class, "ExplicitDescription", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEAttribute(getExplicitDescription_Specification(), ecorePackage.getEString(), "specification", null, 0, 1, ExplicitDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEReference(getExplicitDescription_Expression(), this.getExpression(), null, "expression", null, 0, 1, ExplicitDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(functionEClass, Function.class, "Function", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
@@ -1462,7 +1441,6 @@ public class FunctionsPackageImpl extends EPackageImpl implements FunctionsPacka
initEReference(getPower_Exponent(), this.getExpression(), null, "exponent", null, 0, 1, Power.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(randomVariableEClass, RandomVariable.class, "RandomVariable", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEAttribute(getRandomVariable_Specification(), ecorePackage.getEString(), "specification", null, 0, 1, RandomVariable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEReference(getRandomVariable_ProbFunction(), this.getProbabilityFunction(), null, "probFunction", null, 0, 1, RandomVariable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(probabilityFunctionEClass, ProbabilityFunction.class, "ProbabilityFunction", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel/src/edu/kit/ipd/descartes/mm/applicationlevel/functions/impl/RandomVariableImpl.java b/edu.kit.ipd.descartes.mm.applicationlevel/src/edu/kit/ipd/descartes/mm/applicationlevel/functions/impl/RandomVariableImpl.java
index 920283bf398acd57bce4bf0a805b10a47bfc0fc9..24a4b45d1e6776707dd567913c757b8f9cbace18 100644
--- a/edu.kit.ipd.descartes.mm.applicationlevel/src/edu/kit/ipd/descartes/mm/applicationlevel/functions/impl/RandomVariableImpl.java
+++ b/edu.kit.ipd.descartes.mm.applicationlevel/src/edu/kit/ipd/descartes/mm/applicationlevel/functions/impl/RandomVariableImpl.java
@@ -23,7 +23,6 @@ import org.eclipse.emf.ecore.impl.EObjectImpl;
* <p>
* The following features are implemented:
* <ul>
- * <li>{@link edu.kit.ipd.descartes.mm.applicationlevel.functions.impl.RandomVariableImpl#getSpecification <em>Specification</em>}</li>
* <li>{@link edu.kit.ipd.descartes.mm.applicationlevel.functions.impl.RandomVariableImpl#getProbFunction <em>Prob Function</em>}</li>
* </ul>
* </p>
@@ -31,24 +30,6 @@ import org.eclipse.emf.ecore.impl.EObjectImpl;
* @generated
*/
public class RandomVariableImpl extends EObjectImpl implements RandomVariable {
- /**
- * The default value of the '{@link #getSpecification() <em>Specification</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getSpecification()
- * @generated
- * @ordered
- */
- protected static final String SPECIFICATION_EDEFAULT = null;
- /**
- * The cached value of the '{@link #getSpecification() <em>Specification</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getSpecification()
- * @generated
- * @ordered
- */
- protected String specification = SPECIFICATION_EDEFAULT;
/**
* The cached value of the '{@link #getProbFunction() <em>Prob Function</em>}' containment reference.
* <!-- begin-user-doc -->
@@ -78,27 +59,6 @@ public class RandomVariableImpl extends EObjectImpl implements RandomVariable {
return FunctionsPackage.Literals.RANDOM_VARIABLE;
}
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getSpecification() {
- return specification;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setSpecification(String newSpecification) {
- String oldSpecification = specification;
- specification = newSpecification;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, FunctionsPackage.RANDOM_VARIABLE__SPECIFICATION, oldSpecification, specification));
- }
-
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -164,8 +124,6 @@ public class RandomVariableImpl extends EObjectImpl implements RandomVariable {
@Override
public Object eGet(int featureID, boolean resolve, boolean coreType) {
switch (featureID) {
- case FunctionsPackage.RANDOM_VARIABLE__SPECIFICATION:
- return getSpecification();
case FunctionsPackage.RANDOM_VARIABLE__PROB_FUNCTION:
return getProbFunction();
}
@@ -180,9 +138,6 @@ public class RandomVariableImpl extends EObjectImpl implements RandomVariable {
@Override
public void eSet(int featureID, Object newValue) {
switch (featureID) {
- case FunctionsPackage.RANDOM_VARIABLE__SPECIFICATION:
- setSpecification((String)newValue);
- return;
case FunctionsPackage.RANDOM_VARIABLE__PROB_FUNCTION:
setProbFunction((ProbabilityFunction)newValue);
return;
@@ -198,9 +153,6 @@ public class RandomVariableImpl extends EObjectImpl implements RandomVariable {
@Override
public void eUnset(int featureID) {
switch (featureID) {
- case FunctionsPackage.RANDOM_VARIABLE__SPECIFICATION:
- setSpecification(SPECIFICATION_EDEFAULT);
- return;
case FunctionsPackage.RANDOM_VARIABLE__PROB_FUNCTION:
setProbFunction((ProbabilityFunction)null);
return;
@@ -216,28 +168,10 @@ public class RandomVariableImpl extends EObjectImpl implements RandomVariable {
@Override
public boolean eIsSet(int featureID) {
switch (featureID) {
- case FunctionsPackage.RANDOM_VARIABLE__SPECIFICATION:
- return SPECIFICATION_EDEFAULT == null ? specification != null : !SPECIFICATION_EDEFAULT.equals(specification);
case FunctionsPackage.RANDOM_VARIABLE__PROB_FUNCTION:
return probFunction != null;
}
return super.eIsSet(featureID);
}
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public String toString() {
- if (eIsProxy()) return super.toString();
-
- StringBuffer result = new StringBuffer(super.toString());
- result.append(" (specification: ");
- result.append(specification);
- result.append(')');
- return result.toString();
- }
-
} //RandomVariableImpl