From 4d60f867d5430ad9b6e277b4ca365b67e875d9f0 Mon Sep 17 00:00:00 2001 From: ksilar Date: Mon, 24 Dec 2018 16:39:26 +0300 Subject: [PATCH 1/9] 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/9] =?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/9] =?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 ; - } + } From aca3cd138a7889b65643bd3aaf6a97c94e38f320 Mon Sep 17 00:00:00 2001 From: ksilerman Date: Wed, 26 Dec 2018 00:27:22 +0300 Subject: [PATCH 4/9] initial commit --- lesson2/arrayExceprion/main.java | 27 +++++++++++++++++++++++++++ lesson3/maps/main.java | 4 ++++ 2 files changed, 31 insertions(+) create mode 100644 lesson2/arrayExceprion/main.java create mode 100644 lesson3/maps/main.java diff --git a/lesson2/arrayExceprion/main.java b/lesson2/arrayExceprion/main.java new file mode 100644 index 0000000..3beca26 --- /dev/null +++ b/lesson2/arrayExceprion/main.java @@ -0,0 +1,27 @@ +package lesson2.arrayExceprion; + +import java.lang.reflect.Array; +import java.util.Arrays; + +public class main { + public static void main(String[] args) { + + String[] weekDays = {"1", "2", "3" , "4"}; + Arr(weekDays); + } + //int i=Integer.parseInt(s); + public static void Arr(String[] a){ + int[] pars = new int[a.length]; + int sum; + for (int i = 0; i < a.length; i++) { + pars[i] = Integer.parseInt(a[i]); + System.out.println(pars[i]); + } + sum = pars[0]+pars[1]+pars[2]+pars[3]; + System.out.println(sum); + } + + +} + + diff --git a/lesson3/maps/main.java b/lesson3/maps/main.java new file mode 100644 index 0000000..e87b861 --- /dev/null +++ b/lesson3/maps/main.java @@ -0,0 +1,4 @@ +package lesson3.maps; + +public class main { +} From 16f948482e7d2fe4b083c019ec426a44b9d82c33 Mon Sep 17 00:00:00 2001 From: ksilerman Date: Mon, 7 Jan 2019 16:53:30 +0300 Subject: [PATCH 5/9] 1 --- lesson3/maps/main.java | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/lesson3/maps/main.java b/lesson3/maps/main.java index e87b861..c909dd3 100644 --- a/lesson3/maps/main.java +++ b/lesson3/maps/main.java @@ -1,4 +1,32 @@ package lesson3.maps; +import java.util.*; + public class main { + public static void main(String[] args) { + + ArrayList al = new ArrayList<>(); + al.add("Яблоко"); al.add("Банан"); al.add("Апельсин"); al.add("Мандарин"); al.add("Яблоко"); al.add("Груша"); al.add("Ананас"); al.add("Банан"); al.add("Киви"); al.add("Абрикос"); + System.out.println(al); + System.out.println("Всего = " + al.size()); + + Set unic = new HashSet(al); + System.out.println(unic); + System.out.println("Всего = "+ unic.size()); + + HashMap wordToCount = new HashMap<>(); + for (String word : al) + { + if (!wordToCount.containsKey(word)) + { + wordToCount.put(word, 0); + } + wordToCount.put(word, wordToCount.get(word) + 1); + } + for (String word : wordToCount.keySet()) + { + System.out.println(word + " " + wordToCount.get(word)); + } + + } } From 3dbc48da21950043da452d751db0530c07bda594 Mon Sep 17 00:00:00 2001 From: ksilerman Date: Mon, 7 Jan 2019 19:08:22 +0300 Subject: [PATCH 6/9] 3 --- lesson3/maps/PhoneBook.java | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 lesson3/maps/PhoneBook.java diff --git a/lesson3/maps/PhoneBook.java b/lesson3/maps/PhoneBook.java new file mode 100644 index 0000000..a428175 --- /dev/null +++ b/lesson3/maps/PhoneBook.java @@ -0,0 +1,4 @@ +package lesson3.maps; + +public class PhoneBook { +} From 52bd9c4440f5b937cb479ec18f90db0ef2675c69 Mon Sep 17 00:00:00 2001 From: ksilerman Date: Mon, 7 Jan 2019 19:09:43 +0300 Subject: [PATCH 7/9] =?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 --- lesson3/maps/PhoneBook.java | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/lesson3/maps/PhoneBook.java b/lesson3/maps/PhoneBook.java index a428175..274d9da 100644 --- a/lesson3/maps/PhoneBook.java +++ b/lesson3/maps/PhoneBook.java @@ -1,4 +1,30 @@ package lesson3.maps; +import java.util.*; + public class PhoneBook { -} + private Map pb; + + public PhoneBook() { + pb = new TreeMap<>(); + } + + public void add(String name, String phone) { + pb.put(name, phone); + } + + List get(String name) { + List list = new ArrayList<>(); + for (Map.Entry entry : pb.entrySet()) + if (name.equals(entry.getValue())) + list.add(entry.getKey()); + return list; + } + + @Override + public String toString() { + return pb.toString(); + } + + +} \ No newline at end of file From b9a26462512de63bc3bed2a24a77abca0f2067a8 Mon Sep 17 00:00:00 2001 From: ksilerman Date: Mon, 7 Jan 2019 19:10:51 +0300 Subject: [PATCH 8/9] initial commit --- lesson3/maps/main.java | 28 +++++++++++++++++++++++++--- 1 file changed, 25 insertions(+), 3 deletions(-) diff --git a/lesson3/maps/main.java b/lesson3/maps/main.java index c909dd3..373bed4 100644 --- a/lesson3/maps/main.java +++ b/lesson3/maps/main.java @@ -1,19 +1,26 @@ +/** + * Java. level 2. Lesson 3. Example of homework + * autor Rudenko Alexander + * version date 07/01/2019 + * + */ package lesson3.maps; import java.util.*; public class main { public static void main(String[] args) { - +// 1 Часть задания ---------------------------------- ArrayList al = new ArrayList<>(); al.add("Яблоко"); al.add("Банан"); al.add("Апельсин"); al.add("Мандарин"); al.add("Яблоко"); al.add("Груша"); al.add("Ананас"); al.add("Банан"); al.add("Киви"); al.add("Абрикос"); System.out.println(al); - System.out.println("Всего = " + al.size()); + System.out.println("Всего элементов = " + al.size()); Set unic = new HashSet(al); System.out.println(unic); - System.out.println("Всего = "+ unic.size()); + System.out.println("Всего уникальных элементов = "+ unic.size()); + System.out.println("Подсчет уникальных элементов:"); HashMap wordToCount = new HashMap<>(); for (String word : al) { @@ -27,6 +34,21 @@ public static void main(String[] args) { { System.out.println(word + " " + wordToCount.get(word)); } +//------------------------------------------------------ + + // 2 Часть задания ---------- + System.out.println("\n" + "Записная книга:"); + + PhoneBook phoneBook = new PhoneBook(); + phoneBook.add("Саня", "863 233 3301"); + phoneBook.add("Вова", "863 212 1102"); + phoneBook.add("Леха", "863 243 1111"); + phoneBook.add("Жека", "863 240 2704"); + phoneBook.add("Витя", "863 248 2222"); + + System.out.println(phoneBook); + System.out.println(phoneBook.get("Вова")); + // -------------------------- } } From f2a5614e780d79ba80e8776eeb2795808dd288b2 Mon Sep 17 00:00:00 2001 From: ksilerman Date: Tue, 8 Jan 2019 21:30:48 +0300 Subject: [PATCH 9/9] initial commit --- lesson3/maps/PhoneBook.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lesson3/maps/PhoneBook.java b/lesson3/maps/PhoneBook.java index 274d9da..330bce9 100644 --- a/lesson3/maps/PhoneBook.java +++ b/lesson3/maps/PhoneBook.java @@ -16,8 +16,9 @@ public void add(String name, String phone) { List get(String name) { List list = new ArrayList<>(); for (Map.Entry entry : pb.entrySet()) - if (name.equals(entry.getValue())) - list.add(entry.getKey()); + if (name.equals(entry.getKey())) + list.add(entry.getKey()+ " " + entry.getValue()); + return list; }