Compare commits

..

No commits in common. "960abf0fb330fc0a3cc3767d432e6a605f53aa0b" and "13cfe513fecd6e3c83073748b37e2392d0ca6112" have entirely different histories.

2 changed files with 90 additions and 57 deletions

View file

@ -61,12 +61,9 @@ attributes
type: TypeCase
operations
changerEtat(nouveauEtat: TypeCase)
getEtat(): TypeCase
constraints
inv:
plateau.cases->select(c: Case | c.x = x and c.y = y)->size() = 1
inv:
coordonne: x <= 10 and x > 0 and y > 0 and y <= 10
getEtat(): TypeCase
constraints
inv coordonne: x <= 10 and x > 0 and y > 0 and y <= 10
end
class Bateau

View file

@ -206,18 +206,29 @@
</strategy>
<hidden>false</hidden>
</edgeproperty>
<edgeproperty id="Compose::target::rolename" sizeCalculated="true" type="rolename" userDefined="false" visible="true">
<name>plateau</name>
<strategy type="org.tzi.use.gui.views.diagrams.elements.positioning.StrategyRelativeToAttached">
<userOffsetX>0.0</userOffsetX>
<userOffsetY>0.0</userOffsetY>
<attached>Compose::WayPoint::1</attached>
<offset_x>8</offset_x>
<offset_y>8</offset_y>
<placement>BOTTOM</placement>
<placement>TOP</placement>
</strategy>
<hidden>false</hidden>
</edgeproperty>
<edgeproperty id="Compose::AssociationName" sizeCalculated="true" type="associationName" userDefined="false" visible="true">
<name>Compose</name>
<strategy type="org.tzi.use.gui.views.diagrams.elements.positioning.StrategyInBetween">
<userOffsetX>0.0</userOffsetX>
<userOffsetY>0.0</userOffsetY>
<offsetX>0.0</offsetX>
<offsetY>-10.0</offsetY>
<related length="2">
<related0>Compose::WayPoint::0</related0>
<related1>Compose::WayPoint::1</related1>
</related>
</strategy>
<hidden>false</hidden>
</edgeproperty>
@ -275,7 +286,20 @@
<target>Coup</target>
<name>Etat</name>
<properties>
<edgeproperty id="Etat::target::rolename" sizeCalculated="true" type="rolename" userDefined="false" visible="true">
<name>coup</name>
<strategy type="org.tzi.use.gui.views.diagrams.elements.positioning.StrategyRelativeToAttached">
<userOffsetX>0.0</userOffsetX>
<userOffsetY>0.0</userOffsetY>
<attached>Etat::WayPoint::1</attached>
<offset_x>8</offset_x>
<offset_y>8</offset_y>
<placement>TOP</placement>
</strategy>
<hidden>false</hidden>
</edgeproperty>
<edgeproperty id="Etat::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>
@ -286,18 +310,6 @@
</strategy>
<hidden>false</hidden>
</edgeproperty>
<edgeproperty id="Etat::target::rolename" sizeCalculated="true" type="rolename" userDefined="true" visible="true">
<name>coup</name>
<strategy type="org.tzi.use.gui.views.diagrams.elements.positioning.StrategyRelativeToAttached">
<userOffsetX>18.0</userOffsetX>
<userOffsetY>21.0</userOffsetY>
<attached>Etat::WayPoint::1</attached>
<offset_x>8</offset_x>
<offset_y>8</offset_y>
<placement>TOP</placement>
</strategy>
<hidden>false</hidden>
</edgeproperty>
<edgeproperty id="Etat::AssociationName" sizeCalculated="true" type="associationName" userDefined="false" visible="true">
<name>Etat</name>
<strategy type="org.tzi.use.gui.views.diagrams.elements.positioning.StrategyInBetween">
@ -366,7 +378,20 @@
<target>Flotte</target>
<name>Appartient</name>
<properties>
<edgeproperty id="Appartient::target::rolename" sizeCalculated="true" type="rolename" userDefined="false" visible="true">
<name>flotte</name>
<strategy type="org.tzi.use.gui.views.diagrams.elements.positioning.StrategyRelativeToAttached">
<userOffsetX>0.0</userOffsetX>
<userOffsetY>0.0</userOffsetY>
<attached>Appartient::WayPoint::1</attached>
<offset_x>8</offset_x>
<offset_y>8</offset_y>
<placement>TOP</placement>
</strategy>
<hidden>false</hidden>
</edgeproperty>
<edgeproperty id="Appartient::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>
@ -377,18 +402,6 @@
</strategy>
<hidden>false</hidden>
</edgeproperty>
<edgeproperty id="Appartient::target::rolename" sizeCalculated="true" type="rolename" userDefined="true" visible="true">
<name>flotte</name>
<strategy type="org.tzi.use.gui.views.diagrams.elements.positioning.StrategyRelativeToAttached">
<userOffsetX>105.0</userOffsetX>
<userOffsetY>0.0</userOffsetY>
<attached>Appartient::WayPoint::1</attached>
<offset_x>8</offset_x>
<offset_y>8</offset_y>
<placement>TOP</placement>
</strategy>
<hidden>false</hidden>
</edgeproperty>
<edgeproperty id="Appartient::AssociationName" sizeCalculated="true" type="associationName" userDefined="false" visible="true">
<name>Appartient</name>
<strategy type="org.tzi.use.gui.views.diagrams.elements.positioning.StrategyInBetween">
@ -495,7 +508,20 @@
</strategy>
<hidden>false</hidden>
</edgeproperty>
<edgeproperty id="Utilise::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>Utilise::WayPoint::0</attached>
<offset_x>8</offset_x>
<offset_y>8</offset_y>
<placement>TOP</placement>
</strategy>
<hidden>false</hidden>
</edgeproperty>
<edgeproperty id="Utilise::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>
@ -506,18 +532,6 @@
</strategy>
<hidden>false</hidden>
</edgeproperty>
<edgeproperty id="Utilise::source::rolename" sizeCalculated="true" type="rolename" userDefined="true" visible="true">
<name>joueur</name>
<strategy type="org.tzi.use.gui.views.diagrams.elements.positioning.StrategyRelativeToAttached">
<userOffsetX>-16.0</userOffsetX>
<userOffsetY>-10.0</userOffsetY>
<attached>Utilise::WayPoint::0</attached>
<offset_x>8</offset_x>
<offset_y>8</offset_y>
<placement>TOP</placement>
</strategy>
<hidden>false</hidden>
</edgeproperty>
</properties>
<waypoints>
<edgeproperty id="Utilise::WayPoint::0" sizeCalculated="true" type="WayPoint" userDefined="false" visible="true">
@ -560,19 +574,29 @@
</strategy>
<hidden>false</hidden>
</edgeproperty>
<edgeproperty id="Joue2::target::rolename" sizeCalculated="true" type="rolename" userDefined="false" visible="true">
<name>jeu1</name>
<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>TOP</placement>
<placement>BOTTOM</placement>
</strategy>
<hidden>false</hidden>
</edgeproperty>
<edgeproperty id="Joue2::AssociationName" sizeCalculated="true" type="associationName" userDefined="false" visible="true">
<name>Joue2</name>
<strategy type="org.tzi.use.gui.views.diagrams.elements.positioning.StrategyInBetween">
<userOffsetX>0.0</userOffsetX>
<userOffsetY>0.0</userOffsetY>
<offsetX>0.0</offsetX>
<offsetY>-10.0</offsetY>
<related length="2">
<related0>Joue2::WayPoint::0</related0>
<related1>Joue2::WayPoint::1</related1>
</related>
</strategy>
<hidden>false</hidden>
</edgeproperty>
@ -638,7 +662,7 @@
<target>Bateau</target>
<name>Appartient2</name>
<properties>
<edgeproperty id="Appartient2::target::rolename" sizeCalculated="true" type="rolename" userDefined="false" visible="true">
<name>bateaux</name>
<strategy type="org.tzi.use.gui.views.diagrams.elements.positioning.StrategyRelativeToAttached">
<userOffsetX>0.0</userOffsetX>
@ -650,12 +674,12 @@
</strategy>
<hidden>false</hidden>
</edgeproperty>
<edgeproperty id="Appartient2::source::multiplicity" sizeCalculated="true" type="multiplicity" userDefined="false" visible="true">
<name>1</name>
<edgeproperty id="Appartient2::target::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>Appartient2::WayPoint::0</attached>
<attached>Appartient2::WayPoint::1</attached>
<offset_x>8</offset_x>
<offset_y>8</offset_y>
<placement>BOTTOM</placement>
@ -688,6 +712,18 @@
</strategy>
<hidden>false</hidden>
</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>
<waypoints>
<edgeproperty id="Appartient2::WayPoint::0" sizeCalculated="true" type="WayPoint" userDefined="false" visible="true">
@ -756,7 +792,7 @@
</strategy>
<hidden>false</hidden>
</edgeproperty>
<edgeproperty id="Joue1::source::rolename" sizeCalculated="true" type="rolename" userDefined="true" visible="true">
<name>joueur1</name>
<strategy type="org.tzi.use.gui.views.diagrams.elements.positioning.StrategyRelativeToAttached">
<userOffsetX>14.0</userOffsetX>