merde update & update nom association
This commit is contained in:
parent
726199cb14
commit
a951d191a1
2 changed files with 33 additions and 27 deletions
|
@ -84,6 +84,7 @@ end
|
|||
class Flotte
|
||||
operations
|
||||
ajouterBateau(bateau: Bateau)
|
||||
|
||||
pre torpilleur: bateau.type = TypeBateau::Torpilleur implies bateaux->select(b: Bateau | b.type = TypeBateau::Torpilleur)->size() < 1
|
||||
pre contre_torpilleur: bateau.type = TypeBateau::Contre_Torpilleur implies bateaux->select(b: Bateau | b.type = TypeBateau::Contre_Torpilleur)->size() < 2
|
||||
pre croiseur: bateau.type = TypeBateau::Croiseur implies bateaux->select(b: Bateau | b.type = TypeBateau::Croiseur)->size() < 1
|
||||
|
@ -154,12 +155,12 @@ Joueur[1] role joueur
|
|||
Plateau[1] role plateau
|
||||
end
|
||||
|
||||
composition Joue1 between
|
||||
composition EstEnJeu1 between
|
||||
Joueur[1] role joueur1
|
||||
Jeu[1] role jeu1
|
||||
end
|
||||
|
||||
composition Joue2 between
|
||||
composition EstEnJeu2 between
|
||||
Joueur[1] role joueur2
|
||||
Jeu[1] role jeu2
|
||||
end
|
||||
|
@ -169,12 +170,12 @@ Joueur[1] role joueur
|
|||
Coup[0..100] role coups
|
||||
end
|
||||
|
||||
association Appartient between
|
||||
association flotte_joueur between
|
||||
Joueur[1] role joueur
|
||||
Flotte[1] role flotte
|
||||
end
|
||||
|
||||
composition Appartient2 between
|
||||
composition flotte_bateau between
|
||||
Flotte[1] role flotte
|
||||
Bateau[5] role bateaux
|
||||
end
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue