Skip to content

Commit cef4778

Browse files
perezpperezp
authored
Merge pull request #25 from perezp/master
Scenario of DTSM ready to offer Reliability results
2 parents 09f2298 + 35682c2 commit cef4778

File tree

12 files changed

+414
-72
lines changed

12 files changed

+414
-72
lines changed

‎bundles/es.unizar.disco.dice.static.profile/resources/DICE.ecore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@
8484
<eClassifiers xsi:type="ecore:EClass" name="CoreDataSource" abstract="true"
8585
eSuperTypes="#//DICE_UML_Extensions/DPIM/DpimStorageNode"/>
8686
<eClassifiers xsi:type="ecore:EClass" name="CoreDirectAcyclicGraph" abstract="true"
87-
eSuperTypes="../../org.eclipse.papyrus.marte.static.profile/resources/MARTE.ecore#//MARTE_AnalysisModel/GQAM/GaScenario">
87+
eSuperTypes="../../com.masdes.dam.static.profile/resources/DAM.ecore#//DAM_UML_Extensions/System/Core/DaService">
8888
<eStructuralFeatures xsi:type="ecore:EReference" name="hasSourceNode" ordered="false"
8989
lowerBound="1" upperBound="-1" eType="#//DICE_UML_Extensions/DTSM/Core/CoreDAGSourceNode"/>
9090
<eStructuralFeatures xsi:type="ecore:EReference" name="base_Class" ordered="false"

‎bundles/es.unizar.disco.dice.static.profile/resources/DICE.profile.notation‎

Lines changed: 30 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1509,25 +1509,26 @@
15091509
<element xmi:type="uml:Stereotype" href="DICE.profile.uml#_kiO_kOejEeWj7ZPL8JeBTQ"/>
15101510
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_msU04TSMEeaS5Mns13NsQg" x="313" y="239"/>
15111511
</children>
1512-
<children xmi:type="notation:Shape" xmi:id="_p61_UDSMEeaS5Mns13NsQg" type="Stereotype_Shape" fillColor="8047085">
1513-
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_9NjmIjSMEeaS5Mns13NsQg" source="QualifiedName">
1514-
<details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_9NjmIzSMEeaS5Mns13NsQg" key="QualifiedNameDepth" value="0"/>
1512+
<children xmi:type="notation:Shape" xmi:id="_wPFSgAWbEee6F_uL6ESNCQ" type="Stereotype_Shape" fillColor="12621752">
1513+
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yZ3vEAWbEee6F_uL6ESNCQ" source="QualifiedName">
1514+
<details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yZ4WIAWbEee6F_uL6ESNCQ" key="QualifiedNameDepth" value="0"/>
15151515
</eAnnotations>
1516-
<children xmi:type="notation:DecorationNode" xmi:id="_p61_UjSMEeaS5Mns13NsQg" type="Stereotype_NameLabel"/>
1517-
<children xmi:type="notation:BasicCompartment" xmi:id="_p61_UzSMEeaS5Mns13NsQg" type="Stereotype_AttributeCompartment">
1518-
<styles xmi:type="notation:TitleStyle" xmi:id="_p61_VDSMEeaS5Mns13NsQg"/>
1519-
<styles xmi:type="notation:SortingStyle" xmi:id="_p61_VTSMEeaS5Mns13NsQg"/>
1520-
<styles xmi:type="notation:FilteringStyle" xmi:id="_p61_VjSMEeaS5Mns13NsQg"/>
1521-
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_p61_VzSMEeaS5Mns13NsQg"/>
1522-
</children>
1523-
<children xmi:type="notation:BasicCompartment" xmi:id="_p61_WDSMEeaS5Mns13NsQg" type="Stereotype_OperationCompartment">
1524-
<styles xmi:type="notation:TitleStyle" xmi:id="_p61_WTSMEeaS5Mns13NsQg"/>
1525-
<styles xmi:type="notation:SortingStyle" xmi:id="_p61_WjSMEeaS5Mns13NsQg"/>
1526-
<styles xmi:type="notation:FilteringStyle" xmi:id="_p61_WzSMEeaS5Mns13NsQg"/>
1527-
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_p61_XDSMEeaS5Mns13NsQg"/>
1528-
</children>
1529-
<element xmi:type="uml:Stereotype" href="pathmap://Papyrus_PROFILES/MARTE.profile.uml#_XYaMIBKYEdyGYuetzx6T5A"/>
1530-
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_p61_UTSMEeaS5Mns13NsQg" x="1014" y="245"/>
1516+
<children xmi:type="notation:DecorationNode" xmi:id="_wPHuwAWbEee6F_uL6ESNCQ" type="Stereotype_NameLabel"/>
1517+
<children xmi:type="notation:BasicCompartment" xmi:id="_wPHuwQWbEee6F_uL6ESNCQ" type="Stereotype_AttributeCompartment">
1518+
<styles xmi:type="notation:TitleStyle" xmi:id="_wPHuwgWbEee6F_uL6ESNCQ"/>
1519+
<styles xmi:type="notation:SortingStyle" xmi:id="_wPHuwwWbEee6F_uL6ESNCQ"/>
1520+
<styles xmi:type="notation:FilteringStyle" xmi:id="_wPHuxAWbEee6F_uL6ESNCQ"/>
1521+
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_wPHuxQWbEee6F_uL6ESNCQ"/>
1522+
</children>
1523+
<children xmi:type="notation:BasicCompartment" xmi:id="_wPHuxgWbEee6F_uL6ESNCQ" type="Stereotype_OperationCompartment">
1524+
<styles xmi:type="notation:TitleStyle" xmi:id="_wPHuxwWbEee6F_uL6ESNCQ"/>
1525+
<styles xmi:type="notation:SortingStyle" xmi:id="_wPHuyAWbEee6F_uL6ESNCQ"/>
1526+
<styles xmi:type="notation:FilteringStyle" xmi:id="_wPHuyQWbEee6F_uL6ESNCQ"/>
1527+
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_wPHuygWbEee6F_uL6ESNCQ"/>
1528+
</children>
1529+
<styles xmi:type="notation:IntValueStyle" xmi:id="_y3jJkAWbEee6F_uL6ESNCQ" name="shapeDirection" intValue="4"/>
1530+
<element xmi:type="uml:Stereotype" href="pathmap://DAM_PROFILES/DAM.profile.uml#_UMuEIOPvEeKfvsJiOXhpew"/>
1531+
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_wPFSgQWbEee6F_uL6ESNCQ" x="1090" y="237"/>
15311532
</children>
15321533
<styles xmi:type="notation:StringValueStyle" xmi:id="_U9PkATSMEeaS5Mns13NsQg" name="diagram_compatibility_version" stringValue="1.2.0"/>
15331534
<styles xmi:type="notation:DiagramStyle" xmi:id="_U9PkAjSMEeaS5Mns13NsQg"/>
@@ -1605,19 +1606,6 @@
16051606
<sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_nCJ68DSMEeaS5Mns13NsQg" id="(0.52,0.0)"/>
16061607
<targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_nCJ68TSMEeaS5Mns13NsQg" id="(0.4603174603174603,1.0)"/>
16071608
</edges>
1608-
<edges xmi:type="notation:Connector" xmi:id="_p7XjwDSMEeaS5Mns13NsQg" type="Generalization_Edge" source="_Vw7qwDSMEeaS5Mns13NsQg" target="_p61_UDSMEeaS5Mns13NsQg">
1609-
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_OumbADSNEeaS5Mns13NsQg" source="PapyrusCSSForceValue">
1610-
<details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_OumbATSNEeaS5Mns13NsQg" key="routing" value="true"/>
1611-
</eAnnotations>
1612-
<children xmi:type="notation:DecorationNode" xmi:id="_p7XjwzSMEeaS5Mns13NsQg" type="Generalization_StereotypeLabel">
1613-
<layoutConstraint xmi:type="notation:Location" xmi:id="_p7XjxDSMEeaS5Mns13NsQg" y="60"/>
1614-
</children>
1615-
<styles xmi:type="notation:FontStyle" xmi:id="_p7XjwTSMEeaS5Mns13NsQg"/>
1616-
<element xmi:type="uml:Generalization" href="DICE.profile.uml#_LnTawC5qEeaF_sH3mLTVKg"/>
1617-
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_p7XjwjSMEeaS5Mns13NsQg" points="[-62, 0, 0, 63]$[-62, -63, 0, 0]"/>
1618-
<sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_PiVlEDSNEeaS5Mns13NsQg" id="(0.3467153284671533,0.0)"/>
1619-
<targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_PEjc4DSNEeaS5Mns13NsQg" id="(0.5981308411214953,1.0)"/>
1620-
</edges>
16211609
<edges xmi:type="notation:Connector" xmi:id="_rrxKYDSMEeaS5Mns13NsQg" type="Generalization_Edge" source="_VxJGIDSMEeaS5Mns13NsQg" target="_VwxSsDSMEeaS5Mns13NsQg" routing="Rectilinear">
16221610
<children xmi:type="notation:DecorationNode" xmi:id="_rrxKYzSMEeaS5Mns13NsQg" type="Generalization_StereotypeLabel">
16231611
<layoutConstraint xmi:type="notation:Location" xmi:id="_rrxKZDSMEeaS5Mns13NsQg" x="52" y="27"/>
@@ -1638,6 +1626,17 @@
16381626
<sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3MPj8DSMEeaS5Mns13NsQg" id="(0.6094890510948905,0.0)"/>
16391627
<targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_2DrZYDSMEeaS5Mns13NsQg" id="(0.32,1.0)"/>
16401628
</edges>
1629+
<edges xmi:type="notation:Connector" xmi:id="_-kdcoAWbEee6F_uL6ESNCQ" type="Generalization_Edge" source="_Vw7qwDSMEeaS5Mns13NsQg" target="_wPFSgAWbEee6F_uL6ESNCQ">
1630+
<children xmi:type="notation:DecorationNode" xmi:id="_-keDsAWbEee6F_uL6ESNCQ" type="Generalization_StereotypeLabel">
1631+
<styles xmi:type="notation:BooleanValueStyle" xmi:id="_CgvsAAWcEee6F_uL6ESNCQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
1632+
<layoutConstraint xmi:type="notation:Location" xmi:id="_-keDsQWbEee6F_uL6ESNCQ" x="-1" y="38"/>
1633+
</children>
1634+
<styles xmi:type="notation:FontStyle" xmi:id="_-kdcoQWbEee6F_uL6ESNCQ"/>
1635+
<element xmi:type="uml:Generalization" href="DICE.profile.uml#_-jgaYAWbEee6F_uL6ESNCQ"/>
1636+
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_-kdcogWbEee6F_uL6ESNCQ" points="[1141, 479, -643984, -643984]$[1124, 473, -643984, -643984]"/>
1637+
<sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_-lKnQAWbEee6F_uL6ESNCQ" id="(0.33211678832116787,0.0)"/>
1638+
<targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_-lKnQQWbEee6F_uL6ESNCQ" id="(0.6094420600858369,1.0)"/>
1639+
</edges>
16411640
</notation:Diagram>
16421641
<notation:Diagram xmi:id="_MQZzoDx3EeaOH59TuV453g" type="PapyrusUMLProfileDiagram" name="DDSM" measurementUnit="Pixel">
16431642
<children xmi:type="notation:Shape" xmi:id="_Uz4QkDx3EeaOH59TuV453g" type="Stereotype_Shape">

‎bundles/es.unizar.disco.dice.static.profile/resources/DICE.profile.uml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -154,8 +154,8 @@
154154
</ownedAttribute>
155155
</packagedElement>
156156
<packagedElement xmi:type="uml:Stereotype" xmi:id="_2HB5kCluEeaibdPncpUwfA" name="CoreDirectAcyclicGraph" isAbstract="true">
157-
<generalization xmi:type="uml:Generalization" xmi:id="_LnTawC5qEeaF_sH3mLTVKg">
158-
<general xmi:type="uml:Stereotype" href="pathmap://Papyrus_PROFILES/MARTE.profile.uml#_XYaMIBKYEdyGYuetzx6T5A"/>
157+
<generalization xmi:type="uml:Generalization" xmi:id="_-jgaYAWbEee6F_uL6ESNCQ">
158+
<general xmi:type="uml:Stereotype" href="pathmap://DAM_PROFILES/DAM.profile.uml#_UMuEIOPvEeKfvsJiOXhpew"/>
159159
</generalization>
160160
<ownedAttribute xmi:type="uml:Property" xmi:id="_5tJY4CpkEeaibdPncpUwfA" name="hasSourceNode" type="_9mn3oCluEeaibdPncpUwfA">
161161
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2egq8CpqEeaibdPncpUwfA" value="1"/>

‎bundles/es.unizar.disco.dice.static.profile/src/es/unizar/disco/dice/DTSM/Core/CoreDirectAcyclicGraph.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
*/
33
package es.unizar.disco.dice.DTSM.Core;
44

5-
import org.eclipse.emf.common.util.EList;
5+
import com.masdes.dam.Core.DaService;
66

7-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GaScenario;
7+
import org.eclipse.emf.common.util.EList;
88

99
/**
1010
* <!-- begin-user-doc -->
@@ -23,7 +23,7 @@
2323
* @model abstract="true"
2424
* @generated
2525
*/
26-
public interface CoreDirectAcyclicGraph extends GaScenario {
26+
public interface CoreDirectAcyclicGraph extends DaService {
2727
/**
2828
* Returns the value of the '<em><b>Has Source Node</b></em>' reference list.
2929
* The list contents are of type {@link es.unizar.disco.dice.DTSM.Core.CoreDAGSourceNode}.

0 commit comments

Comments
 (0)