added constraint
This commit is contained in:
parent
ebac675b3b
commit
a4fc5e5fe8
2 changed files with 84 additions and 79 deletions
|
@ -42,6 +42,11 @@ end
|
||||||
class Flotte
|
class Flotte
|
||||||
operations
|
operations
|
||||||
ajouterBateau(bateau: Bateau)
|
ajouterBateau(bateau: Bateau)
|
||||||
|
constraints
|
||||||
|
inv: bateaux->select(b: Bateau | b.type = TypeBateau::Torpilleur)->size() = 1
|
||||||
|
inv: bateaux->select(b: Bateau | b.type = TypeBateau::Contre_Torpilleur)->size() = 2
|
||||||
|
inv: bateaux->select(b: Bateau | b.type = TypeBateau::Croiseur)->size() = 1
|
||||||
|
inv: bateaux->select(b: Bateau | b.type = TypeBateau::Porte_Avions)->size() = 1
|
||||||
end
|
end
|
||||||
|
|
||||||
class Coup
|
class Coup
|
||||||
|
|
|
@ -416,18 +416,6 @@
|
||||||
</strategy>
|
</strategy>
|
||||||
<hidden>false</hidden>
|
<hidden>false</hidden>
|
||||||
</edgeproperty>
|
</edgeproperty>
|
||||||
<edgeproperty id="Appartient::source::rolename" sizeCalculated="true" type="rolename" userDefined="false" visible="true">
|
|
||||||
<name>joueur</name>
|
|
||||||
<strategy type="org.tzi.use.gui.views.diagrams.elements.positioning.StrategyRelativeToAttached">
|
|
||||||
<userOffsetX>0.0</userOffsetX>
|
|
||||||
<userOffsetY>0.0</userOffsetY>
|
|
||||||
<attached>Appartient::WayPoint::0</attached>
|
|
||||||
<offset_x>8</offset_x>
|
|
||||||
<offset_y>8</offset_y>
|
|
||||||
<placement>TOP</placement>
|
|
||||||
</strategy>
|
|
||||||
<hidden>false</hidden>
|
|
||||||
</edgeproperty>
|
|
||||||
<edgeproperty id="Appartient::source::multiplicity" sizeCalculated="true" type="multiplicity" userDefined="false" visible="true">
|
<edgeproperty id="Appartient::source::multiplicity" sizeCalculated="true" type="multiplicity" userDefined="false" visible="true">
|
||||||
<name>1</name>
|
<name>1</name>
|
||||||
<strategy type="org.tzi.use.gui.views.diagrams.elements.positioning.StrategyRelativeToAttached">
|
<strategy type="org.tzi.use.gui.views.diagrams.elements.positioning.StrategyRelativeToAttached">
|
||||||
|
@ -440,6 +428,18 @@
|
||||||
</strategy>
|
</strategy>
|
||||||
<hidden>false</hidden>
|
<hidden>false</hidden>
|
||||||
</edgeproperty>
|
</edgeproperty>
|
||||||
|
<edgeproperty id="Appartient::source::rolename" sizeCalculated="true" type="rolename" userDefined="false" visible="true">
|
||||||
|
<name>joueur</name>
|
||||||
|
<strategy type="org.tzi.use.gui.views.diagrams.elements.positioning.StrategyRelativeToAttached">
|
||||||
|
<userOffsetX>0.0</userOffsetX>
|
||||||
|
<userOffsetY>0.0</userOffsetY>
|
||||||
|
<attached>Appartient::WayPoint::0</attached>
|
||||||
|
<offset_x>8</offset_x>
|
||||||
|
<offset_y>8</offset_y>
|
||||||
|
<placement>TOP</placement>
|
||||||
|
</strategy>
|
||||||
|
<hidden>false</hidden>
|
||||||
|
</edgeproperty>
|
||||||
</properties>
|
</properties>
|
||||||
<waypoints>
|
<waypoints>
|
||||||
<edgeproperty id="Appartient::WayPoint::0" sizeCalculated="true" type="WayPoint" userDefined="false" visible="true">
|
<edgeproperty id="Appartient::WayPoint::0" sizeCalculated="true" type="WayPoint" userDefined="false" visible="true">
|
||||||
|
@ -484,18 +484,6 @@
|
||||||
</strategy>
|
</strategy>
|
||||||
<hidden>false</hidden>
|
<hidden>false</hidden>
|
||||||
</edgeproperty>
|
</edgeproperty>
|
||||||
<edgeproperty id="Utilise::target::multiplicity" sizeCalculated="true" type="multiplicity" userDefined="false" visible="true">
|
|
||||||
<name>1</name>
|
|
||||||
<strategy type="org.tzi.use.gui.views.diagrams.elements.positioning.StrategyRelativeToAttached">
|
|
||||||
<userOffsetX>0.0</userOffsetX>
|
|
||||||
<userOffsetY>0.0</userOffsetY>
|
|
||||||
<attached>Utilise::WayPoint::1</attached>
|
|
||||||
<offset_x>8</offset_x>
|
|
||||||
<offset_y>8</offset_y>
|
|
||||||
<placement>BOTTOM</placement>
|
|
||||||
</strategy>
|
|
||||||
<hidden>false</hidden>
|
|
||||||
</edgeproperty>
|
|
||||||
<edgeproperty id="Utilise::target::rolename" sizeCalculated="true" type="rolename" userDefined="false" visible="true">
|
<edgeproperty id="Utilise::target::rolename" sizeCalculated="true" type="rolename" userDefined="false" visible="true">
|
||||||
<name>plateau</name>
|
<name>plateau</name>
|
||||||
<strategy type="org.tzi.use.gui.views.diagrams.elements.positioning.StrategyRelativeToAttached">
|
<strategy type="org.tzi.use.gui.views.diagrams.elements.positioning.StrategyRelativeToAttached">
|
||||||
|
@ -508,6 +496,18 @@
|
||||||
</strategy>
|
</strategy>
|
||||||
<hidden>false</hidden>
|
<hidden>false</hidden>
|
||||||
</edgeproperty>
|
</edgeproperty>
|
||||||
|
<edgeproperty id="Utilise::target::multiplicity" sizeCalculated="true" type="multiplicity" userDefined="false" visible="true">
|
||||||
|
<name>1</name>
|
||||||
|
<strategy type="org.tzi.use.gui.views.diagrams.elements.positioning.StrategyRelativeToAttached">
|
||||||
|
<userOffsetX>0.0</userOffsetX>
|
||||||
|
<userOffsetY>0.0</userOffsetY>
|
||||||
|
<attached>Utilise::WayPoint::1</attached>
|
||||||
|
<offset_x>8</offset_x>
|
||||||
|
<offset_y>8</offset_y>
|
||||||
|
<placement>BOTTOM</placement>
|
||||||
|
</strategy>
|
||||||
|
<hidden>false</hidden>
|
||||||
|
</edgeproperty>
|
||||||
<edgeproperty id="Utilise::source::rolename" sizeCalculated="true" type="rolename" userDefined="false" visible="true">
|
<edgeproperty id="Utilise::source::rolename" sizeCalculated="true" type="rolename" userDefined="false" visible="true">
|
||||||
<name>joueur</name>
|
<name>joueur</name>
|
||||||
<strategy type="org.tzi.use.gui.views.diagrams.elements.positioning.StrategyRelativeToAttached">
|
<strategy type="org.tzi.use.gui.views.diagrams.elements.positioning.StrategyRelativeToAttached">
|
||||||
|
@ -576,18 +576,6 @@
|
||||||
</strategy>
|
</strategy>
|
||||||
<hidden>false</hidden>
|
<hidden>false</hidden>
|
||||||
</edgeproperty>
|
</edgeproperty>
|
||||||
<edgeproperty id="Joue2::target::multiplicity" sizeCalculated="true" type="multiplicity" userDefined="false" visible="true">
|
|
||||||
<name>1</name>
|
|
||||||
<strategy type="org.tzi.use.gui.views.diagrams.elements.positioning.StrategyRelativeToAttached">
|
|
||||||
<userOffsetX>0.0</userOffsetX>
|
|
||||||
<userOffsetY>0.0</userOffsetY>
|
|
||||||
<attached>Joue2::WayPoint::1</attached>
|
|
||||||
<offset_x>8</offset_x>
|
|
||||||
<offset_y>8</offset_y>
|
|
||||||
<placement>BOTTOM</placement>
|
|
||||||
</strategy>
|
|
||||||
<hidden>false</hidden>
|
|
||||||
</edgeproperty>
|
|
||||||
<edgeproperty id="Joue2::target::rolename" sizeCalculated="true" type="rolename" userDefined="false" visible="true">
|
<edgeproperty id="Joue2::target::rolename" sizeCalculated="true" type="rolename" userDefined="false" visible="true">
|
||||||
<name>jeu1</name>
|
<name>jeu1</name>
|
||||||
<strategy type="org.tzi.use.gui.views.diagrams.elements.positioning.StrategyRelativeToAttached">
|
<strategy type="org.tzi.use.gui.views.diagrams.elements.positioning.StrategyRelativeToAttached">
|
||||||
|
@ -600,12 +588,12 @@
|
||||||
</strategy>
|
</strategy>
|
||||||
<hidden>false</hidden>
|
<hidden>false</hidden>
|
||||||
</edgeproperty>
|
</edgeproperty>
|
||||||
<edgeproperty id="Joue2::source::multiplicity" sizeCalculated="true" type="multiplicity" userDefined="false" visible="true">
|
<edgeproperty id="Joue2::target::multiplicity" sizeCalculated="true" type="multiplicity" userDefined="false" visible="true">
|
||||||
<name>1</name>
|
<name>1</name>
|
||||||
<strategy type="org.tzi.use.gui.views.diagrams.elements.positioning.StrategyRelativeToAttached">
|
<strategy type="org.tzi.use.gui.views.diagrams.elements.positioning.StrategyRelativeToAttached">
|
||||||
<userOffsetX>0.0</userOffsetX>
|
<userOffsetX>0.0</userOffsetX>
|
||||||
<userOffsetY>0.0</userOffsetY>
|
<userOffsetY>0.0</userOffsetY>
|
||||||
<attached>Joue2::WayPoint::0</attached>
|
<attached>Joue2::WayPoint::1</attached>
|
||||||
<offset_x>8</offset_x>
|
<offset_x>8</offset_x>
|
||||||
<offset_y>8</offset_y>
|
<offset_y>8</offset_y>
|
||||||
<placement>BOTTOM</placement>
|
<placement>BOTTOM</placement>
|
||||||
|
@ -624,6 +612,18 @@
|
||||||
</strategy>
|
</strategy>
|
||||||
<hidden>false</hidden>
|
<hidden>false</hidden>
|
||||||
</edgeproperty>
|
</edgeproperty>
|
||||||
|
<edgeproperty id="Joue2::source::multiplicity" sizeCalculated="true" type="multiplicity" userDefined="false" visible="true">
|
||||||
|
<name>1</name>
|
||||||
|
<strategy type="org.tzi.use.gui.views.diagrams.elements.positioning.StrategyRelativeToAttached">
|
||||||
|
<userOffsetX>0.0</userOffsetX>
|
||||||
|
<userOffsetY>0.0</userOffsetY>
|
||||||
|
<attached>Joue2::WayPoint::0</attached>
|
||||||
|
<offset_x>8</offset_x>
|
||||||
|
<offset_y>8</offset_y>
|
||||||
|
<placement>BOTTOM</placement>
|
||||||
|
</strategy>
|
||||||
|
<hidden>false</hidden>
|
||||||
|
</edgeproperty>
|
||||||
</properties>
|
</properties>
|
||||||
<waypoints>
|
<waypoints>
|
||||||
<edgeproperty id="Joue2::WayPoint::0" sizeCalculated="true" type="WayPoint" userDefined="false" visible="true">
|
<edgeproperty id="Joue2::WayPoint::0" sizeCalculated="true" type="WayPoint" userDefined="false" visible="true">
|
||||||
|
@ -692,18 +692,6 @@
|
||||||
</strategy>
|
</strategy>
|
||||||
<hidden>false</hidden>
|
<hidden>false</hidden>
|
||||||
</edgeproperty>
|
</edgeproperty>
|
||||||
<edgeproperty id="Appartient2::source::multiplicity" sizeCalculated="true" type="multiplicity" userDefined="false" visible="true">
|
|
||||||
<name>1</name>
|
|
||||||
<strategy type="org.tzi.use.gui.views.diagrams.elements.positioning.StrategyRelativeToAttached">
|
|
||||||
<userOffsetX>0.0</userOffsetX>
|
|
||||||
<userOffsetY>0.0</userOffsetY>
|
|
||||||
<attached>Appartient2::WayPoint::0</attached>
|
|
||||||
<offset_x>8</offset_x>
|
|
||||||
<offset_y>8</offset_y>
|
|
||||||
<placement>BOTTOM</placement>
|
|
||||||
</strategy>
|
|
||||||
<hidden>false</hidden>
|
|
||||||
</edgeproperty>
|
|
||||||
<edgeproperty id="Appartient2::source::rolename" sizeCalculated="true" type="rolename" userDefined="false" visible="true">
|
<edgeproperty id="Appartient2::source::rolename" sizeCalculated="true" type="rolename" userDefined="false" visible="true">
|
||||||
<name>flotte</name>
|
<name>flotte</name>
|
||||||
<strategy type="org.tzi.use.gui.views.diagrams.elements.positioning.StrategyRelativeToAttached">
|
<strategy type="org.tzi.use.gui.views.diagrams.elements.positioning.StrategyRelativeToAttached">
|
||||||
|
@ -716,6 +704,18 @@
|
||||||
</strategy>
|
</strategy>
|
||||||
<hidden>false</hidden>
|
<hidden>false</hidden>
|
||||||
</edgeproperty>
|
</edgeproperty>
|
||||||
|
<edgeproperty id="Appartient2::source::multiplicity" sizeCalculated="true" type="multiplicity" userDefined="false" visible="true">
|
||||||
|
<name>1</name>
|
||||||
|
<strategy type="org.tzi.use.gui.views.diagrams.elements.positioning.StrategyRelativeToAttached">
|
||||||
|
<userOffsetX>0.0</userOffsetX>
|
||||||
|
<userOffsetY>0.0</userOffsetY>
|
||||||
|
<attached>Appartient2::WayPoint::0</attached>
|
||||||
|
<offset_x>8</offset_x>
|
||||||
|
<offset_y>8</offset_y>
|
||||||
|
<placement>BOTTOM</placement>
|
||||||
|
</strategy>
|
||||||
|
<hidden>false</hidden>
|
||||||
|
</edgeproperty>
|
||||||
</properties>
|
</properties>
|
||||||
<waypoints>
|
<waypoints>
|
||||||
<edgeproperty id="Appartient2::WayPoint::0" sizeCalculated="true" type="WayPoint" userDefined="false" visible="true">
|
<edgeproperty id="Appartient2::WayPoint::0" sizeCalculated="true" type="WayPoint" userDefined="false" visible="true">
|
||||||
|
@ -760,18 +760,6 @@
|
||||||
</strategy>
|
</strategy>
|
||||||
<hidden>false</hidden>
|
<hidden>false</hidden>
|
||||||
</edgeproperty>
|
</edgeproperty>
|
||||||
<edgeproperty id="Joue1::target::rolename" sizeCalculated="true" type="rolename" userDefined="false" visible="true">
|
|
||||||
<name>jeu2</name>
|
|
||||||
<strategy type="org.tzi.use.gui.views.diagrams.elements.positioning.StrategyRelativeToAttached">
|
|
||||||
<userOffsetX>0.0</userOffsetX>
|
|
||||||
<userOffsetY>0.0</userOffsetY>
|
|
||||||
<attached>Joue1::WayPoint::1</attached>
|
|
||||||
<offset_x>8</offset_x>
|
|
||||||
<offset_y>8</offset_y>
|
|
||||||
<placement>TOP</placement>
|
|
||||||
</strategy>
|
|
||||||
<hidden>false</hidden>
|
|
||||||
</edgeproperty>
|
|
||||||
<edgeproperty id="Joue1::target::multiplicity" sizeCalculated="true" type="multiplicity" userDefined="false" visible="true">
|
<edgeproperty id="Joue1::target::multiplicity" sizeCalculated="true" type="multiplicity" userDefined="false" visible="true">
|
||||||
<name>1</name>
|
<name>1</name>
|
||||||
<strategy type="org.tzi.use.gui.views.diagrams.elements.positioning.StrategyRelativeToAttached">
|
<strategy type="org.tzi.use.gui.views.diagrams.elements.positioning.StrategyRelativeToAttached">
|
||||||
|
@ -784,15 +772,15 @@
|
||||||
</strategy>
|
</strategy>
|
||||||
<hidden>false</hidden>
|
<hidden>false</hidden>
|
||||||
</edgeproperty>
|
</edgeproperty>
|
||||||
<edgeproperty id="Joue1::source::multiplicity" sizeCalculated="true" type="multiplicity" userDefined="false" visible="true">
|
<edgeproperty id="Joue1::target::rolename" sizeCalculated="true" type="rolename" userDefined="false" visible="true">
|
||||||
<name>1</name>
|
<name>jeu2</name>
|
||||||
<strategy type="org.tzi.use.gui.views.diagrams.elements.positioning.StrategyRelativeToAttached">
|
<strategy type="org.tzi.use.gui.views.diagrams.elements.positioning.StrategyRelativeToAttached">
|
||||||
<userOffsetX>0.0</userOffsetX>
|
<userOffsetX>0.0</userOffsetX>
|
||||||
<userOffsetY>0.0</userOffsetY>
|
<userOffsetY>0.0</userOffsetY>
|
||||||
<attached>Joue1::WayPoint::0</attached>
|
<attached>Joue1::WayPoint::1</attached>
|
||||||
<offset_x>8</offset_x>
|
<offset_x>8</offset_x>
|
||||||
<offset_y>8</offset_y>
|
<offset_y>8</offset_y>
|
||||||
<placement>BOTTOM</placement>
|
<placement>TOP</placement>
|
||||||
</strategy>
|
</strategy>
|
||||||
<hidden>false</hidden>
|
<hidden>false</hidden>
|
||||||
</edgeproperty>
|
</edgeproperty>
|
||||||
|
@ -808,6 +796,18 @@
|
||||||
</strategy>
|
</strategy>
|
||||||
<hidden>false</hidden>
|
<hidden>false</hidden>
|
||||||
</edgeproperty>
|
</edgeproperty>
|
||||||
|
<edgeproperty id="Joue1::source::multiplicity" sizeCalculated="true" type="multiplicity" userDefined="false" visible="true">
|
||||||
|
<name>1</name>
|
||||||
|
<strategy type="org.tzi.use.gui.views.diagrams.elements.positioning.StrategyRelativeToAttached">
|
||||||
|
<userOffsetX>0.0</userOffsetX>
|
||||||
|
<userOffsetY>0.0</userOffsetY>
|
||||||
|
<attached>Joue1::WayPoint::0</attached>
|
||||||
|
<offset_x>8</offset_x>
|
||||||
|
<offset_y>8</offset_y>
|
||||||
|
<placement>BOTTOM</placement>
|
||||||
|
</strategy>
|
||||||
|
<hidden>false</hidden>
|
||||||
|
</edgeproperty>
|
||||||
</properties>
|
</properties>
|
||||||
<waypoints>
|
<waypoints>
|
||||||
<edgeproperty id="Joue1::WayPoint::0" sizeCalculated="true" type="WayPoint" userDefined="false" visible="true">
|
<edgeproperty id="Joue1::WayPoint::0" sizeCalculated="true" type="WayPoint" userDefined="false" visible="true">
|
||||||
|
@ -876,18 +876,6 @@
|
||||||
</strategy>
|
</strategy>
|
||||||
<hidden>false</hidden>
|
<hidden>false</hidden>
|
||||||
</edgeproperty>
|
</edgeproperty>
|
||||||
<edgeproperty id="Tire::source::multiplicity" sizeCalculated="true" type="multiplicity" userDefined="false" visible="true">
|
|
||||||
<name>*</name>
|
|
||||||
<strategy type="org.tzi.use.gui.views.diagrams.elements.positioning.StrategyRelativeToAttached">
|
|
||||||
<userOffsetX>0.0</userOffsetX>
|
|
||||||
<userOffsetY>0.0</userOffsetY>
|
|
||||||
<attached>Tire::WayPoint::0</attached>
|
|
||||||
<offset_x>8</offset_x>
|
|
||||||
<offset_y>8</offset_y>
|
|
||||||
<placement>BOTTOM</placement>
|
|
||||||
</strategy>
|
|
||||||
<hidden>false</hidden>
|
|
||||||
</edgeproperty>
|
|
||||||
<edgeproperty id="Tire::source::rolename" sizeCalculated="true" type="rolename" userDefined="false" visible="true">
|
<edgeproperty id="Tire::source::rolename" sizeCalculated="true" type="rolename" userDefined="false" visible="true">
|
||||||
<name>joueur</name>
|
<name>joueur</name>
|
||||||
<strategy type="org.tzi.use.gui.views.diagrams.elements.positioning.StrategyRelativeToAttached">
|
<strategy type="org.tzi.use.gui.views.diagrams.elements.positioning.StrategyRelativeToAttached">
|
||||||
|
@ -900,6 +888,18 @@
|
||||||
</strategy>
|
</strategy>
|
||||||
<hidden>false</hidden>
|
<hidden>false</hidden>
|
||||||
</edgeproperty>
|
</edgeproperty>
|
||||||
|
<edgeproperty id="Tire::source::multiplicity" sizeCalculated="true" type="multiplicity" userDefined="false" visible="true">
|
||||||
|
<name>*</name>
|
||||||
|
<strategy type="org.tzi.use.gui.views.diagrams.elements.positioning.StrategyRelativeToAttached">
|
||||||
|
<userOffsetX>0.0</userOffsetX>
|
||||||
|
<userOffsetY>0.0</userOffsetY>
|
||||||
|
<attached>Tire::WayPoint::0</attached>
|
||||||
|
<offset_x>8</offset_x>
|
||||||
|
<offset_y>8</offset_y>
|
||||||
|
<placement>BOTTOM</placement>
|
||||||
|
</strategy>
|
||||||
|
<hidden>false</hidden>
|
||||||
|
</edgeproperty>
|
||||||
</properties>
|
</properties>
|
||||||
<waypoints>
|
<waypoints>
|
||||||
<edgeproperty id="Tire::WayPoint::0" sizeCalculated="true" type="WayPoint" userDefined="false" visible="true">
|
<edgeproperty id="Tire::WayPoint::0" sizeCalculated="true" type="WayPoint" userDefined="false" visible="true">
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue