From 80b57d58d34d77b514986e3b170d2f63bc50d443 Mon Sep 17 00:00:00 2001 From: Daniel Brunner <0xFEEDC0DE64@gmail.com> Date: Tue, 20 Dec 2016 10:38:34 +0100 Subject: [PATCH] Erweiterte Schnecken dings --- .idea/workspace.xml | 362 +++++++++--------- .../ninja/brunner/pgtl/Main.class | Bin 511 -> 0 bytes .../ninja/brunner/pgtl/program3/Person.class | Bin 825 -> 825 bytes .../ninja/brunner/pgtl/program3/Program.class | Bin 3838 -> 3717 bytes .../brunner/pgtl/program3/RennSimulator.class | Bin 3296 -> 4069 bytes .../ninja/brunner/pgtl/program3/Rennen.class | Bin 1722 -> 2190 bytes .../brunner/pgtl/program3/Rennstrecke.class | Bin 540 -> 1472 bytes .../brunner/pgtl/program3/Schnecke.class | Bin 540 -> 1955 bytes .../brunner/pgtl/program3/Wettbüro.class | Bin 1729 -> 1740 bytes .../NameBereitsVergebenException.class | Bin 390 -> 0 bytes .../RennenNichtAktivException.class | Bin 381 -> 0 bytes .../SchneckeNichtFreiException.class | Bin 384 -> 0 bytes .../StreckeNichtFreiException.class | Bin 381 -> 0 bytes .../exceptions/ZuWenigGeldException.class | Bin 366 -> 0 bytes src/ninja/brunner/pgtl/Main.java | 10 - src/ninja/brunner/pgtl/program3/Person.java | 2 + src/ninja/brunner/pgtl/program3/Program.java | 46 +-- .../brunner/pgtl/program3/RennSimulator.java | 51 ++- src/ninja/brunner/pgtl/program3/Rennen.java | 43 ++- .../brunner/pgtl/program3/Rennstrecke.java | 18 + src/ninja/brunner/pgtl/program3/Schnecke.java | 35 ++ src/ninja/brunner/pgtl/program3/Wettbüro.java | 5 +- .../NameBereitsVergebenException.java | 4 - .../exceptions/RennenNichtAktivException.java | 4 - .../SchneckeNichtFreiException.java | 4 - .../exceptions/StreckeNichtFreiException.java | 7 - .../exceptions/ZuWenigGeldException.java | 4 - 27 files changed, 332 insertions(+), 263 deletions(-) delete mode 100644 out/production/PGTL-Programs/ninja/brunner/pgtl/Main.class delete mode 100644 out/production/PGTL-Programs/ninja/brunner/pgtl/program3/exceptions/NameBereitsVergebenException.class delete mode 100644 out/production/PGTL-Programs/ninja/brunner/pgtl/program3/exceptions/RennenNichtAktivException.class delete mode 100644 out/production/PGTL-Programs/ninja/brunner/pgtl/program3/exceptions/SchneckeNichtFreiException.class delete mode 100644 out/production/PGTL-Programs/ninja/brunner/pgtl/program3/exceptions/StreckeNichtFreiException.class delete mode 100644 out/production/PGTL-Programs/ninja/brunner/pgtl/program3/exceptions/ZuWenigGeldException.class delete mode 100644 src/ninja/brunner/pgtl/Main.java delete mode 100644 src/ninja/brunner/pgtl/program3/exceptions/NameBereitsVergebenException.java delete mode 100644 src/ninja/brunner/pgtl/program3/exceptions/RennenNichtAktivException.java delete mode 100644 src/ninja/brunner/pgtl/program3/exceptions/SchneckeNichtFreiException.java delete mode 100644 src/ninja/brunner/pgtl/program3/exceptions/StreckeNichtFreiException.java delete mode 100644 src/ninja/brunner/pgtl/program3/exceptions/ZuWenigGeldException.java diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 17b2ed9..7e21120 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,21 +2,31 @@ - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + @@ -36,27 +46,33 @@ - - - + + + - - - - - + + + - - + + - - - - - + + + + + + + + + + + + + @@ -85,21 +101,22 @@ @@ -111,10 +128,9 @@ - @@ -141,7 +157,6 @@ - @@ -161,24 +176,6 @@ + - + + + + + + + - + + - - + + + @@ -498,22 +510,22 @@ - - + + - + - + - + - + @@ -548,12 +560,34 @@ + + + + + + + + - - - + + + + + + + + + + + + + + + + + @@ -561,9 +595,15 @@ - - - + + + + + + + + + @@ -581,97 +621,39 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + - + - + - - - - - - - - - - + + - + + + + + + + + + @@ -680,33 +662,67 @@ + + + + + + + + - - - - - + + + - - - - - + + + + + + + + + + + - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/out/production/PGTL-Programs/ninja/brunner/pgtl/Main.class b/out/production/PGTL-Programs/ninja/brunner/pgtl/Main.class deleted file mode 100644 index f5c1431308be8919b3200ae916a6eff02c14f151..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 511 zcmX^0Z`VEs1_omWX)Xp91`#d>Q3f$~261)<2}TAso6Nk-5<5l)W)00SMg|t={FGEi z27aH+yi~u^+@#c^ki?{%R7M6NpZw&+oUp{AOb{O`$WoG#S64e4mzAiWR8*Rm zms+G>kY19b@0*yJXU)jKlAD;B$H*Y25$%(eSeB@tlbDyTA6!zDnU`)2wlJ|My_k_f z7>hI`1D9(>a%w?IW`15VJA))616Oc{z+M>$t8>oatI;Mypq(SqSAtr)D*bAj10F0YK!AyX5#$;MMh12U1_pfwMg~R(1_oBG?F@_?85kIt7&sUh7}y|!44e!M z3_MUa7Xvo~0|O_>3k*zP&Bk!eI~bS{nzGK042-?3;+NC delta 13 UcmdnVwv%nc4<<&T$v>GK042f&3IG5A diff --git a/out/production/PGTL-Programs/ninja/brunner/pgtl/program3/Program.class b/out/production/PGTL-Programs/ninja/brunner/pgtl/program3/Program.class index 85640dc274b5f39fe647745049f6d3c1785df7a1..c934ceff2bb8a27324d33115965fc5ca1b827531 100644 GIT binary patch delta 1550 zcmew-+bSD;>ff$?3=9m$3VgTrSu9Q`7{JENW@nhg&M=pY!ImL| zgJB+*5`!(nd@cqXh6Ny@1sn_uK{hYqU|7t-u!NmqDLccm%_5AMj69+~S&3zd`ZH3p@GNr5Y2A3ozXZt1=gd`^Aq_Q)_vNPndGt6OR;Bu`hO`np?hpB?C7D8v_H=_Du{- zLd@G3Savh8Ms8G4O*m2!I)^+CqY02Aj5!5SYQPEhG$PaMWuHiGW!GY}!Ji5Ei?( zkQju;p)Dj1VR32;NkCX!+Cq{L7Pq#L6okd2EhG(L@oEdnKv;a*Lb4DRzqXJZge9OY zBoAWwvF~M20J&7LUWeI;4eV@PW~1Op7F`yj;7C?oHlyHe3`$@>C?iy`f>p4ARj@-< zuxbmb=&-=dz@~ytTSyh5f*ouI2iOb&Hlup5Jyt9N9D5nmBAKWLm?wDj|0pz7BT_z1RzRHh0Gvah+1;}@sz{DWHl)#kCV8hhO z)XOx1!G?jE!H0o?A&Nnafq{XQfrEjaL4bja!HGeT;SGZ-V>N>g;}-^VCjNQ`3nncF zOD0zaE2abn2e1(-40cQn4E9Wo3{Fg)46aPQ44zCA7~Gg9GPpCXW$<8H$KcJhjlqY( zmw|yHh=GH_iAjzjh#{DPiQx@n2}1}&C<8NNHN#VeFotjj7RE0OISdgDkqoR%DGag< zQ4G-xOiUADECyEwrtJ(d46zIh3<6Bc8R8h?85kK77#J8N7+C%@B{MLwGbFMzBr!0u eGbGFUfe3~a1_lNe21bTd21bT71_lNuhI9bPpihnf delta 1594 zcmZpb{U=+0>ff$?3=9m$4EwkkJQ#908S)tNIT#AK7z!DR*cpns7+4u{*%?Z>7}!B{ zDF;ItNT{5Hp@M^)#s;91L?B;oUBQQ_Y~zbGN^+TT85{Vlz;`S85wwk zOA?c_eG>~p5|eUL*%{*48H(8%O2E!u%E-V4x2Bk#VdZ3TW@WZjJPfND)=YL_7Uf*a z!?2EFJtKqWWCbRL$#u-!jH;6rm}Dk%adI=NgT+=cOEPa@*f{wZb3XGXhRvHTShyIO zw=is-?8@pUz{tQ6kXlrnpQm8R!?2BE`{c!}A#6Jsb}}+JgN%_w@(`8)n9R=R!o7=O zHxI)ehP{jo)*vnNNLr#0VF35U=5981rp=<9A&ip?xy%?jCa>U!3~WBT8Q3GYGjRB_?`7bOWY!kq67b%}z#SaPqAkQDkOF41Y76lS z)Pk98+CqGS4AVetKLNqL4E!K10^1k_!5W0X3|4I+VK9SDTSx@VVArk}5(Tq3w1vdL z3;{N6A#n(cU0X;3!s5^tl7z50wS}Z0EG}&!X$Xs3TSx}N;?Wk8g|K+Fh2$VCK5Zd+ z2#a4^NCCnU&=yhzv8-6?+4nLif!wOB%WT93cDE!8vr%v)izEw+QE()yBnz8S@HPe& zus>9h6tO}Su|X8ELlv=V3#sX{z)ixgh)r8a9jd54l39|49byy*#3%u%g;uNr9D5lw zBAIoBG=;RbF=z)zvgiou2jMOo|NlOqL7| zOo0sEOd$+TOrZ=eOoa@t^-M(!?o7oDo=p7=UQ81h{F!Dj1TgqAFfhb0a58u?u`>iQ z1T!!*d}WMb2w@0iU}2oVaF8L4A)JAg@gqY5Lj*%40~=E)gDgW7Lo@?3Q!$to!@vy6 zQVg*SaSRL$0!*C@@eBzJj0_S?jSPtlNeoO3$qWn(QVh)hwV6T~nAsUp*cnpU8PXUS g*%{Jf*%>lq88R6d7+4q>8L}7{8L}A|7?>Dx01ri1od5s; diff --git a/out/production/PGTL-Programs/ninja/brunner/pgtl/program3/RennSimulator.class b/out/production/PGTL-Programs/ninja/brunner/pgtl/program3/RennSimulator.class index 0f2422ca6700c0ca7aede2bcbcaf89a8685ff11b..0d69c9c6f54d2d9bdc3d1b17d2bb7b411d68b663 100644 GIT binary patch delta 2158 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 diff --git a/out/production/PGTL-Programs/ninja/brunner/pgtl/program3/Rennen.class b/out/production/PGTL-Programs/ninja/brunner/pgtl/program3/Rennen.class index b010ddc7125003826330bb9051a5efae445414c8..4bfb58d0f3609c5deff0dc2908c25778228a561f 100644 GIT binary patch literal 2190 zcmX^0Z`VEs1_on>WG)6t25U|R2?iSwVGAPcK!iOfg9C#jJA)G!13QB?2ZJ++cHv-f z1<`I?4DJjb>dqa+`aCm9(;G%yuf!@>;J zMn(qq0+9VVd5jFA*lY}AWKbvMcWCZmWKh?@n?507Yz<1&D)`KVr87nbj_jhuq@>iG zJO)Ju2?j|91_l-e22j#s009{WSr7$EU|?E-K@qHikwJ+;nSqf(g@J*glz|DXM^bA$ z1EZGqRt6?5ovjSaTDn^qShSe8GO%uBU|?WkPz4*y#=yY9&A`II!@$YF%fQFL#~{og zz#zdO$e_l+z@P;&h(Vn}18kin*ddGz3=EQ>gwDVOX2~(gGcYqSGH5brF))Fh@Qi_( zft7)QAz>2(+inK-$n6XqLY&(exU{w~Fl}St65`&*z_pEmXBz{r))ofVnGC$U8TcZF z__s3%?AO}Dz^t{6K~QT81B;LLK3irxS(!x)BHFS>RxFY%TH6?eT9_G^|9`8+0`&(fQVbysk_=G{(hTtoGGJesFt9TCF|aXc zGw3j|FxWFlGw3qNGcYnZF-S1zG3YZeF}N^@F&HrDGcbev0QJ2g0|Nse1GCXT20?ZP zBSyv_45AFi(7@+oU}P|X`~C^k_i;$R7sl!PSy11LzV!cfm|V-N%T{T)0O zk^L^upva)WpuwQXV8o!zV9B7u;LD)O5X7Lu5W%3v5X+zr_q#6xE7b3H3{p_PJ2Hqv z{qD>l3io>)hTjFCeiuRUyD5ViH0Dn+Ff)MClocpqQM|@%1M-!x&OSS4GZs-6*+mTE zI-)E_R;<#JtlJpG8*Exw7?=NlDZPe)fdS$#IR9A^XHaBd jWB|pg7z4B5e+C`~R(1vpMzH@F7=AEFqWI7foM)^6EWzHu delta 1002 zcmeAZ+{NpC>ff$?3=9m$47OYh{0zFB415fFAVMER7=Q>vP6i_eV|E4;E(Ugx0#gvj zjEjMbL6@DuoQr`6L|d>kSZ*x6&B!P^Igm+mayOH-k_3YS4}$=MAP<8OgD?++2!kjO zgBXK2JA)MugEfO3BZI@lJ2G0S70IauC7Jno#rnY|MXAZzseYNs86|E-shO@YDRu@M zMh3@;cVsk>RVQcUVOI_@Ssh7jP-0R~P6K?Xihz%Ym~NHB;p z$S^Q4Xo1a@WRPW$1DhlXwu6y@fk6_ik_pTbVGsqIF3+IAz{DWMz`$t0z{J4Hz`&5D zwS|Fs3j^CR2JYPq?2+3UIQDC8VPNsm-e+6SY$q$Th(S(U*2s!Ql4T16Cs+|z_}+_ zH3k_5JqB3@GX`k}8wPm>M+OB3PlkF$hFAtAhGYgshD-)!uy11+I2qI!1Q-+lo>=p;l-fDpu(Waz{DWKpunKUpvu6^5X-;@Rp-Yb4OJJ&AOTeu%pe9;$H0&U z4Lx;8cnkew;ACgeV6119{K3Hbk3kH?Vf?`$%Am=>z`(}9#K6wL#lXm*1q)1u{m{U) z)!M?qItvt%JdxWOc=u~DLxYDAXYep$2_7W|4h9AW^*RQ21`P&&1}z2=25klz1|0?i z23-a-1|0?)20d_am@u$17{I-$2=}H6+?#4h-n2#XCLaScKf2FY7#JCN7#JC}85kIt G7<2%I8=ac~ diff --git a/out/production/PGTL-Programs/ninja/brunner/pgtl/program3/Rennstrecke.class b/out/production/PGTL-Programs/ninja/brunner/pgtl/program3/Rennstrecke.class index 3e1f08bda32a0b49de1045316d4ca94611d2762d..e98433717bdfcebf00783232966d937597681886 100644 GIT binary patch literal 1472 zcmX^0Z`VEs1_omWe=Y_w23<}DQ3gE_p${Sq*cl8t7>u|WSQ(5t8B7>V*%{2Z7&sYp zIT*}Av;_x)B`1RwgB}NiHHdG+#bC=|$H8FF!QjBb;K(K}-YF3Qx^2Mg|t={FGEi z27aH+yi~u^+@#c^ki?`Mu$%Ie6LZ26i!wocs31#8MrJW1gC;@Si%W`9le1H;85vlU zQqwc@7#Y+x2x>~rvj#bdtqAH#-r$nN0;ug=t`*6t1tppJdBuzj?8!N)iFu_3 zj10^gAYEL+`K3k4scxAd#|wZ$0O|%kP}uS?$TDd0Fo-iq@GwX+NbxX8GsrM92!o^` z!45Z?kwL;KwJ0^Sq*x&{Pa!okFEv*IWLj#TBFGRIb_Q1-1~&$GMh0<&Zb+m#m1gFo zq!uwUh(b(A1#5&lLqUm$!Gpn*kwHjFp)9{hA+a+@ z8Y6=M!YlqsS*gh-j0~b!QVb}Zk(35k7MG;vGBPmdmx44vQdnlben3%XUP*9CQEFl? zC=DhS6r|>*Ff!<3GZCT*Ddj^0(VCG#iIDR_8G)lD9}@VC3?dqu7^YdnA{o_Lj124r zAV=opF(@*KGKeuSFfcPPf|3UV0|O%{g@9>k1{tV~EQ1^aBZE8x149x669Y2?1A~ax zb_PZ*?X3(cTD#2K6!B*5+ygV+amp9_N;gA4;BgE}NE1Q|3K7#LU> z7#Ua@7#TDfw4e^H1_vPng9XT;$Ds}tLUX7vl0!uhj)Mgrvg4!~*coIP1R3NQj2ILc Y%o!BHj^kkf1(XHUaaf(C4UPpJ0NNc)&j0`b delta 180 zcmX@WJ%>f*)W2Q(7#J9g8DzN_*cik(8CV&_L4*W|kYs0&VrP(^nDlh=dPW5yUIrN+ z26hGx9tKVZE*=JM2A;_WnCy+1H8jH*6d70<*cccXm>C#BN*EXz7(uGQG&chem}X?) zW#D6AWZ<7H!lKG3FxiSlT3?WXfkACs8AKQu I7?>DD0mE+(xBvhE diff --git a/out/production/PGTL-Programs/ninja/brunner/pgtl/program3/Schnecke.class b/out/production/PGTL-Programs/ninja/brunner/pgtl/program3/Schnecke.class index 37d44cf17b119c9a7c3a1231884f9215729d4b29..376910fedf5fdedebfaa5b53a73cd434dba8f9dc 100644 GIT binary patch literal 1955 zcmX^0Z`VEs1_on>G%f~d1`|#ODF#yzVFn`1*%>T27%aIMSQ)H18LSy>*coiO7&sYB zI2i0ev^@ud11EzcgDD4t6NvB3#o)r=%EjQu;LgF|!NK6k!QjQg;0+S+0jcxlWbk9~ zXJ-gtX9#3uV986&O=V;d^2tgpOVrOv%uCk~E-A{)OSfiZ;7u+qDoV{O2};e&OU+|s zQ1Qvj%*#sDPbw(K~w`t9%`*-7$XCVbAC!HBLlxrW?rgaX>L+#QAlD^4%nIb z$%#2(iA9+pK2(sUBqOt!kwFcw>w=Rr@=}wtQ>_^pSd&uIGxHc3)HU$xfcgjI9=0NA z2=E4%BqnG3CKf=g=5nn_PAvfWwV08CJvk>eF|V|Mk%3tQq>CfFC^0E1H75@&5XH#A z6`WsMl$`383Gxar%td;jkmq4gV$kPdkYSMJVUS~x=V4G_P-J8f21!981#S@|gM?FR zQEFyMu|j5^LTYASYOVsrsfr*&l-U`Aco>2iLKqpu5xOB^>r|SVlagA*$RGqUAyon9 z1_dP^hERquMg}1zg|hr2g~ZY{sG$l<>lG0pcOBfkgl|W`QGN{3APKW5v%S_HF0hxkg2oFO% zLjn&&B0~~8LoyFT3PUO*g9^Sx2s4(EK>*=<|D>$cMTYE_5zS2LCH!G;YVohVq{=1OUx-v^-p7D5YzBPHWjJ@ltDA| zO2R;@zzNfnk%1eOzCpfD&Q4`y&?J~Gic5;1c}bm+N1;j?8Q5}C^U_N)7#SEn859|$ z7^E2(7?>FtK}nv0fq@Z}>cO-EgCYY10}BHqgA#)>10#b90|P?@0}}%i0|SGI)^-L) zE$yugOj?Xv8JIx?%SHwU1||ko1_lN(237_J1|9|$23`hE27U%U1_1_P20;cjupC%F zgF1r-0|LVqgN>GM9lFY>SW976#^H47|G;SR;klwllEr-^9SNn}IWO zI|G*x_cjI|tt|{p+ZcF+c(*a|Xm4TQ1F`wHG4O0-5ZJ~b2y!2@7V{1Up{)#H*D-@# zC&j=9@&N-ogD8U_gE)g7gCv79gA{`|gEW#0ec&$iVbErfXJBN|frOJFgDx~!SQ!`@ z^ceJ^j&1=5A_Idh$kE54juu99vR8{WME*>U|?s^WDsP~W>96&VK8OT qW$L$tm>5I>E4~n1 diff --git a/out/production/PGTL-Programs/ninja/brunner/pgtl/program3/Wettbüro.class b/out/production/PGTL-Programs/ninja/brunner/pgtl/program3/Wettbüro.class index 4ff1ad824428f15d1276112ba76651688a10292a..5f24c0f6493be2caf061ce6f482817550f27dc4b 100644 GIT binary patch delta 620 zcmX@edxqEN)W2Q(7#J9g8C3K>8Tc8DL4*k>0}q2KJA)YqgER?U2wh_12Y37gE)f(10#dvWH(lwdMO45 z1|bF(1_lOB1{MY`27U%^1}O#}25ANc1|9}R1_lOc1{nrf1_lO31~~?K1||kc1_p-7 z3~UUn3=9l9+FKad#95}zVc^}(z#b{Yv7Lc)zjh>8Fl{RX+inJ~NNpWmahB~2+#47e z7?>Fl_6ag@F$mQ&h%ksS$TNt6Ei{1`3bl}dL5D$sK@sc-9R?)^Wdt+Jhg*H3E; z1B>o92EK6JV34brz^>v08!E-X#URZf%pe1HkQPKI+(DuYIt;pC2Z=K1F{m>zF>o<( OgB=M9SAB4p8vp?DLP|3L delta 583 zcmX@Zdyv=j)W2Q(7#J9g863G7_!$h?84S4?m>3K=8Tc5CK!h={U_JR9 zql{8&MRICENoIatv3^u(cxql|x_fF)iYrW%kwFopj4M2~q$HJxL5#t6@@r;wZZQTs z9tL{`2Sx@}ko06r7P-m!ENhMV82A|&7?>Cs83Y&v85kLaz&v3FMv%R5z9<7T10#bN zgE#{tgT!QiR-JlD1_lNp1{MYe1}+8`25ts^1|9|}23`g!1_lNm21W)325AOq1{nqh z21W*11~~>M1_=fRhKUSp46F8C~YeP+inKV zNNpWmahB~2TpJh|7?>Flwh1wCF$gmV)ia1P$TEn7tuuib3AK)aL5o42K>_RpEe1sf zB?cytg$&9JDh$kEmMVi90}F#X*kDE>1`P%V1{MZJ26hHU22BPnkPjIc7*ZKnz`hgR z&A=V0t+Jhg$4_eu1B>o92HtSp4Ge*xFax=Y4{WG30~dn~gD`_E*g;wlop1+Pq|~C2#H5^5Mg}3D{N%)(u*9NF5FaYYQj(Eb%*f#Clb4y7m8hRoRGOEUTBKi) zUXr6Ss6GPxEL51 K7#X<1s(1i^j%R5A diff --git a/out/production/PGTL-Programs/ninja/brunner/pgtl/program3/exceptions/RennenNichtAktivException.class b/out/production/PGTL-Programs/ninja/brunner/pgtl/program3/exceptions/RennenNichtAktivException.class deleted file mode 100644 index bde78f0249028b5c91a2c6b73ea7796deab9b2f7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 381 zcmX^0Z`VEs1_omW0WJn+23~dsK6VCvMg}&U%)HDJJ4Oa(4b3n{1{UZ1lvG9rexJ;| zRKL>Pq|~C2#H5^5Mg}3D{N%)(u*9NF5FaYYQj(Eb%*f#6lb4y7m8hRoRGOEUTBKi) zUXr6Pq|~C2#H5^5Mg}3D{N%)(u*9NF5FaYYQj(Eb%*f#Elb4y7m8hRoRGOEUTBKi) zUXr6Pq|~C2#H5^5Mg}3D{N%)(u*9NF5FaYYQj(Eb%*f#6lb4y7m8hRoRGOEUTBKi) zUXr6Pq|~C2#H5^5Mg}3D{N%)(u*9NF5FaYYQj(Eb%*bHtlb4y7m8hRoRGOEUTBKi) zUXr6!R6SZb!;0n$!ElN&x%LG{@ ziA|ASR$^Hq4+9GWDTn*M~cSL6L!pftdjW7#SErwlFX wetten = new ArrayList(); + //TODO + return wetten; } } diff --git a/src/ninja/brunner/pgtl/program3/Program.java b/src/ninja/brunner/pgtl/program3/Program.java index 98433c4..3874693 100644 --- a/src/ninja/brunner/pgtl/program3/Program.java +++ b/src/ninja/brunner/pgtl/program3/Program.java @@ -1,16 +1,10 @@ package ninja.brunner.pgtl.program3; -import ninja.brunner.pgtl.program3.exceptions.NameBereitsVergebenException; -import ninja.brunner.pgtl.program3.exceptions.ZuWenigGeldException; - -import java.util.ArrayList; - public class Program { public static void main(String[] args) throws InterruptedException { System.out.println("Initialisiere..."); RennSimulator rennSimulator = new RennSimulator(); - Wettbüro büro = new Wettbüro(); try { Rennstrecke rennstrecken[] = { @@ -48,33 +42,35 @@ public class Program { }; Person personen[] = { - büro.registrierePerson("Person 1", 1234), - büro.registrierePerson("Person 2", 12345), - büro.registrierePerson("Person 3", 123), - büro.registrierePerson("Person 4", 4444), - büro.registrierePerson("Person 5", 1500), - büro.registrierePerson("Person 6", 8123), - büro.registrierePerson("Person 7", 1000), - büro.registrierePerson("Person 8", 5555) + rennSimulator.getWettbüro().registrierePerson("Person 1", 1234), + rennSimulator.getWettbüro().registrierePerson("Person 2", 12345), + rennSimulator.getWettbüro().registrierePerson("Person 3", 123), + rennSimulator.getWettbüro().registrierePerson("Person 4", 4444), + rennSimulator.getWettbüro().registrierePerson("Person 5", 1500), + rennSimulator.getWettbüro().registrierePerson("Person 6", 8123), + rennSimulator.getWettbüro().registrierePerson("Person 7", 1000), + rennSimulator.getWettbüro().registrierePerson("Person 8", 5555) }; - büro.wetteAbschließen(personen[0], rennen[0], rennen[0].schnecken[0], 100); - büro.wetteAbschließen(personen[0], rennen[0], rennen[0].schnecken[0], 100); - büro.wetteAbschließen(personen[0], rennen[0], rennen[0].schnecken[0], 100); - büro.wetteAbschließen(personen[0], rennen[0], rennen[0].schnecken[0], 100); + rennSimulator.getWettbüro().wetteAbschließen(personen[0], rennen[0], rennen[0].schnecken[0], 100); + rennSimulator.getWettbüro().wetteAbschließen(personen[1], rennen[0], rennen[0].schnecken[0], 100); + rennSimulator.getWettbüro().wetteAbschließen(personen[2], rennen[0], rennen[0].schnecken[0], 100); + rennSimulator.getWettbüro().wetteAbschließen(personen[3], rennen[0], rennen[0].schnecken[0], 100); } - catch (NameBereitsVergebenException ex) - { - System.out.println("Fehler beim Initialisieren: " + ex.toString()); - return; - } - catch (ZuWenigGeldException ex) + catch (Exception ex) { System.out.println("Fehler beim Initialisieren: " + ex.toString()); return; } - rennSimulator.start(); + System.out.println("Beginne Simulation..."); + + try { + rennSimulator.start(); + } catch (Exception ex) { + System.out.println("Fehler beim Simulieren: " + ex.toString()); + return; + } System.out.println("Simulation beendet."); } diff --git a/src/ninja/brunner/pgtl/program3/RennSimulator.java b/src/ninja/brunner/pgtl/program3/RennSimulator.java index 9437a9c..70dbdd1 100644 --- a/src/ninja/brunner/pgtl/program3/RennSimulator.java +++ b/src/ninja/brunner/pgtl/program3/RennSimulator.java @@ -1,17 +1,24 @@ package ninja.brunner.pgtl.program3; -import ninja.brunner.pgtl.program3.exceptions.NameBereitsVergebenException; - import java.util.ArrayList; public class RennSimulator { + private Wettbüro wettbüro; + private ArrayList rennstrecken; private ArrayList schnecken; private ArrayList rennen; + private boolean changesAllowed; + public Wettbüro getWettbüro() { + return wettbüro; + } + public RennSimulator() { + wettbüro = new Wettbüro(); + rennstrecken = new ArrayList(); schnecken = new ArrayList(); rennen = new ArrayList(); @@ -19,30 +26,39 @@ public class RennSimulator { changesAllowed = true; } - public Rennstrecke registriereRennstrecke(String name, int length) throws NameBereitsVergebenException { + public Rennstrecke registriereRennstrecke(String name, int length) throws Exception { + if(!changesAllowed) + throw new Exception("Änderungen nicht mehr erlaubt!"); + for(Rennstrecke rennstrecke : rennstrecken) if(rennstrecke.name == name) - throw new NameBereitsVergebenException(); + throw new Exception("Name bereits vergeben!"); Rennstrecke rennstrecke = new Rennstrecke(name, length); rennstrecken.add(rennstrecke); return rennstrecke; } - public Schnecke registriereSchnecke(String name) throws NameBereitsVergebenException { + public Schnecke registriereSchnecke(String name) throws Exception { + if(!changesAllowed) + throw new Exception("Änderungen nicht mehr erlaubt!"); + for(Schnecke schnecke : schnecken) if(schnecke.name == name) - throw new NameBereitsVergebenException(); + throw new Exception("Name bereits vergeben!"); Schnecke schnecke = new Schnecke(name); schnecken.add(schnecke); return schnecke; } - public Rennen registriereRennen(String name, Rennstrecke rennstrecke, Schnecke schnecken[]) throws NameBereitsVergebenException { + public Rennen registriereRennen(String name, Rennstrecke rennstrecke, Schnecke schnecken[]) throws Exception { + if(!changesAllowed) + throw new Exception("Änderungen nicht mehr erlaubt!"); + for(Rennen _rennen : rennen) if(_rennen.name == name) - throw new NameBereitsVergebenException(); + throw new Exception("Name bereits vergeben!"); Rennen _rennen = new Rennen(name, rennstrecke, schnecken); rennen.add(_rennen); @@ -53,7 +69,7 @@ public class RennSimulator { try { rennen.begin(); - //TODO + while(rennen.schritt()); rennen.cleanup(); } @@ -67,6 +83,21 @@ public class RennSimulator { return null; } - public void start() { + public void start() throws Exception { + if(!changesAllowed) + throw new Exception("Simulation bereits gestartet!"); + + changesAllowed = false; + + for(Rennen _rennen : rennen) + { + RennErgebnis rennErgebnis = simuliere(_rennen); + + //TODO: notify wettBüro + } + + rennen.clear(); + + changesAllowed = true; } } diff --git a/src/ninja/brunner/pgtl/program3/Rennen.java b/src/ninja/brunner/pgtl/program3/Rennen.java index 218224c..9441d8c 100644 --- a/src/ninja/brunner/pgtl/program3/Rennen.java +++ b/src/ninja/brunner/pgtl/program3/Rennen.java @@ -1,9 +1,5 @@ package ninja.brunner.pgtl.program3; -import ninja.brunner.pgtl.program3.exceptions.StreckeNichtFreiException; -import ninja.brunner.pgtl.program3.exceptions.SchneckeNichtFreiException; -import ninja.brunner.pgtl.program3.exceptions.RennenNichtAktivException; - public class Rennen { String name; Rennstrecke rennStrecke; @@ -20,28 +16,37 @@ public class Rennen { this.currentlyRenning = false; } - public void begin() throws StreckeNichtFreiException, SchneckeNichtFreiException { - if(rennStrecke.currentRennen != null) - throw new StreckeNichtFreiException(); + public void begin() throws Exception { + System.out.println("Begine Rennen \"" + name + "\""); + if(currentlyRenning) + throw new Exception("Rennen bereits aktiv!"); + rennStrecke.begin(this); for(Schnecke schnecke : schnecken) - if(schnecke.currentRennen != null) - throw new SchneckeNichtFreiException(); - + schnecke.begin(this); currentlyRenning = true; - rennStrecke.currentRennen = this; - for(Schnecke schnecke : schnecken) - schnecke.currentRennen = this; } - public void cleanup() throws RennenNichtAktivException - { + public void cleanup() throws Exception { + System.out.println("Beende Rennen \"" + name + "\""); if(!currentlyRenning) - throw new RennenNichtAktivException(); + throw new Exception("Rennen nicht aktiv!"); - currentlyRenning = false; - rennStrecke.currentRennen = null; + rennStrecke.cleanup(); for(Schnecke schnecke : schnecken) - schnecke.currentRennen = null; + schnecke.cleanup(); + currentlyRenning = false; + } + + public boolean schritt() throws Exception { + if(!currentlyRenning) + throw new Exception("Rennen nicht aktiv!"); + + boolean anySchnecke = false; + + for(Schnecke schnecke : schnecken) + anySchnecke |= schnecke.krabbeln(); + + return anySchnecke; } } diff --git a/src/ninja/brunner/pgtl/program3/Rennstrecke.java b/src/ninja/brunner/pgtl/program3/Rennstrecke.java index 69fb89c..c80fdb9 100644 --- a/src/ninja/brunner/pgtl/program3/Rennstrecke.java +++ b/src/ninja/brunner/pgtl/program3/Rennstrecke.java @@ -13,4 +13,22 @@ public class Rennstrecke { currentRennen = null; } + + public void begin(Rennen rennen) throws Exception { + if(currentRennen != null) + throw new Exception("Bereits in einem Rennen!"); + + System.out.println("Bereite Rennstrecke \"" + name + "\" vor auf Rennen \"" + rennen.name + "\""); + + currentRennen = rennen; + } + + public void cleanup() throws Exception { + if(currentRennen == null) + throw new Exception("In keinem Rennen in Verwendung!"); + + System.out.println("Räume Rennstrecke \"" + name + "\" auf"); + + currentRennen = null; + } } diff --git a/src/ninja/brunner/pgtl/program3/Schnecke.java b/src/ninja/brunner/pgtl/program3/Schnecke.java index dc1f324..e50db8a 100644 --- a/src/ninja/brunner/pgtl/program3/Schnecke.java +++ b/src/ninja/brunner/pgtl/program3/Schnecke.java @@ -15,4 +15,39 @@ public class Schnecke { currentRennen = null; position = null; } + + public void begin(Rennen rennen) throws Exception { + if(currentRennen != null) + throw new Exception("Bereits in einem Rennen!"); + + System.out.println("Bereite Schnecke \"" + name + "\" vor auf Rennen \"" + rennen.name + "\""); + + this.currentRennen = rennen; + this.position = 0; + } + + public void cleanup() throws Exception { + if(currentRennen == null) + throw new Exception("Gerade in keinem Rennen!"); + + System.out.println("Räume Schnecke \"" + name + "\" auf"); + + this.currentRennen = null; + this.position = null; + } + + public boolean krabbeln() throws Exception { + if(currentRennen == null) + throw new Exception("Schnecke gerade nicht in einem Rennen!"); + + if(position < currentRennen.rennStrecke.length) { + position += 1; //TODO: random + if (position > currentRennen.rennStrecke.length) { + position = currentRennen.rennStrecke.length; + return false; + } + return true; + } else + return false; + } } diff --git a/src/ninja/brunner/pgtl/program3/Wettbüro.java b/src/ninja/brunner/pgtl/program3/Wettbüro.java index 44db759..a9d9c26 100644 --- a/src/ninja/brunner/pgtl/program3/Wettbüro.java +++ b/src/ninja/brunner/pgtl/program3/Wettbüro.java @@ -1,7 +1,6 @@ package ninja.brunner.pgtl.program3; import java.util.ArrayList; -import ninja.brunner.pgtl.program3.exceptions.ZuWenigGeldException; public class Wettbüro { public ArrayList personen; @@ -12,11 +11,11 @@ public class Wettbüro { wetten = new ArrayList(); } - public Wette wetteAbschließen(Person person, Rennen rennen, Schnecke schnecke, float einsatz) throws ZuWenigGeldException { + public Wette wetteAbschließen(Person person, Rennen rennen, Schnecke schnecke, float einsatz) throws Exception { if(person.guthaben < einsatz) - throw new ZuWenigGeldException(); + throw new Exception("Zu wenig Geld!"); person.guthaben -= einsatz; diff --git a/src/ninja/brunner/pgtl/program3/exceptions/NameBereitsVergebenException.java b/src/ninja/brunner/pgtl/program3/exceptions/NameBereitsVergebenException.java deleted file mode 100644 index 851e78a..0000000 --- a/src/ninja/brunner/pgtl/program3/exceptions/NameBereitsVergebenException.java +++ /dev/null @@ -1,4 +0,0 @@ -package ninja.brunner.pgtl.program3.exceptions; - -public class NameBereitsVergebenException extends Exception { -} diff --git a/src/ninja/brunner/pgtl/program3/exceptions/RennenNichtAktivException.java b/src/ninja/brunner/pgtl/program3/exceptions/RennenNichtAktivException.java deleted file mode 100644 index 850edae..0000000 --- a/src/ninja/brunner/pgtl/program3/exceptions/RennenNichtAktivException.java +++ /dev/null @@ -1,4 +0,0 @@ -package ninja.brunner.pgtl.program3.exceptions; - -public class RennenNichtAktivException extends Exception { -} diff --git a/src/ninja/brunner/pgtl/program3/exceptions/SchneckeNichtFreiException.java b/src/ninja/brunner/pgtl/program3/exceptions/SchneckeNichtFreiException.java deleted file mode 100644 index 9094891..0000000 --- a/src/ninja/brunner/pgtl/program3/exceptions/SchneckeNichtFreiException.java +++ /dev/null @@ -1,4 +0,0 @@ -package ninja.brunner.pgtl.program3.exceptions; - -public class SchneckeNichtFreiException extends Exception { -} diff --git a/src/ninja/brunner/pgtl/program3/exceptions/StreckeNichtFreiException.java b/src/ninja/brunner/pgtl/program3/exceptions/StreckeNichtFreiException.java deleted file mode 100644 index c539972..0000000 --- a/src/ninja/brunner/pgtl/program3/exceptions/StreckeNichtFreiException.java +++ /dev/null @@ -1,7 +0,0 @@ -package ninja.brunner.pgtl.program3.exceptions; - -/** - * Created by Daniel on 13.12.2016. - */ -public class StreckeNichtFreiException extends Exception { -} diff --git a/src/ninja/brunner/pgtl/program3/exceptions/ZuWenigGeldException.java b/src/ninja/brunner/pgtl/program3/exceptions/ZuWenigGeldException.java deleted file mode 100644 index 93d8dd0..0000000 --- a/src/ninja/brunner/pgtl/program3/exceptions/ZuWenigGeldException.java +++ /dev/null @@ -1,4 +0,0 @@ -package ninja.brunner.pgtl.program3.exceptions; - -public class ZuWenigGeldException extends Exception { -}