From b93ddf431e6be351cde8ec95e9dce8deaee520d8 Mon Sep 17 00:00:00 2001 From: DaniilDomnin Date: Tue, 29 Nov 2022 17:20:15 +0300 Subject: [PATCH 1/9] First --- lab-01/.idea/misc.xml | 6 + lab-01/.idea/uiDesigner.xml | 124 ++++++++++++++++++ lab-02/DocksAndHobos/.idea/.gitignore | 3 + .../.idea/libraries/json_simple_1_1.xml | 9 ++ lab-02/DocksAndHobos/.idea/misc.xml | 6 + lab-02/DocksAndHobos/.idea/modules.xml | 8 ++ lab-02/DocksAndHobos/.idea/uiDesigner.xml | 124 ++++++++++++++++++ lab-02/DocksAndHobos/.idea/vcs.xml | 6 + lab-02/DocksAndHobos/DocksAndHobos.iml | 12 ++ lab-02/DocksAndHobos/config.json | 23 ++++ .../DaniilDomnin/doks_and_hobos/CLogger.class | Bin 0 -> 1014 bytes .../doks_and_hobos/Controller.class | Bin 0 -> 2827 bytes .../DaniilDomnin/doks_and_hobos/Docks.class | Bin 0 -> 4881 bytes .../by/DaniilDomnin/doks_and_hobos/Main.class | Bin 0 -> 2079 bytes .../by/DaniilDomnin/doks_and_hobos/Ship.class | Bin 0 -> 728 bytes .../doks_and_hobos/ShipGenerator.class | Bin 0 -> 1193 bytes .../by/DaniilDomnin/doks_and_hobos/Main.java | 26 ++++ 17 files changed, 347 insertions(+) create mode 100644 lab-01/.idea/misc.xml create mode 100644 lab-01/.idea/uiDesigner.xml create mode 100644 lab-02/DocksAndHobos/.idea/.gitignore create mode 100644 lab-02/DocksAndHobos/.idea/libraries/json_simple_1_1.xml create mode 100644 lab-02/DocksAndHobos/.idea/misc.xml create mode 100644 lab-02/DocksAndHobos/.idea/modules.xml create mode 100644 lab-02/DocksAndHobos/.idea/uiDesigner.xml create mode 100644 lab-02/DocksAndHobos/.idea/vcs.xml create mode 100644 lab-02/DocksAndHobos/DocksAndHobos.iml create mode 100644 lab-02/DocksAndHobos/config.json create mode 100644 lab-02/DocksAndHobos/out/production/DocksAndHobos/by/DaniilDomnin/doks_and_hobos/CLogger.class create mode 100644 lab-02/DocksAndHobos/out/production/DocksAndHobos/by/DaniilDomnin/doks_and_hobos/Controller.class create mode 100644 lab-02/DocksAndHobos/out/production/DocksAndHobos/by/DaniilDomnin/doks_and_hobos/Docks.class create mode 100644 lab-02/DocksAndHobos/out/production/DocksAndHobos/by/DaniilDomnin/doks_and_hobos/Main.class create mode 100644 lab-02/DocksAndHobos/out/production/DocksAndHobos/by/DaniilDomnin/doks_and_hobos/Ship.class create mode 100644 lab-02/DocksAndHobos/out/production/DocksAndHobos/by/DaniilDomnin/doks_and_hobos/ShipGenerator.class create mode 100644 lab-02/DocksAndHobos/src/by/DaniilDomnin/doks_and_hobos/Main.java diff --git a/lab-01/.idea/misc.xml b/lab-01/.idea/misc.xml new file mode 100644 index 0000000..639900d --- /dev/null +++ b/lab-01/.idea/misc.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/lab-01/.idea/uiDesigner.xml b/lab-01/.idea/uiDesigner.xml new file mode 100644 index 0000000..2b63946 --- /dev/null +++ b/lab-01/.idea/uiDesigner.xml @@ -0,0 +1,124 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/lab-02/DocksAndHobos/.idea/.gitignore b/lab-02/DocksAndHobos/.idea/.gitignore new file mode 100644 index 0000000..26d3352 --- /dev/null +++ b/lab-02/DocksAndHobos/.idea/.gitignore @@ -0,0 +1,3 @@ +# Default ignored files +/shelf/ +/workspace.xml diff --git a/lab-02/DocksAndHobos/.idea/libraries/json_simple_1_1.xml b/lab-02/DocksAndHobos/.idea/libraries/json_simple_1_1.xml new file mode 100644 index 0000000..8578a69 --- /dev/null +++ b/lab-02/DocksAndHobos/.idea/libraries/json_simple_1_1.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/lab-02/DocksAndHobos/.idea/misc.xml b/lab-02/DocksAndHobos/.idea/misc.xml new file mode 100644 index 0000000..d15472f --- /dev/null +++ b/lab-02/DocksAndHobos/.idea/misc.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/lab-02/DocksAndHobos/.idea/modules.xml b/lab-02/DocksAndHobos/.idea/modules.xml new file mode 100644 index 0000000..2682366 --- /dev/null +++ b/lab-02/DocksAndHobos/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/lab-02/DocksAndHobos/.idea/uiDesigner.xml b/lab-02/DocksAndHobos/.idea/uiDesigner.xml new file mode 100644 index 0000000..2b63946 --- /dev/null +++ b/lab-02/DocksAndHobos/.idea/uiDesigner.xml @@ -0,0 +1,124 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/lab-02/DocksAndHobos/.idea/vcs.xml b/lab-02/DocksAndHobos/.idea/vcs.xml new file mode 100644 index 0000000..b2bdec2 --- /dev/null +++ b/lab-02/DocksAndHobos/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/lab-02/DocksAndHobos/DocksAndHobos.iml b/lab-02/DocksAndHobos/DocksAndHobos.iml new file mode 100644 index 0000000..bd0c28c --- /dev/null +++ b/lab-02/DocksAndHobos/DocksAndHobos.iml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/lab-02/DocksAndHobos/config.json b/lab-02/DocksAndHobos/config.json new file mode 100644 index 0000000..2f39897 --- /dev/null +++ b/lab-02/DocksAndHobos/config.json @@ -0,0 +1,23 @@ +{ + "generating_time": 2, + "ship_capacity_min": 20, + "ship_capacity_max": 100, + "max_ships": 4, + "unloading_speed": 1, + "dock_capacity": 100, + "hobos": 10, + "stealing_time": 2, + "eating_time": 3, + "cargo_types" : [ + "meat", + "fish", + "oil" + ], + + "ingredients_count" : [ + 1, + 2, + 10, + 4 + ] +} \ No newline at end of file diff --git a/lab-02/DocksAndHobos/out/production/DocksAndHobos/by/DaniilDomnin/doks_and_hobos/CLogger.class b/lab-02/DocksAndHobos/out/production/DocksAndHobos/by/DaniilDomnin/doks_and_hobos/CLogger.class new file mode 100644 index 0000000000000000000000000000000000000000..188575dd22f18c4cee5ba8a024c0e5a9d6cc7bcb GIT binary patch literal 1014 zcma)5ZEw<06n-wSwUjatH}>LunbQeOsZPJKEHMlXNrQ|3&0ocPE11Y36WK7Iqo}qZcPr2oC&#^xA zPsAW(nBSG24EGq)m1-{w9a#;Ai5yIZt^OBlpLA>Z+O8pwdz_*(n%m zaOh;HNu@mlrbe9BXLPe@XSC1NF2KIgA%zO9>RGK-TFn@MT9lr}Hl9;NC9g*>L^*}_ zmF_gtQI^Wh((MK639^ZFWG6R8eu_KW=UBcHQ@U^#{+f*{`(UJ{XxSO0wP nL>Qo4($BH}9gokD{|Wu@0$XR$6nAVU<}MOPi6T1`PvP}nB@f|* literal 0 HcmV?d00001 diff --git a/lab-02/DocksAndHobos/out/production/DocksAndHobos/by/DaniilDomnin/doks_and_hobos/Controller.class b/lab-02/DocksAndHobos/out/production/DocksAndHobos/by/DaniilDomnin/doks_and_hobos/Controller.class new file mode 100644 index 0000000000000000000000000000000000000000..c5c91438dc76cb0e59554b9acdf82f4cfc132203 GIT binary patch literal 2827 zcmbVOYgZFj6x|mH195mG^02;&k_2k3_F;|M@~8?8*b0L5g+p?Mk;zP)Oi=o=&wtR5 z?Pou`Rsol;)vo2ouKtkzinjYqQWBQ7p@o&XckY}yXYYN^J$HWnQHZ> z!9)a&3hlS8bt~yu?n?6N@@<_76dKRlt{q%dsE@_xo6&@315p$EU@F9yHt_+6|HVV(?zL2y!cZ(; zi>(-@I-&5U$n=)Nt(pQ=%09Ix@BbiWFUCxa3;Q5euz_f`OTvZsXp;B1(+&tG^$Fs83ULjVKW~hvW>cx8|u7yCe zdKXa1?3{_~f}#0(zUfq~|CcujN0?nnKHL zU}e^(t$Z0?mt*CYv({i``wgCAZzY=}RiU4kDFHI;75$99WDEPY3WJjZnhkBt^MXR) zTlr}nta{l(TO;yO+<|YPU?M$bWygdY_lWj$4j1YX>^jj>fhK z?#aI0F!71BLP?Py%m&(Wh?!46lkN1m30t<4IqC8|9e1okK^F{s$<#k1;q%lm@b#|E zw~K#SI2K+>Ivi!hI<}e!uRQWOtCJ%x9C;pxBhTG%`89$FamV zRAP7&M&jruS`s~xO>`tiHqo7Ug5Je#^lxI|2@WrgEIz`~g~u2IwlRFp=rgu(GO>l1 zAJR)5mUvAd%4-unH}gM=RwC;rwm!6AkauVKrEr0mM$v(rw7iH$UdLcznWM~vi3(?e zS@?~~*9Gdsned6wOB5MoVL)@Wf%fyX1%b=$@ihTzWbPsP~s)Xp>g^IeZA*&(k z8zYc-7`UhO(vE^1We7XUwAV>d5|re8ogPG)t^^~@K0wR#6WmxF*~a_7Jfw+~M-#;? zaqi(An7RlKa?T)*ucY`k)=M0EDlBx+@0wX<845w{^(D literal 0 HcmV?d00001 diff --git a/lab-02/DocksAndHobos/out/production/DocksAndHobos/by/DaniilDomnin/doks_and_hobos/Docks.class b/lab-02/DocksAndHobos/out/production/DocksAndHobos/by/DaniilDomnin/doks_and_hobos/Docks.class new file mode 100644 index 0000000000000000000000000000000000000000..414d23c9fb005b8264c9cf9ffda52e1fb2d65946 GIT binary patch literal 4881 zcmb7IiGLL38Ga_4WRlGULJWa`_HE-V$FikD!r?IzzD?1N*Fmuc5Tnc5HvWhDc*muZ}Ve zOVp;UZ>M4j*GXhO&vN`&TVc4>%nWZgN2AaYDMtki9hC;AVY-I;fkUxPreoWwO>Ww; zomkQx$@H5}vVYhea5J$@Zek>(p(0^=LvDY<%{ug;vFq{-#>LnS1J$@fLuHbx`V;1; znXvss8njMXooS#}R;Op3lxrq!XQ)3jYFSBHn{A*@)=HEsGBek}m3Wng8QkYtNtnT4_hi(9Z|$^wT=}AR^l2B(}}7iknl@oEzI1_K+gksLJ>32T&8X>aVh z9EQb%XcdPCvrfXdT}K$4$)+t&g}%u^J2n%fLDy?H6T=!7gn4+eP*ZOdThXDT)4(=# zX}IbVp7adcqh!ez%Wo^Nlr`2_!oc_wc|MA6yhg`P13lO^sWx{FdzQ(Jlw?wtMJ2_| zpEBQTpbs}`FqBr-(2ZuAY^Z4rr?!9BuowKB|qob*#9Phw8b=+;>9=vN@fr_H%5PMOY zIJlC7przSvteXV!NfXOV$II{@D(aD*6~+7TejOh$a1{5Bcdg0WX?;|LQ^a*rzX(Vt zVASJ7Lc0&kj*cl)T91zy_$cn9XBi=8Lu1EflA!`0H}DC3k_2osogTruUA1AVYHZqD zhWl9@YI;GwJxAG@KV#stl7?ArDa-WQ@&{VSM9(k7aShRSCmF~{_P$`?iy~7hCyDg6 z3Y;+TfJ~JsuvlU`zN}&1MB8OfEYHi1`c|_2pfoIY9UUh%%$e9j+Q@-XSdZc%d`0;6 zh=$o=ez6C*2NVUHdRd1(_K;)xS&wDV5bB+UM;U&$2w4dHKnLBY%ky*UF~tR zUc%aJ3sIu#*0@}1h}~_Y>-rhqH%7Nx{;-?OOfSW+qWCp_qvN**eurl?ESe}c+u84q zSg|hUHYLnKGvT`)FN_uG@VBSJr56b04Qyo-PFb1yF4rB&j>bbVUR)`Y1b2~k;q8~d zm^b;#vf;iOXl^r8sUF+6;#K&=OS*G#m^SrJFTtOrm;Kqmk8y96{FZX=Z!-6sfgehL zGddi{^4d~nCSzrEyr5z6MSxC)jgEg#YKM~o4qznF@<3uCEf(<}RL)P{=s7BqySsYw zp01v}XR9ag)#}N6GEet0HO_HAZERn?f8Y~xN{A6UN?q#T}ks9To2^Xc9K?$afYAk=^tS5 zo5fKjYUoiNNAppI#h8H>BC>)pw{oQeGqIb`n=uQ6n2p=`&T^L0w-CAOIsPiXMh%Py zkKu7XWh8iNY9xq8)aV>Bl1q{&Z$T(kBf(A3@#Kw$`eYb5V4G=F4?d6c_8LSAWH{d7ex81bvGxd>h}%!;a$=6m@+qIczCEdJNq)*nS#2 z2ws#^yT_k7>^X;64zHDcoUA#G*O`1)@u@H#>}x3>U$ahQUk>Tx7akC7BMRGEWJ&W!=%&-TX!v5_`b2xNFBL$v$sY4A+Z6oIKYP|>z9Ia3eEuhkQ zH1~ZxMe{{iqS8qi`AV2ir?|!vc@ah0d2*vjt|0srpI%TS;CA}6kZ9U@IOC7v4H~uI zK?c4x!nHZ1X%0tPAI96O-<`vIIn^*%edO@LJlIiFVSB8P8$Wgoi)8DkWNQwe=FWM6 zcA5TMUIVRsUc>PVchQkN@GD7Z;98Pr73sQ~QLbUMYx%Nt9d;s)y`=N4ELofMzYRCw zFg6sD(!f`sACSlr`R$>|b%y#P_y#nQl_I&z1zEW#KwurSA_1v-TscL2oSHMY5G`rL zVm;QUGWEnnrmC3<@U^fKn;Anp{oPvdu!vDesfmZ{LLL@!vzD&%Vj6gMH&qGUSBE`o zQJxjtnCukER1!I%Tzb0r1VzJi-bSCgungOY=r&^99rEj%f?umcenk-x&MZBTlBy!< z>w#k<)GLlvGqqnjj>@jHcxX?{DLnl6Nflc$U)>&@WV@N6EaPkoD|jiJ)AEAtGBWc= zcv{I-hio%zTd1X+hIz;YhBpU@Ok>#5mVCb)>=W>dRNcyds=(e!iyP(Z%HNNWro3YW+w@YVMd3(yB}%gMzUH9gj?fbBtkd8y|sD2 zxwMfqQO__q&45z7_hcX*2woAPg|iH2Jgs)6zi7hPurX!;oMV_s7rGF(<4`I;m)SA# zoD{}!fnlh58pE}=CB<&V&1HIATj+C1Ofp=05w8K-GO+Oqrjodn!mGHNV3<#53jfbDXJMLB5WD!Z+Z8&sXbTLZT^b5n`8MWpJ%vTM3?l&vc6d;y)Tt@*7T*5v`BGVU$MDQU zUzg&;nuwBkk72wSw;s#Dy&Z=9uppz@#ua>E8sI}BE1l1`csyxCU68~Q(cY&rtJ*t= zEZkx^TcKsAA{MBH$LcE3yh2S?ifTesEPO(2G`Y2Khms&oC@NB@I4XI%u3`(Tl!V~1 z@rh+sShz=_qge3ZxyZ&%d}`pYGu(I?{L_=l=S^ClF=YCrwW3uV>L4)JXM+;)TjW27 zU}1}RA<|2x4I&$Pd~OguU?`^h_2!9Y%Js8u7C6@e{*d8nAK)8YDu%?0u28p(6{HfI z^=es!4|zEtiBr%X4|aGc&Au&6#CtMgnC%C}#LiLhYV(ZA^y8iZ(3u^irxv7e}!V0g_lncI(wu|gr=de*bnc?LR06N4kcuB{Ty30XJ8(~LO?h{YcVyP8fKT5Q9{b**cZ*??D1XS!7(`*m*=0NW;B{HYGwOUuP2*Y|U7L|?- z9lEXSp(o79rwSRC7L5yyx^4R0nBM>>dkoX_3);E#X7nDKZ-D*URPWH!sDUv&qGzgQ zfG<&`-3Y$IV+umfYzd=e3H)`8WU+yfW7tI})xhWx&KDM*Vq)WWTy$PL!t2MlQp`Hn zjxhHW^GC>Lows_{H=65r8+d>77&pl<*Q5NXXWcf;Iv@84Z@0X&&PtE)ZfD)V+EU^e z`Qr7dMAj*E6$Q}_knfm4O@_z7ir7$m=0R3MNbZ-!m?M8F<-S)`LVK$WDL_5-N>3m*DF AjsO4v literal 0 HcmV?d00001 diff --git a/lab-02/DocksAndHobos/out/production/DocksAndHobos/by/DaniilDomnin/doks_and_hobos/Ship.class b/lab-02/DocksAndHobos/out/production/DocksAndHobos/by/DaniilDomnin/doks_and_hobos/Ship.class new file mode 100644 index 0000000000000000000000000000000000000000..ab6f7ac4f69901659532de949f5c340f83016556 GIT binary patch literal 728 zcma)4+iKfD6r3aL5-Wi@(}y6WJv*y8XJ({7e}DZ3(8FE`2eklh1P?x8^HhCN@m!f{{2@8b z(vslsYop5^q1Nt<>R3ZPKp0^i5#e=m5g#g}_53hj7;WN7{&_i8W-^}TNxqDSGkr!_ zOVyc5b$LOczI13rXkwEPrmC3cW1|)sVQX+Zdsr6QOy3h)?fzZ3Ga|SL`GiT$fi~I6 z`69`Rk1CnlHhHS%BUNbGSD;(Y^pfyqa1XsaH9F491Ce%Om2I~>cSR7^?OQj_IGsLY zLt)-vZo4m9!(o12q}h=ceRav?omj;yj>6&3;PAz9+KO}G)#cm618^!_eL~G5&F)W7 zckdEG_w6M%zFWdWes0-gm!BT$@X{er9UggZ| z{=mjJE*wa6--4lScun@IhJ?p>vLZVxa`5#Za^t_`r+8M8d#ps1`qtd7FZnseoyS7N SPs{H8l^?(ILwIf{zPJJzmU`p> literal 0 HcmV?d00001 diff --git a/lab-02/DocksAndHobos/out/production/DocksAndHobos/by/DaniilDomnin/doks_and_hobos/ShipGenerator.class b/lab-02/DocksAndHobos/out/production/DocksAndHobos/by/DaniilDomnin/doks_and_hobos/ShipGenerator.class new file mode 100644 index 0000000000000000000000000000000000000000..bfed9f835857477d3d662fe3e4fb661820b22f11 GIT binary patch literal 1193 zcma)6ZBG+H5Pr7Ta_wmWAEtj&`?vd-&P`~(> zG=Y*xV*KonGR|IG1;vD1vO703`|R_~%-xTlU%vrZ$1?*lXgcC15*T7g@A41aZE#t4 z-&A+KTF5Z8CZq`088pk@Od*Ms4#UJSOoruZ$KBvkh{lHBltQ}O{`*#i%k9dJU-esV zc}MKM@}w8=&<_~KTJ&D2@jYG>VW-mM`wXn8Fh@*`D!{)pgjCTn6XTd*7_RZ4?pGvl zdM$=bDI(hrMZ6FDW=KkJKP>sO z&XBN*MZ0KV7IQkTnwZBmhKVysFvMHpqZgH|pun!1xPhAtx&kXms%pY26l{vk!ZKmQ zq1?Jh{)|vps11@CyZL7wrFU*nBU9tic`cgDjVLH){= z&Qbc`(?S%or@=aV1HjyWxSc6Q@iqIfo*GDoMaw=97owmATq;$6n%tWw3K?a;9n`#+ zBGP?o(sL@E#v@4|7ogEfUkh0=HRRDw;|zw|k-ZXSC2)uKyX5&qCx&RxI7eX4+#z&l z{ty?O>BJ$@UnrnqmDVgZ9&|+) jo.get("cargo_types")); + Docks docks = new Docks((long)jo.get("dock_capacity"), (long)jo.get("unloading_speed"), (ArrayList) jo.get("cargo_types"), (long)jo.get("hobos"), (ArrayList) jo.get("ingredients_count"), (long)jo.get("eating_time"), (long)jo.get("stealing_time")); + Controller c = new Controller(generator, docks, (long)jo.get("generating_time"), (long)jo.get("max_ships")); + } +} \ No newline at end of file From f567bd9ed507513f3e40fee3dcc06c6f221e9807 Mon Sep 17 00:00:00 2001 From: DaniilDomnin Date: Tue, 29 Nov 2022 17:27:31 +0300 Subject: [PATCH 2/9] Fix --- lab-01/.idea/workspace.xml | 110 ++++++++++++++++ .../DaniilDomnin/doks_and_hobos/CLogger.class | Bin 1014 -> 0 bytes .../by/DaniilDomnin/doks_and_hobos/Main.class | Bin 2079 -> 1920 bytes .../doks_and_hobos/Controller.java | 51 +++++++ .../by/DaniilDomnin/doks_and_hobos/Docks.java | 99 ++++++++++++++ .../by/DaniilDomnin/doks_and_hobos/Main.java | 1 - .../by/DaniilDomnin/doks_and_hobos/Ship.java | 23 ++++ .../doks_and_hobos/ShipGenerator.java | 23 ++++ lab-02/Docks_Hobos/.idea/.gitignore | 3 + lab-02/Docks_Hobos/.idea/compiler.xml | 11 ++ lab-02/Docks_Hobos/.idea/encodings.xml | 7 + lab-02/Docks_Hobos/.idea/jarRepositories.xml | 20 +++ .../.idea/libraries/json_simple_1_1.xml | 9 ++ lab-02/Docks_Hobos/.idea/misc.xml | 6 + lab-02/Docks_Hobos/.idea/modules.xml | 8 ++ lab-02/Docks_Hobos/.idea/uiDesigner.xml | 124 ++++++++++++++++++ lab-02/Docks_Hobos/.idea/vcs.xml | 6 + lab-02/Docks_Hobos/Docks_Hobos.iml | 12 ++ lab-02/Docks_Hobos/config.json | 17 +++ lab-02/Docks_Hobos/pom.xml | 9 ++ .../resources/META-INF/maven/archetype.xml | 9 ++ .../resources/archetype-resources/pom.xml | 15 +++ .../src/main/java/App.java | 13 ++ .../src/test/java/AppTest.java | 38 ++++++ lab-02/README.md | 43 ------ lab-02/untitled/.idea/misc.xml | 14 ++ lab-02/untitled/.idea/modules.xml | 8 ++ lab-02/untitled/.idea/vcs.xml | 6 + lab-02/untitled/.idea/workspace.xml | 64 +++++++++ lab-02/untitled/ear/pom.xml | 47 +++++++ lab-02/untitled/ejbs/pom.xml | 37 ++++++ .../src/main/resources/META-INF/ejb-jar.xml | 0 lab-02/untitled/pom.xml | 62 +++++++++ lab-02/untitled/primary-source/pom.xml | 36 +++++ lab-02/untitled/projects/logging/pom.xml | 12 ++ lab-02/untitled/projects/pom.xml | 16 +++ lab-02/untitled/servlets/pom.xml | 17 +++ lab-02/untitled/servlets/servlet/pom.xml | 19 +++ .../servlet/src/main/webapp/WEB-INF/web.xml | 0 .../servlet/src/main/webapp/index.jsp | 5 + lab-02/untitled/untitled.iml | 9 ++ lab-02/untitled1/.idea/.gitignore | 3 + lab-02/untitled1/.idea/compiler.xml | 16 +++ lab-02/untitled1/.idea/encodings.xml | 7 + lab-02/untitled1/.idea/jarRepositories.xml | 20 +++ lab-02/untitled1/.idea/misc.xml | 14 ++ lab-02/untitled1/.idea/vcs.xml | 6 + lab-02/untitled1/ghd.java | 2 + lab-02/untitled1/pom.xml | 9 ++ .../resources/META-INF/maven/archetype.xml | 9 ++ .../resources/archetype-resources/pom.xml | 15 +++ .../src/main/java/App.java | 13 ++ .../src/test/java/AppTest.java | 38 ++++++ 53 files changed, 1117 insertions(+), 44 deletions(-) create mode 100644 lab-01/.idea/workspace.xml delete mode 100644 lab-02/DocksAndHobos/out/production/DocksAndHobos/by/DaniilDomnin/doks_and_hobos/CLogger.class create mode 100644 lab-02/DocksAndHobos/src/by/DaniilDomnin/doks_and_hobos/Controller.java create mode 100644 lab-02/DocksAndHobos/src/by/DaniilDomnin/doks_and_hobos/Docks.java create mode 100644 lab-02/DocksAndHobos/src/by/DaniilDomnin/doks_and_hobos/Ship.java create mode 100644 lab-02/DocksAndHobos/src/by/DaniilDomnin/doks_and_hobos/ShipGenerator.java create mode 100644 lab-02/Docks_Hobos/.idea/.gitignore create mode 100644 lab-02/Docks_Hobos/.idea/compiler.xml create mode 100644 lab-02/Docks_Hobos/.idea/encodings.xml create mode 100644 lab-02/Docks_Hobos/.idea/jarRepositories.xml create mode 100644 lab-02/Docks_Hobos/.idea/libraries/json_simple_1_1.xml create mode 100644 lab-02/Docks_Hobos/.idea/misc.xml create mode 100644 lab-02/Docks_Hobos/.idea/modules.xml create mode 100644 lab-02/Docks_Hobos/.idea/uiDesigner.xml create mode 100644 lab-02/Docks_Hobos/.idea/vcs.xml create mode 100644 lab-02/Docks_Hobos/Docks_Hobos.iml create mode 100644 lab-02/Docks_Hobos/config.json create mode 100644 lab-02/Docks_Hobos/pom.xml create mode 100644 lab-02/Docks_Hobos/src/main/resources/META-INF/maven/archetype.xml create mode 100644 lab-02/Docks_Hobos/src/main/resources/archetype-resources/pom.xml create mode 100644 lab-02/Docks_Hobos/src/main/resources/archetype-resources/src/main/java/App.java create mode 100644 lab-02/Docks_Hobos/src/main/resources/archetype-resources/src/test/java/AppTest.java delete mode 100644 lab-02/README.md create mode 100644 lab-02/untitled/.idea/misc.xml create mode 100644 lab-02/untitled/.idea/modules.xml create mode 100644 lab-02/untitled/.idea/vcs.xml create mode 100644 lab-02/untitled/.idea/workspace.xml create mode 100644 lab-02/untitled/ear/pom.xml create mode 100644 lab-02/untitled/ejbs/pom.xml create mode 100644 lab-02/untitled/ejbs/src/main/resources/META-INF/ejb-jar.xml create mode 100644 lab-02/untitled/pom.xml create mode 100644 lab-02/untitled/primary-source/pom.xml create mode 100644 lab-02/untitled/projects/logging/pom.xml create mode 100644 lab-02/untitled/projects/pom.xml create mode 100644 lab-02/untitled/servlets/pom.xml create mode 100644 lab-02/untitled/servlets/servlet/pom.xml create mode 100644 lab-02/untitled/servlets/servlet/src/main/webapp/WEB-INF/web.xml create mode 100644 lab-02/untitled/servlets/servlet/src/main/webapp/index.jsp create mode 100644 lab-02/untitled/untitled.iml create mode 100644 lab-02/untitled1/.idea/.gitignore create mode 100644 lab-02/untitled1/.idea/compiler.xml create mode 100644 lab-02/untitled1/.idea/encodings.xml create mode 100644 lab-02/untitled1/.idea/jarRepositories.xml create mode 100644 lab-02/untitled1/.idea/misc.xml create mode 100644 lab-02/untitled1/.idea/vcs.xml create mode 100644 lab-02/untitled1/ghd.java create mode 100644 lab-02/untitled1/pom.xml create mode 100644 lab-02/untitled1/src/main/resources/META-INF/maven/archetype.xml create mode 100644 lab-02/untitled1/src/main/resources/archetype-resources/pom.xml create mode 100644 lab-02/untitled1/src/main/resources/archetype-resources/src/main/java/App.java create mode 100644 lab-02/untitled1/src/main/resources/archetype-resources/src/test/java/AppTest.java diff --git a/lab-01/.idea/workspace.xml b/lab-01/.idea/workspace.xml new file mode 100644 index 0000000..40eee58 --- /dev/null +++ b/lab-01/.idea/workspace.xml @@ -0,0 +1,110 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1665161880468 + + + + + + + + + + + file://$PROJECT_DIR$/src/by/DaniilDomnin/quizer/Main.java + 57 + + + + + \ No newline at end of file diff --git a/lab-02/DocksAndHobos/out/production/DocksAndHobos/by/DaniilDomnin/doks_and_hobos/CLogger.class b/lab-02/DocksAndHobos/out/production/DocksAndHobos/by/DaniilDomnin/doks_and_hobos/CLogger.class deleted file mode 100644 index 188575dd22f18c4cee5ba8a024c0e5a9d6cc7bcb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1014 zcma)5ZEw<06n-wSwUjatH}>LunbQeOsZPJKEHMlXNrQ|3&0ocPE11Y36WK7Iqo}qZcPr2oC&#^xA zPsAW(nBSG24EGq)m1-{w9a#;Ai5yIZt^OBlpLA>Z+O8pwdz_*(n%m zaOh;HNu@mlrbe9BXLPe@XSC1NF2KIgA%zO9>RGK-TFn@MT9lr}Hl9;NC9g*>L^*}_ zmF_gtQI^Wh((MK639^ZFWG6R8eu_KW=UBcHQ@U^#{+f*{`(UJ{XxSO0wP nL>Qo4($BH}9gokD{|Wu@0$XR$6nAVU<}MOPi6T1`PvP}nB@f|* diff --git a/lab-02/DocksAndHobos/out/production/DocksAndHobos/by/DaniilDomnin/doks_and_hobos/Main.class b/lab-02/DocksAndHobos/out/production/DocksAndHobos/by/DaniilDomnin/doks_and_hobos/Main.class index cdcb3dcf059fb115d7b0dc4935e29c7afde7f4f0..bf66681238e0a6ec8e844d7b0f52ef5f482f0fc6 100644 GIT binary patch delta 811 zcmYjP+fEZv6kVsCwnMET!?g$&1hl}=0^TbZK~bp%#0y$)b(kK@NSSFmQv-=f{Qw^z z=gB90@x?b|LK7Pa&%XI3{(-t%1e;0r*?X9zJoixwOs8=cPQwatWKJASl54Zwq8@xc|6q6~dv+tXK+G0Jc} zZRu+%UCU{@;cUt{$IwtPvzC@N%uLG8ah{fOfx)wCtys2dDw!4#E6I<@c$PB$W!%d#A zopOWRuWK7Ad)3I7WAu) delta 949 zcmYjP%Tg0j5Ir{`WEjIMyg>zdnS_A|K9C?$6vV^;KEWs&hsk9a2s1G=C{$VE(uEtD z53pRiaG_QumZ_rH=)x~>sUPB_69iLJ)zjUl&$-=w@AK-{HR8A5pLYO+@#vNKr$$6G zTHI*$pbdu^dbgb&tuaGYd4}Q86t^O}Y00|683I0kjL_g7Ix65OgNrZ8Pk2G2!-Hd} zVG!ptn#ChJRk_i{AZs}k3OCJFhkE*2 z&_GYUk?x`iZ|LQJp-f>f;l0_hfcq5H;{zTbLAz?fJ3NF;JBs2d7NNjNJbw?8;3y+H X!xB`wgJq%#1Zr5t8f6WN9Z3HLpajok diff --git a/lab-02/DocksAndHobos/src/by/DaniilDomnin/doks_and_hobos/Controller.java b/lab-02/DocksAndHobos/src/by/DaniilDomnin/doks_and_hobos/Controller.java new file mode 100644 index 0000000..156b940 --- /dev/null +++ b/lab-02/DocksAndHobos/src/by/DaniilDomnin/doks_and_hobos/Controller.java @@ -0,0 +1,51 @@ +package by.DaniilDomnin.doks_and_hobos; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.concurrent.atomic.AtomicInteger; + +public class Controller { + Controller(ShipGenerator generator, Docks docks, long generating_time, long max_ships) throws InterruptedException { + this.generator = generator; + this.generating_time = generating_time; + this.max_ships = max_ships; + this.docks = docks; + ship_count = new AtomicInteger(); + Thread thread = new Thread(docks::StartStealing); + thread.start(); + Generating(); + } + + private void Generating() throws InterruptedException { + while (true) { + if (ship_count.get() < max_ships) { + Ship ship = generator.GenerateShip(); + Thread thread = new Thread(()->{ + try { + Uploading(ship); + } catch (InterruptedException e) { + throw new RuntimeException(e); + } + }); + thread.start(); + ship_count.incrementAndGet(); + } + + Thread.sleep(generating_time * 1000); + } + } + + private void Uploading(Ship ship) throws InterruptedException { + docks.Unloading(ship); + ship_count.decrementAndGet(); + } + + private ShipGenerator generator; + + private AtomicInteger ship_count; + private long generating_time; + + private long max_ships; + + private Docks docks; +} diff --git a/lab-02/DocksAndHobos/src/by/DaniilDomnin/doks_and_hobos/Docks.java b/lab-02/DocksAndHobos/src/by/DaniilDomnin/doks_and_hobos/Docks.java new file mode 100644 index 0000000..edf4989 --- /dev/null +++ b/lab-02/DocksAndHobos/src/by/DaniilDomnin/doks_and_hobos/Docks.java @@ -0,0 +1,99 @@ +package by.DaniilDomnin.doks_and_hobos; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Random; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.atomic.AtomicBoolean; +import java.util.concurrent.locks.Lock; +import java.util.concurrent.locks.ReentrantLock; + +public class Docks { + Docks(long dock_capacity, long unloading_speed, ArrayList cargo_names, long hobos, ArrayList ingredients_count, long eating_time, long stealing_time) { + this.dock_capacity = dock_capacity; + this.unloading_speed = unloading_speed; + this.hobos = hobos; + this.ingredients_count = ingredients_count; + this.eating_time = eating_time; + this.stealing_time = stealing_time; + current_ingredients_count = new ArrayList<>(); + for (int i = 0; i < ingredients_count.size(); ++i) { + current_ingredients_count.add(0L); + } + add_ingredient_mutex = new ReentrantLock(); + cargo_names.forEach(x -> { + cargo_count.put(x, 0L); + }); + + } + + public void Unloading (Ship ship) throws InterruptedException { + while (ship.GetCapacity() != 0) { + Thread.sleep(1000); + cargo_count.put(ship.GetCargoName(), Math.min(cargo_count.get(ship.GetCargoName()) + Math.min(ship.GetCapacity(), unloading_speed), dock_capacity)); + ship.SetCapacity(Math.max(0, ship.GetCapacity() - unloading_speed)); + } + } + + public void StartStealing () { + for (int i = 0; i < hobos - 2; ++i) { + Thread thread = new Thread(() -> { + try { + Stealing(); + } catch (InterruptedException e) { + throw new RuntimeException(e); + } + }); + thread.start(); + } + } + + private void Stealing () throws InterruptedException { + while (true) { + Thread.sleep(stealing_time * 1000); + add_ingredient_mutex.lock(); + int index = new Random().nextInt(0, ingredients_count.size()); + current_ingredients_count.set(index, current_ingredients_count.get(index) + 1); + if (CanStartEating()) { + ClearCurrentIngredients();; + Thread.sleep(eating_time * 1000); + } + add_ingredient_mutex.unlock(); + } + } + + private void ClearCurrentIngredients() { + for (int i = 0; i < current_ingredients_count.size(); ++i) { + current_ingredients_count.set(i, current_ingredients_count.get(i) - ingredients_count.get(i)); + } + } + + private boolean CanStartEating () { + for (int i = 0; i < current_ingredients_count.size(); ++i) { + if (current_ingredients_count.get(i) < ingredients_count.get(i)) { + return false; + } + } + return true; + } + + + + + private long dock_capacity; + private long unloading_speed; + + private long hobos; + + private long eating_time; + + private long stealing_time; + + private ArrayList current_ingredients_count; + + private Lock add_ingredient_mutex; + + private ArrayList ingredients_count; + + private ConcurrentHashMap cargo_count = new ConcurrentHashMap<>(); +} diff --git a/lab-02/DocksAndHobos/src/by/DaniilDomnin/doks_and_hobos/Main.java b/lab-02/DocksAndHobos/src/by/DaniilDomnin/doks_and_hobos/Main.java index 3c5594d..f975d88 100644 --- a/lab-02/DocksAndHobos/src/by/DaniilDomnin/doks_and_hobos/Main.java +++ b/lab-02/DocksAndHobos/src/by/DaniilDomnin/doks_and_hobos/Main.java @@ -18,7 +18,6 @@ public static void main(String[] args) throws IOException, ParseException, Inter // Object obj = new JSONParser().parse(new FileReader(args[1])); Object obj = new JSONParser().parse(new FileReader("config.json")); JSONObject jo = (JSONObject) obj; - CLogger.GetInstance().WriteInLog(Le); ShipGenerator generator = new ShipGenerator((long)jo.get("ship_capacity_max"), (long)jo.get("ship_capacity_min"), (ArrayList) jo.get("cargo_types")); Docks docks = new Docks((long)jo.get("dock_capacity"), (long)jo.get("unloading_speed"), (ArrayList) jo.get("cargo_types"), (long)jo.get("hobos"), (ArrayList) jo.get("ingredients_count"), (long)jo.get("eating_time"), (long)jo.get("stealing_time")); Controller c = new Controller(generator, docks, (long)jo.get("generating_time"), (long)jo.get("max_ships")); diff --git a/lab-02/DocksAndHobos/src/by/DaniilDomnin/doks_and_hobos/Ship.java b/lab-02/DocksAndHobos/src/by/DaniilDomnin/doks_and_hobos/Ship.java new file mode 100644 index 0000000..7f39f0c --- /dev/null +++ b/lab-02/DocksAndHobos/src/by/DaniilDomnin/doks_and_hobos/Ship.java @@ -0,0 +1,23 @@ +package by.DaniilDomnin.doks_and_hobos; + +public class Ship { + Ship(long capacity, String cargo_name) { + this.capacity = capacity; + this.cargo_name= cargo_name; + } + + public String GetCargoName () { + return cargo_name; + } + + public long GetCapacity () { + return capacity; + } + + public void SetCapacity (long capacity) { + this.capacity = capacity; + } + + private long capacity; + private String cargo_name; +} diff --git a/lab-02/DocksAndHobos/src/by/DaniilDomnin/doks_and_hobos/ShipGenerator.java b/lab-02/DocksAndHobos/src/by/DaniilDomnin/doks_and_hobos/ShipGenerator.java new file mode 100644 index 0000000..53af099 --- /dev/null +++ b/lab-02/DocksAndHobos/src/by/DaniilDomnin/doks_and_hobos/ShipGenerator.java @@ -0,0 +1,23 @@ +package by.DaniilDomnin.doks_and_hobos; + +import java.util.ArrayList; +import java.util.Random; + +public class ShipGenerator { + + ShipGenerator(long ship_capacity_max, long ship_capacity_min, ArrayList cargo_names) { + this.ship_capacity_max = ship_capacity_max; + this.ship_capacity_min = ship_capacity_min; + this.cargo_names = cargo_names; + } + + public Ship GenerateShip() { + Random ran = new Random(); + return new Ship(ran.nextLong(ship_capacity_min, ship_capacity_max + 1), cargo_names.get(ran.nextInt(0, cargo_names.size()))); + } + + private long ship_capacity_max; + private long ship_capacity_min; + + private ArrayList cargo_names; +} diff --git a/lab-02/Docks_Hobos/.idea/.gitignore b/lab-02/Docks_Hobos/.idea/.gitignore new file mode 100644 index 0000000..26d3352 --- /dev/null +++ b/lab-02/Docks_Hobos/.idea/.gitignore @@ -0,0 +1,3 @@ +# Default ignored files +/shelf/ +/workspace.xml diff --git a/lab-02/Docks_Hobos/.idea/compiler.xml b/lab-02/Docks_Hobos/.idea/compiler.xml new file mode 100644 index 0000000..6d57a93 --- /dev/null +++ b/lab-02/Docks_Hobos/.idea/compiler.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/lab-02/Docks_Hobos/.idea/encodings.xml b/lab-02/Docks_Hobos/.idea/encodings.xml new file mode 100644 index 0000000..aa00ffa --- /dev/null +++ b/lab-02/Docks_Hobos/.idea/encodings.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/lab-02/Docks_Hobos/.idea/jarRepositories.xml b/lab-02/Docks_Hobos/.idea/jarRepositories.xml new file mode 100644 index 0000000..712ab9d --- /dev/null +++ b/lab-02/Docks_Hobos/.idea/jarRepositories.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/lab-02/Docks_Hobos/.idea/libraries/json_simple_1_1.xml b/lab-02/Docks_Hobos/.idea/libraries/json_simple_1_1.xml new file mode 100644 index 0000000..4e96a8f --- /dev/null +++ b/lab-02/Docks_Hobos/.idea/libraries/json_simple_1_1.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/lab-02/Docks_Hobos/.idea/misc.xml b/lab-02/Docks_Hobos/.idea/misc.xml new file mode 100644 index 0000000..d15472f --- /dev/null +++ b/lab-02/Docks_Hobos/.idea/misc.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/lab-02/Docks_Hobos/.idea/modules.xml b/lab-02/Docks_Hobos/.idea/modules.xml new file mode 100644 index 0000000..ab9efc7 --- /dev/null +++ b/lab-02/Docks_Hobos/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/lab-02/Docks_Hobos/.idea/uiDesigner.xml b/lab-02/Docks_Hobos/.idea/uiDesigner.xml new file mode 100644 index 0000000..2b63946 --- /dev/null +++ b/lab-02/Docks_Hobos/.idea/uiDesigner.xml @@ -0,0 +1,124 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/lab-02/Docks_Hobos/.idea/vcs.xml b/lab-02/Docks_Hobos/.idea/vcs.xml new file mode 100644 index 0000000..b2bdec2 --- /dev/null +++ b/lab-02/Docks_Hobos/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/lab-02/Docks_Hobos/Docks_Hobos.iml b/lab-02/Docks_Hobos/Docks_Hobos.iml new file mode 100644 index 0000000..00f06e8 --- /dev/null +++ b/lab-02/Docks_Hobos/Docks_Hobos.iml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/lab-02/Docks_Hobos/config.json b/lab-02/Docks_Hobos/config.json new file mode 100644 index 0000000..968634d --- /dev/null +++ b/lab-02/Docks_Hobos/config.json @@ -0,0 +1,17 @@ +{ + "generating_time": 10, + "ship_capacity_min": 20, + "ship_capacity_max": 100, + "max_ships": 4, + "unloading_speed": 3, + "dock_capacity": 100, + "hobos": 4, + "stealing_time": 10, + "eating_time": 20, + "cargo_types" : [ + "meat", + "fish", + "oil" + ], + "ingredients_count" : 8 +} \ No newline at end of file diff --git a/lab-02/Docks_Hobos/pom.xml b/lab-02/Docks_Hobos/pom.xml new file mode 100644 index 0000000..257a7d7 --- /dev/null +++ b/lab-02/Docks_Hobos/pom.xml @@ -0,0 +1,9 @@ + + 4.0.0 + org.example + Docks_Hobos + 1.0-SNAPSHOT + Archetype - Docks_Hobos + http://maven.apache.org + diff --git a/lab-02/Docks_Hobos/src/main/resources/META-INF/maven/archetype.xml b/lab-02/Docks_Hobos/src/main/resources/META-INF/maven/archetype.xml new file mode 100644 index 0000000..f6bed99 --- /dev/null +++ b/lab-02/Docks_Hobos/src/main/resources/META-INF/maven/archetype.xml @@ -0,0 +1,9 @@ + + Docks_Hobos + + src/main/java/App.java + + + src/test/java/AppTest.java + + diff --git a/lab-02/Docks_Hobos/src/main/resources/archetype-resources/pom.xml b/lab-02/Docks_Hobos/src/main/resources/archetype-resources/pom.xml new file mode 100644 index 0000000..d9f0232 --- /dev/null +++ b/lab-02/Docks_Hobos/src/main/resources/archetype-resources/pom.xml @@ -0,0 +1,15 @@ + + 4.0.0 + $org.example + $Docks_Hobos + $1.0-SNAPSHOT + + + junit + junit + 3.8.1 + test + + + diff --git a/lab-02/Docks_Hobos/src/main/resources/archetype-resources/src/main/java/App.java b/lab-02/Docks_Hobos/src/main/resources/archetype-resources/src/main/java/App.java new file mode 100644 index 0000000..1fa6a95 --- /dev/null +++ b/lab-02/Docks_Hobos/src/main/resources/archetype-resources/src/main/java/App.java @@ -0,0 +1,13 @@ +package $org.example; + +/** + * Hello world! + * + */ +public class App +{ + public static void main( String[] args ) + { + System.out.println( "Hello World!" ); + } +} diff --git a/lab-02/Docks_Hobos/src/main/resources/archetype-resources/src/test/java/AppTest.java b/lab-02/Docks_Hobos/src/main/resources/archetype-resources/src/test/java/AppTest.java new file mode 100644 index 0000000..65be417 --- /dev/null +++ b/lab-02/Docks_Hobos/src/main/resources/archetype-resources/src/test/java/AppTest.java @@ -0,0 +1,38 @@ +package $org.example; + +import junit.framework.Test; +import junit.framework.TestCase; +import junit.framework.TestSuite; + +/** + * Unit test for simple App. + */ +public class AppTest + extends TestCase +{ + /** + * Create the test case + * + * @param testName name of the test case + */ + public AppTest( String testName ) + { + super( testName ); + } + + /** + * @return the suite of tests being tested + */ + public static Test suite() + { + return new TestSuite( AppTest.class ); + } + + /** + * Rigourous Test :-) + */ + public void testApp() + { + assertTrue( true ); + } +} diff --git a/lab-02/README.md b/lab-02/README.md deleted file mode 100644 index 1d490cf..0000000 --- a/lab-02/README.md +++ /dev/null @@ -1,43 +0,0 @@ -# Docks & Hobos -В данной задачем вам предстоит поработать с потоками и примитивами синхронизации в Java. - -# Архитектура приложения -В задаче никого шаблона предложенно не будет, архитектура приложения полностью зависит только от вас (архитектура и чистота также будут оцениваться). - -Все переменные должны задаваться в файле *config.json*. Путь до этого файла передается аргументов в вашу программу, при запуске она читаетс все переменные из этого файла и конструирует необходимые сущности. - ->Всю работу ведите в пакете `by.<ваш ник>.docks_and_hobos` - -# Основные действующие лица -- *Генератор кораблей* — Генератор кораблей каждые _generating_time_ секунд производит подходящий к бухте грузовой корабль. -- *Корабль* — Корабль может иметь разную грузоподъемность и один из типов груза. Диапазон грузоподъемноти коробля от _ship_capacity_min_ до _ship_capacity_max_, все типы грузов перечислены в массиве _cargo_types_. -- *Тонель* — Заходя в бухту, корабли попадают в узкий тоннель, вмещающий только _max_ships_ кораблей. Корабли, которые не могут пройти, тонут. Корабли, находящиеся в тоннеле, ожидают вызова от доков. -- *Доки* — Корабли швартуются в доках для разгрузки, которая идет со скоростью _unloading_speed_ единиц товара в секунду. Разгруженные товары хранятся в доках, максимальное количество хранимого товара _dock_capacity_ для каждой еденицы, если товар не помещается на склад его выкидывают. -- *Бродяги* — В доках обитает _hobos > 2_ бродяг. Они вечно голодны и имеют тягу к высокой кухне, то есть питаются исключительно “Омерзительно длинными бутербродами”. В состав порции, достаточной для временного насыщения ватаги кулинаров входит по _X_i_ единиц _i-го_ ингридента, указывается в массиве _ingridients_count_. Бродяги воруют ингредиенты со складов в доках и готовят их над горящей бочкой: двое всегда занимаются готовкой, остальные воруют ингредиенты, при этом время, за которое один вор может украсть и принести единицу товара - _stealing_time_ секунд. Приготовив необходимую порцию еды, бродяги останавливаются на _eating_time_ секунд, чтобы поесть, после чего продолжают привычную рутину, при этом распределение ответственности за готовку и грабеж происходит случайным образом. - -# Полезные ссылки -- С чего стоит начать - https://goo.gl/f1HZxk. -- Атомарные переменные — https://www.baeldung.com/java-atomic-variables -- Thread — https://www.simplilearn.com/tutorials/java-tutorial/thread-in-java -- Рассказ про многопоточность с семинара — https://disk.yandex.ru/i/rPOOINFYFwGmHQ. -- Рассказ про многопоточность в Java с семинара — https://disk.yandex.ru/i/m16sdlCFlhiJCw. - ->Не испольузйте mutex и atomic там где это не требуется! Использование этих примитивов сильно замедляет выполнение программы. - -# ★ Логирование -Добавьте в свое приложение библиотеку для логирования. Библиотека может быть произвольной. Логирование должно работать следющим образом: -- Логируете все что вам кажется интересным. -- Логирование должно производится и в консоль и в файл (тут может быть разный уровень логирования, чтобы не захлмалять консоль). -- Каждый промежуток времени (выберите самостоятельно) файл с логами должен сохраняться и логи должны начать писаться в другой файл. Название файлов должно содержать начало записи логов в этот файл. -- Сохраните любой лог (до 100 строчек) в репозитории. - -## Полезные ссылки -- Обзор на разные библиотеки логирования — https://habr.com/ru/post/247647/ -- Настройка _log4j_ — https://www.codejava.net/coding/how-to-configure-log4j-as-logging-mechanism-in-java - -# ★★ Condition Variable -Condition variable — явялется примитивом синхронизации и используется для построения более специфичных методов синхронизации таких как *Semaphore*, *Barier* и других. - -Разобраться что такое Condition Variable, как в общих чертах с помощью них построить *Semaphore* и *Barier*. Если необходимо добавить в свой код что-то из описанного выше. - -- Лекция в шаде — https://disk.yandex.ru/i/Lc9eYl-rO4Nunw diff --git a/lab-02/untitled/.idea/misc.xml b/lab-02/untitled/.idea/misc.xml new file mode 100644 index 0000000..6372894 --- /dev/null +++ b/lab-02/untitled/.idea/misc.xml @@ -0,0 +1,14 @@ + + + + + + + + + + \ No newline at end of file diff --git a/lab-02/untitled/.idea/modules.xml b/lab-02/untitled/.idea/modules.xml new file mode 100644 index 0000000..3007dae --- /dev/null +++ b/lab-02/untitled/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/lab-02/untitled/.idea/vcs.xml b/lab-02/untitled/.idea/vcs.xml new file mode 100644 index 0000000..b2bdec2 --- /dev/null +++ b/lab-02/untitled/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/lab-02/untitled/.idea/workspace.xml b/lab-02/untitled/.idea/workspace.xml new file mode 100644 index 0000000..2e49a27 --- /dev/null +++ b/lab-02/untitled/.idea/workspace.xml @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1669312821595 + + + + + + + \ No newline at end of file diff --git a/lab-02/untitled/ear/pom.xml b/lab-02/untitled/ear/pom.xml new file mode 100644 index 0000000..2eebe45 --- /dev/null +++ b/lab-02/untitled/ear/pom.xml @@ -0,0 +1,47 @@ + + 4.0.0 + root.project + ear + ear + 1.0 + ear assembly + + root + project + 1.0 + + + + root.project + ejbs + ejb + + + root.project.servlets + servlet + war + + + root.project + primary-source + + + root.project.projects + logging + + + + + + maven-ear-plugin + + + + true + + + + + + + diff --git a/lab-02/untitled/ejbs/pom.xml b/lab-02/untitled/ejbs/pom.xml new file mode 100644 index 0000000..3477dd7 --- /dev/null +++ b/lab-02/untitled/ejbs/pom.xml @@ -0,0 +1,37 @@ + + 4.0.0 + root.project + ejbs + ejb + 1.0 + enterprise java beans + + root + project + 1.0 + + + + root.project + primary-source + + + root.project.projects + logging + + + + + + maven-ejb-plugin + + + + true + + + + + + + diff --git a/lab-02/untitled/ejbs/src/main/resources/META-INF/ejb-jar.xml b/lab-02/untitled/ejbs/src/main/resources/META-INF/ejb-jar.xml new file mode 100644 index 0000000..e69de29 diff --git a/lab-02/untitled/pom.xml b/lab-02/untitled/pom.xml new file mode 100644 index 0000000..e6a952a --- /dev/null +++ b/lab-02/untitled/pom.xml @@ -0,0 +1,62 @@ + + 4.0.0 + root + 1.0 + project + pom + project + + projects + primary-source + servlets + ejbs + ear + site + + + + + + org.apache.maven.plugins + maven-site-plugin + + /usr/bin/unzip -o > err.txt + + + + + + + + + root.project.projects + logging + 1.0 + + + root.project + primary-source + 1.0 + + + root.project.servlets + servlet + 1.0 + war + + + root.project + ejbs + 1.0 + ejb + + + + + + site + project website + scp://local.company.com/websites/project.company.com/ + + + diff --git a/lab-02/untitled/primary-source/pom.xml b/lab-02/untitled/primary-source/pom.xml new file mode 100644 index 0000000..6537299 --- /dev/null +++ b/lab-02/untitled/primary-source/pom.xml @@ -0,0 +1,36 @@ + + 4.0.0 + root.project + primary-source + jar + core project classes + + root + project + 1.0 + + + + root.project.projects + logging + + + + + + maven-compiler-plugin + + iso-8859-1 + + + + org.apache.maven.plugins + maven-javadoc-plugin + + 128m + 512m + + + + + diff --git a/lab-02/untitled/projects/logging/pom.xml b/lab-02/untitled/projects/logging/pom.xml new file mode 100644 index 0000000..4c426ea --- /dev/null +++ b/lab-02/untitled/projects/logging/pom.xml @@ -0,0 +1,12 @@ + + 4.0.0 + root.project.projects + logging + jar + logging + + root.project + projects + 1.0 + + diff --git a/lab-02/untitled/projects/pom.xml b/lab-02/untitled/projects/pom.xml new file mode 100644 index 0000000..a7774b6 --- /dev/null +++ b/lab-02/untitled/projects/pom.xml @@ -0,0 +1,16 @@ + + 4.0.0 + root.project + 1.0 + projects + pom + sub projects + + root + project + 1.0 + + + logging + + diff --git a/lab-02/untitled/servlets/pom.xml b/lab-02/untitled/servlets/pom.xml new file mode 100644 index 0000000..a7e6302 --- /dev/null +++ b/lab-02/untitled/servlets/pom.xml @@ -0,0 +1,17 @@ + + 4.0.0 + root.project + servlets + pom + servlets + 1.0 + + root + project + 1.0 + + + servlet + + + diff --git a/lab-02/untitled/servlets/servlet/pom.xml b/lab-02/untitled/servlets/servlet/pom.xml new file mode 100644 index 0000000..b9ce63f --- /dev/null +++ b/lab-02/untitled/servlets/servlet/pom.xml @@ -0,0 +1,19 @@ + + 4.0.0 + root.project.servlets + servlet + war + servlet + + root.project + servlets + 1.0 + + + + root.project + primary-source + provided + + + diff --git a/lab-02/untitled/servlets/servlet/src/main/webapp/WEB-INF/web.xml b/lab-02/untitled/servlets/servlet/src/main/webapp/WEB-INF/web.xml new file mode 100644 index 0000000..e69de29 diff --git a/lab-02/untitled/servlets/servlet/src/main/webapp/index.jsp b/lab-02/untitled/servlets/servlet/src/main/webapp/index.jsp new file mode 100644 index 0000000..c38169b --- /dev/null +++ b/lab-02/untitled/servlets/servlet/src/main/webapp/index.jsp @@ -0,0 +1,5 @@ + + +

Hello World!

+ + diff --git a/lab-02/untitled/untitled.iml b/lab-02/untitled/untitled.iml new file mode 100644 index 0000000..f03cca2 --- /dev/null +++ b/lab-02/untitled/untitled.iml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/lab-02/untitled1/.idea/.gitignore b/lab-02/untitled1/.idea/.gitignore new file mode 100644 index 0000000..26d3352 --- /dev/null +++ b/lab-02/untitled1/.idea/.gitignore @@ -0,0 +1,3 @@ +# Default ignored files +/shelf/ +/workspace.xml diff --git a/lab-02/untitled1/.idea/compiler.xml b/lab-02/untitled1/.idea/compiler.xml new file mode 100644 index 0000000..68861fa --- /dev/null +++ b/lab-02/untitled1/.idea/compiler.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/lab-02/untitled1/.idea/encodings.xml b/lab-02/untitled1/.idea/encodings.xml new file mode 100644 index 0000000..aa00ffa --- /dev/null +++ b/lab-02/untitled1/.idea/encodings.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/lab-02/untitled1/.idea/jarRepositories.xml b/lab-02/untitled1/.idea/jarRepositories.xml new file mode 100644 index 0000000..712ab9d --- /dev/null +++ b/lab-02/untitled1/.idea/jarRepositories.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/lab-02/untitled1/.idea/misc.xml b/lab-02/untitled1/.idea/misc.xml new file mode 100644 index 0000000..6372894 --- /dev/null +++ b/lab-02/untitled1/.idea/misc.xml @@ -0,0 +1,14 @@ + + + + + + + + + + \ No newline at end of file diff --git a/lab-02/untitled1/.idea/vcs.xml b/lab-02/untitled1/.idea/vcs.xml new file mode 100644 index 0000000..b2bdec2 --- /dev/null +++ b/lab-02/untitled1/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/lab-02/untitled1/ghd.java b/lab-02/untitled1/ghd.java new file mode 100644 index 0000000..9023aa4 --- /dev/null +++ b/lab-02/untitled1/ghd.java @@ -0,0 +1,2 @@ +public class ghd { +} diff --git a/lab-02/untitled1/pom.xml b/lab-02/untitled1/pom.xml new file mode 100644 index 0000000..400665e --- /dev/null +++ b/lab-02/untitled1/pom.xml @@ -0,0 +1,9 @@ + + 4.0.0 + org.example + untitled1 + 1.0-SNAPSHOT + Archetype - untitled1 + http://maven.apache.org + diff --git a/lab-02/untitled1/src/main/resources/META-INF/maven/archetype.xml b/lab-02/untitled1/src/main/resources/META-INF/maven/archetype.xml new file mode 100644 index 0000000..433aeec --- /dev/null +++ b/lab-02/untitled1/src/main/resources/META-INF/maven/archetype.xml @@ -0,0 +1,9 @@ + + untitled1 + + src/main/java/App.java + + + src/test/java/AppTest.java + + diff --git a/lab-02/untitled1/src/main/resources/archetype-resources/pom.xml b/lab-02/untitled1/src/main/resources/archetype-resources/pom.xml new file mode 100644 index 0000000..dc10015 --- /dev/null +++ b/lab-02/untitled1/src/main/resources/archetype-resources/pom.xml @@ -0,0 +1,15 @@ + + 4.0.0 + $org.example + $untitled1 + $1.0-SNAPSHOT + + + junit + junit + 3.8.1 + test + + + diff --git a/lab-02/untitled1/src/main/resources/archetype-resources/src/main/java/App.java b/lab-02/untitled1/src/main/resources/archetype-resources/src/main/java/App.java new file mode 100644 index 0000000..1fa6a95 --- /dev/null +++ b/lab-02/untitled1/src/main/resources/archetype-resources/src/main/java/App.java @@ -0,0 +1,13 @@ +package $org.example; + +/** + * Hello world! + * + */ +public class App +{ + public static void main( String[] args ) + { + System.out.println( "Hello World!" ); + } +} diff --git a/lab-02/untitled1/src/main/resources/archetype-resources/src/test/java/AppTest.java b/lab-02/untitled1/src/main/resources/archetype-resources/src/test/java/AppTest.java new file mode 100644 index 0000000..65be417 --- /dev/null +++ b/lab-02/untitled1/src/main/resources/archetype-resources/src/test/java/AppTest.java @@ -0,0 +1,38 @@ +package $org.example; + +import junit.framework.Test; +import junit.framework.TestCase; +import junit.framework.TestSuite; + +/** + * Unit test for simple App. + */ +public class AppTest + extends TestCase +{ + /** + * Create the test case + * + * @param testName name of the test case + */ + public AppTest( String testName ) + { + super( testName ); + } + + /** + * @return the suite of tests being tested + */ + public static Test suite() + { + return new TestSuite( AppTest.class ); + } + + /** + * Rigourous Test :-) + */ + public void testApp() + { + assertTrue( true ); + } +} From c27d76924bbf720c3d10a86ebff90ac2de99d969 Mon Sep 17 00:00:00 2001 From: DaniilDomnin Date: Tue, 29 Nov 2022 17:28:25 +0300 Subject: [PATCH 3/9] Fix --- lab-02/Docks_Hobos/.idea/.gitignore | 3 - lab-02/Docks_Hobos/.idea/compiler.xml | 11 -- lab-02/Docks_Hobos/.idea/encodings.xml | 7 - lab-02/Docks_Hobos/.idea/jarRepositories.xml | 20 --- .../.idea/libraries/json_simple_1_1.xml | 9 -- lab-02/Docks_Hobos/.idea/misc.xml | 6 - lab-02/Docks_Hobos/.idea/modules.xml | 8 -- lab-02/Docks_Hobos/.idea/uiDesigner.xml | 124 ------------------ lab-02/Docks_Hobos/.idea/vcs.xml | 6 - lab-02/Docks_Hobos/Docks_Hobos.iml | 12 -- lab-02/Docks_Hobos/config.json | 17 --- lab-02/Docks_Hobos/pom.xml | 9 -- .../resources/META-INF/maven/archetype.xml | 9 -- .../resources/archetype-resources/pom.xml | 15 --- .../src/main/java/App.java | 13 -- .../src/test/java/AppTest.java | 38 ------ lab-02/untitled/.idea/misc.xml | 14 -- lab-02/untitled/.idea/modules.xml | 8 -- lab-02/untitled/.idea/vcs.xml | 6 - lab-02/untitled/.idea/workspace.xml | 64 --------- lab-02/untitled/ear/pom.xml | 47 ------- lab-02/untitled/ejbs/pom.xml | 37 ------ .../src/main/resources/META-INF/ejb-jar.xml | 0 lab-02/untitled/pom.xml | 62 --------- lab-02/untitled/primary-source/pom.xml | 36 ----- lab-02/untitled/projects/logging/pom.xml | 12 -- lab-02/untitled/projects/pom.xml | 16 --- lab-02/untitled/servlets/pom.xml | 17 --- lab-02/untitled/servlets/servlet/pom.xml | 19 --- .../servlet/src/main/webapp/WEB-INF/web.xml | 0 .../servlet/src/main/webapp/index.jsp | 5 - lab-02/untitled/untitled.iml | 9 -- lab-02/untitled1/.idea/.gitignore | 3 - lab-02/untitled1/.idea/compiler.xml | 16 --- lab-02/untitled1/.idea/encodings.xml | 7 - lab-02/untitled1/.idea/jarRepositories.xml | 20 --- lab-02/untitled1/.idea/misc.xml | 14 -- lab-02/untitled1/.idea/vcs.xml | 6 - lab-02/untitled1/ghd.java | 2 - lab-02/untitled1/pom.xml | 9 -- .../resources/META-INF/maven/archetype.xml | 9 -- .../resources/archetype-resources/pom.xml | 15 --- .../src/main/java/App.java | 13 -- .../src/test/java/AppTest.java | 38 ------ 44 files changed, 811 deletions(-) delete mode 100644 lab-02/Docks_Hobos/.idea/.gitignore delete mode 100644 lab-02/Docks_Hobos/.idea/compiler.xml delete mode 100644 lab-02/Docks_Hobos/.idea/encodings.xml delete mode 100644 lab-02/Docks_Hobos/.idea/jarRepositories.xml delete mode 100644 lab-02/Docks_Hobos/.idea/libraries/json_simple_1_1.xml delete mode 100644 lab-02/Docks_Hobos/.idea/misc.xml delete mode 100644 lab-02/Docks_Hobos/.idea/modules.xml delete mode 100644 lab-02/Docks_Hobos/.idea/uiDesigner.xml delete mode 100644 lab-02/Docks_Hobos/.idea/vcs.xml delete mode 100644 lab-02/Docks_Hobos/Docks_Hobos.iml delete mode 100644 lab-02/Docks_Hobos/config.json delete mode 100644 lab-02/Docks_Hobos/pom.xml delete mode 100644 lab-02/Docks_Hobos/src/main/resources/META-INF/maven/archetype.xml delete mode 100644 lab-02/Docks_Hobos/src/main/resources/archetype-resources/pom.xml delete mode 100644 lab-02/Docks_Hobos/src/main/resources/archetype-resources/src/main/java/App.java delete mode 100644 lab-02/Docks_Hobos/src/main/resources/archetype-resources/src/test/java/AppTest.java delete mode 100644 lab-02/untitled/.idea/misc.xml delete mode 100644 lab-02/untitled/.idea/modules.xml delete mode 100644 lab-02/untitled/.idea/vcs.xml delete mode 100644 lab-02/untitled/.idea/workspace.xml delete mode 100644 lab-02/untitled/ear/pom.xml delete mode 100644 lab-02/untitled/ejbs/pom.xml delete mode 100644 lab-02/untitled/ejbs/src/main/resources/META-INF/ejb-jar.xml delete mode 100644 lab-02/untitled/pom.xml delete mode 100644 lab-02/untitled/primary-source/pom.xml delete mode 100644 lab-02/untitled/projects/logging/pom.xml delete mode 100644 lab-02/untitled/projects/pom.xml delete mode 100644 lab-02/untitled/servlets/pom.xml delete mode 100644 lab-02/untitled/servlets/servlet/pom.xml delete mode 100644 lab-02/untitled/servlets/servlet/src/main/webapp/WEB-INF/web.xml delete mode 100644 lab-02/untitled/servlets/servlet/src/main/webapp/index.jsp delete mode 100644 lab-02/untitled/untitled.iml delete mode 100644 lab-02/untitled1/.idea/.gitignore delete mode 100644 lab-02/untitled1/.idea/compiler.xml delete mode 100644 lab-02/untitled1/.idea/encodings.xml delete mode 100644 lab-02/untitled1/.idea/jarRepositories.xml delete mode 100644 lab-02/untitled1/.idea/misc.xml delete mode 100644 lab-02/untitled1/.idea/vcs.xml delete mode 100644 lab-02/untitled1/ghd.java delete mode 100644 lab-02/untitled1/pom.xml delete mode 100644 lab-02/untitled1/src/main/resources/META-INF/maven/archetype.xml delete mode 100644 lab-02/untitled1/src/main/resources/archetype-resources/pom.xml delete mode 100644 lab-02/untitled1/src/main/resources/archetype-resources/src/main/java/App.java delete mode 100644 lab-02/untitled1/src/main/resources/archetype-resources/src/test/java/AppTest.java diff --git a/lab-02/Docks_Hobos/.idea/.gitignore b/lab-02/Docks_Hobos/.idea/.gitignore deleted file mode 100644 index 26d3352..0000000 --- a/lab-02/Docks_Hobos/.idea/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -# Default ignored files -/shelf/ -/workspace.xml diff --git a/lab-02/Docks_Hobos/.idea/compiler.xml b/lab-02/Docks_Hobos/.idea/compiler.xml deleted file mode 100644 index 6d57a93..0000000 --- a/lab-02/Docks_Hobos/.idea/compiler.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/lab-02/Docks_Hobos/.idea/encodings.xml b/lab-02/Docks_Hobos/.idea/encodings.xml deleted file mode 100644 index aa00ffa..0000000 --- a/lab-02/Docks_Hobos/.idea/encodings.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/lab-02/Docks_Hobos/.idea/jarRepositories.xml b/lab-02/Docks_Hobos/.idea/jarRepositories.xml deleted file mode 100644 index 712ab9d..0000000 --- a/lab-02/Docks_Hobos/.idea/jarRepositories.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/lab-02/Docks_Hobos/.idea/libraries/json_simple_1_1.xml b/lab-02/Docks_Hobos/.idea/libraries/json_simple_1_1.xml deleted file mode 100644 index 4e96a8f..0000000 --- a/lab-02/Docks_Hobos/.idea/libraries/json_simple_1_1.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/lab-02/Docks_Hobos/.idea/misc.xml b/lab-02/Docks_Hobos/.idea/misc.xml deleted file mode 100644 index d15472f..0000000 --- a/lab-02/Docks_Hobos/.idea/misc.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/lab-02/Docks_Hobos/.idea/modules.xml b/lab-02/Docks_Hobos/.idea/modules.xml deleted file mode 100644 index ab9efc7..0000000 --- a/lab-02/Docks_Hobos/.idea/modules.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/lab-02/Docks_Hobos/.idea/uiDesigner.xml b/lab-02/Docks_Hobos/.idea/uiDesigner.xml deleted file mode 100644 index 2b63946..0000000 --- a/lab-02/Docks_Hobos/.idea/uiDesigner.xml +++ /dev/null @@ -1,124 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/lab-02/Docks_Hobos/.idea/vcs.xml b/lab-02/Docks_Hobos/.idea/vcs.xml deleted file mode 100644 index b2bdec2..0000000 --- a/lab-02/Docks_Hobos/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/lab-02/Docks_Hobos/Docks_Hobos.iml b/lab-02/Docks_Hobos/Docks_Hobos.iml deleted file mode 100644 index 00f06e8..0000000 --- a/lab-02/Docks_Hobos/Docks_Hobos.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/lab-02/Docks_Hobos/config.json b/lab-02/Docks_Hobos/config.json deleted file mode 100644 index 968634d..0000000 --- a/lab-02/Docks_Hobos/config.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "generating_time": 10, - "ship_capacity_min": 20, - "ship_capacity_max": 100, - "max_ships": 4, - "unloading_speed": 3, - "dock_capacity": 100, - "hobos": 4, - "stealing_time": 10, - "eating_time": 20, - "cargo_types" : [ - "meat", - "fish", - "oil" - ], - "ingredients_count" : 8 -} \ No newline at end of file diff --git a/lab-02/Docks_Hobos/pom.xml b/lab-02/Docks_Hobos/pom.xml deleted file mode 100644 index 257a7d7..0000000 --- a/lab-02/Docks_Hobos/pom.xml +++ /dev/null @@ -1,9 +0,0 @@ - - 4.0.0 - org.example - Docks_Hobos - 1.0-SNAPSHOT - Archetype - Docks_Hobos - http://maven.apache.org - diff --git a/lab-02/Docks_Hobos/src/main/resources/META-INF/maven/archetype.xml b/lab-02/Docks_Hobos/src/main/resources/META-INF/maven/archetype.xml deleted file mode 100644 index f6bed99..0000000 --- a/lab-02/Docks_Hobos/src/main/resources/META-INF/maven/archetype.xml +++ /dev/null @@ -1,9 +0,0 @@ - - Docks_Hobos - - src/main/java/App.java - - - src/test/java/AppTest.java - - diff --git a/lab-02/Docks_Hobos/src/main/resources/archetype-resources/pom.xml b/lab-02/Docks_Hobos/src/main/resources/archetype-resources/pom.xml deleted file mode 100644 index d9f0232..0000000 --- a/lab-02/Docks_Hobos/src/main/resources/archetype-resources/pom.xml +++ /dev/null @@ -1,15 +0,0 @@ - - 4.0.0 - $org.example - $Docks_Hobos - $1.0-SNAPSHOT - - - junit - junit - 3.8.1 - test - - - diff --git a/lab-02/Docks_Hobos/src/main/resources/archetype-resources/src/main/java/App.java b/lab-02/Docks_Hobos/src/main/resources/archetype-resources/src/main/java/App.java deleted file mode 100644 index 1fa6a95..0000000 --- a/lab-02/Docks_Hobos/src/main/resources/archetype-resources/src/main/java/App.java +++ /dev/null @@ -1,13 +0,0 @@ -package $org.example; - -/** - * Hello world! - * - */ -public class App -{ - public static void main( String[] args ) - { - System.out.println( "Hello World!" ); - } -} diff --git a/lab-02/Docks_Hobos/src/main/resources/archetype-resources/src/test/java/AppTest.java b/lab-02/Docks_Hobos/src/main/resources/archetype-resources/src/test/java/AppTest.java deleted file mode 100644 index 65be417..0000000 --- a/lab-02/Docks_Hobos/src/main/resources/archetype-resources/src/test/java/AppTest.java +++ /dev/null @@ -1,38 +0,0 @@ -package $org.example; - -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; - -/** - * Unit test for simple App. - */ -public class AppTest - extends TestCase -{ - /** - * Create the test case - * - * @param testName name of the test case - */ - public AppTest( String testName ) - { - super( testName ); - } - - /** - * @return the suite of tests being tested - */ - public static Test suite() - { - return new TestSuite( AppTest.class ); - } - - /** - * Rigourous Test :-) - */ - public void testApp() - { - assertTrue( true ); - } -} diff --git a/lab-02/untitled/.idea/misc.xml b/lab-02/untitled/.idea/misc.xml deleted file mode 100644 index 6372894..0000000 --- a/lab-02/untitled/.idea/misc.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/lab-02/untitled/.idea/modules.xml b/lab-02/untitled/.idea/modules.xml deleted file mode 100644 index 3007dae..0000000 --- a/lab-02/untitled/.idea/modules.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/lab-02/untitled/.idea/vcs.xml b/lab-02/untitled/.idea/vcs.xml deleted file mode 100644 index b2bdec2..0000000 --- a/lab-02/untitled/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/lab-02/untitled/.idea/workspace.xml b/lab-02/untitled/.idea/workspace.xml deleted file mode 100644 index 2e49a27..0000000 --- a/lab-02/untitled/.idea/workspace.xml +++ /dev/null @@ -1,64 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1669312821595 - - - - - - - \ No newline at end of file diff --git a/lab-02/untitled/ear/pom.xml b/lab-02/untitled/ear/pom.xml deleted file mode 100644 index 2eebe45..0000000 --- a/lab-02/untitled/ear/pom.xml +++ /dev/null @@ -1,47 +0,0 @@ - - 4.0.0 - root.project - ear - ear - 1.0 - ear assembly - - root - project - 1.0 - - - - root.project - ejbs - ejb - - - root.project.servlets - servlet - war - - - root.project - primary-source - - - root.project.projects - logging - - - - - - maven-ear-plugin - - - - true - - - - - - - diff --git a/lab-02/untitled/ejbs/pom.xml b/lab-02/untitled/ejbs/pom.xml deleted file mode 100644 index 3477dd7..0000000 --- a/lab-02/untitled/ejbs/pom.xml +++ /dev/null @@ -1,37 +0,0 @@ - - 4.0.0 - root.project - ejbs - ejb - 1.0 - enterprise java beans - - root - project - 1.0 - - - - root.project - primary-source - - - root.project.projects - logging - - - - - - maven-ejb-plugin - - - - true - - - - - - - diff --git a/lab-02/untitled/ejbs/src/main/resources/META-INF/ejb-jar.xml b/lab-02/untitled/ejbs/src/main/resources/META-INF/ejb-jar.xml deleted file mode 100644 index e69de29..0000000 diff --git a/lab-02/untitled/pom.xml b/lab-02/untitled/pom.xml deleted file mode 100644 index e6a952a..0000000 --- a/lab-02/untitled/pom.xml +++ /dev/null @@ -1,62 +0,0 @@ - - 4.0.0 - root - 1.0 - project - pom - project - - projects - primary-source - servlets - ejbs - ear - site - - - - - - org.apache.maven.plugins - maven-site-plugin - - /usr/bin/unzip -o > err.txt - - - - - - - - - root.project.projects - logging - 1.0 - - - root.project - primary-source - 1.0 - - - root.project.servlets - servlet - 1.0 - war - - - root.project - ejbs - 1.0 - ejb - - - - - - site - project website - scp://local.company.com/websites/project.company.com/ - - - diff --git a/lab-02/untitled/primary-source/pom.xml b/lab-02/untitled/primary-source/pom.xml deleted file mode 100644 index 6537299..0000000 --- a/lab-02/untitled/primary-source/pom.xml +++ /dev/null @@ -1,36 +0,0 @@ - - 4.0.0 - root.project - primary-source - jar - core project classes - - root - project - 1.0 - - - - root.project.projects - logging - - - - - - maven-compiler-plugin - - iso-8859-1 - - - - org.apache.maven.plugins - maven-javadoc-plugin - - 128m - 512m - - - - - diff --git a/lab-02/untitled/projects/logging/pom.xml b/lab-02/untitled/projects/logging/pom.xml deleted file mode 100644 index 4c426ea..0000000 --- a/lab-02/untitled/projects/logging/pom.xml +++ /dev/null @@ -1,12 +0,0 @@ - - 4.0.0 - root.project.projects - logging - jar - logging - - root.project - projects - 1.0 - - diff --git a/lab-02/untitled/projects/pom.xml b/lab-02/untitled/projects/pom.xml deleted file mode 100644 index a7774b6..0000000 --- a/lab-02/untitled/projects/pom.xml +++ /dev/null @@ -1,16 +0,0 @@ - - 4.0.0 - root.project - 1.0 - projects - pom - sub projects - - root - project - 1.0 - - - logging - - diff --git a/lab-02/untitled/servlets/pom.xml b/lab-02/untitled/servlets/pom.xml deleted file mode 100644 index a7e6302..0000000 --- a/lab-02/untitled/servlets/pom.xml +++ /dev/null @@ -1,17 +0,0 @@ - - 4.0.0 - root.project - servlets - pom - servlets - 1.0 - - root - project - 1.0 - - - servlet - - - diff --git a/lab-02/untitled/servlets/servlet/pom.xml b/lab-02/untitled/servlets/servlet/pom.xml deleted file mode 100644 index b9ce63f..0000000 --- a/lab-02/untitled/servlets/servlet/pom.xml +++ /dev/null @@ -1,19 +0,0 @@ - - 4.0.0 - root.project.servlets - servlet - war - servlet - - root.project - servlets - 1.0 - - - - root.project - primary-source - provided - - - diff --git a/lab-02/untitled/servlets/servlet/src/main/webapp/WEB-INF/web.xml b/lab-02/untitled/servlets/servlet/src/main/webapp/WEB-INF/web.xml deleted file mode 100644 index e69de29..0000000 diff --git a/lab-02/untitled/servlets/servlet/src/main/webapp/index.jsp b/lab-02/untitled/servlets/servlet/src/main/webapp/index.jsp deleted file mode 100644 index c38169b..0000000 --- a/lab-02/untitled/servlets/servlet/src/main/webapp/index.jsp +++ /dev/null @@ -1,5 +0,0 @@ - - -

Hello World!

- - diff --git a/lab-02/untitled/untitled.iml b/lab-02/untitled/untitled.iml deleted file mode 100644 index f03cca2..0000000 --- a/lab-02/untitled/untitled.iml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/lab-02/untitled1/.idea/.gitignore b/lab-02/untitled1/.idea/.gitignore deleted file mode 100644 index 26d3352..0000000 --- a/lab-02/untitled1/.idea/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -# Default ignored files -/shelf/ -/workspace.xml diff --git a/lab-02/untitled1/.idea/compiler.xml b/lab-02/untitled1/.idea/compiler.xml deleted file mode 100644 index 68861fa..0000000 --- a/lab-02/untitled1/.idea/compiler.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/lab-02/untitled1/.idea/encodings.xml b/lab-02/untitled1/.idea/encodings.xml deleted file mode 100644 index aa00ffa..0000000 --- a/lab-02/untitled1/.idea/encodings.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/lab-02/untitled1/.idea/jarRepositories.xml b/lab-02/untitled1/.idea/jarRepositories.xml deleted file mode 100644 index 712ab9d..0000000 --- a/lab-02/untitled1/.idea/jarRepositories.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/lab-02/untitled1/.idea/misc.xml b/lab-02/untitled1/.idea/misc.xml deleted file mode 100644 index 6372894..0000000 --- a/lab-02/untitled1/.idea/misc.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/lab-02/untitled1/.idea/vcs.xml b/lab-02/untitled1/.idea/vcs.xml deleted file mode 100644 index b2bdec2..0000000 --- a/lab-02/untitled1/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/lab-02/untitled1/ghd.java b/lab-02/untitled1/ghd.java deleted file mode 100644 index 9023aa4..0000000 --- a/lab-02/untitled1/ghd.java +++ /dev/null @@ -1,2 +0,0 @@ -public class ghd { -} diff --git a/lab-02/untitled1/pom.xml b/lab-02/untitled1/pom.xml deleted file mode 100644 index 400665e..0000000 --- a/lab-02/untitled1/pom.xml +++ /dev/null @@ -1,9 +0,0 @@ - - 4.0.0 - org.example - untitled1 - 1.0-SNAPSHOT - Archetype - untitled1 - http://maven.apache.org - diff --git a/lab-02/untitled1/src/main/resources/META-INF/maven/archetype.xml b/lab-02/untitled1/src/main/resources/META-INF/maven/archetype.xml deleted file mode 100644 index 433aeec..0000000 --- a/lab-02/untitled1/src/main/resources/META-INF/maven/archetype.xml +++ /dev/null @@ -1,9 +0,0 @@ - - untitled1 - - src/main/java/App.java - - - src/test/java/AppTest.java - - diff --git a/lab-02/untitled1/src/main/resources/archetype-resources/pom.xml b/lab-02/untitled1/src/main/resources/archetype-resources/pom.xml deleted file mode 100644 index dc10015..0000000 --- a/lab-02/untitled1/src/main/resources/archetype-resources/pom.xml +++ /dev/null @@ -1,15 +0,0 @@ - - 4.0.0 - $org.example - $untitled1 - $1.0-SNAPSHOT - - - junit - junit - 3.8.1 - test - - - diff --git a/lab-02/untitled1/src/main/resources/archetype-resources/src/main/java/App.java b/lab-02/untitled1/src/main/resources/archetype-resources/src/main/java/App.java deleted file mode 100644 index 1fa6a95..0000000 --- a/lab-02/untitled1/src/main/resources/archetype-resources/src/main/java/App.java +++ /dev/null @@ -1,13 +0,0 @@ -package $org.example; - -/** - * Hello world! - * - */ -public class App -{ - public static void main( String[] args ) - { - System.out.println( "Hello World!" ); - } -} diff --git a/lab-02/untitled1/src/main/resources/archetype-resources/src/test/java/AppTest.java b/lab-02/untitled1/src/main/resources/archetype-resources/src/test/java/AppTest.java deleted file mode 100644 index 65be417..0000000 --- a/lab-02/untitled1/src/main/resources/archetype-resources/src/test/java/AppTest.java +++ /dev/null @@ -1,38 +0,0 @@ -package $org.example; - -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; - -/** - * Unit test for simple App. - */ -public class AppTest - extends TestCase -{ - /** - * Create the test case - * - * @param testName name of the test case - */ - public AppTest( String testName ) - { - super( testName ); - } - - /** - * @return the suite of tests being tested - */ - public static Test suite() - { - return new TestSuite( AppTest.class ); - } - - /** - * Rigourous Test :-) - */ - public void testApp() - { - assertTrue( true ); - } -} From b95523bc73f45f97af5b5f0fe3c92a994fd26576 Mon Sep 17 00:00:00 2001 From: DaniilDomnin Date: Tue, 29 Nov 2022 17:37:18 +0300 Subject: [PATCH 4/9] Fix --- .../src/by/DaniilDomnin/doks_and_hobos/Main.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lab-02/DocksAndHobos/src/by/DaniilDomnin/doks_and_hobos/Main.java b/lab-02/DocksAndHobos/src/by/DaniilDomnin/doks_and_hobos/Main.java index f975d88..d2cec21 100644 --- a/lab-02/DocksAndHobos/src/by/DaniilDomnin/doks_and_hobos/Main.java +++ b/lab-02/DocksAndHobos/src/by/DaniilDomnin/doks_and_hobos/Main.java @@ -15,8 +15,8 @@ public class Main { public static void main(String[] args) throws IOException, ParseException, InterruptedException { - // Object obj = new JSONParser().parse(new FileReader(args[1])); - Object obj = new JSONParser().parse(new FileReader("config.json")); + Object obj = new JSONParser().parse(new FileReader(args[1])); + // Object obj = new JSONParser().parse(new FileReader("config.json")); JSONObject jo = (JSONObject) obj; ShipGenerator generator = new ShipGenerator((long)jo.get("ship_capacity_max"), (long)jo.get("ship_capacity_min"), (ArrayList) jo.get("cargo_types")); Docks docks = new Docks((long)jo.get("dock_capacity"), (long)jo.get("unloading_speed"), (ArrayList) jo.get("cargo_types"), (long)jo.get("hobos"), (ArrayList) jo.get("ingredients_count"), (long)jo.get("eating_time"), (long)jo.get("stealing_time")); From 6729b0e427897fa258c9e6e2a74e31d481fde1f0 Mon Sep 17 00:00:00 2001 From: DaniilDomnin Date: Tue, 29 Nov 2022 17:43:59 +0300 Subject: [PATCH 5/9] Fix --- .../DaniilDomnin/doks_and_hobos/Docks.class | Bin 4881 -> 4693 bytes .../by/DaniilDomnin/doks_and_hobos/Main.class | Bin 1920 -> 1904 bytes .../by/DaniilDomnin/doks_and_hobos/Main.java | 2 +- 3 files changed, 1 insertion(+), 1 deletion(-) diff --git a/lab-02/DocksAndHobos/out/production/DocksAndHobos/by/DaniilDomnin/doks_and_hobos/Docks.class b/lab-02/DocksAndHobos/out/production/DocksAndHobos/by/DaniilDomnin/doks_and_hobos/Docks.class index 414d23c9fb005b8264c9cf9ffda52e1fb2d65946..ba1b027a9f807dcf6168b46433d5203d0e4384d1 100644 GIT binary patch delta 1328 zcmZ8gS#T6p6g{tJP17@zq)4b?An*Z6CM4to0bvBH7$})QNKq*Xh!)kst{9kVt2%>! zR6g`WK$iGa1T~^830p7(h5)iCo8ZnS>z{n{!56#db;e=Js_CBlZr^*(xy$RSygp99 z{QUSS05fr~U;oEft79D28d!#P0%g^y_=1(@`(}OGwA<>NT31>tG6@y&v4IWPD0}^{ zbZ$1#g--;+Nz-o5m`-M{nQ6D%1U%L8H+2ldrv^TQUtmNsZJADTwc}WJCS|ud);sOA zI)-5lwix(A#rRj->GxKwQfb=^e5qW)=8R>gi5S4w0u?Xir0k64IC4#(SbQTl2F3)t z@vQ+Lz8g3ac&L?^RToHa&NxI!#23rmdMbQT$IrMFz-0r!;Maj?x>q#*uF5UQ$Q2u3 z9P!~#rROgLr*WoO{rvP@SH2qteoz{XlxbFe3T$E(96l!*0g)$Y|(;NUuAh2;T<0XqEdylcRfhdJ9FE zMXbHphY-&W_Tzwj6pD#HSr)DveUQF#qNp!@_@0=`8bu{R^vmVpu_Z$a4v~8Rhh4tS z;de!^d=!o)6vI$J14n6l>HCV$AiaXBn3&zX7XfaGTk8BAc@1UO(LI4HS&I@(%##N>qLVn~CYBbE zv*WK5rijeEl8RY&m5wo0J-W*tWj!PFFhDq$tgIjL6Ei$G%V-VfaNg~L#wGLMH~fJs Uu5}gHa20>Mhypip8+Q@?7l;QHFaQ7m delta 1547 zcmZuxX>3$g7(I9PzIn5>Af}xbDzU6OGM; zXpD**K2TBIaH&gCN^!cNP(?*>!=>(`Xx(u6;~#>Jcpyw%bm%p zP4l!v|BUYia6bMV(x#m0BHWHU+}Nn&PTVCBTxVQwgri2RE8KBIGG(q8u*dsS0;jd9 zlkRx9J<%OYb)*ueu|DF#Jp#^-lxajYY{GqRSUNUii@=Qk2^Vnp%H(K_c(n?!G{=>q zzbjIAxrQn{pyLWWXdQQ!yB^ZGuv4VS>_%~8`xH1{PEW-PTb)|D{VcGF6FFd(3{#Mb6=yy(YsI-Zv~ zuD)0_eoc>r8Pu@@0s1_uP?Eawk~Qu+Qw&*0Tys1-F|5Oh-NR1zUp6bKt?+-Y;R}4} z##cJN#y7*J<`CjrYn?Z=@Tdg*UdM;n5|kfTz=@xv?`IwFOJ03tEM_K}qee1mCfztD zP;CXh72af3TRh&=*Xzdb)={q+d6_e`A;V`GXDRJ+R6yWAzaN48`v^RYablElW7Y=! z=D@hxfdIdCIAB^ce2Yr=@a;+z;R0g4f>+_=djfm0&oX==F=6%l8Y^C-Zx&JH$pl^} zrnJhb#Do3T0bgZtR>2$OeiLsgzT>`Y#kghoLlMc4&F+-Ad;>ah0Bnst&=Ex*VTm zDS~YpHgN*g4B4Sb$LKz$ETF%BH_n)eRo$bwgl1$6HwmI|SUqC(2K?z=xUJ;w4DRJo zO-OxZaQ_6t8C<0qqgar^*3SA29@&byGV}=u@1%#Bx=;>}w4=@E#{8EAB6- z*v+$P^ooMU+T`6(jjan-r*j2RWLYR*j+v|G79j>s9vsR`EMbR%7VgJI6xl*O7v~k& zC{yl^RIsc-LB8jUDTNnVGBac&p}0(GG})J`W@b>o9Sx_p^;A`xx4~&2RGJPu2J@n_ zYtc$kZD_NIERO^DbJ^1R2p==Uj!zhE!z4cCuiS#q=sSY%@Po3Z@FS-1i$WCm K6~EyRl>Q5t#aDg+ diff --git a/lab-02/DocksAndHobos/out/production/DocksAndHobos/by/DaniilDomnin/doks_and_hobos/Main.class b/lab-02/DocksAndHobos/out/production/DocksAndHobos/by/DaniilDomnin/doks_and_hobos/Main.class index bf66681238e0a6ec8e844d7b0f52ef5f482f0fc6..6c6b9b5faf7fb4009fb788298e5d6f047d32818b 100644 GIT binary patch delta 876 zcmYjPOHDUZf?$foSS=2^3wmy$AA5^vkM@KWPvw%9z0sS zaKl%4+uL-|i&hAQod|0${2Xuv7{oWu0ehVJS(hDU0j>=}FM7~xudzs^pTYM;ekMz4 zSx-qZLr?MO!yzvY;|N1@nhL9OI;S!?LnDhEhU{Gym^{jGK#{X4BVlc4RMUeHLtAxC z&eGD-Og1ZT$28O8(SdN~vQdU$Xwm-e2yi2-9*i*z(NXz1LwRa)kQiE$1QUv!krmC_ z<`7}<=k&B8CpA5lFf*!}FwY@;G(gyrkr0A^;;2L6-HDd|Ow1mh^f{!MF zFJ*Y*B{Y}8$HUHv61+wDW21X$TPmX?E()DRHzx!&Q8&gpuVkM4B9L zXdZ9C{{}^2qM>-Q#ukOs4aGBcT*B0ptBmRRShq{e3m57QQJAUY5@x5||Ahyuf&}`R z+7YBUivZrC6T9fDnh~uD#tN>J@D6;$4csJyf_RTxxJ|~);yLbM6;9#}<1X&OMQqlO XIPR124~WK5a}AI1n276?JD~gpOGdcH delta 940 zcmZWnT~E_s6n@@rbES?A%IAhS70>}?bNCGcil71mR1}?}vvg$?N4u;=Au*Xhz#GyV z{Q+L+oiSmFi-bE9Z`5o5f{FeD(^fPjDx9@H^3MG`CWQ#qEE^-OHe%4>RNuzOyB7orahXxw}oXU&^G z!tPcE$^ONK?RFLjhZyS3Wi6LdkfIW+nh zLXk=PE7xq-ac*~vq0`y4FlH!EOdfHD+BCV9WqF)p2(0N@LrxRll$lf2G>VDhbv0i-WQ^1x`BILcrhpM#bp~8xNJbL>6tA_Px%%7_3>{A5!)Mn^ z7D|y0WqmaxHZeQCuBbUnGjuOxd)3p!6#JEDsBj$|9RkP_IUFE6Nl}bmMz5!*2==~Q zo+9g%fdCR@eY*{q#tcO@n8ghmLSPn!pE`l<61>SGYDy52qOS=57U~ndJ7}6Np(QDa z!7a2Eb`ajeQAzBgV9!5M_PdMdohczoohPe`{Z;) jo.get("cargo_types")); From 1e21cc5b547c5ea268953e1073c6fad9174ec707 Mon Sep 17 00:00:00 2001 From: DaniilDomnin Date: Wed, 30 Nov 2022 18:52:22 +0300 Subject: [PATCH 6/9] Fix --- lab-02/DocksAndHobos/config.json | 5 +-- .../doks_and_hobos/Controller.class | Bin 2827 -> 2827 bytes .../DaniilDomnin/doks_and_hobos/Docks.class | Bin 4693 -> 5204 bytes .../by/DaniilDomnin/doks_and_hobos/Main.class | Bin 1904 -> 1920 bytes .../by/DaniilDomnin/doks_and_hobos/Ship.class | Bin 728 -> 728 bytes .../doks_and_hobos/Controller.java | 10 ++--- .../by/DaniilDomnin/doks_and_hobos/Docks.java | 40 +++++++++++++----- .../by/DaniilDomnin/doks_and_hobos/Main.java | 1 - .../by/DaniilDomnin/doks_and_hobos/Ship.java | 2 +- 9 files changed, 38 insertions(+), 20 deletions(-) diff --git a/lab-02/DocksAndHobos/config.json b/lab-02/DocksAndHobos/config.json index 2f39897..52cbf87 100644 --- a/lab-02/DocksAndHobos/config.json +++ b/lab-02/DocksAndHobos/config.json @@ -15,9 +15,8 @@ ], "ingredients_count" : [ - 1, + 7, 2, - 10, - 4 + 10 ] } \ No newline at end of file diff --git a/lab-02/DocksAndHobos/out/production/DocksAndHobos/by/DaniilDomnin/doks_and_hobos/Controller.class b/lab-02/DocksAndHobos/out/production/DocksAndHobos/by/DaniilDomnin/doks_and_hobos/Controller.class index c5c91438dc76cb0e59554b9acdf82f4cfc132203..f0041e7f3c956628c0aa0e2f184bb2422bd500fb 100644 GIT binary patch delta 46 qcmeAc>lWK!!l5X{z|FwJz`!8HAj=>Jrui8Jz_c)g-WlWK!!lB5-z|FwJz`(%7Aj=>Jrui8Jz_c)g-WH zw$-*)deg(BYVDC8XlrX0gtpSVT3hXX+E#0;J^uiurO*5AWHSpeK%&$9wsON;tT6*RqSdH@siW4!EX>x>Jb0jOgXKC-W|i$6wjrAu$!VxbS>8}~AeGI#^q{5Z>t3A&;(BtHM<-sBoi)Ei0+w#SL?~K~A+fozDlxI2Lwld+7IJio`Ah?YLOSB_=M# zWg2EpbKaA6hcxK>tW4hCwukmxy5q$-l_X?1DVwe_aXGHwZdN+2VQxTBNH)p%ZXF$@ zZaRRFR5HSH+jg6HdY0?=@T-AjF{&#~T!pJO%;DCdhz3UUzCEsCNeK2cc9e~h^%Qoe zi4E9D?OLgnJw^#_Z0R{0F#;Ao&w%=J&FLSRu#=!V5`htO8?9j2(L?8Og za(2hCXIo?>mdn^SH>n_h%KR=9yK%h+Q|-#!+DeTP)>@%?+R9V!^ z)2ELAPc%yY+w-n#4Q6bD(Tkg;s=iUfyl@bu8Ny62-fZG6Qh8%J-}3w#+>E#Bc)N*r zNavzgNFNb98J1i!SY2*4@lMI}S~A=#1*XeQ+l+bz-Ys0-CTZF=15P?_FOyJF1hVeE zCfj%U51RN8K1{AVEw@*~+Ndfaw`z&+7H2kPS;pZA!&D?+8PbUJi|NK)l`T~b3pyNZ6snL*~u+@8>`p#sYq7#uUf=^i!|ET74A zJM%iUW665*WqMh!DC*8^ngP!4aa?M43F(`R{(d=EM`ho?I$a)m$a zz zLs9{hQ)k5TR|{1w&|s8gMtmeXuUI0eUFMe`92)f@{)z_)wY>Vv=XVbaamH4%R-{7}8erMwMcv{2K>3ntE zec2Jatw)8!71karlX%5h*kaRgf8IP_gdP(2AFv1k%?i6xVmlW3@%#Jogf)g#L0K})VvO*(n+BvxPD7F(ogI(86Jqx(u1lkLDgUn;+oTErteAe-)aCZ7ztEa~7 zqZlnE27&iSMyp z!M?-%{XTm&(GPELl?umrw4>=(x-)MMa`vIS(R3WWyU21Ll-hwUD+_qjEgEI;^yv<@ zklr{J;zGLA!k>2K&|+@7kmi1X$7nu6sD)0UE*>~}g6(QVP9mbc$S5LmyWyw!bW*i| zgY;(!(R7M%u6qP;RC=O_}ko6z`IW1J>jnE2%yClPWtCC;@WPDEq!$*Snw7+?E+R)> z;Fz2Q;+Tl|^Ao7;IgST+wI0EjAAN{3gjAimAGY1fz6;p9lEkcHg>Ea^u3~Eb7*DEo z^jBAd8NH4XFp4GdosATo<#8?D7d!|50BBdT!8ANzp$4790aK-ixu>$C7v{ET}= o@pHB27x*QgQqq3KzCYkk__Jy~hri%CyudMov;T&F;9qF`AIu^z0RR91 delta 2277 zcmZ8idsGx<6#vcc?9T4&w}8l^2qNm@!Y+b}0xD{{DXd{(AS-Iw03#90V!Kd2s*SRz z_MowcMV4mK!)NM(QfgL~+JjPi`){58=$!hibIhXq%`OO@19R`(@6Nry`@8pkdokyd zQ$F|K@e=^%R}720OwVp}DaOSqMx3f0O4> zX}d-5SOv`t0r0w7lnpY<5oBnkEdPq><}gDW+OR=9z(K89MQtfCR4+tm3&BD{W1|M!hYo zWNO@YhUYnmG2VcxguLyckQ$^6jUlz6iL@}s`Xa+i+{fG=l^cB4|zW{)EqDe2%jc&M}a``#drvKL-*Z7{xqJto^hQ$0f|F?Z^A-8CcH)d-GHFLhy=2P z+&vK7eOkReueuM;+8#_f3YW3S?y#p>qHynq!+iuUYcKMnnCahQ7rF<2bN8WyJm(z6 z+%%K>I2Hg=cn?uH5pUCTJ|zYiz13;I+s8*rkpdqaSV3|%#$X-B;%;Q%9r9WOD}A4V zckv$V^d7=q>?6rFPKcmuoD!q1?WZD5y2j}->l!bdmlp!3%BpLeEE^7xo*JQ=`Qd&X zjDMPeJ@f$woDRbP<+n<(iJ}Cj{x4F}D|8g2_WZh4emD)>7|6Ajf-_=k3&;^6$ar7vdM)umY&^+0B3X+P^tEb#9vd4z`4h8pMXAe&~QC$q_c4} zfl+KJCDoO#KcaX%MyssoByRPS!!tXOOhO}%%n{LEpppl65|9|9Q}o%0%%Z_4qERfS zdP?BMY%Ikb+>E)XrCq9{@g1btMYcW~OkS5dtS*TPxr&v-HIB(Z7a6CRT(`x`n`bQ5 zQR{m&W3Y&bD}AU6vW>g;MpHmrw$-mU;_S6XBoon~{@V#`5y?{e*>MkClBe>iIC7WBDtG* znMzgs}U*c}?bNCGcil71mR1}?}vvg$?N4u;=Au*Xhz#GyV z{Q+L+oiSmFi-bE9Z`5o5f{FeD(^fPjDx9@H^3MG`CWQ#qEE^-OHe%4>RNuzOyB7orahXxw}oXU&^G z!tPcE$^ONK?RFLjhZyS3Wi6LdkfIW+nh zLXk=PE7xq-ac*~vq0`y4FlH!EOdfHD+BCV9WqF)p2(0N@LrxRll$lf2G>VDhbv0i-WQ^1x`BILcrhpM#bp~8xNJbL>6tA_Px%%7_3>{A5!)Mn^ z7D|y0WqmaxHZeQCuBbUnGjuOxd)3p!6#JEDsBj$|9RkP_IUFE6Nl}bmMz5!*2==~Q zo+9g%fdCR@eY*{q#tcO@n8ghmLSPn!pE`l<61>SGYDy52qOS=57U~ndJ7}6Np(QDa z!7a2Eb`ajeQAzBgV9!5M_PdMdohczoohPe`{Z;DUZf?$foSS=2^3wmy$AA5^vkM@KWPvw%9z0sS zaKl%4+uL-|i&hAQod|0${2Xuv7{oWu0ehVJS(hDU0j>=}FM7~xudzs^pTYM;ekMz4 zSx-qZLr?MO!yzvY;|N1@nhL9OI;S!?LnDhEhU{Gym^{jGK#{X4BVlc4RMUeHLtAxC z&eGD-Og1ZT$28O8(SdN~vQdU$Xwm-e2yi2-9*i*z(NXz1LwRa)kQiE$1QUv!krmC_ z<`7}<=k&B8CpA5lFf*!}FwY@;G(gyrkr0A^;;2L6-HDd|Ow1mh^f{!MF zFJ*Y*B{Y}8$HUHv61+wDW21X$TPmX?E()DRHzx!&Q8&gpuVkM4B9L zXdZ9C{{}^2qM>-Q#ukOs4aGBcT*B0ptBmRRShq{e3m57QQJAUY5@x5||Ahyuf&}`R z+7YBUivZrC6T9fDnh~uD#tN>J@D6;$4csJyf_RTxxJ|~);yLbM6;9#}<1X&OMQqlO XIPR124~WK5a}AI1n276?JD~gpOGdcH diff --git a/lab-02/DocksAndHobos/out/production/DocksAndHobos/by/DaniilDomnin/doks_and_hobos/Ship.class b/lab-02/DocksAndHobos/out/production/DocksAndHobos/by/DaniilDomnin/doks_and_hobos/Ship.class index ab6f7ac4f69901659532de949f5c340f83016556..69571f0b3148d92f4a2e3d9345f388858607b828 100644 GIT binary patch delta 14 Vcmcb?dV_Vt3`Rzw%`+M8838Gd1f&1} delta 14 Vcmcb?dV_Vt3`Rz#%`+M8838FS1e5>( diff --git a/lab-02/DocksAndHobos/src/by/DaniilDomnin/doks_and_hobos/Controller.java b/lab-02/DocksAndHobos/src/by/DaniilDomnin/doks_and_hobos/Controller.java index 156b940..5401c30 100644 --- a/lab-02/DocksAndHobos/src/by/DaniilDomnin/doks_and_hobos/Controller.java +++ b/lab-02/DocksAndHobos/src/by/DaniilDomnin/doks_and_hobos/Controller.java @@ -40,12 +40,12 @@ private void Uploading(Ship ship) throws InterruptedException { ship_count.decrementAndGet(); } - private ShipGenerator generator; + private final ShipGenerator generator; - private AtomicInteger ship_count; - private long generating_time; + private final AtomicInteger ship_count; + private final long generating_time; - private long max_ships; + private final long max_ships; - private Docks docks; + private final Docks docks; } diff --git a/lab-02/DocksAndHobos/src/by/DaniilDomnin/doks_and_hobos/Docks.java b/lab-02/DocksAndHobos/src/by/DaniilDomnin/doks_and_hobos/Docks.java index edf4989..1e77a72 100644 --- a/lab-02/DocksAndHobos/src/by/DaniilDomnin/doks_and_hobos/Docks.java +++ b/lab-02/DocksAndHobos/src/by/DaniilDomnin/doks_and_hobos/Docks.java @@ -16,6 +16,7 @@ public class Docks { this.ingredients_count = ingredients_count; this.eating_time = eating_time; this.stealing_time = stealing_time; + this.cargo_names = cargo_names; current_ingredients_count = new ArrayList<>(); for (int i = 0; i < ingredients_count.size(); ++i) { current_ingredients_count.add(0L); @@ -52,7 +53,11 @@ private void Stealing () throws InterruptedException { while (true) { Thread.sleep(stealing_time * 1000); add_ingredient_mutex.lock(); - int index = new Random().nextInt(0, ingredients_count.size()); + int index = GetStealIndex(); + if (index == -1) { + continue; + } + cargo_count.put(cargo_names.get(index), cargo_count.get(cargo_names.get(index)) - 1); current_ingredients_count.set(index, current_ingredients_count.get(index) + 1); if (CanStartEating()) { ClearCurrentIngredients();; @@ -62,6 +67,19 @@ private void Stealing () throws InterruptedException { } } + private int GetStealIndex () { + ArrayList indexes = new ArrayList(); + for (int i = 0; i < cargo_names.size(); ++i) { + if (cargo_count.get(cargo_names.get(i)) > 0) { + indexes.add(i); + } + } + if (indexes.size() == 0) { + return -1; + } + return indexes.get(new Random().nextInt(0, indexes.size())); + } + private void ClearCurrentIngredients() { for (int i = 0; i < current_ingredients_count.size(); ++i) { current_ingredients_count.set(i, current_ingredients_count.get(i) - ingredients_count.get(i)); @@ -80,20 +98,22 @@ private boolean CanStartEating () { - private long dock_capacity; - private long unloading_speed; + private final long dock_capacity; + private final long unloading_speed; + + private final long hobos; - private long hobos; + private final long eating_time; - private long eating_time; + private final long stealing_time; - private long stealing_time; + private final ArrayList current_ingredients_count; - private ArrayList current_ingredients_count; + private final Lock add_ingredient_mutex; - private Lock add_ingredient_mutex; + private final ArrayList ingredients_count; - private ArrayList ingredients_count; + private final ArrayList cargo_names; - private ConcurrentHashMap cargo_count = new ConcurrentHashMap<>(); + private final ConcurrentHashMap cargo_count = new ConcurrentHashMap<>(); } diff --git a/lab-02/DocksAndHobos/src/by/DaniilDomnin/doks_and_hobos/Main.java b/lab-02/DocksAndHobos/src/by/DaniilDomnin/doks_and_hobos/Main.java index b7ea394..ababf7e 100644 --- a/lab-02/DocksAndHobos/src/by/DaniilDomnin/doks_and_hobos/Main.java +++ b/lab-02/DocksAndHobos/src/by/DaniilDomnin/doks_and_hobos/Main.java @@ -16,7 +16,6 @@ public class Main { public static void main(String[] args) throws IOException, ParseException, InterruptedException { Object obj = new JSONParser().parse(new FileReader(args[0])); - // Object obj = new JSONParser().parse(new FileReader("config.json")); JSONObject jo = (JSONObject) obj; ShipGenerator generator = new ShipGenerator((long)jo.get("ship_capacity_max"), (long)jo.get("ship_capacity_min"), (ArrayList) jo.get("cargo_types")); Docks docks = new Docks((long)jo.get("dock_capacity"), (long)jo.get("unloading_speed"), (ArrayList) jo.get("cargo_types"), (long)jo.get("hobos"), (ArrayList) jo.get("ingredients_count"), (long)jo.get("eating_time"), (long)jo.get("stealing_time")); diff --git a/lab-02/DocksAndHobos/src/by/DaniilDomnin/doks_and_hobos/Ship.java b/lab-02/DocksAndHobos/src/by/DaniilDomnin/doks_and_hobos/Ship.java index 7f39f0c..5a8b31f 100644 --- a/lab-02/DocksAndHobos/src/by/DaniilDomnin/doks_and_hobos/Ship.java +++ b/lab-02/DocksAndHobos/src/by/DaniilDomnin/doks_and_hobos/Ship.java @@ -19,5 +19,5 @@ public void SetCapacity (long capacity) { } private long capacity; - private String cargo_name; + private final String cargo_name; } From 1ca411eb4dfe4632abf01d34cea014332c093d8e Mon Sep 17 00:00:00 2001 From: DaniilDomnin Date: Sat, 3 Dec 2022 19:12:03 +0300 Subject: [PATCH 7/9] Fix --- lab-01/.idea/misc.xml | 6 - lab-01/.idea/uiDesigner.xml | 124 ------------------ lab-01/.idea/workspace.xml | 110 ---------------- lab-02/DocksAndHobos/.idea/.gitignore | 3 - .../.idea/libraries/json_simple_1_1.xml | 9 -- lab-02/DocksAndHobos/.idea/misc.xml | 6 - lab-02/DocksAndHobos/.idea/modules.xml | 8 -- lab-02/DocksAndHobos/.idea/uiDesigner.xml | 124 ------------------ lab-02/DocksAndHobos/.idea/vcs.xml | 6 - .../doks_and_hobos/Controller.class | Bin 2827 -> 0 bytes .../DaniilDomnin/doks_and_hobos/Docks.class | Bin 5204 -> 0 bytes .../by/DaniilDomnin/doks_and_hobos/Main.class | Bin 1920 -> 0 bytes .../by/DaniilDomnin/doks_and_hobos/Ship.class | Bin 728 -> 0 bytes .../doks_and_hobos/ShipGenerator.class | Bin 1193 -> 0 bytes 14 files changed, 396 deletions(-) delete mode 100644 lab-01/.idea/misc.xml delete mode 100644 lab-01/.idea/uiDesigner.xml delete mode 100644 lab-01/.idea/workspace.xml delete mode 100644 lab-02/DocksAndHobos/.idea/.gitignore delete mode 100644 lab-02/DocksAndHobos/.idea/libraries/json_simple_1_1.xml delete mode 100644 lab-02/DocksAndHobos/.idea/misc.xml delete mode 100644 lab-02/DocksAndHobos/.idea/modules.xml delete mode 100644 lab-02/DocksAndHobos/.idea/uiDesigner.xml delete mode 100644 lab-02/DocksAndHobos/.idea/vcs.xml delete mode 100644 lab-02/DocksAndHobos/out/production/DocksAndHobos/by/DaniilDomnin/doks_and_hobos/Controller.class delete mode 100644 lab-02/DocksAndHobos/out/production/DocksAndHobos/by/DaniilDomnin/doks_and_hobos/Docks.class delete mode 100644 lab-02/DocksAndHobos/out/production/DocksAndHobos/by/DaniilDomnin/doks_and_hobos/Main.class delete mode 100644 lab-02/DocksAndHobos/out/production/DocksAndHobos/by/DaniilDomnin/doks_and_hobos/Ship.class delete mode 100644 lab-02/DocksAndHobos/out/production/DocksAndHobos/by/DaniilDomnin/doks_and_hobos/ShipGenerator.class diff --git a/lab-01/.idea/misc.xml b/lab-01/.idea/misc.xml deleted file mode 100644 index 639900d..0000000 --- a/lab-01/.idea/misc.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/lab-01/.idea/uiDesigner.xml b/lab-01/.idea/uiDesigner.xml deleted file mode 100644 index 2b63946..0000000 --- a/lab-01/.idea/uiDesigner.xml +++ /dev/null @@ -1,124 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/lab-01/.idea/workspace.xml b/lab-01/.idea/workspace.xml deleted file mode 100644 index 40eee58..0000000 --- a/lab-01/.idea/workspace.xml +++ /dev/null @@ -1,110 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1665161880468 - - - - - - - - - - - file://$PROJECT_DIR$/src/by/DaniilDomnin/quizer/Main.java - 57 - - - - - \ No newline at end of file diff --git a/lab-02/DocksAndHobos/.idea/.gitignore b/lab-02/DocksAndHobos/.idea/.gitignore deleted file mode 100644 index 26d3352..0000000 --- a/lab-02/DocksAndHobos/.idea/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -# Default ignored files -/shelf/ -/workspace.xml diff --git a/lab-02/DocksAndHobos/.idea/libraries/json_simple_1_1.xml b/lab-02/DocksAndHobos/.idea/libraries/json_simple_1_1.xml deleted file mode 100644 index 8578a69..0000000 --- a/lab-02/DocksAndHobos/.idea/libraries/json_simple_1_1.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/lab-02/DocksAndHobos/.idea/misc.xml b/lab-02/DocksAndHobos/.idea/misc.xml deleted file mode 100644 index d15472f..0000000 --- a/lab-02/DocksAndHobos/.idea/misc.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/lab-02/DocksAndHobos/.idea/modules.xml b/lab-02/DocksAndHobos/.idea/modules.xml deleted file mode 100644 index 2682366..0000000 --- a/lab-02/DocksAndHobos/.idea/modules.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/lab-02/DocksAndHobos/.idea/uiDesigner.xml b/lab-02/DocksAndHobos/.idea/uiDesigner.xml deleted file mode 100644 index 2b63946..0000000 --- a/lab-02/DocksAndHobos/.idea/uiDesigner.xml +++ /dev/null @@ -1,124 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/lab-02/DocksAndHobos/.idea/vcs.xml b/lab-02/DocksAndHobos/.idea/vcs.xml deleted file mode 100644 index b2bdec2..0000000 --- a/lab-02/DocksAndHobos/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/lab-02/DocksAndHobos/out/production/DocksAndHobos/by/DaniilDomnin/doks_and_hobos/Controller.class b/lab-02/DocksAndHobos/out/production/DocksAndHobos/by/DaniilDomnin/doks_and_hobos/Controller.class deleted file mode 100644 index f0041e7f3c956628c0aa0e2f184bb2422bd500fb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2827 zcmbVOYgZFj6x|mH195mG^02;&k_2k3_F;|M@~8?8*b0L5g+p?Mk;zP)Oi=o=&wtR5 z?Pou`Rsol;)vo2ouKtkzinjYqQWBQ7p@o&)J9o}KXYYN^JvYDp@%U!|7x8Trb*MMc zU?PG>h4$Olx|MV+cO`js`L@mk3XSJ&*A6Z!)W_oU&1gcifvAanFcsp<8_5aFwQXm@ z%el6j%zA5uCCkk&t$NE|Avx~3f$uqv_7$2}w5xq9@Hju2uCZ};)y`l3+dd^xTTQf~ zU7@Y)#&%bh0z0P_)ResMG|?sRn{(E^r2@AXWOcuZ9vo1JWWCHPCN4}vc78KHM~x2E1FWW1Sg|-1Lq8+Oq|CBg^~YKNeX7!y_O177>dPf zu@%EqCluZknch;kRa2l!*{Am8{U4<4#h8h4Vc%xE8DHmEf1_^pvJN858vp8l7cDQF zxPnR1($Sin8e&r-@;gWym^Lwks|tfPR0_+Uhv&NMcvhC$E5vHj43&{ky?D>WwGe1l z?*b~BoilM=Ff?D!mz^6}P&ia+HFAu6znBkn_U(Haoeyl!HL$4AU$J2U$#LI#AH@xP zAeHu^LT`1Y@yK|0!(xojD=hAbMWxl$%2%mBOi^J9J?>@Mf7;Tvt7nS2W$n*NT!qfG zm$96A%eUpZyx0(|+B~SkwIWm%51VfgHUM#1k)qTTQamd=YS3|m^c;obwfu)!Q)rnD ztjyZ9l`q5Va;)5P)*7rFzrj=Ntz>hgD)jR*B|v7qqMy;1Y+>J4VQ^AFv!RW7UQh^p zD?hD+RWDm;YeYVZJMaw@Oav$@9INoN-F0tGC(|Jy?yzoI8D1M33j1=^Prp^Cy}YRu z;0muGM;8Xup0`%ar>Y3d20p91dS%zfxsAO3e=kcR|9x-uIWLDDw;X5I4s@y=jcpO! zlXJUa;uC3wk|IBt4YcJDGv9tD$LVtuwj3vO(&c?R?pTF_E*SWdseeYo=c!@f>s^O$ z7yq(wEWDC*ILe51Y&8*d%9YPqr(AL2$on`PdGCfJZ(5EG{6z2(cYVy+Q$9Cw97}9N zC5AU)B#v&PCD9YvL`Py|6Wxg?=v~}K|0V{W;PB$e;v*bgc#I)n8^h;}K4S|f6I*!s zA-&XLiQfrC`Q1d%&HRs|mB_k@tq(02_@JN{b=GR3~b?*?>KgR{{v2NB<8be zVUrks%<#fwdPI1HrlSiSTe>k}Kf25<{2gfm1E0#M+OmdUMh-oTa9yFj!3mO)Q*6#EV$=pNp}R0+|$3l()+Lsmo7 zH%1`wFmO+4(~g22We7XUwAV>d5|re8ogPG)t^^~@K0wR#6WmxF*~a_7Jfw+~M-#;? zaqi(0n7RlKapy0>yU%XQ80U4 YTgP2~O0!Qn`-1PHgmE8V;T!b*1qZ>?#{d8T diff --git a/lab-02/DocksAndHobos/out/production/DocksAndHobos/by/DaniilDomnin/doks_and_hobos/Docks.class b/lab-02/DocksAndHobos/out/production/DocksAndHobos/by/DaniilDomnin/doks_and_hobos/Docks.class deleted file mode 100644 index bb20ee4b37ee76237bed6df80ccccfc215389777..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5204 zcmb7IiGLL38GdFrn@J`Uh!KJzlruH zw$-*)deg(BYVDC8XlrX0gtpSVT3hXX+E#0;J^uiurO*5AWHSpeK%&$9wsON;tT6*RqSdH@siW4!EX>x>Jb0jOgXKC-W|i$6wjrAu$!VxbS>8}~AeGI#^q{5Z>t3A&;(BtHM<-sBoi)Ei0+w#SL?~K~A+fozDlxI2Lwld+7IJio`Ah?YLOSB_=M# zWg2EpbKaA6hcxK>tW4hCwukmxy5q$-l_X?1DVwe_aXGHwZdN+2VQxTBNH)p%ZXF$@ zZaRRFR5HSH+jg6HdY0?=@T-AjF{&#~T!pJO%;DCdhz3UUzCEsCNeK2cc9e~h^%Qoe zi4E9D?OLgnJw^#_Z0R{0F#;Ao&w%=J&FLSRu#=!V5`htO8?9j2(L?8Og za(2hCXIo?>mdn^SH>n_h%KR=9yK%h+Q|-#!+DeTP)>@%?+R9V!^ z)2ELAPc%yY+w-n#4Q6bD(Tkg;s=iUfyl@bu8Ny62-fZG6Qh8%J-}3w#+>E#Bc)N*r zNavzgNFNb98J1i!SY2*4@lMI}S~A=#1*XeQ+l+bz-Ys0-CTZF=15P?_FOyJF1hVeE zCfj%U51RN8K1{AVEw@*~+Ndfaw`z&+7H2kPS;pZA!&D?+8PbUJi|NK)l`T~b3pyNZ6snL*~u+@8>`p#sYq7#uUf=^i!|ET74A zJM%iUW665*WqMh!DC*8^ngP!4aa?M43F(`R{(d=EM`ho?I$a)m$a zz zLs9{hQ)k5TR|{1w&|s8gMtmeXuUI0eUFMe`92)f@{)z_)wY>Vv=XVbaamH4%R-{7}8erMwMcv{2K>3ntE zec2Jatw)8!71karlX%5h*kaRgf8IP_gdP(2AFv1k%?i6xVmlW3@%#Jogf)g#L0K})VvO*(n+BvxPD7F(ogI(86Jqx(u1lkLDgUn;+oTErteAe-)aCZ7ztEa~7 zqZlnE27&iSMyp z!M?-%{XTm&(GPELl?umrw4>=(x-)MMa`vIS(R3WWyU21Ll-hwUD+_qjEgEI;^yv<@ zklr{J;zGLA!k>2K&|+@7kmi1X$7nu6sD)0UE*>~}g6(QVP9mbc$S5LmyWyw!bW*i| zgY;(!(R7M%u6qP;RC=O_}ko6z`IW1J>jnE2%yClPWtCC;@WPDEq!$*Snw7+?E+R)> z;Fz2Q;+Tl|^Ao7;IgST+wI0EjAAN{3gjAimAGY1fz6;p9lEkcHg>Ea^u3~Eb7*DEo z^jBAd8NH4XFp4GdosATo<#8?D7d!|50BBdT!8ANzp$4790aK-ixu>$C7v{ET}= o@pHB27x*QgQqq3KzCYkk__Jy~hri%CyudMov;T&F;9qF`AIu^z0RR91 diff --git a/lab-02/DocksAndHobos/out/production/DocksAndHobos/by/DaniilDomnin/doks_and_hobos/Main.class b/lab-02/DocksAndHobos/out/production/DocksAndHobos/by/DaniilDomnin/doks_and_hobos/Main.class deleted file mode 100644 index bf66681238e0a6ec8e844d7b0f52ef5f482f0fc6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1920 zcmah~U31e$6g`_bu_86#-j<#W*BQpsnQ{^a!;a#o zv^0^_QO__~Q9!Be`_dJU1b2jQ;4H(Ly7HdNMoxz@VPZxDIL9!TE)F1+LSK4~e5S19 zSt-oo0>eaf8pHLTCB=^8<}*XCG5UNG^9+lxbzjv~V3+n~`+@L;&qGD%7a7h6B&ybVo7ZJ{P;K$&CgyNCg|~5qh-wJpZDlx< z9-LDVzQZs*$hoMzhKZ|qH-&4s&M@VYpv>Klh$>Jpu=4-&rDq_mN#%Y+Rl|d}2$HzL zFdN0~gwnO|`aVA>${;jx5n0XlO=2cpD8!_lv?0oqu!-Xl%xtOpv%tUy3}+o$_8Bqo zA;V0^a}{@}g4Licgk#`is$N8?flnz3()hxW!V80HU3I+Bz~_{N;Gy;jWlI>yQ|KTR z+&vbV$l(hOpE~l^o8X_GRH2~L`jR0tBCSp3g}!oK-K!gvNFy%(F$4o!R2M3GRkuN4 z;tuX>L=PA$>EejkCz>fg$~q!A9|PZJxHcmA4woK7VpBQPEi*;wiQP`CCj7^|=90uJ zsycVe+?RUa6DGoa889r5f}&$nH4?4pjQRAFq1)EKsHCSBq;RvRsHuTft*K!Q+P!x% z7{;24;d1fKSC!75>J>uy47pKwPZCX?r#qC8t&DPvIcH#XhSgEVgH|DY=Dp{2(GI2Z z==xQUuOAJl?Y+Jx2~K3co@Q@?M$>c1ln`7QaJB7)!uLDvP&j=XI<%xZeqHGKN(|{L z<+KZy@D5N@zyI`J;YMhS{_=z7p*g0tnMBm zM~3eYDQ^v}dxlx-qaooZv3J(`Y)H7)Uw3hPEpdc9m75ERtaZ09&sv-Pbr<*6CI(qA zM%mDJh5idP!Z$FF-)TVpjY|;|>v6XD29GG~3-}WyJSKJ)@CUv{nONDtZ}<-1W1Re! eQNa&LkT=5<{79t#L|z8ze#S4Tk<_967{q@heh*Oq diff --git a/lab-02/DocksAndHobos/out/production/DocksAndHobos/by/DaniilDomnin/doks_and_hobos/Ship.class b/lab-02/DocksAndHobos/out/production/DocksAndHobos/by/DaniilDomnin/doks_and_hobos/Ship.class deleted file mode 100644 index 69571f0b3148d92f4a2e3d9345f388858607b828..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 728 zcma)4+iKfD5IrO75-Wa99UG_z2qSDFBD_k@;zMP$UL592qfI=`zpN(8Oega^$yf1cu1^RX zsX9@qF3$)wkP3|mO>7gwR28#)V$?Dtw1&66M`fYS>@A_)8Qg`tV}g5-PnpylYLgwE zE|aYIq>_a#lc#DiR)v;x1-j*2uL!S)|Dl(=Mjx{BK%^a6WjmejT@i#$`_+vzp3Z== zkuYyCw=)o};V3^X((Jt!eRY}1zF5Ue9)-i#;PAuaq~x4ap$p1 T@zb_vf9=Pw{1BeojxYWIEtY!p diff --git a/lab-02/DocksAndHobos/out/production/DocksAndHobos/by/DaniilDomnin/doks_and_hobos/ShipGenerator.class b/lab-02/DocksAndHobos/out/production/DocksAndHobos/by/DaniilDomnin/doks_and_hobos/ShipGenerator.class deleted file mode 100644 index bfed9f835857477d3d662fe3e4fb661820b22f11..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1193 zcma)6ZBG+H5Pr7Ta_wmWAEtj&`?vd-&P`~(> zG=Y*xV*KonGR|IG1;vD1vO703`|R_~%-xTlU%vrZ$1?*lXgcC15*T7g@A41aZE#t4 z-&A+KTF5Z8CZq`088pk@Od*Ms4#UJSOoruZ$KBvkh{lHBltQ}O{`*#i%k9dJU-esV zc}MKM@}w8=&<_~KTJ&D2@jYG>VW-mM`wXn8Fh@*`D!{)pgjCTn6XTd*7_RZ4?pGvl zdM$=bDI(hrMZ6FDW=KkJKP>sO z&XBN*MZ0KV7IQkTnwZBmhKVysFvMHpqZgH|pun!1xPhAtx&kXms%pY26l{vk!ZKmQ zq1?Jh{)|vps11@CyZL7wrFU*nBU9tic`cgDjVLH){= z&Qbc`(?S%or@=aV1HjyWxSc6Q@iqIfo*GDoMaw=97owmATq;$6n%tWw3K?a;9n`#+ zBGP?o(sL@E#v@4|7ogEfUkh0=HRRDw;|zw|k-ZXSC2)uKyX5&qCx&RxI7eX4+#z&l z{ty?O>BJ$@UnrnqmDVgZ9&|+ Date: Sun, 4 Dec 2022 21:44:52 +0300 Subject: [PATCH 8/9] Add console logger --- lab-02/DocksAndHobos/.idea/.gitignore | 3 + .../.idea/libraries/json_simple_1_1.xml | 9 ++ lab-02/DocksAndHobos/.idea/misc.xml | 6 + lab-02/DocksAndHobos/.idea/modules.xml | 8 ++ lab-02/DocksAndHobos/.idea/uiDesigner.xml | 124 ++++++++++++++++++ lab-02/DocksAndHobos/.idea/vcs.xml | 6 + lab-02/DocksAndHobos/config.json | 4 +- .../doks_and_hobos/Controller.java | 12 ++ .../by/DaniilDomnin/doks_and_hobos/Docks.java | 8 +- 9 files changed, 177 insertions(+), 3 deletions(-) create mode 100644 lab-02/DocksAndHobos/.idea/.gitignore create mode 100644 lab-02/DocksAndHobos/.idea/libraries/json_simple_1_1.xml create mode 100644 lab-02/DocksAndHobos/.idea/misc.xml create mode 100644 lab-02/DocksAndHobos/.idea/modules.xml create mode 100644 lab-02/DocksAndHobos/.idea/uiDesigner.xml create mode 100644 lab-02/DocksAndHobos/.idea/vcs.xml diff --git a/lab-02/DocksAndHobos/.idea/.gitignore b/lab-02/DocksAndHobos/.idea/.gitignore new file mode 100644 index 0000000..26d3352 --- /dev/null +++ b/lab-02/DocksAndHobos/.idea/.gitignore @@ -0,0 +1,3 @@ +# Default ignored files +/shelf/ +/workspace.xml diff --git a/lab-02/DocksAndHobos/.idea/libraries/json_simple_1_1.xml b/lab-02/DocksAndHobos/.idea/libraries/json_simple_1_1.xml new file mode 100644 index 0000000..8578a69 --- /dev/null +++ b/lab-02/DocksAndHobos/.idea/libraries/json_simple_1_1.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/lab-02/DocksAndHobos/.idea/misc.xml b/lab-02/DocksAndHobos/.idea/misc.xml new file mode 100644 index 0000000..d15472f --- /dev/null +++ b/lab-02/DocksAndHobos/.idea/misc.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/lab-02/DocksAndHobos/.idea/modules.xml b/lab-02/DocksAndHobos/.idea/modules.xml new file mode 100644 index 0000000..2682366 --- /dev/null +++ b/lab-02/DocksAndHobos/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/lab-02/DocksAndHobos/.idea/uiDesigner.xml b/lab-02/DocksAndHobos/.idea/uiDesigner.xml new file mode 100644 index 0000000..2b63946 --- /dev/null +++ b/lab-02/DocksAndHobos/.idea/uiDesigner.xml @@ -0,0 +1,124 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/lab-02/DocksAndHobos/.idea/vcs.xml b/lab-02/DocksAndHobos/.idea/vcs.xml new file mode 100644 index 0000000..b2bdec2 --- /dev/null +++ b/lab-02/DocksAndHobos/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/lab-02/DocksAndHobos/config.json b/lab-02/DocksAndHobos/config.json index 52cbf87..35e3f96 100644 --- a/lab-02/DocksAndHobos/config.json +++ b/lab-02/DocksAndHobos/config.json @@ -1,9 +1,9 @@ { - "generating_time": 2, + "generating_time": 15, "ship_capacity_min": 20, "ship_capacity_max": 100, "max_ships": 4, - "unloading_speed": 1, + "unloading_speed": 7, "dock_capacity": 100, "hobos": 10, "stealing_time": 2, diff --git a/lab-02/DocksAndHobos/src/by/DaniilDomnin/doks_and_hobos/Controller.java b/lab-02/DocksAndHobos/src/by/DaniilDomnin/doks_and_hobos/Controller.java index 5401c30..bcfe8e5 100644 --- a/lab-02/DocksAndHobos/src/by/DaniilDomnin/doks_and_hobos/Controller.java +++ b/lab-02/DocksAndHobos/src/by/DaniilDomnin/doks_and_hobos/Controller.java @@ -3,6 +3,8 @@ import java.util.ArrayList; import java.util.Collections; import java.util.concurrent.atomic.AtomicInteger; +import java.util.logging.Level; +import java.util.logging.Logger; public class Controller { Controller(ShipGenerator generator, Docks docks, long generating_time, long max_ships) throws InterruptedException { @@ -11,6 +13,7 @@ public class Controller { this.max_ships = max_ships; this.docks = docks; ship_count = new AtomicInteger(); + consoleLOgger = Logger.getLogger(" "); Thread thread = new Thread(docks::StartStealing); thread.start(); Generating(); @@ -20,6 +23,7 @@ private void Generating() throws InterruptedException { while (true) { if (ship_count.get() < max_ships) { Ship ship = generator.GenerateShip(); + consoleLOgger.log(Level.INFO, "Generate new ship"); Thread thread = new Thread(()->{ try { Uploading(ship); @@ -29,6 +33,8 @@ private void Generating() throws InterruptedException { }); thread.start(); ship_count.incrementAndGet(); + } else { + consoleLOgger.log(Level.INFO, "The ship sank in the tunnel"); } Thread.sleep(generating_time * 1000); @@ -40,8 +46,14 @@ private void Uploading(Ship ship) throws InterruptedException { ship_count.decrementAndGet(); } + public static Logger GetConsoleLogger () { + return consoleLOgger; + } + private final ShipGenerator generator; + private static Logger consoleLOgger; + private final AtomicInteger ship_count; private final long generating_time; diff --git a/lab-02/DocksAndHobos/src/by/DaniilDomnin/doks_and_hobos/Docks.java b/lab-02/DocksAndHobos/src/by/DaniilDomnin/doks_and_hobos/Docks.java index 1e77a72..550dbd9 100644 --- a/lab-02/DocksAndHobos/src/by/DaniilDomnin/doks_and_hobos/Docks.java +++ b/lab-02/DocksAndHobos/src/by/DaniilDomnin/doks_and_hobos/Docks.java @@ -7,6 +7,7 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; +import java.util.logging.Level; public class Docks { Docks(long dock_capacity, long unloading_speed, ArrayList cargo_names, long hobos, ArrayList ingredients_count, long eating_time, long stealing_time) { @@ -29,11 +30,13 @@ public class Docks { } public void Unloading (Ship ship) throws InterruptedException { + long capacity = ship.GetCapacity(); while (ship.GetCapacity() != 0) { Thread.sleep(1000); cargo_count.put(ship.GetCargoName(), Math.min(cargo_count.get(ship.GetCargoName()) + Math.min(ship.GetCapacity(), unloading_speed), dock_capacity)); ship.SetCapacity(Math.max(0, ship.GetCapacity() - unloading_speed)); } + Controller.GetConsoleLogger().log(Level.INFO, "Unload " + capacity + " " + ship.GetCargoName()); } public void StartStealing () { @@ -57,11 +60,14 @@ private void Stealing () throws InterruptedException { if (index == -1) { continue; } + Controller.GetConsoleLogger().log(Level.INFO, "Hobo steals " + cargo_names.get(index)); cargo_count.put(cargo_names.get(index), cargo_count.get(cargo_names.get(index)) - 1); current_ingredients_count.set(index, current_ingredients_count.get(index) + 1); if (CanStartEating()) { - ClearCurrentIngredients();; + ClearCurrentIngredients(); + Controller.GetConsoleLogger().log(Level.INFO, "Hobos start eating"); Thread.sleep(eating_time * 1000); + Controller.GetConsoleLogger().log(Level.INFO, "Hobos finish eating"); } add_ingredient_mutex.unlock(); } From a38b4f451be1e240e86f7f121f88408f47d4d251 Mon Sep 17 00:00:00 2001 From: DaniilDomnin Date: Sun, 4 Dec 2022 21:48:12 +0300 Subject: [PATCH 9/9] Fix --- lab-02/DocksAndHobos/.idea/.gitignore | 3 - .../.idea/libraries/json_simple_1_1.xml | 9 -- lab-02/DocksAndHobos/.idea/misc.xml | 6 - lab-02/DocksAndHobos/.idea/modules.xml | 8 -- lab-02/DocksAndHobos/.idea/uiDesigner.xml | 124 ------------------ lab-02/DocksAndHobos/.idea/vcs.xml | 6 - 6 files changed, 156 deletions(-) delete mode 100644 lab-02/DocksAndHobos/.idea/.gitignore delete mode 100644 lab-02/DocksAndHobos/.idea/libraries/json_simple_1_1.xml delete mode 100644 lab-02/DocksAndHobos/.idea/misc.xml delete mode 100644 lab-02/DocksAndHobos/.idea/modules.xml delete mode 100644 lab-02/DocksAndHobos/.idea/uiDesigner.xml delete mode 100644 lab-02/DocksAndHobos/.idea/vcs.xml diff --git a/lab-02/DocksAndHobos/.idea/.gitignore b/lab-02/DocksAndHobos/.idea/.gitignore deleted file mode 100644 index 26d3352..0000000 --- a/lab-02/DocksAndHobos/.idea/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -# Default ignored files -/shelf/ -/workspace.xml diff --git a/lab-02/DocksAndHobos/.idea/libraries/json_simple_1_1.xml b/lab-02/DocksAndHobos/.idea/libraries/json_simple_1_1.xml deleted file mode 100644 index 8578a69..0000000 --- a/lab-02/DocksAndHobos/.idea/libraries/json_simple_1_1.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/lab-02/DocksAndHobos/.idea/misc.xml b/lab-02/DocksAndHobos/.idea/misc.xml deleted file mode 100644 index d15472f..0000000 --- a/lab-02/DocksAndHobos/.idea/misc.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/lab-02/DocksAndHobos/.idea/modules.xml b/lab-02/DocksAndHobos/.idea/modules.xml deleted file mode 100644 index 2682366..0000000 --- a/lab-02/DocksAndHobos/.idea/modules.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/lab-02/DocksAndHobos/.idea/uiDesigner.xml b/lab-02/DocksAndHobos/.idea/uiDesigner.xml deleted file mode 100644 index 2b63946..0000000 --- a/lab-02/DocksAndHobos/.idea/uiDesigner.xml +++ /dev/null @@ -1,124 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/lab-02/DocksAndHobos/.idea/vcs.xml b/lab-02/DocksAndHobos/.idea/vcs.xml deleted file mode 100644 index b2bdec2..0000000 --- a/lab-02/DocksAndHobos/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file