Commit aa9b22c3 authored by Simon Eismann's avatar Simon Eismann

Merge branch 'empiricalBlackBox' into StatisticalModel

Conflicts:
	sources/qpme.model/model/qpme.ecore
	sources/qpme.model/model/qpme.genmodel
	sources/qpme.model/src/edu/kit/ipd/descartes/qpme/model/DistributionFunction.java
	sources/qpme.model/src/edu/kit/ipd/descartes/qpme/model/ModelPackage.java
	sources/qpme.model/src/edu/kit/ipd/descartes/qpme/model/QpmeDocument.java
	sources/qpme.model/src/edu/kit/ipd/descartes/qpme/model/QueueingColorReference.java
	sources/qpme.model/src/edu/kit/ipd/descartes/qpme/model/impl/ModelPackageImpl.java
	sources/qpme.model/src/edu/kit/ipd/descartes/qpme/model/impl/QueueingColorReferenceImpl.java
parents 51715154 7649aabc
......@@ -2,6 +2,9 @@
<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="model" nsURI="http://www.descartes-research.net/qpme/model/1.0"
nsPrefix="qpme">
<eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
<details key="qualified" value="false"/>
</eAnnotations>
<eClassifiers xsi:type="ecore:EClass" name="Color" eSuperTypes="#//IdentifiableElement">
<eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
<details key="name" value="color"/>
......@@ -136,7 +139,8 @@
<eLiterals name="REPLAY" value="16" literal="Replay"/>
<eLiterals name="DISCRETE_EMPIRICAL" value="17" literal="DiscreteEmpirical"/>
<eLiterals name="CONTINUOUS_EMPIRICAL" value="18" literal="ContinuousEmpirical"/>
<eLiterals name="MARS" value="22" literal="MARS"/>
<eLiterals name="DETERMINISTIC_CONCURRENCY" value="19" literal="DeterministicConcurrency"/>
<eLiterals name="MARS" value="20" literal="MARS"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EDataType" name="DistributionFunctionObject" instanceClassName="org.eclipse.emf.common.util.Enumerator">
<eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
......@@ -864,7 +868,9 @@
<eStructuralFeatures xsi:type="ecore:EAttribute" name="replayFile" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="valuesFile" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="probabilitiesFile" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="marsFile" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="concurrenciesFile" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="responsetimesFile" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="marsFile" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="QueueingPetriNet">
<eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
......
......@@ -31,6 +31,7 @@
<genEnumLiterals ecoreEnumLiteral="qpme.ecore#//DistributionFunction/REPLAY"/>
<genEnumLiterals ecoreEnumLiteral="qpme.ecore#//DistributionFunction/DISCRETE_EMPIRICAL"/>
<genEnumLiterals ecoreEnumLiteral="qpme.ecore#//DistributionFunction/CONTINUOUS_EMPIRICAL"/>
<genEnumLiterals ecoreEnumLiteral="qpme.ecore#//DistributionFunction/DETERMINISTIC_CONCURRENCY"/>
<genEnumLiterals ecoreEnumLiteral="qpme.ecore#//DistributionFunction/MARS"/>
</genEnums>
<genEnums typeSafeEnumCompatible="false" ecoreEnum="qpme.ecore#//FlowDirection">
......@@ -203,6 +204,8 @@
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute qpme.ecore#//QueueingColorReference/replayFile"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute qpme.ecore#//QueueingColorReference/valuesFile"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute qpme.ecore#//QueueingColorReference/probabilitiesFile"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute qpme.ecore#//QueueingColorReference/concurrenciesFile"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute qpme.ecore#//QueueingColorReference/responsetimesFile"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute qpme.ecore#//QueueingColorReference/marsFile"/>
</genClasses>
<genClasses ecoreClass="qpme.ecore#//QueueingPetriNet">
......
/**
* <copyright>
* </copyright>
*
* $Id$
*/
package edu.kit.ipd.descartes.qpme.model;
/**
* <!-- begin-user-doc -->
* A representation of the model object '<em><b>Color</b></em>'.
* <!-- end-user-doc -->
*
* <p>
* The following features are supported:
* </p>
* <ul>
* <li>{@link edu.kit.ipd.descartes.qpme.model.Color#getDescription <em>Description</em>}</li>
* <li>{@link edu.kit.ipd.descartes.qpme.model.Color#getName <em>Name</em>}</li>
* <li>{@link edu.kit.ipd.descartes.qpme.model.Color#getRealColor <em>Real Color</em>}</li>
* </ul>
*
* @see edu.kit.ipd.descartes.qpme.model.ModelPackage#getColor()
* @model extendedMetaData="name='color' kind='empty'"
* @generated
*/
public interface Color extends IdentifiableElement {
/**
* Returns the value of the '<em><b>Description</b></em>' attribute.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Description</em>' attribute isn't clear,
* there really should be more of a description here...
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Description</em>' attribute.
* @see #setDescription(String)
* @see edu.kit.ipd.descartes.qpme.model.ModelPackage#getColor_Description()
* @model dataType="org.eclipse.emf.ecore.xml.type.String"
* extendedMetaData="kind='attribute' name='description' namespace='##targetNamespace'"
* @generated
*/
String getDescription();
/**
* Sets the value of the '{@link edu.kit.ipd.descartes.qpme.model.Color#getDescription <em>Description</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @param value the new value of the '<em>Description</em>' attribute.
* @see #getDescription()
* @generated
*/
void setDescription(String value);
/**
* Returns the value of the '<em><b>Name</b></em>' attribute.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Name</em>' attribute isn't clear,
* there really should be more of a description here...
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Name</em>' attribute.
* @see #setName(String)
* @see edu.kit.ipd.descartes.qpme.model.ModelPackage#getColor_Name()
* @model dataType="org.eclipse.emf.ecore.xml.type.String" required="true"
* extendedMetaData="kind='attribute' name='name' namespace='##targetNamespace'"
* @generated
*/
String getName();
/**
* Sets the value of the '{@link edu.kit.ipd.descartes.qpme.model.Color#getName <em>Name</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @param value the new value of the '<em>Name</em>' attribute.
* @see #getName()
* @generated
*/
void setName(String value);
/**
* Returns the value of the '<em><b>Real Color</b></em>' attribute.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Real Color</em>' attribute isn't clear,
* there really should be more of a description here...
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Real Color</em>' attribute.
* @see #setRealColor(String)
* @see edu.kit.ipd.descartes.qpme.model.ModelPackage#getColor_RealColor()
* @model dataType="edu.kit.ipd.descartes.qpme.model.RgbValue" required="true"
* extendedMetaData="kind='attribute' name='real-color' namespace='##targetNamespace'"
* @generated
*/
String getRealColor();
/**
* Sets the value of the '{@link edu.kit.ipd.descartes.qpme.model.Color#getRealColor <em>Real Color</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @param value the new value of the '<em>Real Color</em>' attribute.
* @see #getRealColor()
* @generated
*/
void setRealColor(String value);
} // Color
/**
*/
package edu.kit.ipd.descartes.qpme.model;
/**
* <!-- begin-user-doc -->
* A representation of the model object '<em><b>Color</b></em>'.
* <!-- end-user-doc -->
*
* <p>
* The following features are supported:
* </p>
* <ul>
* <li>{@link edu.kit.ipd.descartes.qpme.model.Color#getDescription <em>Description</em>}</li>
* <li>{@link edu.kit.ipd.descartes.qpme.model.Color#getName <em>Name</em>}</li>
* <li>{@link edu.kit.ipd.descartes.qpme.model.Color#getRealColor <em>Real Color</em>}</li>
* </ul>
*
* @see edu.kit.ipd.descartes.qpme.model.ModelPackage#getColor()
* @model extendedMetaData="name='color' kind='empty'"
* @generated
*/
public interface Color extends IdentifiableElement {
/**
* Returns the value of the '<em><b>Description</b></em>' attribute.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Description</em>' attribute isn't clear,
* there really should be more of a description here...
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Description</em>' attribute.
* @see #setDescription(String)
* @see edu.kit.ipd.descartes.qpme.model.ModelPackage#getColor_Description()
* @model dataType="org.eclipse.emf.ecore.xml.type.String"
* extendedMetaData="kind='attribute' name='description' namespace='##targetNamespace'"
* @generated
*/
String getDescription();
/**
* Sets the value of the '{@link edu.kit.ipd.descartes.qpme.model.Color#getDescription <em>Description</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @param value the new value of the '<em>Description</em>' attribute.
* @see #getDescription()
* @generated
*/
void setDescription(String value);
/**
* Returns the value of the '<em><b>Name</b></em>' attribute.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Name</em>' attribute isn't clear,
* there really should be more of a description here...
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Name</em>' attribute.
* @see #setName(String)
* @see edu.kit.ipd.descartes.qpme.model.ModelPackage#getColor_Name()
* @model dataType="org.eclipse.emf.ecore.xml.type.String" required="true"
* extendedMetaData="kind='attribute' name='name' namespace='##targetNamespace'"
* @generated
*/
String getName();
/**
* Sets the value of the '{@link edu.kit.ipd.descartes.qpme.model.Color#getName <em>Name</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @param value the new value of the '<em>Name</em>' attribute.
* @see #getName()
* @generated
*/
void setName(String value);
/**
* Returns the value of the '<em><b>Real Color</b></em>' attribute.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Real Color</em>' attribute isn't clear,
* there really should be more of a description here...
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Real Color</em>' attribute.
* @see #setRealColor(String)
* @see edu.kit.ipd.descartes.qpme.model.ModelPackage#getColor_RealColor()
* @model dataType="edu.kit.ipd.descartes.qpme.model.RgbValue" required="true"
* extendedMetaData="kind='attribute' name='real-color' namespace='##targetNamespace'"
* @generated
*/
String getRealColor();
/**
* Sets the value of the '{@link edu.kit.ipd.descartes.qpme.model.Color#getRealColor <em>Real Color</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @param value the new value of the '<em>Real Color</em>' attribute.
* @see #getRealColor()
* @generated
*/
void setRealColor(String value);
} // Color
/**
* <copyright>
* </copyright>
*
* $Id$
*/
package edu.kit.ipd.descartes.qpme.model;
/**
* <!-- begin-user-doc -->
* A representation of the model object '<em><b>Color Reference</b></em>'.
* <!-- end-user-doc -->
*
* <p>
* The following features are supported:
* </p>
* <ul>
* <li>{@link edu.kit.ipd.descartes.qpme.model.ColorReference#getMetaAttributes <em>Meta Attributes</em>}</li>
* <li>{@link edu.kit.ipd.descartes.qpme.model.ColorReference#getColor <em>Color</em>}</li>
* </ul>
*
* @see edu.kit.ipd.descartes.qpme.model.ModelPackage#getColorReference()
* @model abstract="true"
* extendedMetaData="name='color-reference' kind='elementOnly'"
* @generated
*/
public interface ColorReference extends IncidenceFunctionElement {
/**
* Returns the value of the '<em><b>Meta Attributes</b></em>' containment reference.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Meta Attributes</em>' containment reference isn't clear,
* there really should be more of a description here...
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Meta Attributes</em>' containment reference.
* @see #setMetaAttributes(ColorReferencesMetaAttributesContainer)
* @see edu.kit.ipd.descartes.qpme.model.ModelPackage#getColorReference_MetaAttributes()
* @model containment="true"
* extendedMetaData="kind='element' name='meta-attributes' namespace='##targetNamespace'"
* @generated
*/
ColorReferencesMetaAttributesContainer getMetaAttributes();
/**
* Sets the value of the '{@link edu.kit.ipd.descartes.qpme.model.ColorReference#getMetaAttributes <em>Meta Attributes</em>}' containment reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @param value the new value of the '<em>Meta Attributes</em>' containment reference.
* @see #getMetaAttributes()
* @generated
*/
void setMetaAttributes(ColorReferencesMetaAttributesContainer value);
/**
* Returns the value of the '<em><b>Color</b></em>' reference.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Color</em>' reference isn't clear,
* there really should be more of a description here...
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Color</em>' reference.
* @see #setColor(Color)
* @see edu.kit.ipd.descartes.qpme.model.ModelPackage#getColorReference_Color()
* @model resolveProxies="false" required="true"
* extendedMetaData="kind='attribute' name='color-id' namespace='##targetNamespace'"
* @generated
*/
Color getColor();
/**
* Sets the value of the '{@link edu.kit.ipd.descartes.qpme.model.ColorReference#getColor <em>Color</em>}' reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @param value the new value of the '<em>Color</em>' reference.
* @see #getColor()
* @generated
*/
void setColor(Color value);
} // ColorReference
/**
*/
package edu.kit.ipd.descartes.qpme.model;
/**
* <!-- begin-user-doc -->
* A representation of the model object '<em><b>Color Reference</b></em>'.
* <!-- end-user-doc -->
*
* <p>
* The following features are supported:
* </p>
* <ul>
* <li>{@link edu.kit.ipd.descartes.qpme.model.ColorReference#getMetaAttributes <em>Meta Attributes</em>}</li>
* <li>{@link edu.kit.ipd.descartes.qpme.model.ColorReference#getColor <em>Color</em>}</li>
* </ul>
*
* @see edu.kit.ipd.descartes.qpme.model.ModelPackage#getColorReference()
* @model abstract="true"
* extendedMetaData="name='color-reference' kind='elementOnly'"
* @generated
*/
public interface ColorReference extends IncidenceFunctionElement {
/**
* Returns the value of the '<em><b>Meta Attributes</b></em>' containment reference.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Meta Attributes</em>' containment reference isn't clear,
* there really should be more of a description here...
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Meta Attributes</em>' containment reference.
* @see #setMetaAttributes(ColorReferencesMetaAttributesContainer)
* @see edu.kit.ipd.descartes.qpme.model.ModelPackage#getColorReference_MetaAttributes()
* @model containment="true"
* extendedMetaData="kind='element' name='meta-attributes' namespace='##targetNamespace'"
* @generated
*/
ColorReferencesMetaAttributesContainer getMetaAttributes();
/**
* Sets the value of the '{@link edu.kit.ipd.descartes.qpme.model.ColorReference#getMetaAttributes <em>Meta Attributes</em>}' containment reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @param value the new value of the '<em>Meta Attributes</em>' containment reference.
* @see #getMetaAttributes()
* @generated
*/
void setMetaAttributes(ColorReferencesMetaAttributesContainer value);
/**
* Returns the value of the '<em><b>Color</b></em>' reference.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Color</em>' reference isn't clear,
* there really should be more of a description here...
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Color</em>' reference.
* @see #setColor(Color)
* @see edu.kit.ipd.descartes.qpme.model.ModelPackage#getColorReference_Color()
* @model resolveProxies="false" required="true"
* extendedMetaData="kind='attribute' name='color-id' namespace='##targetNamespace'"
* @generated
*/
Color getColor();
/**
* Sets the value of the '{@link edu.kit.ipd.descartes.qpme.model.ColorReference#getColor <em>Color</em>}' reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @param value the new value of the '<em>Color</em>' reference.
* @see #getColor()
* @generated
*/
void setColor(Color value);
} // ColorReference
/**
* <copyright>
* </copyright>
*
* $Id$
*/
package edu.kit.ipd.descartes.qpme.model;
import org.eclipse.emf.ecore.EObject;
/**
* <!-- begin-user-doc -->
* A representation of the model object '<em><b>Color Reference Meta Attribute</b></em>'.
* <!-- end-user-doc -->
*
*
* @see edu.kit.ipd.descartes.qpme.model.ModelPackage#getColorReferenceMetaAttribute()
* @model abstract="true"
* extendedMetaData="name='color-reference-meta-attribute' kind='empty'"
* @generated
*/
public interface ColorReferenceMetaAttribute extends EObject {
} // ColorReferenceMetaAttribute
/**
*/
package edu.kit.ipd.descartes.qpme.model;
import org.eclipse.emf.ecore.EObject;
/**
* <!-- begin-user-doc -->
* A representation of the model object '<em><b>Color Reference Meta Attribute</b></em>'.
* <!-- end-user-doc -->
*
*
* @see edu.kit.ipd.descartes.qpme.model.ModelPackage#getColorReferenceMetaAttribute()
* @model abstract="true"
* extendedMetaData="name='color-reference-meta-attribute' kind='empty'"
* @generated
*/
public interface ColorReferenceMetaAttribute extends EObject {
} // ColorReferenceMetaAttribute
/**
* <copyright>
* </copyright>
*
* $Id$
*/
package edu.kit.ipd.descartes.qpme.model;
import org.eclipse.emf.common.util.EList;
import org.eclipse.emf.ecore.EObject;
/**
* <!-- begin-user-doc -->
* A representation of the model object '<em><b>Color References Container</b></em>'.
* <!-- end-user-doc -->
*
* <p>
* The following features are supported:
* </p>
* <ul>
* <li>{@link edu.kit.ipd.descartes.qpme.model.ColorReferencesContainer#getDefinitions <em>Definitions</em>}</li>
* </ul>
*
* @see edu.kit.ipd.descartes.qpme.model.ModelPackage#getColorReferencesContainer()
* @model extendedMetaData="name='color-references-container' kind='elementOnly'"
* @generated
*/
public interface ColorReferencesContainer extends EObject {
/**
* Returns the value of the '<em><b>Definitions</b></em>' containment reference list.
* The list contents are of type {@link edu.kit.ipd.descartes.qpme.model.ColorReference}.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Definitions</em>' containment reference list isn't clear,
* there really should be more of a description here...
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Definitions</em>' containment reference list.
* @see edu.kit.ipd.descartes.qpme.model.ModelPackage#getColorReferencesContainer_Definitions()
* @model containment="true"
* extendedMetaData="kind='element' name='color-ref' namespace='##targetNamespace'"
* @generated
*/
EList<ColorReference> getDefinitions();
} // ColorReferencesContainer
/**
*/
package edu.kit.ipd.descartes.qpme.model;
import org.eclipse.emf.common.util.EList;
import org.eclipse.emf.ecore.EObject;
/**
* <!-- begin-user-doc -->
* A representation of the model object '<em><b>Color References Container</b></em>'.
* <!-- end-user-doc -->
*
* <p>
* The following features are supported:
* </p>
* <ul>
* <li>{@link edu.kit.ipd.descartes.qpme.model.ColorReferencesContainer#getDefinitions <em>Definitions</em>}</li>
* </ul>
*
* @see edu.kit.ipd.descartes.qpme.model.ModelPackage#getColorReferencesContainer()
* @model extendedMetaData="name='color-references-container' kind='elementOnly'"
* @generated