From 8794cffdfef25ffc1179793071ba7b8954bd8c10 Mon Sep 17 00:00:00 2001 From: Elena Date: Thu, 2 Feb 2023 19:14:26 +0300 Subject: [PATCH 1/3] update ignore file and 1 file with OOP --- .gitignore | 1 - OOP/Children.class | Bin 0 -> 1321 bytes OOP/Family.class | Bin 0 -> 1414 bytes OOP/Father.class | Bin 0 -> 1002 bytes OOP/Human.class | Bin 0 -> 2289 bytes OOP/Mother.class | Bin 0 -> 1571 bytes 6 files changed, 1 deletion(-) create mode 100644 OOP/Children.class create mode 100644 OOP/Family.class create mode 100644 OOP/Father.class create mode 100644 OOP/Human.class create mode 100644 OOP/Mother.class diff --git a/.gitignore b/.gitignore index a1c2a23..3004d02 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,4 @@ # Compiled class file -*.class # Log file *.log diff --git a/OOP/Children.class b/OOP/Children.class new file mode 100644 index 0000000000000000000000000000000000000000..abb094b09ef4444ee8c415734357d0d022f13d2e GIT binary patch literal 1321 zcmZuxOHUI~6#g!KOgoII6;NJ+?{?Hy1)t@msF9>735NYh$9ANhA!Taf&UaiGAK9t469|*tyh%Te9q2Ix!hV1W^U5hDK-tnv5OETZL@N zv;~wIgKu|MAhtSKhBj$fFXMu?Q8ZO-L`=aZ4b5l~Xj)D;X1IBBDH(RwDGCJQiPPcX z?PSki6m4i%(4nCdT>=}Hqb9D+x~6n@%C105je+H)#>w4f1*TCHPO$q0G{ zI{pXy;Z>^F8CLNY1x~ENbB%VcRSbJG;$%&M^%=`H&zFmr%+f{UQh}CO#+fn-lSavs z=ejZI<}LQSDYJ4C(qwAn7$QcgM9#FcQia6LG|Cu8-x8l$oPpqcQ0iJNmr782QB}uC1%0qF_>OEqekFf<$(2l3*#xwGMjuc+d?FFMV|IeXsE=XuX_^6HQDd@#v80&RRJgL4g+a zLal{WNv+YxlDDA45ICe(R8>{HpVhLr$nF(YQA?_GxaOt?8aI}`hV7Ut5v#bv~)aXGMsAj~k;CShkz zn>r2&9Ps9eN2$i8$kbGoATH|oK)_H%Z;?*FQ21I9ZIBv1Br^|cVAf7g=d7%bFbDp@ ztkg@Y|3b%cf#zBtV!S~`pX)dwuwVT~F~zW253Ap4qVsBOZz{~ zrZcIdliU8PHr2Yf;1{R1X9SM;ZL8F3U9JARxsGnSwcg#gw!x6v5H)ZX=LGiUEqB_b4ynDT!N%EVy8OmyXkDFfVJ^xMa6lGOY z(Z-Cg?`?Zc?PPCCZAp`6-t6PpzPR1aUZRHW@lD_tW{HJY2?+kqVAZ%8rmBkI9e9I63N{BOys=>V2|5&?UP{=;@NZ zCG>TdaPdqD{Y89U!T{Nacd+$f5A}Qui9c}yf1wXgFo>sw=oukf!q-^FB#O9;6{N80 ubLgw##8*gAuB3f};soViMH1i8Q2OX;d`o%tRI3Bu(N}={cPP3J-@gU~p{)i0 literal 0 HcmV?d00001 diff --git a/OOP/Father.class b/OOP/Father.class new file mode 100644 index 0000000000000000000000000000000000000000..db23c76f24c1cc92b54a8fb61b10f07ac2dfb157 GIT binary patch literal 1002 zcma))eQVQD6vm(1rs&twljW7KGlY$n<24S6aR6#-R+So?Y1k!Xc@Ixu+ z1pn{@_@Tt--j+?479=G1+>>*D=iKMq-+zAo0?@)E3pwPAFl-cH3Y0pX!{**}EF%H) zc@PC@OQ2rg_ddxJ*$ibgYgjq!W(gr#04u|iB=ZcLAt_rO5&!LqpQ$=pt*iw<# zM@w)5-v6C2%g=fmJprQ~4|vFRFNpku>G;@Bj^uGjPsNM-GVIADQ2V*lNJqg$!1gZW z+7ZahArr(te|(hVAUy4+GMzGRZFY?ICdkxf;)@K+nxjJs`N!9oP;XXY>(XAHFu=`tqXx@Pr~&MG zCoSD8V7iaLW8y6C_gM!(fHxAfjTuW4#N6<6195zD#EdPmm#B`npKV%^2PIjgDn o)Xn{djW29vCW%Qm@Ihl#StaaD27&tvlby@S{e{U7bcu(50jd(Xp#T5? literal 0 HcmV?d00001 diff --git a/OOP/Human.class b/OOP/Human.class new file mode 100644 index 0000000000000000000000000000000000000000..363c1f28290bb9e796f9850f36ec21f2f0de43d9 GIT binary patch literal 2289 zcmZ`)T~ixn6n-}3qe+(pLZB^(rnP7i0@2!53lybTN|X|uI5><~3v83^gv3cUIK9)3 zKfyoXl{a2g#sF5S_q|&FP{-%&Zu7a!z`pOEJ6{X)(&Y~EgO~nx?Yt} z<0>ZPQ?R60_w{;&rmGU_H3g|uevod^;>0|q;vL}$@6{@``nqP=RPU;I4@sNdT#@K` z#Jp(SQ1L!)Du|VIbFJqHiBx(}Lm(fh_)s9Dgsk_SBaKW5vnsNf>q&9(S;N#1C|heX z(c=!WQOj*HH6|0JYX^&$kW-*rzgsQqAM2HM#Pwy;I^rMSPR@U_UY!4Y{@iLUBxm-M zbZMPGpHEu9(d}RU|81Sot(CO?<0AND8qcg#+rL4_Uj<;D65W`O;A7kh;S&|Nafc`A z6f0jf^^#s!5IWQaYN zpWZecrKPvaC`4PA&`6_P`>_`lY`7QEw^vpWDb||xJ$=oPj798QJTK)!lI`r{cnI*x zYtEfdZlS&MTH7lxtiAG9agFkymlCWfcNO~kxh66vP%=|3gfiI{hBI?5jQ&Zx5BK?; zAOhs~Qz49Dazr@>VjN09#=+xre8D#|*>NcLP9l)#5;8O}#9aU@uJR7Qh$Yseoal(g zZQ@Zr;}jjEWWp9qISa=7l0>+S_ya&x3`d2g=a{QcV;Z9~i zHgk;WB|fe{=3{2_2&wpd@C?44p{Y}RRNV1ri#vh2;xX=i*U5x48y-?|4G~r$#u#Ur k!Om>Ry44EsS65~fCm3$vG2`&jdm5YE4bfU)3_fiA4{7L<^Z)<= literal 0 HcmV?d00001 diff --git a/OOP/Mother.class b/OOP/Mother.class new file mode 100644 index 0000000000000000000000000000000000000000..65b19df3d4162f68a96cf72c564e80f214f0f96c GIT binary patch literal 1571 zcma)6T~8B16g>lNm)3<=6cj(8Dkv1Set%FzrO`lAgam^RJ`L^I4s3VG?vzNP59+Hw zz@MQ;#rUA_K9xUYytCW1#WseA-MMr3-gC~qcV>V8`SBCL9Oe_~L9c~~jVNLa@#W=} z>_V-|U541KbfunSn3-HGZ18QKb+}v3u4+%Z<=jC$Q)_YbA#NdI;}C3ygn?gDx*|N{ z5~W&^YpIB9uoKQG8!)nx48z?N81%y!v~a}6Q4BGp+C=X7T2vW&RZTMth3HacS4g|2 z3Iwm_2B`zbY#hf3!?7yg6nW*6o@Y{5$nrIJwa;*VvQyerrz?SzIA!6qjZus-90{cC zCuFd;482434s}CaV<>bhw3F>1o+*Nhq!+?n$$6 zI3v0usbag(no^Eh$jg+#7U{zaUX{+ys^+>zaRU{;O(!8=kxt1IR8+jE9OW%=NyCkm zgCp zb??pI+r9T`THe)vQHK{@S9p1c`@Zlk(1o4osJL4p79KE+{y&rk8CH!n-Q*s+F^t}H zm&u9-PntYu$kOHqLTf5>^5UhD$SzoBB>ENBC-U{+EWHQNOK*udHju<7&e3iz%)vM& zXh+#Nj|+rotVv=qj44c!WpY!PuhfSsdklOM}W?<*%nHD%WV)Zs9yi5d&qL^lVQaJhk%rPUM{&3u9N zk&Li2vB3E1nS2X`bPH|R|Dc} XxK3*yd2Y}%gIU@o$hwF7c!-g|A>?VD literal 0 HcmV?d00001 From 7b06cc5ef531d86cd0bf36c31583a5baf8dc67a0 Mon Sep 17 00:00:00 2001 From: Elena Date: Thu, 2 Feb 2023 20:44:45 +0300 Subject: [PATCH 2/3] added true oop dz --- Human.java | 125 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 125 insertions(+) create mode 100644 Human.java diff --git a/Human.java b/Human.java new file mode 100644 index 0000000..b5ac5ed --- /dev/null +++ b/Human.java @@ -0,0 +1,125 @@ +package Family; + +class Human{ + private int age; + private String gender; + private String familyStatus; + private String havingChildren; + private String colorHair; + + Human(int age, String familyStatus, String havingChildren) { + this.age = age; + this.familyStatus = familyStatus; + this.havingChildren = havingChildren; + } + + Human(int age, String gender) { + this.age = age; + this.gender = gender; + } + + Human(int age, String familyStatus, String havingChildren, String colorHair) { + this(age,familyStatus, havingChildren); + this.colorHair = colorHair; + + } + + public int getAge() {return age;} + public String getGender() {return gender;} + public String getFamilyStatus() {return familyStatus;} + public String getHavingChildren() {return havingChildren;} + public String getColorHair() {return colorHair;} + public void setAge(int age) {this.age = age;} + public void setGender(String gender) {this.gender = gender;} + public void setFamilyStatus(String familyStatus) {this.familyStatus = familyStatus;} + public void setHavingChildren(String havingChildren) {this.havingChildren = havingChildren;} + public void setColorHair(String colorHair) {this.colorHair = colorHair;} + void showFamilyStatus() { + int age = getAge(); + String status = getFamilyStatus(); + String ch = getHavingChildren(); + System.out.printf("Человек в возрасте: %d лет. Семейное положение: %s. Дети: %s", age, status, ch); + } +} + +class Father extends Human { + Father(int age, String familyStatus, String colorEye, String havingChildren, String havingBrothersAndSisters) { + super(age, familyStatus, havingChildren); + setColorEye(colorEye); + setHavingBrothersAndSisters(havingBrothersAndSisters); + } + private String colorEye; + private String havingBrothersAndSisters; + + public void setColorEye(String colorEye) {this.colorEye = colorEye;} + public void setHavingBrothersAndSisters(String havingBrothersAndSisters) {this.havingBrothersAndSisters = havingBrothersAndSisters;} + + public String getColorEye() {return colorEye;} + public String getHavingBrothersAndSisters() {return havingBrothersAndSisters;} +} + +class Mother extends Human { + Mother(int age, String familyStatus, String havingChildren, String colorHair, String education){ + super(age, familyStatus, havingChildren, colorHair); + this.education = education; + } + Mother(int age, String gender) { + super(age, gender); + } + private String education; + + public void setEducation(String education) {this.education = education;} + public String getEducation() {return education;} + + void voice(String name) { + System.out.println(name + " иди есть суп"); + } + +} + +class Children extends Mother { + Children(String name, int age, String gender, String parents) { + super(age, gender); + this.parents = parents; + this.name = name; + } + private String parents; + private String name; + int hunger() { + return (int)(Math.random() * 9); + } + void goEat() { + System.out.println("Ест..."); + int food = (int)(Math.random() * 3); + int hunger = hunger() - food; + int trueLevelFood = 5; + if (hunger == trueLevelFood) + System.out.println("Ребенок больше не голоден"); + else if (hunger < trueLevelFood) { + goEat(); + } + else { + System.out.println("Ребенок переел"); + } + } + public void setParents(String parents) {this.parents = parents;} + public String getParents() {return parents;} + +} + + +class Family { + public static void main(String[] args) { + Father father = new Father(45, "не женат", "голубые глаза", "1 ребенок", "нет сестер"); + Mother mother = new Mother(34, "не замужем", "1 ребенок", "рыжые волосы", "высшее"); + Children children1 = new Children("Степан", 12, "мужской", "Лев и Марина"); + Children children2 = new Children("Дмитрий", 18, "мужской", "Леонид и Марина"); + + mother.setHavingChildren("2 ребенка"); + + mother.voice("Степан,"); + children1.goEat(); + father.showFamilyStatus(); + } + +} \ No newline at end of file From 32f906735c64443b2ed2ef02c9046ee844f8028d Mon Sep 17 00:00:00 2001 From: Elena Date: Thu, 2 Feb 2023 20:48:11 +0300 Subject: [PATCH 3/3] delete useless files --- OOP/Children.class | Bin 1321 -> 0 bytes OOP/Family.class | Bin 1414 -> 0 bytes OOP/Father.class | Bin 1002 -> 0 bytes OOP/Human.class | Bin 2289 -> 0 bytes OOP/Mother.class | Bin 1571 -> 0 bytes 5 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 OOP/Children.class delete mode 100644 OOP/Family.class delete mode 100644 OOP/Father.class delete mode 100644 OOP/Human.class delete mode 100644 OOP/Mother.class diff --git a/OOP/Children.class b/OOP/Children.class deleted file mode 100644 index abb094b09ef4444ee8c415734357d0d022f13d2e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1321 zcmZuxOHUI~6#g!KOgoII6;NJ+?{?Hy1)t@msF9>735NYh$9ANhA!Taf&UaiGAK9t469|*tyh%Te9q2Ix!hV1W^U5hDK-tnv5OETZL@N zv;~wIgKu|MAhtSKhBj$fFXMu?Q8ZO-L`=aZ4b5l~Xj)D;X1IBBDH(RwDGCJQiPPcX z?PSki6m4i%(4nCdT>=}Hqb9D+x~6n@%C105je+H)#>w4f1*TCHPO$q0G{ zI{pXy;Z>^F8CLNY1x~ENbB%VcRSbJG;$%&M^%=`H&zFmr%+f{UQh}CO#+fn-lSavs z=ejZI<}LQSDYJ4C(qwAn7$QcgM9#FcQia6LG|Cu8-x8l$oPpqcQ0iJNmr782QB}uC1%0qF_>OEqekFf<$(2l3*#xwGMjuc+d?FFMV|IeXsE=XuX_^6HQDd@#v80&RRJgL4g+a zLal{WNv+YxlDDA45ICe(R8>{HpVhLr$nF(YQA?_GxaOt?8aI}`hV7Ut5v#bv~)aXGMsAj~k;CShkz zn>r2&9Ps9eN2$i8$kbGoATH|oK)_H%Z;?*FQ21I9ZIBv1Br^|cVAf7g=d7%bFbDp@ ztkg@Y|3b%cf#zBtV!S~`pX)dwuwVT~F~zW253Ap4qVsBOZz{~ zrZcIdliU8PHr2Yf;1{R1X9SM;ZL8F3U9JARxsGnSwcg#gw!x6v5H)ZX=LGiUEqB_b4ynDT!N%EVy8OmyXkDFfVJ^xMa6lGOY z(Z-Cg?`?Zc?PPCCZAp`6-t6PpzPR1aUZRHW@lD_tW{HJY2?+kqVAZ%8rmBkI9e9I63N{BOys=>V2|5&?UP{=;@NZ zCG>TdaPdqD{Y89U!T{Nacd+$f5A}Qui9c}yf1wXgFo>sw=oukf!q-^FB#O9;6{N80 ubLgw##8*gAuB3f};soViMH1i8Q2OX;d`o%tRI3Bu(N}={cPP3J-@gU~p{)i0 diff --git a/OOP/Father.class b/OOP/Father.class deleted file mode 100644 index db23c76f24c1cc92b54a8fb61b10f07ac2dfb157..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1002 zcma))eQVQD6vm(1rs&twljW7KGlY$n<24S6aR6#-R+So?Y1k!Xc@Ixu+ z1pn{@_@Tt--j+?479=G1+>>*D=iKMq-+zAo0?@)E3pwPAFl-cH3Y0pX!{**}EF%H) zc@PC@OQ2rg_ddxJ*$ibgYgjq!W(gr#04u|iB=ZcLAt_rO5&!LqpQ$=pt*iw<# zM@w)5-v6C2%g=fmJprQ~4|vFRFNpku>G;@Bj^uGjPsNM-GVIADQ2V*lNJqg$!1gZW z+7ZahArr(te|(hVAUy4+GMzGRZFY?ICdkxf;)@K+nxjJs`N!9oP;XXY>(XAHFu=`tqXx@Pr~&MG zCoSD8V7iaLW8y6C_gM!(fHxAfjTuW4#N6<6195zD#EdPmm#B`npKV%^2PIjgDn o)Xn{djW29vCW%Qm@Ihl#StaaD27&tvlby@S{e{U7bcu(50jd(Xp#T5? diff --git a/OOP/Human.class b/OOP/Human.class deleted file mode 100644 index 363c1f28290bb9e796f9850f36ec21f2f0de43d9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2289 zcmZ`)T~ixn6n-}3qe+(pLZB^(rnP7i0@2!53lybTN|X|uI5><~3v83^gv3cUIK9)3 zKfyoXl{a2g#sF5S_q|&FP{-%&Zu7a!z`pOEJ6{X)(&Y~EgO~nx?Yt} z<0>ZPQ?R60_w{;&rmGU_H3g|uevod^;>0|q;vL}$@6{@``nqP=RPU;I4@sNdT#@K` z#Jp(SQ1L!)Du|VIbFJqHiBx(}Lm(fh_)s9Dgsk_SBaKW5vnsNf>q&9(S;N#1C|heX z(c=!WQOj*HH6|0JYX^&$kW-*rzgsQqAM2HM#Pwy;I^rMSPR@U_UY!4Y{@iLUBxm-M zbZMPGpHEu9(d}RU|81Sot(CO?<0AND8qcg#+rL4_Uj<;D65W`O;A7kh;S&|Nafc`A z6f0jf^^#s!5IWQaYN zpWZecrKPvaC`4PA&`6_P`>_`lY`7QEw^vpWDb||xJ$=oPj798QJTK)!lI`r{cnI*x zYtEfdZlS&MTH7lxtiAG9agFkymlCWfcNO~kxh66vP%=|3gfiI{hBI?5jQ&Zx5BK?; zAOhs~Qz49Dazr@>VjN09#=+xre8D#|*>NcLP9l)#5;8O}#9aU@uJR7Qh$Yseoal(g zZQ@Zr;}jjEWWp9qISa=7l0>+S_ya&x3`d2g=a{QcV;Z9~i zHgk;WB|fe{=3{2_2&wpd@C?44p{Y}RRNV1ri#vh2;xX=i*U5x48y-?|4G~r$#u#Ur k!Om>Ry44EsS65~fCm3$vG2`&jdm5YE4bfU)3_fiA4{7L<^Z)<= diff --git a/OOP/Mother.class b/OOP/Mother.class deleted file mode 100644 index 65b19df3d4162f68a96cf72c564e80f214f0f96c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1571 zcma)6T~8B16g>lNm)3<=6cj(8Dkv1Set%FzrO`lAgam^RJ`L^I4s3VG?vzNP59+Hw zz@MQ;#rUA_K9xUYytCW1#WseA-MMr3-gC~qcV>V8`SBCL9Oe_~L9c~~jVNLa@#W=} z>_V-|U541KbfunSn3-HGZ18QKb+}v3u4+%Z<=jC$Q)_YbA#NdI;}C3ygn?gDx*|N{ z5~W&^YpIB9uoKQG8!)nx48z?N81%y!v~a}6Q4BGp+C=X7T2vW&RZTMth3HacS4g|2 z3Iwm_2B`zbY#hf3!?7yg6nW*6o@Y{5$nrIJwa;*VvQyerrz?SzIA!6qjZus-90{cC zCuFd;482434s}CaV<>bhw3F>1o+*Nhq!+?n$$6 zI3v0usbag(no^Eh$jg+#7U{zaUX{+ys^+>zaRU{;O(!8=kxt1IR8+jE9OW%=NyCkm zgCp zb??pI+r9T`THe)vQHK{@S9p1c`@Zlk(1o4osJL4p79KE+{y&rk8CH!n-Q*s+F^t}H zm&u9-PntYu$kOHqLTf5>^5UhD$SzoBB>ENBC-U{+EWHQNOK*udHju<7&e3iz%)vM& zXh+#Nj|+rotVv=qj44c!WpY!PuhfSsdklOM}W?<*%nHD%WV)Zs9yi5d&qL^lVQaJhk%rPUM{&3u9N zk&Li2vB3E1nS2X`bPH|R|Dc} XxK3*yd2Y}%gIU@o$hwF7c!-g|A>?VD