Compare commits

...

2 commits

Author SHA1 Message Date
960abf0fb3 Merge remote-tracking branch 'origin/main' 2025-01-17 14:00:26 +01:00
54f335ea3d added constraint 2025-01-17 13:57:19 +01:00
2 changed files with 57 additions and 90 deletions

View file

@ -61,9 +61,12 @@ attributes
type: TypeCase type: TypeCase
operations operations
changerEtat(nouveauEtat: TypeCase) changerEtat(nouveauEtat: TypeCase)
getEtat(): TypeCase getEtat(): TypeCase
constraints constraints
inv coordonne: x <= 10 and x > 0 and y > 0 and y <= 10 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
end end
class Bateau class Bateau

View file

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