From 4d60f867d5430ad9b6e277b4ca365b67e875d9f0 Mon Sep 17 00:00:00 2001 From: ksilar Date: Mon, 24 Dec 2018 16:39:26 +0300 Subject: [PATCH 1/3] obstracles --- lesson1.maraphon/Cource.java | 9 +++++---- lesson1.maraphon/MainCross.java | 2 +- lesson1.maraphon/Team.java | 15 ++++++++++++++- 3 files changed, 20 insertions(+), 6 deletions(-) diff --git a/lesson1.maraphon/Cource.java b/lesson1.maraphon/Cource.java index b30ff47..c75cae4 100644 --- a/lesson1.maraphon/Cource.java +++ b/lesson1.maraphon/Cource.java @@ -4,9 +4,10 @@ public class Cource { Obstracle[] c = {new Cross(80),new Wall(5),new Water(3)}; - public void doIt(){ - Cross(80); - Wall(5); - Water(3); + public void doIt(Team team){ + for (Competitor competitor : team.getCompetitors()) { + for (Obstracle obstracle : obstracles) + { if (competitor.isDistance()) + { obstracle.doIt(competitor); } } } } } } diff --git a/lesson1.maraphon/MainCross.java b/lesson1.maraphon/MainCross.java index 6275898..2b97a8f 100644 --- a/lesson1.maraphon/MainCross.java +++ b/lesson1.maraphon/MainCross.java @@ -5,7 +5,7 @@ public class MainCross { public static void main(String[] args) { Cource c = new Cource (); - Team comp = new Team (); + Team comp = new Team ("1" , {new Human("Bob"), new Cat("Vaska"),new Dog("Tuzik")}); c.doIt(comp); diff --git a/lesson1.maraphon/Team.java b/lesson1.maraphon/Team.java index 2dbf64b..11c9ab3 100644 --- a/lesson1.maraphon/Team.java +++ b/lesson1.maraphon/Team.java @@ -1,9 +1,22 @@ package lesson1.maraphon; public class Team { - Competitor[] comp = {new Human("Bob"), new Cat("Vaska"),new Dog("Tuzik")}; + private String name; + private Competitor[] competitors; + public Team (String name, Competitor[] competitors){ + this.name = name; + this.competitors = competitors; + } + + public String getName() { + return name; + } + + public Competitor[] getCompetitors() { + return competitors; + } } From 708ff692ec33361354d3eac05c14f415a2d0fb7e Mon Sep 17 00:00:00 2001 From: ksilar Date: Mon, 24 Dec 2018 17:21:30 +0300 Subject: [PATCH 2/3] =?UTF-8?q?=D0=B1=D0=B5=D0=B7=20=D0=B2=D1=8B=D0=B2?= =?UTF-8?q?=D0=BE=D0=B4=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lesson1.maraphon/Animal.java | 3 ++- lesson1.maraphon/Cource.java | 14 ++++++++++---- lesson1.maraphon/Human.java | 1 + lesson1.maraphon/MainCross.java | 4 +++- lesson1.maraphon/Team.java | 10 ++++++---- 5 files changed, 22 insertions(+), 10 deletions(-) diff --git a/lesson1.maraphon/Animal.java b/lesson1.maraphon/Animal.java index ace66bd..58de260 100644 --- a/lesson1.maraphon/Animal.java +++ b/lesson1.maraphon/Animal.java @@ -49,7 +49,7 @@ public void jump(int heigth) { } } - @Override + /* @Override public boolean isDistance() { return onDistance; } @@ -58,4 +58,5 @@ public boolean isDistance() { public void info() { System.out.println(type + " " +name+ " "+ onDistance); } + */ } diff --git a/lesson1.maraphon/Cource.java b/lesson1.maraphon/Cource.java index c75cae4..17a67fb 100644 --- a/lesson1.maraphon/Cource.java +++ b/lesson1.maraphon/Cource.java @@ -2,12 +2,18 @@ public class Cource { - Obstracle[] c = {new Cross(80),new Wall(5),new Water(3)}; + private Obstracle[] c = {new Cross(80),new Wall(5),new Water(3)}; public void doIt(Team team){ for (Competitor competitor : team.getCompetitors()) { - for (Obstracle obstracle : obstracles) - { if (competitor.isDistance()) - { obstracle.doIt(competitor); } } } } + for (Obstracle obstracle : c) + { + if (competitor.isDistance()) + { + obstracle.doIt(competitor); + } + } + } } } + diff --git a/lesson1.maraphon/Human.java b/lesson1.maraphon/Human.java index cd1f10b..58631a7 100644 --- a/lesson1.maraphon/Human.java +++ b/lesson1.maraphon/Human.java @@ -56,4 +56,5 @@ public boolean isDistance() { public void info() { System.out.println(name + " " + active); } + } diff --git a/lesson1.maraphon/MainCross.java b/lesson1.maraphon/MainCross.java index 2b97a8f..1411d87 100644 --- a/lesson1.maraphon/MainCross.java +++ b/lesson1.maraphon/MainCross.java @@ -5,10 +5,12 @@ public class MainCross { public static void main(String[] args) { Cource c = new Cource (); - Team comp = new Team ("1" , {new Human("Bob"), new Cat("Vaska"),new Dog("Tuzik")}); + Team comp = new Team ("1" , new Human("Bob"), new Cat("Vaska"), new Dog("Tuzik") ); c.doIt(comp); + + /* Competitor[] competitors = {new Human("Bob"), new Cat("Vaska"),new Dog("Tuzik")}; Obstracle[] obstracles = {new Cross(80),new Wall(5),new Water(3)}; for(Competitor c: competitors){ diff --git a/lesson1.maraphon/Team.java b/lesson1.maraphon/Team.java index 11c9ab3..9bcdcbe 100644 --- a/lesson1.maraphon/Team.java +++ b/lesson1.maraphon/Team.java @@ -5,18 +5,20 @@ public class Team { private String name; private Competitor[] competitors; - public Team (String name, Competitor[] competitors){ + public Team (String name, Competitor... competitors){ this.name = name; this.competitors = competitors; } - public String getName() { - return name; - } public Competitor[] getCompetitors() { return competitors; } + + public void showResult () { + System.out.println(name + " " + active); + return ; + } } From 084ef005920619633ef6f5d1f1dde3d3d4ee3be3 Mon Sep 17 00:00:00 2001 From: ksilerman Date: Mon, 24 Dec 2018 19:24:14 +0300 Subject: [PATCH 3/3] =?UTF-8?q?=D0=B2=D1=8B=D0=BF=D0=BE=D0=BB=D0=BD=D0=B5?= =?UTF-8?q?=D0=BD=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lesson1.maraphon/Animal.java | 4 ++-- lesson1.maraphon/Cource.java | 13 +++++++++---- lesson1.maraphon/Human.java | 3 +++ lesson1.maraphon/Team.java | 5 +---- 4 files changed, 15 insertions(+), 10 deletions(-) diff --git a/lesson1.maraphon/Animal.java b/lesson1.maraphon/Animal.java index 58de260..686aec1 100644 --- a/lesson1.maraphon/Animal.java +++ b/lesson1.maraphon/Animal.java @@ -49,7 +49,7 @@ public void jump(int heigth) { } } - /* @Override + @Override public boolean isDistance() { return onDistance; } @@ -58,5 +58,5 @@ public boolean isDistance() { public void info() { System.out.println(type + " " +name+ " "+ onDistance); } - */ + } diff --git a/lesson1.maraphon/Cource.java b/lesson1.maraphon/Cource.java index 17a67fb..46db634 100644 --- a/lesson1.maraphon/Cource.java +++ b/lesson1.maraphon/Cource.java @@ -5,15 +5,20 @@ public class Cource { private Obstracle[] c = {new Cross(80),new Wall(5),new Water(3)}; public void doIt(Team team){ + System.out.println("Команда: " + team); for (Competitor competitor : team.getCompetitors()) { - for (Obstracle obstracle : c) - { - if (competitor.isDistance()) - { + for (Obstracle obstracle : c) { + if (competitor.isDistance() == true) { + System.out.println(team.getCompetitors() + " успешно перепрыгнул"); obstracle.doIt(competitor); + } else { + System.out.println(team.getCompetitors() + " не получилось"); } } } + } + + } diff --git a/lesson1.maraphon/Human.java b/lesson1.maraphon/Human.java index 58631a7..a2f7e98 100644 --- a/lesson1.maraphon/Human.java +++ b/lesson1.maraphon/Human.java @@ -57,4 +57,7 @@ public void info() { System.out.println(name + " " + active); } + public String getName() { + return name; + } } diff --git a/lesson1.maraphon/Team.java b/lesson1.maraphon/Team.java index 9bcdcbe..67d5d65 100644 --- a/lesson1.maraphon/Team.java +++ b/lesson1.maraphon/Team.java @@ -15,10 +15,7 @@ public Competitor[] getCompetitors() { return competitors; } - public void showResult () { - System.out.println(name + " " + active); - return ; - } + }