From 7bdc20428942f2824d6521cfb9fc1ace549fd6ab Mon Sep 17 00:00:00 2001 From: moskala Date: Wed, 4 Mar 2020 12:02:42 +0100 Subject: [PATCH 1/3] Poprawki literowek tylko w tekscie (bez diagramow) --- Dokumentacja/DiagramyKlas/Agent.tex | 2 +- Dokumentacja/DiagramyKlas/DiagramyKlas.tex | 2 +- Dokumentacja/DiagramyKlas/GM.tex | 10 +++++----- Dokumentacja/PrzypadkiUzycia/Agent.tex | 2 +- Dokumentacja/PrzypadkiUzycia/GameMaster.tex | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Dokumentacja/DiagramyKlas/Agent.tex b/Dokumentacja/DiagramyKlas/Agent.tex index b90569f..3f44cae 100644 --- a/Dokumentacja/DiagramyKlas/Agent.tex +++ b/Dokumentacja/DiagramyKlas/Agent.tex @@ -28,7 +28,7 @@ \subsubsection{Agent} \method{RequestResponse()}{Metoda wywoływana na przyjście wiadomości z prośbą o wymianę informacji. Zapamiętuje parametry gracza który poprosił informację do listy \textit{waitingPlayers}} \method{CheckPiece()}{Metoda sprawdzająca czy fragment to fragment fikcyjny. Wysyła zapytanie do GM i w zależności od odpowiedzi aktualizuje stan wiedzy agenta.} \method[public void]{AcceptMessage()}{Metoda pobierająca informacje od serwera komunikacyjnego.} - \method{MakeDecisionFromStrategy()}{Metoda, która wywołuje metodę z obiektu strategy. Wywoływana jest okresowo i to ona decuduje o akcjach wykonywanych przez agenta. Używa IStrategy.} + \method{MakeDecisionFromStrategy()}{Metoda, która wywołuje metodę z obiektu strategy. Wywoływana jest okresowo i to ona decyduje o akcjach wykonywanych przez agenta. Używa IStrategy.} \method[private void]{Communicate()}{Metoda wysyłająca wiadomości do serwera komunikacyjnego. Używana przez metody wykonujące akcje do komunikacj z GM poprzez wysłanie wiadomości do Serwera Komunikacyjnego} \method[private void]{Penalty()}{Metoda czekająca przez okres kary. Po odczekaniu kary wywołuje generowanie kolejnej akcji.} \end{methods} diff --git a/Dokumentacja/DiagramyKlas/DiagramyKlas.tex b/Dokumentacja/DiagramyKlas/DiagramyKlas.tex index 525de7b..a34dd42 100644 --- a/Dokumentacja/DiagramyKlas/DiagramyKlas.tex +++ b/Dokumentacja/DiagramyKlas/DiagramyKlas.tex @@ -4,7 +4,7 @@ \section{Diagramy Klas} W diagramach klas zostały pominięte klasy odpowiedzialne za obsługę połączeń TCP. Jest to zabieg celowy. Nie chcemy narzucać implementacji obsługi połączeń, aby -nie ograniczać wyboru API. Klasy posiadają specjale metody puliczne \textbf{AcceptMessage}, +nie ograniczać wyboru API. Klasy posiadają specjalne metody puliczne \textbf{AcceptMessage}, do których należy przekazać odebraną na porcie wiadomość i które implementują logikę biznesową. Z anaglogicznego powodu nie narzucamy implementacji interfejsów odpowiedzialnych za wysyłanie wiadomości. diff --git a/Dokumentacja/DiagramyKlas/GM.tex b/Dokumentacja/DiagramyKlas/GM.tex index 3322f2f..9bf0757 100644 --- a/Dokumentacja/DiagramyKlas/GM.tex +++ b/Dokumentacja/DiagramyKlas/GM.tex @@ -8,7 +8,7 @@ \subsubsection{Player} \paragraph{Zmienne} \begin{methods} \method[private Int]{id}{Identyfikator gracza} - \method[private Int]{messageCorellationId}{Id nadane graczowi przez serwer komunikacyjny, służy do odsyłania wiadomości} + \method[private Int]{messageCorrelationId}{Id nadane graczowi przez serwer komunikacyjny, służy do odsyłania wiadomości} \method[private Team]{team}{Drużyna,w której jest gracz} \method[private Boolean]{isLeader}{Zmienna informująca czy gracz jest liderem zespołu} \method[private Piece]{holding}{Zmienna informująca czy niesie fragment} @@ -106,7 +106,7 @@ \subsubsection{NormalPiece : AbstractPiece} \method[public int]{Put(AbstractField)}{Implementacja odwiedzającego, wywołuje Put() z AbstractField, przekazuje informację czy przyznać punkty graczowi.} \end{methods} -\subsubsection{Interface Message SenderService} +\subsubsection{Interface MessageSenderService} \paragraph{Metody} \begin{methods} \method[public void]{SendMessage()}{Wysłanie wiadomości do serwera komunikacyjnego. Używana przez Playera do wysyłania wiadomości.} @@ -117,7 +117,7 @@ \subsubsection{GM} \begin{methods} \method[private readonly Dictionary]{players}{Słownik mapujący id gracza z wiadomości na obiekt.} \method[{private readonly Field[][]}]{map}{Faktyczny stan planszy.} - \method[private Set<(int,int)>]{LegalKnowleadgeReplies[2]}{Zbiór par id które oznaczają, że dana odpowiedź z wymianą informacjie jest legalna, bo była poprzedzona zapytaniem.} + \method[private Set<(int,int)>]{LegalKnowledgeReplies[2]}{Zbiór par id które oznaczają, że dana odpowiedź z wymianą informacji jest legalna, bo była poprzedzona zapytaniem.} \method[private Configuration]{conf}{Obiekt parametrów rozgrywki.} \end{methods} @@ -126,8 +126,8 @@ \subsubsection{GM} \method[public void]{AcceptMessage()}{Metoda służy do obsługi wiadomości, powinna być wywoływana przez API obsługujące komunikację} \method[private]{Discover(Field)}{Metoda oblicza wynik akcji discovery} \method[private void]{GeneratePiece()}{Metoda generuje i rozmieszcza fragmenty na planszy.} - \method[private void]{ForwardKnowleadgeQuestion()}{Metoda przekazuje prośbę o informację do właściwego gracza.} - \method[private void]{ForwardKnowleadgeReply()}{Metoda przekazuje odpowiedź na zapytanie do właściwego gracza, jeśli odpowiedź jest legalna, czyli jeśli dana odpowiedź była poprzedzona zapytaniem.} + \method[private void]{ForwardKnowledgeQuestion()}{Metoda przekazuje prośbę o informację do właściwego gracza.} + \method[private void]{ForwardKnowledgeReply()}{Metoda przekazuje odpowiedź na zapytanie do właściwego gracza, jeśli odpowiedź jest legalna, czyli jeśli dana odpowiedź była poprzedzona zapytaniem.} \end{methods} \subsubsection{Enum Team} diff --git a/Dokumentacja/PrzypadkiUzycia/Agent.tex b/Dokumentacja/PrzypadkiUzycia/Agent.tex index e31236b..8281f83 100644 --- a/Dokumentacja/PrzypadkiUzycia/Agent.tex +++ b/Dokumentacja/PrzypadkiUzycia/Agent.tex @@ -8,7 +8,7 @@ \subsection{Agent PU} \begin{itemize} \item Dołączenie do rozgrywki \begin{itemize} - \item Odbywa się poprzez połczenie się z Serwerem Komunikacyjnym na podstwaie danych połączenia wprowadzonych przez użytkownika i wykonanie odpowiedniego zapytania do GM. Jeśli połączenie nie powiodło się, Agent kończy działanie. + \item Odbywa się poprzez połączenie się z Serwerem Komunikacyjnym na podstawie danych połączenia wprowadzonych przez użytkownika i wykonanie odpowiedniego zapytania do GM. Jeśli połączenie nie powiodło się, Agent kończy działanie. \item Odpowiedź zwrotna może być negatywna, w tym przypadku Agent kończy działanie. \item W przypadku odpowiedzi pozytywnej, Agent aktualizuje swoje informacje o parametrach rozgrywki na podstawie informacji otrzymanych z GM i przystępuje do oczekiwania na informację o rozpoczęciu rozgrywki, podczas którego nie wykonuje żadnych czynności. \end{itemize} diff --git a/Dokumentacja/PrzypadkiUzycia/GameMaster.tex b/Dokumentacja/PrzypadkiUzycia/GameMaster.tex index f2db897..48a0021 100644 --- a/Dokumentacja/PrzypadkiUzycia/GameMaster.tex +++ b/Dokumentacja/PrzypadkiUzycia/GameMaster.tex @@ -41,7 +41,7 @@ \subsection{Game Master} \end{itemize} \item Zakończenie rozgrywki \begin{itemize} - \item Zakończenie rozgrwki może być rezultatem trzech zdarzeń, wygraną którejś z drużyn, zarządzeniem zakończenia przez użytkownika oraz utratą połączenia z Serwerem Komunikacyjnym. + \item Zakończenie rozgrywki może być rezultatem trzech zdarzeń, wygraną którejś z drużyn, zarządzeniem zakończenia przez użytkownika oraz utratą połączenia z Serwerem Komunikacyjnym. \item Po zakończeniu Game Master, o ile to możliwe, wysyła informacje o końcu gry do Agentów i prezentuje statystyki w interfejsie graficznym. \end{itemize} \end{itemize} From 4ad5144efdb5d5960142cd2bf8da97914bcc7bb1 Mon Sep 17 00:00:00 2001 From: moskala Date: Fri, 13 Mar 2020 15:08:15 +0100 Subject: [PATCH 2/3] Poprawa literowek w klasach --- Dokumentacja/DiagramyKlas/Agent.tex | 2 +- Dokumentacja/DiagramyKlas/resources/Agent.eps | 469 +++++++++--------- Dokumentacja/DiagramyKlas/resources/GM.eps | 18 +- UML/ClassDiagram/GM.puml | 8 +- UML/ClassDiagram/Player.puml | 2 +- 5 files changed, 241 insertions(+), 258 deletions(-) diff --git a/Dokumentacja/DiagramyKlas/Agent.tex b/Dokumentacja/DiagramyKlas/Agent.tex index 3f44cae..ee6eef2 100644 --- a/Dokumentacja/DiagramyKlas/Agent.tex +++ b/Dokumentacja/DiagramyKlas/Agent.tex @@ -8,7 +8,7 @@ \subsubsection{Agent} \method[public int]{penaltyTime}{Czas kary.} \method[public Team]{team}{Enum drużyny, w której jest gracz.} \method[public bool]{isLeader}{Zmienna informująca czy gracz jest liderem zespołu.} - \method[public bool]{havePiece}{Zmienna informująca czy gracz jest w posiadaniu piece'a.} + \method[public bool]{hasPiece}{Zmienna informująca czy gracz jest w posiadaniu piece'a.} \method[{public Field[,]}]{board}{Tablica dwuwymiarowa przechowująca planszę z perspektywy gracza.} \method[{public Tuple}]{position}{Współrzędne pola na planszy, na którym stoi gracz.} \method[{public List>}]{waitingPlayers}{Lista id oraz informacji czy są oni liderami drużyny graczy oczekujących na odpowiedź.} diff --git a/Dokumentacja/DiagramyKlas/resources/Agent.eps b/Dokumentacja/DiagramyKlas/resources/Agent.eps index a74d573..c78919b 100644 --- a/Dokumentacja/DiagramyKlas/resources/Agent.eps +++ b/Dokumentacja/DiagramyKlas/resources/Agent.eps @@ -1,6 +1,6 @@ %!PS-Adobe-3.0 EPSF-3.0 -%%Creator: cairo 1.15.12 (http://cairographics.org) -%%CreationDate: Sun Jan 19 22:53:11 2020 +%%Creator: cairo 1.16.0 (https://cairographics.org) +%%CreationDate: Fri Mar 13 14:04:20 2020 %%Pages: 1 %%DocumentData: Clean7Bit %%LanguageLevel: 2 @@ -64,10 +64,10 @@ /cairo_imagemask { imagemask cairo_flush_ascii85_file } def %%EndProlog %%BeginSetup -%%BeginResource: font DejaVuSans-Oblique +%%BeginResource: font DejaVuSans 11 dict begin /FontType 42 def -/FontName /DejaVuSans-Oblique def +/FontName /DejaVuSans def /PaintType 0 def /FontMatrix [ 1 0 0 1 0 0 ] def /FontBBox [ 0 0 0 0 ] def @@ -113,178 +113,161 @@ Encoding 187 /guillemotright put /o 18 def end readonly def /sfnts [ -<000100000009008000030010637674209d9fb026000012540000016c6670676de76af1c40000 -13c00000008b676c79664d1914290000009c000011b86865616403d250c40000144c00000036 -686865610ca905d20000148400000024686d747855860625000014a80000004c6c6f63610000 -9ec8000014f4000000506d617870037806090000154400000020707265709291022200001564 -0000040c00020066fe96046605a400030007001a400c04b10006b1010805440204002fc4d4ec -310010d4ecd4ec301311211125211121660400fc73031bfce5fe96070ef8f27206290002007f -008d047104230006000d0031401909020b04a207006c0e040302030c050b0a090300070c0005 -0e10d4d4d4cc11173911121739310010f43cec32393930010701130701370107011307013702 -b427fe9efc25fe7d1003e227fe9dfc25fe7d110423c9fef2fef6b501a25201a2c9fef2fef6b5 -01a252000000000200480000022f0614000300070070402a0205030003010500000306050704 -0705050404073a0263005c047e06060704050201032800250407240810f4b29f07015dc44005 -70046004025df4e4c0393911123931002fe4fcec304b5358071005ed071005ed071005ed0710 -05ed5922b2400901015d4007700960095009035d01330723073303230177b82db827b8dbb806 -14e9cbfba0000001004800000487047b001900ae404d08070605040503050001000205010100 -0d050e0f0e0a0b02090c050f0e1312021411050f0e10050f0f0e3a0c03110001094c147a0f7e -0d010d0f0e0017100c06030205110f0127170f2a0e241a10f4b29f0e015de4d4b45f173f1702 -5dec11391739113911123931002f3ce4f4ec1139393939304b5358071005ed0705ed11173907 -05ed111739071005ed071005ed071005ed17395922b6301b3f1b901b03015db2601b015d01b2 -9f1b015d010323133e013534262322060703231333073e01333216151406047583b983090a6a -5f94d6217bb8d9b8254dd87794a30902a4fd5c029d2f4815545ec5a9fd930460b0616aa09124 -520000000001008300000362059e0019009a403e090807060504060a03051217120205171219 -05171218051717123a12030913016f1715007e097d0b141a191817161513120c0b0a09060302 -010f000f0f1a10c44bb009544bb00a545b4bb00e545b4bb00b545b58b9000fffc0385910c017 -39123931002fecf43cc4ec32113939304b5358071005ed0705ed0705ed071005ed1117395922 -b2181301015d400b19021813671879167919055d010721030e011514163b0107232226353436 -371323373313330303621cfe917706064d55ba1fb0a4a10606779c1d993eb83d04608ffda022 -2e0d403a9a808217372102608f013efec20000000002005effe30491047b00090026009d4024 -006f0a154b144e114c180a7c064c217a1851270a240b0900030e14150323240e231b222710f4 -b29f1b015decd4400bf024d0249f245f243f24055dec39391117391139310010e4f4ece410fe -f4ee10ee30b2702801015d01402c6f006f016f026f036c086f096f0a6f0b6f246f256f268a13 -8a14991399140f8f138f148f158f169a139a14065d005d01b23608015d4009f028d028a0283f -28045d013e013534262322060705210e0115141633323637070e01232226353412373e013332 -1615140603d903038f7b89d2360335fca80604ab9c78d65c2363d36de9fb7d794ed779bee10c -02941022117a8ead9f8f262c108b983634b62828dfcdaf012d764a50e4c02e69000000010048 -000003b4047b00110098400d0b0a000604110709110908241210f4c4b470096009025dccb470 -115011025d12391117393100400c060b070011034c0e7a097e072fe4f4ecd4cc113939304bb0 -3a5058401a070508090804050203060509080d0c020e0b0509080a05090908071005ed0705ed -1117390705ed111739071005ed5922b24f1301015d4013400040014002400e400f4010401140 -135013095db29f13015d012e012322060703231333073e013332161703911c482993dc2471b8 -dbb82349cb731e3a1d03b60f10dfbbfdc50460ae6168070800000001008b000003d306140013 -00b8403c0a050b0f0b09050f0b06050f0b020304030105050f0f0b3a0510010c086f06017d00 -5c0e067e0a0c0a0e0d040b131009080706050201090f000f0b1410d44bb009544bb00a545b4b -b00b545b4bb00c545b4bb00d545b4bb00e545b4bb00f545b4bb010545b4bb011545b58b9000b -ffc03859c4b4700f600f025dccb4a0005000025d11173912173931002fe432fcec10ee321239 -39304b5358071005ed1117390705ed0705ed071005ed592201b6a01550154015035d01072322 -060f01210721032313233733373e013303d31db0645b1614012f1bfed1beb9bfb01ab00f26bf -cd0614994f69638ffc2f03d18f4ec6a000020054ffe30460047b0020002b011c406413121110 -0f05140e0501000b0c020a0d0501002322022421050100292a02282b05000100050402060305 -010002050101003a2b032800210e17216f0c284c06184b177b144c1b7a06510c012b2221170e -0d02072501001e030c18032511231e250e09222c10f4b29f09015decd4b23f1e015dec111739 -11393911173931002fc4e4f4fcf4ec10ee10ee12391239113939304b5358071005ed0705ed11 -1739071005ed1117390705ed1117390705ed1117390705ed1117395922b2301701005d402e3c -183c194f185b185b196a186a197a187a198b1889190b32164316401754165017641660177416 -7017831680170b5d015d4013a50aa00ba00ca00da021a022a023a524a02b09005d400df02da0 -2d902d702d502d3f2d06015d010323370e012322263534242901373e0135342623220607373e -013332161514060723220615141633323637044c7db82251cf7f8fb70139011301000a020291 -835abd642068c75dc6cf0ad1b8e2d96f6296e024027ffd81aa6463af89c4e43108131459632e -2eaa2727aca421597e797f5864d7b40000000001005effe3044a047b001f004b401c114b104e -0d4c14004b014e044c1d7a145120100111000a0e0017222010f4c4ec11393939310010e4f4fc -f4ec10fef4ee30014bb0125458bd0020ffc00001002000200040381137385901072e01232206 -070e0115141633323637070e01232226353412373e01333216044a25429550589f36565e979a -4cab5d2350a959dff07d7b54e2864e9a0435b630303e3957ea7d97942e2eb62121dfcfae0125 -755052230002007f008d046f04230006000d0031401909020700a20b046c0e040302030c050b -0a09030705000c070e10d4dcd4cc12173911121739310010f43cec3239393025370103370107 -013701033701070239270163fc2701810ffc1f270160fa2501810e8dc9010e010bb4fe5e52fe -5ec9010e010bb4fe5e52000100370000022505d5000300324017020503000301050000033a00 -4602020301000002031b0410f4e410c0123931002fe4304b5358071005ed071005ed59220133 -0123015acbfeddcb05d5fa2b00000001000cffe304d305f00027009440370c010d0b051e1f1e -0901080a051f1f1e3a0a0b1e1f040115651459185a11010059045a25561151281e0a1f0b1b07 -01001b1c0e071c222810d4ecd4ecc0c0111239393939310010e4f4ecf4c410eef6ee11173930 -4b535807100eed11173907100eed1117395922b21b0901005d40200b00060c1a011314290029 -013900390133133314331533160c140989158916035d015d01072e012322061514161f011e01 -15140021222627371e013332363534262f012e0135340021321604d32765c75db5d64fa479cd -a0fe9dfede77f079296fdf6fbde45b9679cf97015701136bd205a4c536379e83484d2c1e35a3 -93e2fee42f30d04546a8875a5d261f368d7fdf011d26000000020042fe5604c5047b001f002e -00b64058220123210501002d2e022c2005000100111002120f0501000c0d020b0e050101001f -0501001c1d021b1e050001003a0f1e23010e2c12074b080b4c04234c1b7a2c4c047f007e1220 -1f0008150e0f1e010400290e0015222f10f4b29f15015dc4ec111739113911393931002fe4e4 -ecf4ec10fed5ee11123939113939304b5358071005ed1117390705ed071005ed1117390705ed -111739071005ed1117390705ed1117395922b2603001015d01b4a0308030025d010302002122 -2627371e013332363f010e01232226353412373e013332161737033426232206070e01151416 -33321204c5bf37fec9fef961a64822449856afe124104dcc76aac3766b47bd6771a829205c80 -7649842f4c558179afea0460fc2bfee3fee81d1eb32c2abfb354585ce1c59b0129734c526960 -aefe6588943a3456e97c8a94013d0001ffcdfe5604d30460000f011a40460a2b0b0a000f0607 -080305092b00000f0e2b0f000f0d2b0c0d00000f0d2b0e0d0a0b0a0c2b0b0b0a3a0d0b091000 -0b057d037f0e0b7e100d0c0b0a09060003080f05100f041010d44bb009544bb00c545b4bb00e -545b4bb010545b4bb011545b58b90004ffc038594bb0125458b9000400403859cc1239111739 -310010e432f4ec113911391239304b5358071005ed071008ed071008ed071005ed071005ed11 -17390708ed5922b2070201015d4066260d370d460d7609770a760d860d930d08060005010802 -080e16001501180e260024012402290e3909390a390e380f4909490a480d480e770077017702 -7809780a760b760c790e790f8a088b09890a840b840c890d880e960096019602960a940b940c -960d2a5d005d050e012b01373332363f01033313013301fc80a17d911f6a4d6c4339f8c3ba02 -02c168d76b9a547a6b0437fca6035a000002005effe3051d06140013002500a6404c1f1e0220 -1d05121118191a1b04171c05121102010203000512111305121211100512110d0e020c0f0511 -12113a0f0017204c0c174c03510c7a105c121d131410110f0014122511140e06222610f4b29f -06015decd440075f110f113f11035de4113939113911393931002fece4f4ec10ee113939304b -5358071005ed1117390705ed071005ed0705ed1117390705ed1117390705ed1117395922b660 -278027a02703015d250e01232226353412373e013332161713330123011416333236373e0135 -3426232206070e0103584aca7ba8c376704aba666ca52d78b9fed1b9fde883745693383b4483 -735796353a45a86164e5c7a6012d774f5368610262f9ec01b091a2535154dc6b8b9c524d53dc -00010075ffe304b60460001900d5404c1312021411050f0e10050f0f0e0d050e0f0e0a0b020c -050f0f0e08070605040509030500010002050101003a0c03110001094c14510d017e0f0d0f0e -0017100c0603020511010f0e0127171a10d44bb009544bb00a545b4bb00b545b4bb00c545b4b -b00d545b4bb00e545b4bb00f545b4bb010545b58b90017ffc03859b2af17015decd4b45f0e3f -0e025dc4b47f0f6f0f025d11391739123911123931002fe432f4ec1139393939304b53580710 -05ed071005ed111739071005ed1739071005ed071005ed0705ed111739592201b2601b015d1b -0133030e011514163332363713330323370e012322263534368983b9830a09685f94d8217bb8 -d9b8254ed77993a40a01bc02a4fd63314617555dc8a9026cfba0b0626ba1901e5a0000010048 -0000073f047b002b01154073141312111005150f050c0d0c0e050d0d0c080706050405090305 -000100020501010019051a1b1a1617021518051b1a1f1e02201d051b1a1c051b1b1a3a180f0c -03041d2300030115094c26207a1b7e190d01191a1c18120f0e051b0d030223060029010c231d -1b0d272301270605291b1a242c10f4b29f1a015dc4b4701b601b025dd4400dff29a029a02990 -296f294f29065dececd4b4af236023025dec113911391112391112393911121739113931002f -3c3ce4f43cec321117391739304b5358071005ed0705ed1117390705ed111739071005ed0710 -05ed071005ed111739071005ed071005ed1117395922b2302d01015db6402d602d702d035d40 -13ff2ddf2dbf2da02da02d902d6f2d502d4f2d095d010323133e01353426232206070323133e -013534262322060703231333073e01333216173e01333216151406072f83b8810808645a86d2 -1f7bb8830808645888d21f7bb8dbb8234bc9737a9d1054dd7b909d0802a4fd5c029e2b3e165a -64c9a1fd8f029e253f195b65c9a1fd8f0460ae62678072767ca698214f0000000002005effe3 -0487047b0011002000454012154c001b4c097a005121180e0c120e03222110f4b29f03015dec -d440099f0c7f0c5f0c3f0c045dec310010e4f4ec10ee3001b27022015d4009f022a0227f223f -22045d052226353436373e01333216151402070e01011416333212353426232206070e010208 -c5e54f3f63f49abfeb4e3f62f4fe797f81b9f3827e68a2402f331df3d27afd568680eec085fe -f857868001cb98970143f8919461634abe0000000123012f00b800cb00b800c100aa00c702c7 -00a000370037005200be0189022d00cb00a6008700d9050200b4009c013901140139003700d3 -06140679058505a800cb005c00b80048012f00d90093000000cb00b800b8007f027b02500066 -00c705cd009a009a006f00cb00b800f000ba018300d5009800cb024800f600830354008f008f -009a0073040005d5010a00fe022b00a400b4009c009c000000620000001d032d05d505d505d5 -05f0007f007b005400a406b8061401d300b800cb00a601c301ec00e900a000d3035c03710062 -009c00a80185042304a80448008f0139011401390360008f0283019a046004600460047b0000 -0277009c046001aa061400c5007f027b0000025005cd006600bc0066007700cd013b01850389 -008f007b0000001d05d500cd074a042f009c009c0000077d0335006f0000006f00ae00b2002d -0396027b00f6008303540666009c0266008f02f6037100cd0344002900660073000014000096 -0015b6060504030201002c2010b002254964b040515820c859212d2cb002254964b040515820 -c859212d2c20100720b00050b00d7920b8ffff5058041b0559b0051cb0032508b0042523e120 -b00050b00d7920b8ffff5058041b0559b0051cb0032508e12d2c4b505820b0b3454459212d2c -b002254560442d2c4b5358b00225b0022545445921212d2c45442d00000100000002547a6073 -ada25f0f3cf5001f080000000000cfbbd8c700000000cfbbd8c7f7e0fd330d46088b00020008 -000000010000000000010000076dfe1d00000d85f7e0f9b90d46006400130000000000000000 -00000000001304cd006604f0007f02390048051200480323008304ec005e034a004802d1008b -04e700540466005e04f0007f025c00370514000c0514004204bcffcd0514005e0512007507cb -004804e5005e0000000000000044000000c00000015800000260000003540000046c00000548 -00000648000007ec0000089c000009140000096400000a7800000bc400000d1c00000e3c0000 -0f6800001108000011b8000100000013034e002b0068000c00020010004000070000030e020d -00080004b8028040ffb1fe03b02503af3203ae9603ad0e03ac730e05ac3203abfe03aa2503a9 -0e03a82503a79603a6fa03a5fa03a4fe03a33a03a2fe03a13203a09f5305a096039f4d41059f -53039e32039d14039c96039b0a039afe03991203987d0397bb0396fe03944d4105947d0393fe -0392914705927d03914703908f1b0590fe038f1b038efe038dfe038cfe038bfe038a891e058a -fe03891e0388320387fe0384160383fe0382fe0381fe0380fe037ffe037efe037d4b25057d64 -037cfe037b11037a79bb057afe0379785d0579bb0379800478772505785d0378400477250376 -fe03759603746403730e0372712505726403717012057125037012036f4d41056ffa036e40ff -fe036dfe036cfe036b16036a693a056a6403694b2505693a03684e0b0568180367660e056732 -03660e03656403644d410564960363fe0362610c0562fe03610c03605f19056064035f5e1005 -5f19035e10035d0a035c5b0d055cfe035b0d035a4d41055a960359580e05592803580e0357fa -035655bb0556fe0355545d0555bb0355800454532505545d0354400453250352fe0351502e05 -51fe03502e034f4e0b054f14034e0b034d4b25054d41034c4b25054cfe034b4a11054b25034a -110349fe034847110548fe0347110346fe0345fe0344fe0343427d0543fe03427d0341fe0340 -fa033ffa033efa033c3642053cfe033bc8033a3642053a530339fe407003387d033736420536 -042d0536420335fe0334fe03333a0332fa03300c032ffe032dfe032cfe032b042d052b31032a -100329031005292303281e0327260e05276403260e0325010a05253203240c1805247d032305 -3a0523fe03220c180522bb0321031005211b03201f0b05200f0320b8ffc0409a041f0b031e09 -031e40041d10031c053a051c96031b96031a1925051a64031918120519250318120317162505 -17410316250315fe0314fe0313fa031211190512fe031103100511190310fe030ffe030e053a -050e96030d0c18050d7d030c0b0c050c18030b0c030afe0308053a050896030603100506fe03 -05042d05053a0304031005042d0303100302010a05021803010a03014004001c0301b8016485 -8d012b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b +<0001000000090080000300106376742000691d3900000db8000001fe6670676d7134766a0000 +0fb8000000ab676c796671eda1390000009c00000d1c686561640d13be360000106400000036 +686865610d9f07800000109c00000024686d7478556f0a05000010c00000004c6c6f63610000 +76d00000110c000000506d617870048006710000115c00000020707265703b07f1000000117c +0000056800020066fe96046605a400030007001a400c04fb0006fb0108057f0204002fc4d4ec +310010d4ecd4ec301311211125211121660400fc73031bfce5fe96070ef8f27206290002009e +008d042504230006000d0086404903e804050402e8010205050402e8030206000601e8000006 +0ae80b0c0b09e808090c0c0b09e80a090d070d08e807070d4209020b04e70700a60e090c0502 +0703006f050a076f0c6e0e10fcfc3cd4ec321139111239310010f43cec323939304b53580710 +04ed071008ed071008ed071004ed071004ed071008ed071008ed071004ed5922011509011501 +35131509011501350425fed3012dfe2b23fed3012dfe2b0423bffef4fef4bf01a25201a2bffe +f4fef4bf01a252000000000200c100000179061400030007002b400e06be04b100bc02050108 +0400460810fc3cec3231002fe4fcec30400b1009400950096009700905015d13331123113315 +23c1b8b8b8b80460fba00614e900000100ba00000464047b001300364019030900030e010687 +0e11b80cbc0a010208004e0d09080b461410fcec32f4ec31002f3ce4f4c4ec1112173930b460 +15cf1502015d0111231134262322061511231133153e013332160464b87c7c95acb9b942b375 +c1c602a4fd5c029e9f9ebea4fd870460ae6564ef00010037000002f2059e0013003840190e05 +080f03a9001101bc08870a0b08090204000810120e461410fc3cc4fc3cc432393931002fecf4 +3cc4ec3211393930b2af1501015d01112115211114163b01152322263511233533110177017b +fe854b73bdbdd5a28787059efec28ffda0894e9a9fd202608f013e00000000020071ffe3047f +047b0014001b00704024001501098608880515a90105b90c01bb18b912b80c8c1c1b15020815 +08004b02120f451c10fcecf4ecc4111239310010e4f4ece410ee10ee10f4ee1112393040293f +1d701da01dd01df01d053f003f013f023f153f1b052c072f082f092c0a6f006f016f026f156f +1b095d71015d0115211e0133323637150e01232000111000333200072e0123220607047ffcb2 +0ccdb76ac76263d06bfef4fec70129fce20107b802a5889ab90e025e5abec73434ae2a2c0138 +010a01130143feddc497b4ae9e00000100ba0000034a047b001100304014060b0700110b0387 +0eb809bc070a06080008461210fcc4ec3231002fe4f4ecc4d4cc11123930b450139f1302015d +012e012322061511231133153e0133321617034a1f492c9ca7b9b93aba85132e1c03b41211cb +befdb20460ae6663050500000001002f000002f8061400130059401c0510010c08a906018700 +970e06bc0a02130700070905080d0f0b4c1410fc4bb00a5458b9000b004038594bb00e5458b9 +000bffc038593cc4fc3cc4c412393931002fe432fcec10ee321239393001b640155015a01503 +5d01152322061d012115211123112335333534363302f8b0634d012ffed1b9b0b0aebd061499 +5068638ffc2f03d18f4ebbab0002007bffe3042d047b000a002500bc4027191f0b17090e00a9 +1706b90e1120861fba1cb923b8118c170c001703180d09080b1f030814452610fcecccd4ec32 +3211393931002fc4e4f4fcf4ec10c6ee10ee11391139123930406e301d301e301f3020302130 +223f27401d401e401f402040214022501d501e501f50205021502250277027851d871e871f87 +20872185229027a027f0271e301e301f30203021401e401f40204021501e501f50205021601e +601f60206021701e701f70207021801e801f80208021185d015d0122061514163332363d0137 +1123350e01232226353436332135342623220607353e0133321602bedfac816f99b9b8b83fbc +88accbfdfb0102a79760b65465be5af3f00233667b6273d9b4294cfd81aa6661c1a2bdc0127f +8b2e2eaa2727fc0000010071ffe303e7047b0019003f401b00860188040e860d880ab91104b9 +17b8118c1a07120d004814451a10fce432ec310010e4f4ec10fef4ee10f5ee30400b0f1b101b +801b901ba01b05015d01152e0123220615141633323637150e0123220011100021321603e74e +9d50b3c6c6b3509d4e4da55dfdfed6012d010655a20435ac2b2be3cdcde32b2baa2424013e01 +0e0112013a230000000200c1008d044804230006000d008640490ce80d0c090a090be80a0a09 +0de80708070ce80b0c08080705e8060502030204e803030206e800010005e80405010100420c +050a03e70700a60e0c08010500086f0a07016f0300700e10fc3cfcd43cec1239111239310010 +f43cec323939304b5358071008ed071004ed071004ed071008ed071008ed071004ed071004ed +071008ed59221301150135090125011501350901c101d5fe2b012dfed301b201d5fe2b012dfe +d30423fe5e52fe5ebf010c010cbffe5e52fe5ebf010c010c0000000100c90000019305d50003 +002eb700af02011c00040410fc4bb0105458b9000000403859ec31002fec3001400d30054005 +500560058f059f05065d13331123c9caca05d5fa2b0000010087ffe304a205f00027007e403c +0d0c020e0b021e1f1e080902070a021f1f1e420a0b1e1f0415010015a1149418951104950094 +2591118c281e0a0b1f1b0700221b190e2d071914222810dcc4ecfcece4111239393939310010 +e4f4e4ec10eef6ee10c6111739304b535807100eed11173907100eed1117395922b20f290101 +5db61f292f294f29035d01152e012322061514161f011e0115140421222627351e0133323635 +34262f012e01353424333216044873cc5fa5b377a67ae2d7feddfee76aef807bec72adbc879a +7be2ca0117f569da05a4c53736807663651f192bd9b6d9e0302fd04546887e6e7c1f182dc0ab +c6e4260000020071fe56045a047b000b0028004a4023190c1d0912861316b90f03b92623b827 +bc09b90fbd1a1d261900080c4706121220452910fcc4ecf4ec323231002fc4e4ece4f4c4ec10 +fed5ee1112393930b6602a802aa02a03015d0134262322061514163332361710022122262735 +1e013332363d010e0123220211101233321617353303a2a59594a5a59495a5b8fefefa61ac51 +519e52b5b439b27ccefcfcce7cb239b8023dc8dcdcc8c7dcdcebfee2fee91d1eb32c2abdbf5b +6362013a01030104013a6263aa000001003dfe56047f0460000f018b40430708020911000f0a +110b0a00000f0e110f000f0d110c0d00000f0d110e0d0a0b0a0c110b0b0a420d0b0910000b05 +8703bd0e0bbc100e0d0c0a09060300080f040f0b1010d44bb00a544bb008545b58b9000b0040 +38594bb0145458b9000bffc03859c4c4111739310010e432f4ec113911391239304b53580710 +05ed071008ed071008ed071005ed071008ed0705ed173259220140f0060005080609030d160a +170d100d230d350d490a4f0a4e0d5a095a0a6a0a870d800d930d120a000a09060b050c0b0e0b +0f1701150210041005170a140b140c1a0e1a0f2700240124022004200529082809250a240b24 +0c270d2a0e2a0f201137003501350230043005380a360b360c380d390e390f30114100400140 +024003400440054006400740084209450a470d490e490f401154005101510255035004500556 +06550756085709570a550b550c590e590f501166016602680a690e690f60117b08780e780f89 +008a09850b850c890d890e890f9909950b950c9a0e9a0fa40ba40cab0eab0fb011cf11df11ff +11655d005d050e012b01353332363f01013309013302934e947c936c4c543321fe3bc3015e01 +5ec368c87a9a488654044efc94036c00000000020071ffe3045a06140010001c003840191ab9 +000e14b905088c0eb801970317040008024711120b451d10fcecf4ec323231002fece4f4c4ec +10c4ee30b6601e801ea01e03015d0111331123350e0123220211100033321601141633323635 +342623220603a2b8b83ab17ccbff00ffcb7cb1fdc7a79292a8a89292a703b6025ef9eca86461 +014401080108014461fe15cbe7e7cbcbe7e7000200aeffe30458047b00130014003b401c0309 +00030e0106870e118c0a01bc14b80c0d0908140b4e020800461510fcecf439ec3231002fe4e4 +32f4c4ec1112173930b46f15c01502015d1311331114163332363511331123350e0123222601 +aeb87c7c95adb8b843b175c1c801cf01ba02a6fd619f9fbea4027bfba0ac6663f003a8000001 +00ba0000071d047b0022005a4026061209180f00061d07150c871d2003b81bbc19100700110f +0808065011080f501c18081a462310fcec32fcfcfcec11123931002f3c3ce4f43cc4ec321112 +17393040133024502470249024a024a024bf24df24ff2409015d013e01333216151123113426 +2322061511231134262322061511231133153e01333216042945c082afbeb972758fa6b97277 +8da6b9b93fb0797aab03897c76f5e2fd5c029ea19cbea4fd87029ea29bbfa3fd870460ae6762 +7c00000000020071ffe30475047b000b0017004a401306b91200b90cb8128c1809120f510312 +15451810fcecf4ec310010e4f4ec10ee3040233f197b007b067f077f087f097f0a7f0b7b0c7f +0d7f0e7f0f7f107f117b12a019f01911015d0122061514163332363534262732001110002322 +00111000027394acab9593acac93f00112feeef0f1feef011103dfe7c9c9e7e8c8c7e99cfec8 +feecfeedfec701390113011401380000013500b800cb00cb00c100aa009c01a600b800660000 +007100cb00a002b20085007500b800c301cb0189022d00cb00a600f000d300aa008700cb03aa +0400014a003300cb000000d9050200f4015400b4009c01390114013907060400044e04b40452 +04b804e704cd0037047304cd04600473013303a2055605a60556053903c5021200c9001f00b8 +01df007300ba03e9033303bc0444040e00df03cd03aa00e503aa0404000000cb008f00a4007b +00b80014016f007f027b0252008f00c705cd009a009a006f00cb00cd019e01d300f000ba0183 +00d5009803040248009e01d500c100cb00f600830354027f00000333026600d300c700a400cd +008f009a0073040005d5010a00fe022b00a400b4009c00000062009c0000001d032d05d505d5 +05d505f0007f007b005400a406b80614072301d300b800cb00a601c301ec069300a000d3035c +037103db0185042304a80448008f0139011401390360008f05d5019a06140723066601790460 +04600460047b009c00000277046001aa00e904600762007b00c5007f027b000000b4025205cd +006600bc00660077061000cd013b01850389008f007b0000001d00cd074a042f009c009c0000 +077d006f0000006f0335006a006f007b00ae00b2002d0396008f027b00f600830354063705f6 +008f009c04e10266008f018d02f600cd03440029006604ee00730000140000960000b7070605 +04030201002c2010b002254964b040515820c859212d2cb002254964b040515820c859212d2c +20100720b00050b00d7920b8ffff5058041b0559b0051cb0032508b0042523e120b00050b00d +7920b8ffff5058041b0559b0051cb0032508e12d2c4b505820b0fd454459212d2cb002254560 +442d2c4b5358b00225b0022545445921212d2c45442d2cb00225b0022549b00525b005254960 +b0206368208a108a233a8a10653a2d000001000000025eb8d6665e165f0f3cf5001f08000000 +0000d3d90a2c00000000d3d90a2cf7d6fc4c0e5909dc00000008000000010000000000010000 +076dfe1d00000efef7d6fa510e5900010000000000000000000000000000001304cd006604e5 +009e023900c1051200ba0323003704ec0071034a00ba02d1002f04e7007b0466007104e500c1 +025c00c9051400870514007104bc003d05140071051200ae07cb00ba04e50071000000000000 +00440000011000000160000001d8000002540000032800000398000004300000055c000005f4 +000006c40000070c00000804000008cc00000a9800000b3000000bb400000c7800000d1c0001 +000000130354002b0068000c000200100099000800000415021600080004b8028040fffbfe03 +fa1403f92503f83203f79603f60e03f5fe03f4fe03f32503f20e03f19603f02503ef8a4105ef +fe03ee9603ed9603ecfa03ebfa03eafe03e93a03e84203e7fe03e63203e5e45305e59603e48a +4105e45303e3e22f05e3fa03e22f03e1fe03e0fe03df3203de1403dd9603dcfe03db1203da7d +03d9bb03d8fe03d68a4105d67d03d5d44705d57d03d44703d3d21b05d3fe03d21b03d1fe03d0 +fe03cffe03cefe03cd9603cccb1e05ccfe03cb1e03ca3203c9fe03c6851105c61c03c51603c4 +fe03c3fe03c2fe03c1fe03c0fe03bffe03befe03bdfe03bcfe03bbfe03ba1103b9862505b9fe +03b8b7bb05b8fe03b7b65d05b7bb03b78004b6b52505b65d40ff03b64004b52503b4fe03b396 +03b2fe03b1fe03b0fe03affe03ae6403ad0e03acab2505ac6403abaa1205ab2503aa1203a98a +4105a9fa03a8fe03a7fe03a6fe03a51203a4fe03a3a20e05a33203a20e03a16403a08a4105a0 +96039ffe039e9d0c059efe039d0c039c9b19059c64039b9a10059b19039a1003990a0398fe03 +97960d0597fe03960d03958a410595960394930e05942803930e0392fa039190bb0591fe0390 +8f5d0590bb039080048f8e25058f5d038f40048e25038dfe038c8b2e058cfe038b2e038a8625 +058a410389880b05891403880b03878625058764038685110586250385110384fe0383821105 +83fe0382110381fe0380fe037ffe0340ff7e7d7d057efe037d7d037c64037b5415057b25037a +fe0379fe03780e03770c03760a0375fe0374fa0373fa0372fa0371fa0370fe036ffe036efe03 +6c21036bfe036a1142056a530369fe03687d036711420566fe0365fe0364fe0363fe0362fe03 +613a0360fa035e0c035dfe035bfe035afe0359580a0559fa03580a035716190557320356fe03 +5554150555420354150353011005531803521403514a130551fe03500b034ffe034e4d10054e +fe034d10034cfe034b4a13054bfe034a4910054a1303491d0d05491003480d0347fe03469603 +45960344fe0343022d0543fa0342bb03414b0340fe033ffe033e3d12053e14033d3c0f053d12 +033c3b0d053c40ff0f033b0d033afe0339fe033837140538fa033736100537140336350b0536 +1003350b03341e03330d0332310b0532fe03310b03302f0b05300d032f0b032e2d09052e1003 +2d09032c32032b2a25052b64032a2912052a25032912032827250528410327250326250b0526 +0f03250b0324fe0323fe03220f03210110052112032064031ffa031e1d0d051e64031d0d031c +1142051cfe031bfa031a42031911420519fe031864031716190517fe031601100516190315fe +0314fe0313fe031211420512fe0311022d05114203107d030f64030efe030d0c16050dfe030c +0110050c16030bfe030a100309fe0308022d0508fe030714030664030401100504fe03401503 +022d0503fe0302011005022d0301100300fe0301b80164858d012b2b2b2b2b2b2b2b2b2b2b2b +2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b +2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b +2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b 2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b -2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b002b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b +2b002b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b 2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b 2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b 2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b -2b2b2b2b2b2b2b2b2b2b2b2b2b1d00> +2b2b2b2b2b2b2b1d00> ] def /f-0-0 currentdict end definefont pop %%EndResource @@ -384,17 +367,17 @@ Encoding 121 /y put /L 29 def /b 30 def /h 31 def -/v 32 def -/F 33 def -/bracketleft 34 def -/comma 35 def -/bracketright 36 def -/u 37 def -/less 38 def -/greater 39 def -/w 40 def -/J 41 def -/G 42 def +/F 32 def +/bracketleft 33 def +/comma 34 def +/bracketright 35 def +/u 36 def +/less 37 def +/greater 38 def +/w 39 def +/J 40 def +/G 41 def +/v 42 def /B 43 def /f 44 def /R 45 def @@ -410,9 +393,9 @@ Encoding 121 /y put end readonly def /sfnts [ <0001000000090080000300106376742000691d39000022d8000001fe6670676d7134766a0000 -24d8000000ab676c7966dcd645cf0000009c0000223c6865616403f2510b0000258400000036 -686865610cb80688000025bc00000024686d7478fbf81efe000025e0000000dc6c6f63610003 -ba50000026bc000000e06d61787004a406710000279c00000020707265703b07f100000027bc +24d8000000ab676c7966dcd645cf0000009c0000223c686561640d13be360000258400000036 +686865610d9f07a4000025bc00000024686d7478fbf81efe000025e0000000dc6c6f63610003 +b4d8000026bc000000e06d61787004a406710000279c00000020707265703b07f100000027bc 0000056800020066fe96046605a400030007001a400c04fb0006fb0108057f0204002fc4d4ec 310010d4ecd4ec301311211125211121660400fc73031bfce5fe96070ef8f2720629000100d9 000005db0504000b002340110009019c07030502150400170a0615080c10dcfc3cfc3cec3100 @@ -540,54 +523,54 @@ ffffcc7bb13ab9b9022fcbe7e7cbcbe7e702526461febcfef8fef8febc6164a80614000100ba 000004640614001300344019030900030e0106870e11b80c970a010208004e0d09080b461410 fcec32f4ec31002f3cecf4c4ec1112173930b2601501015d0111231134262322061511231133 113e013332160464b87c7c95acb9b942b375c1c602a4fd5c029e9f9ebea4fd870614fd9e6564 -ef000001003d0000047f0460000600fb40270311040504021101020505040211030206000601 +ef00000100c90000042305d50009002940120695040295008104ad08050107031c00040a10fc +ec32d4c431002fecf4ec10ee30b20f0b01015d13211521112115211123c9035afd700250fdb0 +ca05d5aafe48aafd3700000100b0fef2025806140007003b400f04a906b202a900b108050103 +43000810dc4bb00c5458b90000004038594bb012544bb013545b58b90000ffc03859fccc3231 +0010fcecf4ec301321152311331521b001a8f0f0fe5806148ff9fc8f00000001009eff1201c3 +00fe00050019400c039e0083060304011900180610fcecd4cc310010fcec30373315032313f0 +d3a48152feacfec00140000100c7fef2026f061400070030401003a901b205a900b108004304 +0602040810fc4bb00f544bb010545b58b90002004038593cdcec310010fcecf4ec3001112135 +33112335026ffe58efef0614f8de8f06048f000200aeffe30458047b00130014003b401c0309 +00030e0106870e118c0a01bc14b80c0d0908140b4e020800461510fcecf439ec3231002fe4e4 +32f4c4ec1112173930b46f15c01502015d1311331114163332363511331123350e0123222601 +aeb87c7c95adb8b843b175c1c801cf01ba02a6fd619f9fbea4027bfba0ac6663f003a8000001 +00d9005e05db04a60006004d402a029c030403019c0001040403019c0201050605009c060542 +05040201000503a806a7070102002404230710fcec3239310010f4ec1739304b53580704ed07 +1008ed071008ed071004ed592209021501350105dbfbf80408fafe050203f0fe91fe93b601d1 +a601d100000100d9005e05db04a60006004f402b069c0006030403059c040403009c01020106 +9c05060202014206050302000504a801a7070602240400230710fc3cec39310010f4ec173930 +4b5358071008ed071004ed071004ed071008ed592213350115013501d90502fafe040603f0b6 +fe2fa6fe2fb6016d000000010056000006350460000c01eb404905550605090a0904550a0903 +550a0b0a025501020b0b0a061107080705110405080807021103020c000c011100000c420a05 +0203060300bf0b080c0b0a09080605040302010b07000d10d44bb00a544bb011545b4bb01254 +5b4bb013545b4bb00b545b58b9000000403859014bb00c544bb00d545b4bb010545b58b90000 +ffc03859cc173931002f3cec32321739304b5358071005ed071008ed071008ed071005ed0710 +08ed071005ed0705ed071008ed59220140ff050216021605220a350a49024905460a400a5b02 +5b05550a500a6e026e05660a79027f0279057f05870299029805940abc02bc05ce02c703cf05 +1d0502090306040b050a080b09040b050c1502190316041a051b081b09140b150c2500250123 +022703210425052206220725082709240a210b230c390336043608390c300e46024803460440 +0442054006400740084409440a440b400e400e56005601560250045105520652075008530954 +0a550b6300640165026a0365046a056a066a076e09610b670c6f0e7500750179027d0378047d +057a067f067a077f07780879097f097b0a760b7d0c870288058f0e97009701940293039c049b +05980698079908402f960c9f0ea600a601a402a403ab04ab05a906a907ab08a40caf0eb502b1 +03bd04bb05b809bf0ec402c303cc04ca05795d005d13331b01331b013301230b012356b8e6e5 +d9e6e5b8fedbd9f1f2d90460fc96036afc96036afba00396fc6a0001ff96fe66019305d5000b +004240130b0200079505b000810c05080639011c00040c10fc4bb0105458b9000000403859ec +e43939310010e4fcec1139393001400d300d400d500d600d8f0d9f0d065d13331110062b0135 +33323635c9cacde34d3f866e05d5fa93fef2f4aa96c2000000010073ffe3058b05f0001d0039 +402000051b0195031b950812a111ae15950e91088c1e02001c1134043318190b101e10fcecfc +e4fcc4310010e4f4ecf4ec10fed4ee1139393025112135211106042320001110002132041715 +2e0123200011100021323604c3feb6021275fee6a0fea2fe75018b015e9201076f70fc8bfeee +feed011301126ba8d50191a6fd7f53550199016d016e01994846d75f60fecefed1fed2fece25 +00000001003d0000047f0460000600fb40270311040504021101020505040211030206000601 1100000642020300bf0506050302010504000710d44bb00a5458b90000004038594bb014544b b015545b58b90000ffc03859c4173931002fec3239304b5358071005ed071008ed071008ed07 1005ed592201408e48026a027b027f02860280029102a402080600060109030904150015011a 031a0426002601290329042008350035013a033a043008460046014903490446054806400856 0056015903590450086600660169036904670568066008750074017b037b0475057a06850085 0189038904890586069600960197029a03980498059706a805a706b008c008df08ff083e5d00 -5d133309013301233dc3015e015ec3fe5cfa0460fc5403acfba00000000100c90000042305d5 -0009002940120695040295008104ad08050107031c00040a10fcec32d4c431002fecf4ec10ee -30b20f0b01015d13211521112115211123c9035afd700250fdb0ca05d5aafe48aafd37000001 -00b0fef2025806140007003b400f04a906b202a900b10805010343000810dc4bb00c5458b900 -00004038594bb012544bb013545b58b90000ffc03859fccc32310010fcecf4ec301321152311 -331521b001a8f0f0fe5806148ff9fc8f00000001009eff1201c300fe00050019400c039e0083 -060304011900180610fcecd4cc310010fcec30373315032313f0d3a48152feacfec001400001 -00c7fef2026f061400070030401003a901b205a900b1080043040602040810fc4bb00f544bb0 -10545b58b90002004038593cdcec310010fcecf4ec300111213533112335026ffe58efef0614 -f8de8f06048f000200aeffe30458047b00130014003b401c030900030e0106870e118c0a01bc -14b80c0d0908140b4e020800461510fcecf439ec3231002fe4e432f4c4ec1112173930b46f15 -c01502015d1311331114163332363511331123350e0123222601aeb87c7c95adb8b843b175c1 -c801cf01ba02a6fd619f9fbea4027bfba0ac6663f003a800000100d9005e05db04a60006004d -402a029c030403019c0001040403019c0201050605009c06054205040201000503a806a70701 -02002404230710fcec3239310010f4ec1739304b53580704ed071008ed071008ed071004ed59 -2209021501350105dbfbf80408fafe050203f0fe91fe93b601d1a601d100000100d9005e05db -04a60006004f402b069c0006030403059c040403009c010201069c0506020201420605030200 -0504a801a7070602240400230710fc3cec39310010f4ec1739304b5358071008ed071004ed07 -1004ed071008ed592213350115013501d90502fafe040603f0b6fe2fa6fe2fb6016d00000001 -0056000006350460000c01eb404905550605090a0904550a0903550a0b0a025501020b0b0a06 -1107080705110405080807021103020c000c011100000c420a050203060300bf0b080c0b0a09 -080605040302010b07000d10d44bb00a544bb011545b4bb012545b4bb013545b4bb00b545b58 -b9000000403859014bb00c544bb00d545b4bb010545b58b90000ffc03859cc173931002f3cec -32321739304b5358071005ed071008ed071008ed071005ed071008ed071005ed0705ed071008 -ed59220140ff050216021605220a350a49024905460a400a5b025b05550a500a6e026e05660a -79027f0279057f05870299029805940abc02bc05ce02c703cf051d0502090306040b050a080b -09040b050c1502190316041a051b081b09140b150c2500250123022703210425052206220725 -082709240a210b230c390336043608390c300e46024803460440044205400640074008440944 -0a440b400e400e560056015602500451055206520750085309540a550b6300640165026a0365 -046a056a066a076e09610b670c6f0e7500750179027d0378047d057a067f067a077f07780879 -097f097b0a760b7d0c870288058f0e97009701940293039c049b05980698079908402f960c9f -0ea600a601a402a403ab04ab05a906a907ab08a40caf0eb502b103bd04bb05b809bf0ec402c3 -03cc04ca05795d005d13331b01331b013301230b012356b8e6e5d9e6e5b8fedbd9f1f2d90460 -fc96036afc96036afba00396fc6a0001ff96fe66019305d5000b004240130b0200079505b000 -810c05080639011c00040c10fc4bb0105458b9000000403859ece43939310010e4fcec113939 -3001400d300d400d500d600d8f0d9f0d065d13331110062b013533323635c9cacde34d3f866e -05d5fa93fef2f4aa96c2000000010073ffe3058b05f0001d0039402000051b0195031b950812 -a111ae15950e91088c1e02001c1134043318190b101e10fcecfce4fcc4310010e4f4ecf4ec10 -fed4ee11393930251121352111060423200011100021320417152e0123200011100021323604 -c3feb6021275fee6a0fea2fe75018b015e9201076f70fc8bfeeefeed011301126ba8d50191a6 -fd7f53550199016d016e01994846d75f60fecefed1fed2fece250000000300c9000004ec05d5 +5d133309013301233dc3015e015ec3fe5cfa0460fc5403acfba00000000300c9000004ec05d5 000800110020004340231900950a0995128101950aad1f110b080213191f05000e1c1605191c 2e09001c12042110fcec32fcecd4ec111739393931002fececf4ec10ee3930b20f2201015d01 112132363534262301112132363534262325213216151406071e01151404232101930144a39d @@ -661,20 +644,20 @@ b7008302011900180410fcec31002fec3037331523dbd3d3fefe0001003d024a03c305f00011 4964b040515820c859212d2c20100720b00050b00d7920b8ffff5058041b0559b0051cb00325 08b0042523e120b00050b00d7920b8ffff5058041b0559b0051cb0032508e12d2c4b505820b0 fd454459212d2cb002254560442d2c4b5358b00225b0022545445921212d2c45442d2cb00225 -b0022549b00525b005254960b0206368208a108a233a8a10653a2d00000100000002547ac744 -7e2e5f0f3cf5001f080000000000cfbbd8c800000000cfbbd8c8f7d6fcae0d72095500000008 -000000010000000000010000076dfe1d00000de2f7d6fa510d72000100000000000000000000 +b0022549b00525b005254960b0206368208a108a233a8a10653a2d000001000000025eb8b333 +ac905f0f3cf5001f080000000000d3d90a2c00000000d3d90a2cf7d6fc4c0e5909dc00000008 +000000010000000000010000076dfe1d00000efef7d6fa510e59000100000000000000000000 00000000003704cd006606b400d906e700c904e7007b04a200ba04ec0071062900c904660071 023900c1042b006f04e50071051200ba031f00b0031f00a40514008703230037034a00ba0514 007104bc003d04d300c9023900c102e300640514007102b200f0028b0000025c00c9051400ba -04e3fffa07cb00ba047500c9051400ba051200ba04bc003d049a00c9031f00b0028b009e031f -00c7051200ae06b400d906b400d9068b0056025cff9606330073057d00c902d1002f058f00c9 +04e3fffa07cb00ba047500c9051400ba051200ba049a00c9031f00b0028b009e031f00c70512 +00ae06b400d906b400d9068b0056025cff960633007304bc003d057d00c902d1002f058f00c9 051400710596007305790010053f00c905fc00c905170064028b00db0400003d051700e10000 0000000000440000009800000194000002c0000003b000000484000005040000059c000005ec 0000074c000007f000000868000008d80000093000000a2800000aa400000b1400000bdc0000 0da800000e2800000e6400000e9000000f2800000f6800000f6800000fb000001050000010c0 -00001184000011c800001260000012d8000013fc00001450000014b0000014e80000153c0000 -15c000001638000016b0000018d400001944000019ec00001a9c00001b3400001c4800001ce8 +00001184000011c800001260000012d80000132c0000138c000013c4000014180000149c0000 +15140000158c000017b000001820000018c8000019ec00001a9c00001b3400001c4800001ce8 00001d8000001e7c00001fa40000204c0000210800002130000021cc0000223c000100000037 0354002b0068000c000200100099000800000415021600080004b8028040fffbfe03fa1403f9 2503f83203f79603f60e03f5fe03f4fe03f32503f20e03f19603f02503ef8a4105effe03ee96 @@ -735,9 +718,9 @@ q 0 0 521 470 rectclip 0.562 324.938 79.5 50.059 re S Q 0 g BT -9.214947 0 0 -8.999999 14.0625 337.041527 Tm +9.23394 0 0 -9 14.0625 337.041527 Tm /f-0-0 1 Tf -[(\253interfac)-3(e\273)]TJ +[(\253interface\273)]TJ 9.493606 0 0 -9 18.5625 347.518044 Tm [(IStrategy)]TJ ET @@ -801,8 +784,8 @@ BT [(+team: )-3(T)170(eam)]TJ 8.609865 0 0 -8.25 177.5625 67.610928 Tm [(+isL)18(eader)16(: bool)]TJ -8.424446 0 0 -8.25 177.5625 77.214449 Tm -[(+haveP)20(iece: bool)]TJ +8.58309 0 0 -8.25 177.5625 77.214449 Tm +[(+hasP)19(iece: bool)]TJ 8.45283 0 0 -8.25 177.5625 86.817976 Tm [(+boar)17(d F)70(ield[,])]TJ 8.482043 0 0 -8.25 177.5625 96.421497 Tm @@ -883,9 +866,9 @@ q 1 0 0 1 0 0 cm 223.688 324.938 81.75 50.059 re S Q 0 g BT -9.214947 0 0 -8.999999 238.3125 337.041527 Tm +9.23394 0 0 -9 238.3125 337.041527 Tm /f-0-0 1 Tf -[(\253interfac)-3(e\273)]TJ +[(\253interface\273)]TJ 9.565836 0 0 -9 246.1875 347.518044 Tm (ISender)Tj ET @@ -907,7 +890,7 @@ q 1 0 0 1 0 0 cm 332.062 315.562 90 69.266 re S Q 0 g BT -9.215215 0 0 -9 341.8125 327.666527 Tm +9.229353 0 0 -9 341.8125 327.666527 Tm /f-0-0 1 Tf [(\253enumer)-3(ation\273)]TJ 9.172834 0 0 -9 357.9375 338.143044 Tm @@ -937,7 +920,7 @@ q 1 0 0 1 0 0 cm 448.312 320.062 72 59.66 re S Q 0 g BT -9.215215 0 0 -9 449.0625 332.166527 Tm +9.229353 0 0 -9 449.0625 332.166527 Tm /f-0-0 1 Tf [(\253enumer)-3(ation\273)]TJ 9.642541 0 0 -9 471.5625 342.643044 Tm diff --git a/Dokumentacja/DiagramyKlas/resources/GM.eps b/Dokumentacja/DiagramyKlas/resources/GM.eps index e2abc2a..f03013b 100644 --- a/Dokumentacja/DiagramyKlas/resources/GM.eps +++ b/Dokumentacja/DiagramyKlas/resources/GM.eps @@ -1,6 +1,6 @@ %!PS-Adobe-3.0 EPSF-3.0 %%Creator: cairo 1.16.0 (https://cairographics.org) -%%CreationDate: Mon Nov 25 18:37:44 2019 +%%CreationDate: Fri Mar 13 14:01:11 2020 %%Pages: 1 %%DocumentData: Clean7Bit %%LanguageLevel: 2 @@ -1076,8 +1076,8 @@ BT [(-players:)-3( Dictionary )-3({r)20(eadOnly})]TJ 8.378594 0 0 -8.25 218.8125 38.800424 Tm [(-map: )-3(F)71(ield[][] {r)19(eadOnly})]TJ -8.363234 0 0 -8.25 218.8125 48.403948 Tm -[(-L)18(egalKnowleadgeR)43(eplies: Int)-3([2] {u)-3(nique})]TJ +8.357346 0 0 -8.25 218.8125 48.403948 Tm +[(-L)18(egalKnowledgeR)43(eplies: Int[)-3(2] {u)-3(nique})]TJ 8.469476 0 0 -8.25 218.8125 58.007475 Tm [(-conf)34(: C)-3(on)]TJ /f-0-1 1 Tf @@ -1105,10 +1105,10 @@ BT [(~EndGa)-3(me\(\))]TJ 8.388135 0 0 -8.25 218.8125 131.232079 Tm [(-)-38(Genera)-3(teP)21(iece\(\))]TJ -8.426481 0 0 -8.25 218.8125 140.835606 Tm -[(-F)34(orwar)15(dKnowleadgeQu)-3(estion\(\))]TJ -8.328097 0 0 -8.25 218.8125 150.439053 Tm -[(-F)34(orwar)15(dKnowleadgeR)43(eply\(\))]TJ +8.421053 0 0 -8.25 218.8125 140.835606 Tm +[(-F)34(orwar)15(dKnowledgeQues)-3(tion\(\))]TJ +8.317488 0 0 -8.25 218.8125 150.439053 Tm +[(-F)34(orwar)15(dKnowledgeR)43(eply\(\))]TJ ET 1 g 343.312 461.812 72 59.66 re f @@ -1157,8 +1157,8 @@ BT 8.302703 0 0 -8.25 289.6875 228.696899 Tm /f-0-0 1 Tf [(-id: Int)]TJ -8.544726 0 0 -8.25 289.6875 238.300415 Tm -[(-messageC)-3(or)21(ellationId: In)-3(t)]TJ +8.582267 0 0 -8.25 289.6875 238.300415 Tm +[(-messageC)-3(or)17(r)20(elationId: In)-3(t)]TJ 8.749064 0 0 -8.25 289.6875 247.903954 Tm [(-team:)-3( T)169(eam)]TJ 8.650105 0 0 -8.25 289.6875 257.507469 Tm diff --git a/UML/ClassDiagram/GM.puml b/UML/ClassDiagram/GM.puml index ddb7f75..a7a466a 100644 --- a/UML/ClassDiagram/GM.puml +++ b/UML/ClassDiagram/GM.puml @@ -68,11 +68,11 @@ class GM ~ EndGame() - players: Dictionary {readOnly} - map: Field[][] {readOnly} -- LegalKnowleadgeReplies: Int[2] {unique} +- LegalKnowledgeReplies: Int[2] {unique} - conf: Configuration - GeneratePiece() -- ForwardKnowleadgeQuestion() -- ForwardKnowleadgeReply() +- ForwardKnowledgeQuestion() +- ForwardKnowledgeReply() ~ RedTeamPoints: int ~ BlueTeamPoints: int } @@ -99,7 +99,7 @@ class Player ~ SetHolding(Piece) ~ GetPosition(): Int[2] - id: Int -- messageCorellationId: Int +- messageCorrelationId: Int - team: Team - isLeader: Boolean - holding: Piece diff --git a/UML/ClassDiagram/Player.puml b/UML/ClassDiagram/Player.puml index 975b007..1decd25 100644 --- a/UML/ClassDiagram/Player.puml +++ b/UML/ClassDiagram/Player.puml @@ -21,7 +21,7 @@ class Player { + penaltyTime: int + team: Team + isLeader: bool -+ havePiece: bool ++ hasPiece: bool + board Field[,] + position: Tuple + waitingPlayers: List> From 6bb713c69fc857d9fa531ecf2a40a7f1004f43cf Mon Sep 17 00:00:00 2001 From: moskala Date: Fri, 13 Mar 2020 15:49:10 +0100 Subject: [PATCH 3/3] Zmiana w klasie agenta: pole waitingPlayers --- Dokumentacja/DiagramyKlas/resources/Agent.eps | 116 +++++++++--------- UML/ClassDiagram/Player.puml | 2 +- 2 files changed, 56 insertions(+), 62 deletions(-) diff --git a/Dokumentacja/DiagramyKlas/resources/Agent.eps b/Dokumentacja/DiagramyKlas/resources/Agent.eps index c78919b..e6b55e4 100644 --- a/Dokumentacja/DiagramyKlas/resources/Agent.eps +++ b/Dokumentacja/DiagramyKlas/resources/Agent.eps @@ -1,6 +1,6 @@ %!PS-Adobe-3.0 EPSF-3.0 %%Creator: cairo 1.16.0 (https://cairographics.org) -%%CreationDate: Fri Mar 13 14:04:20 2020 +%%CreationDate: Fri Mar 13 14:45:21 2020 %%Pages: 1 %%DocumentData: Clean7Bit %%LanguageLevel: 2 @@ -758,10 +758,10 @@ BT [(+Mak)33(eDecision\(\))]TJ ET 1 g -173.062 0.562 183 270.062 re f +195.938 0.562 137.25 270.062 re f 0.219608 g q 1 0 0 1 0 0 cm -173.062 0.562 183 270.062 re S Q +195.938 0.562 137.25 270.062 re S Q 0 g BT 9.154329 0 0 -9 250.3125 12.666525 Tm @@ -770,66 +770,66 @@ BT ET 0.219608 g q 1 0 0 1 0 0 cm -173.812 18.539 m 355.312 18.539 l S Q +196.688 18.539 m 332.438 18.539 l S Q 0 g BT -8.347826 0 0 -8.25 177.5625 29.196899 Tm +8.347826 0 0 -8.25 200.4375 29.196899 Tm /f-1-0 1 Tf [(-id: int)]TJ -8.700496 0 0 -8.25 177.5625 38.800424 Tm +8.700496 0 0 -8.25 200.4375 38.800424 Tm [(-sender)15(: ISen)-3(der)]TJ -8.327911 0 0 -8.25 177.5625 48.403948 Tm +8.327911 0 0 -8.25 200.4375 48.403948 Tm [(+penaltyT)29(ime: int)]TJ -8.686775 0 0 -8.25 177.5625 58.007475 Tm +8.686775 0 0 -8.25 200.4375 58.007475 Tm [(+team: )-3(T)170(eam)]TJ -8.609865 0 0 -8.25 177.5625 67.610928 Tm +8.609865 0 0 -8.25 200.4375 67.610928 Tm [(+isL)18(eader)16(: bool)]TJ -8.58309 0 0 -8.25 177.5625 77.214449 Tm +8.58309 0 0 -8.25 200.4375 77.214449 Tm [(+hasP)19(iece: bool)]TJ -8.45283 0 0 -8.25 177.5625 86.817976 Tm +8.45283 0 0 -8.25 200.4375 86.817976 Tm [(+boar)17(d F)70(ield[,])]TJ -8.482043 0 0 -8.25 177.5625 96.421497 Tm +8.482043 0 0 -8.25 200.4375 96.421497 Tm [(+position: T)150(uple)]TJ -8.457186 0 0 -8.25 177.5625 106.025024 Tm -[(+waitingPlayer)-3(s: List>)]TJ -8.504128 0 0 -8.25 177.5625 115.628551 Tm +8.385249 0 0 -8.25 200.4375 106.025024 Tm +[(+waitingPlayer)-3(s: List)]TJ +8.504128 0 0 -8.25 200.4375 115.628551 Tm [(-stra)-3(tegy)72(: IStr)-3(ategy)]TJ -8.331845 0 0 -8.25 177.5625 125.232079 Tm +8.331845 0 0 -8.25 200.4375 125.232079 Tm [(+teamMat)-3(es: int)-3([])]TJ ET 0.219608 g q 1 0 0 1 0 0 cm -173.812 130.176 m 355.312 130.176 l S Q +196.688 130.176 m 332.438 130.176 l S Q 0 g BT -8.241024 0 0 -8.25 177.5625 140.835606 Tm +8.241024 0 0 -8.25 200.4375 140.835606 Tm /f-1-0 1 Tf [(+Player\(\))]TJ -8.336007 0 0 -8.25 177.5625 150.439053 Tm +8.336007 0 0 -8.25 200.4375 150.439053 Tm [(+JoinTheGam)-3(e\(\))]TJ -8.3037 0 0 -8.25 177.5625 160.04258 Tm +8.3037 0 0 -8.25 200.4375 160.04258 Tm [(+Start\()-3(\))]TJ -8.284997 0 0 -8.25 177.5625 169.646095 Tm +8.284997 0 0 -8.25 200.4375 169.646095 Tm (+Stop\(\))Tj -8.021798 0 0 -8.25 177.5625 179.249622 Tm +8.021798 0 0 -8.25 200.4375 179.249622 Tm (+Move\(\))Tj -8.120846 0 0 -8.250001 177.5625 188.853149 Tm +8.120846 0 0 -8.250001 200.4375 188.853149 Tm [(+P)17(ut\(\))]TJ -8.343176 0 0 -8.25 177.5625 198.456665 Tm +8.343176 0 0 -8.25 200.4375 198.456665 Tm [(+BegF)35(orInfo\(\))]TJ -8.186802 0 0 -8.25 177.5625 208.060204 Tm +8.186802 0 0 -8.25 200.4375 208.060204 Tm (+GiveInfo\(\))Tj -8.583289 0 0 -8.25 177.5625 217.663719 Tm +8.583289 0 0 -8.25 200.4375 217.663719 Tm [(+R)44(equestsR)42(esponse\(\))]TJ -8.276743 0 0 -8.25 177.5625 227.267166 Tm +8.276743 0 0 -8.25 200.4375 227.267166 Tm [(+Chec)-3(kP)20(iece\(\))]TJ -8.365145 0 0 -8.25 177.5625 236.870705 Tm +8.365145 0 0 -8.25 200.4375 236.870705 Tm [(+A)18(cceptM)-3(essage\(\))]TJ -8.392638 0 0 -8.25 177.5625 246.47422 Tm +8.392638 0 0 -8.25 200.4375 246.47422 Tm [(+Mak)33(eDecisionF)71(r)21(omStrat)-3(egy\(\))]TJ -8.311689 0 0 -8.250001 177.5625 256.077759 Tm +8.311689 0 0 -8.250001 200.4375 256.077759 Tm [(-Commu)-3(nicate\()-3(\))]TJ -8.219709 0 0 -8.25 177.5625 265.681274 Tm +8.219709 0 0 -8.25 200.4375 265.681274 Tm [(-P)34(enalty\(\))]TJ ET 1 g @@ -950,33 +950,29 @@ q 1 0 0 1 0 0 cm 35.062 390.258 m 40.312 375.258 l 45.562 390.258 l h 35.062 390.258 m S Q q 1 0 0 1 0 0 cm -189.039 279.305 m 180.871 294.766 173.324 309.059 167.203 320.648 c S Q -193.633 270.605 m 188.879 273.184 l 189.43 278.562 l 194.184 275.984 l -h -193.633 270.605 m f +191.242 275.129 m 182.199 292.258 173.801 308.152 167.121 320.801 c S Q +195.879 266.352 m 191.125 268.93 l 191.676 274.309 l 196.43 271.73 l h +195.879 266.352 m f q 1 0 0 1 0 0 cm -193.633 270.605 m 188.879 273.184 l 189.43 278.562 l 194.184 275.984 l -h -193.633 270.605 m S Q +195.879 266.352 m 191.125 268.93 l 191.676 274.309 l 196.43 271.73 l h +195.879 266.352 m S Q 0 g BT -9.726872 0 0 -9.75 151.072575 312.408142 Tm +9.726872 0 0 -9.75 150.977623 312.588364 Tm /f-1-0 1 Tf [(4..*)]TJ ET 0.219608 g q 1 0 0 1 0 0 cm -165.75 230.168 m 129.203 264.879 90.746 301.41 66.199 324.723 c S Q -173.027 223.254 m 167.699 224.18 l 166.504 229.453 l 171.832 228.527 l -h -173.027 223.254 m f +188.465 208.594 m 145.973 248.953 95.762 296.645 66.055 324.859 c S Q +195.758 201.668 m 190.426 202.59 l 189.23 207.863 l 194.559 206.941 l h +195.758 201.668 m f q 1 0 0 1 0 0 cm -173.027 223.254 m 167.699 224.18 l 166.504 229.453 l 171.832 228.527 l -h -173.027 223.254 m S Q +195.758 201.668 m 190.426 202.59 l 189.23 207.863 l 194.559 206.941 l h +195.758 201.668 m S Q 0 g BT -9.423313 0 0 -9.75 64.563675 316.648499 Tm +9.423313 0 0 -9.75 64.533674 316.62014 Tm /f-1-0 1 Tf (1)Tj ET @@ -999,26 +995,24 @@ ET 0.219608 g [ 5.25 5.25] 0 d q 1 0 0 1 0 0 cm -335.492 270.605 m 343.434 285.641 350.953 299.879 357.359 312.008 c S Q -359.137 315.371 m 358.637 308.004 l 357.387 312.059 l 353.332 310.805 l - h -359.137 315.371 m f +333.246 266.352 m 342.059 283.039 350.445 298.914 357.477 312.227 c S Q +359.234 315.555 m 358.73 308.188 l 357.48 312.242 l 353.426 310.988 l h +359.234 315.555 m f [] 0.0 d q 1 0 0 1 0 0 cm -359.137 315.371 m 358.637 308.004 l 357.387 312.059 l 353.332 310.805 l - h -359.137 315.371 m S Q +359.234 315.555 m 358.73 308.188 l 357.48 312.242 l 353.426 310.988 l h +359.234 315.555 m S Q [ 5.25 5.25] 0 d q 1 0 0 1 0 0 cm -356.164 225.102 m 389.914 257.812 426.027 292.816 451.285 317.301 c S Q -454.004 319.934 m 451.246 313.082 l 451.309 317.324 l 447.066 317.391 l - h -454.004 319.934 m f +333.188 202.832 m 372.473 240.906 419.984 286.961 451.117 317.137 c S Q +454.078 320.004 m 451.32 313.152 l 451.383 317.395 l 447.141 317.461 l +h +454.078 320.004 m f [] 0.0 d q 1 0 0 1 0 0 cm -454.004 319.934 m 451.246 313.082 l 451.309 317.324 l 447.066 317.391 l - h -454.004 319.934 m S Q +454.078 320.004 m 451.32 313.152 l 451.383 317.395 l 447.141 317.461 l +h +454.078 320.004 m S Q Q Q showpage %%Trailer diff --git a/UML/ClassDiagram/Player.puml b/UML/ClassDiagram/Player.puml index 1decd25..aab7a02 100644 --- a/UML/ClassDiagram/Player.puml +++ b/UML/ClassDiagram/Player.puml @@ -24,7 +24,7 @@ class Player { + hasPiece: bool + board Field[,] + position: Tuple -+ waitingPlayers: List> ++ waitingPlayers: List - strategy: IStrategy + teamMates: int[]