From c83ea1ad61193ef9be9186712bea46daa57c98bf Mon Sep 17 00:00:00 2001 From: Rita Date: Tue, 17 Dec 2024 21:40:44 +0300 Subject: [PATCH 01/15] ? --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index eac996208..5f0e3f722 100644 --- a/build.gradle +++ b/build.gradle @@ -8,7 +8,7 @@ version '1.0-SNAPSHOT' java { toolchain { - languageVersion = JavaLanguageVersion.of(21) + languageVersion = JavaLanguageVersion.of(23) } } From 2810432fcfd20af590f49724ed316a18ff854a73 Mon Sep 17 00:00:00 2001 From: Rita Date: Wed, 25 Dec 2024 16:12:16 +0300 Subject: [PATCH 02/15] =?UTF-8?q?=D0=B3=D0=BE=D1=82=D0=BE=D0=B2=D0=BE=3F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 5f0e3f722..eac996208 100644 --- a/build.gradle +++ b/build.gradle @@ -8,7 +8,7 @@ version '1.0-SNAPSHOT' java { toolchain { - languageVersion = JavaLanguageVersion.of(23) + languageVersion = JavaLanguageVersion.of(21) } } From 49b2ea7dd74b26c23754c87e52f021478242c65d Mon Sep 17 00:00:00 2001 From: Rita Date: Tue, 14 Jan 2025 16:02:23 +0300 Subject: [PATCH 03/15] =?UTF-8?q?=D0=BF=D1=80=D0=BE=D0=B1=D1=83=D0=B5?= =?UTF-8?q?=D0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../intensive/chapter3/task13/Task13.java | 30 +++++++++++++++++-- 1 file changed, 27 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/walking/intensive/chapter3/task13/Task13.java b/src/main/java/com/walking/intensive/chapter3/task13/Task13.java index 9b2e0520c..25aec2b67 100644 --- a/src/main/java/com/walking/intensive/chapter3/task13/Task13.java +++ b/src/main/java/com/walking/intensive/chapter3/task13/Task13.java @@ -1,5 +1,9 @@ package com.walking.intensive.chapter3.task13; +import java.util.Scanner; + +import static java.lang.Integer.parseInt; + /** * Ваша задача - с помощью лейки полить все растения в саду. * Всего в саду N растений. Они расположены в ряд и слева направо помечены @@ -49,11 +53,31 @@ */ public class Task13 { public static void main(String[] args) { -// Для собственных проверок можете делать любые изменения в этом методе + + Scanner in = new Scanner(System.in); + System.out.print("Введите объём лейки: "); + int wateringCanVolume = in.nextInt(); + System.out.println("Введите через пробел количество воды, необходимое для полива каждого растения: "); + String plantsWatering = in.nextLine(); + + String[] plantsWater = plantsWatering.split(" "); + int[] plants = new int [plantsWater.length]; + for (int i = 0; i < plants.length; i++) { + plants[i] = parseInt(plantsWater[i]); + } + + System.out.println(getStepsCount(plants, wateringCanVolume)); } static int getStepsCount(int[] plants, int wateringCanVolume) { - // Ваш код - return 0; + if (plants.length == 0) { + return 0; + } + + if (wateringCanVolume < 1) { + return -1; + } + + } } From b3d21f05ce1f3987e3602583ef7fdcd3ca80019f Mon Sep 17 00:00:00 2001 From: Rita Date: Tue, 14 Jan 2025 16:17:53 +0300 Subject: [PATCH 04/15] =?UTF-8?q?=D0=BF=D1=80=D0=BE=D0=B1=D1=83=D0=B5?= =?UTF-8?q?=D0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../intensive/chapter3/task13/Task13.java | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/walking/intensive/chapter3/task13/Task13.java b/src/main/java/com/walking/intensive/chapter3/task13/Task13.java index 25aec2b67..03a3e941e 100644 --- a/src/main/java/com/walking/intensive/chapter3/task13/Task13.java +++ b/src/main/java/com/walking/intensive/chapter3/task13/Task13.java @@ -61,7 +61,7 @@ public static void main(String[] args) { String plantsWatering = in.nextLine(); String[] plantsWater = plantsWatering.split(" "); - int[] plants = new int [plantsWater.length]; + int[] plants = new int[plantsWater.length]; for (int i = 0; i < plants.length; i++) { plants[i] = parseInt(plantsWater[i]); } @@ -78,6 +78,21 @@ static int getStepsCount(int[] plants, int wateringCanVolume) { return -1; } + int stepsCount = 0; + int leftover = wateringCanVolume; + for (int i = 0; i < plants.length; i++) { + if (plants[i] < 1 || plants[i] > wateringCanVolume) { + return -1; + } + + if (leftover >= plants[i]) { + stepsCount += 1; + leftover -= plants[i]; + } + + stepsCount += i * 2 + 1; + } + return stepsCount; } } From 2e19034666c01c00557d02838a2790f90f3e7c2a Mon Sep 17 00:00:00 2001 From: Rita Date: Tue, 14 Jan 2025 16:20:55 +0300 Subject: [PATCH 05/15] =?UTF-8?q?=D0=BF=D1=80=D0=BE=D0=B1=D1=83=D0=B5?= =?UTF-8?q?=D0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/walking/intensive/chapter3/task13/Task13.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/walking/intensive/chapter3/task13/Task13.java b/src/main/java/com/walking/intensive/chapter3/task13/Task13.java index 03a3e941e..3a1c3a255 100644 --- a/src/main/java/com/walking/intensive/chapter3/task13/Task13.java +++ b/src/main/java/com/walking/intensive/chapter3/task13/Task13.java @@ -57,8 +57,9 @@ public static void main(String[] args) { Scanner in = new Scanner(System.in); System.out.print("Введите объём лейки: "); int wateringCanVolume = in.nextInt(); - System.out.println("Введите через пробел количество воды, необходимое для полива каждого растения: "); + System.out.print("Введите через пробел количество воды, необходимое для полива каждого растения: "); String plantsWatering = in.nextLine(); + in.close(); String[] plantsWater = plantsWatering.split(" "); int[] plants = new int[plantsWater.length]; From 28ad38646470626a6ef7df8bf991b112ed192c95 Mon Sep 17 00:00:00 2001 From: Rita Date: Tue, 14 Jan 2025 16:33:31 +0300 Subject: [PATCH 06/15] =?UTF-8?q?=D0=BF=D1=80=D0=BE=D0=B1=D1=83=D0=B5?= =?UTF-8?q?=D0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/walking/intensive/chapter3/task13/Task13.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/com/walking/intensive/chapter3/task13/Task13.java b/src/main/java/com/walking/intensive/chapter3/task13/Task13.java index 3a1c3a255..c3c758648 100644 --- a/src/main/java/com/walking/intensive/chapter3/task13/Task13.java +++ b/src/main/java/com/walking/intensive/chapter3/task13/Task13.java @@ -53,7 +53,6 @@ */ public class Task13 { public static void main(String[] args) { - Scanner in = new Scanner(System.in); System.out.print("Введите объём лейки: "); int wateringCanVolume = in.nextInt(); From c9be95185d72197a740d20c3bb2371367c78692d Mon Sep 17 00:00:00 2001 From: Rita Date: Tue, 14 Jan 2025 16:37:12 +0300 Subject: [PATCH 07/15] =?UTF-8?q?=D0=BF=D1=80=D0=BE=D0=B1=D1=83=D0=B5?= =?UTF-8?q?=D0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/walking/intensive/chapter3/task13/Task13.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/com/walking/intensive/chapter3/task13/Task13.java b/src/main/java/com/walking/intensive/chapter3/task13/Task13.java index c3c758648..3a1c3a255 100644 --- a/src/main/java/com/walking/intensive/chapter3/task13/Task13.java +++ b/src/main/java/com/walking/intensive/chapter3/task13/Task13.java @@ -53,6 +53,7 @@ */ public class Task13 { public static void main(String[] args) { + Scanner in = new Scanner(System.in); System.out.print("Введите объём лейки: "); int wateringCanVolume = in.nextInt(); From b597da9fed4decce50825e3064fb9e5762777511 Mon Sep 17 00:00:00 2001 From: Rita Date: Tue, 14 Jan 2025 16:38:31 +0300 Subject: [PATCH 08/15] =?UTF-8?q?=D0=BF=D1=80=D0=BE=D0=B1=D1=83=D0=B5?= =?UTF-8?q?=D0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/walking/intensive/chapter3/task13/Task13.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/com/walking/intensive/chapter3/task13/Task13.java b/src/main/java/com/walking/intensive/chapter3/task13/Task13.java index 3a1c3a255..f35db46e4 100644 --- a/src/main/java/com/walking/intensive/chapter3/task13/Task13.java +++ b/src/main/java/com/walking/intensive/chapter3/task13/Task13.java @@ -92,6 +92,7 @@ static int getStepsCount(int[] plants, int wateringCanVolume) { } stepsCount += i * 2 + 1; + leftover = wateringCanVolume; } return stepsCount; From e03bd194e51972afdcfa2c034f7c6b147bb9f495 Mon Sep 17 00:00:00 2001 From: Rita Date: Tue, 14 Jan 2025 16:41:11 +0300 Subject: [PATCH 09/15] =?UTF-8?q?=D0=BF=D1=80=D0=BE=D0=B1=D1=83=D0=B5?= =?UTF-8?q?=D0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/walking/intensive/chapter3/task13/Task13.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/walking/intensive/chapter3/task13/Task13.java b/src/main/java/com/walking/intensive/chapter3/task13/Task13.java index f35db46e4..908de6024 100644 --- a/src/main/java/com/walking/intensive/chapter3/task13/Task13.java +++ b/src/main/java/com/walking/intensive/chapter3/task13/Task13.java @@ -89,10 +89,11 @@ static int getStepsCount(int[] plants, int wateringCanVolume) { if (leftover >= plants[i]) { stepsCount += 1; leftover -= plants[i]; + } else { + stepsCount += i * 2 + 1; + leftover = wateringCanVolume; } - - stepsCount += i * 2 + 1; - leftover = wateringCanVolume; + } return stepsCount; From e10d5e7d020132bb176bcb5bbe442d8e900f3df9 Mon Sep 17 00:00:00 2001 From: Rita Date: Tue, 14 Jan 2025 16:45:51 +0300 Subject: [PATCH 10/15] =?UTF-8?q?=D0=BF=D1=80=D0=BE=D0=B1=D1=83=D0=B5?= =?UTF-8?q?=D0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/walking/intensive/chapter3/task13/Task13.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/walking/intensive/chapter3/task13/Task13.java b/src/main/java/com/walking/intensive/chapter3/task13/Task13.java index 908de6024..46f4b2997 100644 --- a/src/main/java/com/walking/intensive/chapter3/task13/Task13.java +++ b/src/main/java/com/walking/intensive/chapter3/task13/Task13.java @@ -91,9 +91,9 @@ static int getStepsCount(int[] plants, int wateringCanVolume) { leftover -= plants[i]; } else { stepsCount += i * 2 + 1; - leftover = wateringCanVolume; + leftover = wateringCanVolume - plants[i]; } - + } return stepsCount; From 6d16e3f6d4ba0f70f05b90b22fb75d704b090564 Mon Sep 17 00:00:00 2001 From: Rita Date: Tue, 14 Jan 2025 16:50:51 +0300 Subject: [PATCH 11/15] =?UTF-8?q?=D0=BF=D1=80=D0=BE=D0=B1=D1=83=D0=B5?= =?UTF-8?q?=D0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/walking/intensive/chapter3/task13/Task13.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/walking/intensive/chapter3/task13/Task13.java b/src/main/java/com/walking/intensive/chapter3/task13/Task13.java index 46f4b2997..a43b86966 100644 --- a/src/main/java/com/walking/intensive/chapter3/task13/Task13.java +++ b/src/main/java/com/walking/intensive/chapter3/task13/Task13.java @@ -55,9 +55,9 @@ public class Task13 { public static void main(String[] args) { Scanner in = new Scanner(System.in); - System.out.print("Введите объём лейки: "); + System.out.println("Введите объём лейки: "); int wateringCanVolume = in.nextInt(); - System.out.print("Введите через пробел количество воды, необходимое для полива каждого растения: "); + System.out.println("Введите через пробел количество воды, необходимое для полива каждого растения: "); String plantsWatering = in.nextLine(); in.close(); From 5bf0c5cd5eef622bd0d3f89e125ce9e5bb6d8c7c Mon Sep 17 00:00:00 2001 From: Rita Date: Tue, 14 Jan 2025 16:57:24 +0300 Subject: [PATCH 12/15] =?UTF-8?q?=D0=BF=D1=80=D0=BE=D0=B1=D1=83=D0=B5?= =?UTF-8?q?=D0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/walking/intensive/chapter3/task13/Task13.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/com/walking/intensive/chapter3/task13/Task13.java b/src/main/java/com/walking/intensive/chapter3/task13/Task13.java index a43b86966..89ba05a1f 100644 --- a/src/main/java/com/walking/intensive/chapter3/task13/Task13.java +++ b/src/main/java/com/walking/intensive/chapter3/task13/Task13.java @@ -57,6 +57,7 @@ public static void main(String[] args) { Scanner in = new Scanner(System.in); System.out.println("Введите объём лейки: "); int wateringCanVolume = in.nextInt(); + System.out.println("Введите через пробел количество воды, необходимое для полива каждого растения: "); String plantsWatering = in.nextLine(); in.close(); From 73f9f5c65269e7b8d1ab8bfcb35f59efcce83662 Mon Sep 17 00:00:00 2001 From: Rita Date: Tue, 14 Jan 2025 17:05:31 +0300 Subject: [PATCH 13/15] =?UTF-8?q?=D0=BF=D1=80=D0=BE=D0=B1=D1=83=D0=B5?= =?UTF-8?q?=D0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/walking/intensive/chapter3/task13/Task13.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/walking/intensive/chapter3/task13/Task13.java b/src/main/java/com/walking/intensive/chapter3/task13/Task13.java index 89ba05a1f..a516f09b6 100644 --- a/src/main/java/com/walking/intensive/chapter3/task13/Task13.java +++ b/src/main/java/com/walking/intensive/chapter3/task13/Task13.java @@ -55,11 +55,10 @@ public class Task13 { public static void main(String[] args) { Scanner in = new Scanner(System.in); - System.out.println("Введите объём лейки: "); - int wateringCanVolume = in.nextInt(); - System.out.println("Введите через пробел количество воды, необходимое для полива каждого растения: "); String plantsWatering = in.nextLine(); + System.out.println("Введите объём лейки: "); + int wateringCanVolume = in.nextInt(); in.close(); String[] plantsWater = plantsWatering.split(" "); From fa55cfb730de2964d47978d2f868375756006fd4 Mon Sep 17 00:00:00 2001 From: Rita Date: Wed, 5 Feb 2025 12:07:45 +0300 Subject: [PATCH 14/15] =?UTF-8?q?=D0=B8=D1=81=D0=BF=D1=80=D0=B0=D0=B2?= =?UTF-8?q?=D0=B8=D0=BB=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../walking/intensive/chapter3/task13/Task13.java | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/walking/intensive/chapter3/task13/Task13.java b/src/main/java/com/walking/intensive/chapter3/task13/Task13.java index a516f09b6..580af8074 100644 --- a/src/main/java/com/walking/intensive/chapter3/task13/Task13.java +++ b/src/main/java/com/walking/intensive/chapter3/task13/Task13.java @@ -82,20 +82,23 @@ static int getStepsCount(int[] plants, int wateringCanVolume) { int stepsCount = 0; int leftover = wateringCanVolume; for (int i = 0; i < plants.length; i++) { - if (plants[i] < 1 || plants[i] > wateringCanVolume) { + if (!isValid(plants[i], wateringCanVolume)) { return -1; } - if (leftover >= plants[i]) { - stepsCount += 1; - leftover -= plants[i]; - } else { - stepsCount += i * 2 + 1; + if (leftover < plants[i]) { + stepsCount += i * 2; leftover = wateringCanVolume - plants[i]; } + stepsCount += 1; + leftover -= plants[i]; } return stepsCount; } + + static boolean isValid (int plant, int wateringCanVolume) { + return plant >= 1 && plant <= wateringCanVolume; + } } From 08a917e28947ad862ddc05a7aba17527718069c6 Mon Sep 17 00:00:00 2001 From: Rita Date: Tue, 18 Feb 2025 10:45:52 +0300 Subject: [PATCH 15/15] =?UTF-8?q?=D0=B3=D0=BE=D1=82=D0=BE=D0=B2=D0=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../intensive/chapter3/task13/Task13.java | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/walking/intensive/chapter3/task13/Task13.java b/src/main/java/com/walking/intensive/chapter3/task13/Task13.java index 580af8074..a0d44ed04 100644 --- a/src/main/java/com/walking/intensive/chapter3/task13/Task13.java +++ b/src/main/java/com/walking/intensive/chapter3/task13/Task13.java @@ -79,26 +79,27 @@ static int getStepsCount(int[] plants, int wateringCanVolume) { return -1; } - int stepsCount = 0; - int leftover = wateringCanVolume; - for (int i = 0; i < plants.length; i++) { - if (!isValid(plants[i], wateringCanVolume)) { + for (int plant : plants) { + if (!isValid(plant, wateringCanVolume)) { return -1; } + } + int stepsCount = 0; + int leftover = wateringCanVolume; + for (int i = 0; i < plants.length; i++) { if (leftover < plants[i]) { stepsCount += i * 2; leftover = wateringCanVolume - plants[i]; } - stepsCount += 1; - leftover -= plants[i]; - + stepsCount += 1; + leftover -= plants[i]; } return stepsCount; } - static boolean isValid (int plant, int wateringCanVolume) { + static boolean isValid(int plant, int wateringCanVolume) { return plant >= 1 && plant <= wateringCanVolume; } }