From 31566a16bfdf13b0ff76a47664a704eca9376ed3 Mon Sep 17 00:00:00 2001 From: 1sleepwalker1 Date: 2022年11月30日 20:48:14 +0300 Subject: [PATCH 1/6] =?UTF-8?q?=D0=9F=D1=80=D0=BE=D0=B1=D0=BB=D0=B5=D0=BC?= =?UTF-8?q?=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/Calculator.java | 23 ++++++++++++++ src/main/java/Main.java | 54 +++++++++++++++++++++++++++++++-- src/main/java/added.java | 11 +++++++ src/main/java/rubleOptions.java | 13 ++++++++ 4 files changed, 98 insertions(+), 3 deletions(-) create mode 100644 src/main/java/Calculator.java create mode 100644 src/main/java/added.java create mode 100644 src/main/java/rubleOptions.java diff --git a/src/main/java/Calculator.java b/src/main/java/Calculator.java new file mode 100644 index 0000000..c328391 --- /dev/null +++ b/src/main/java/Calculator.java @@ -0,0 +1,23 @@ + +class Calculator { + + + static String cart = "Добавленные товары "; // название продукта в корзине + double totalPrice = 0; // Общая стоимость товара + double devideSum; + int numberPeople; // количество людей + + void calcul(added added) { + totalPrice = totalPrice + added.prise; + cart = cart + "\n" + added.product; + System.out.println(added.product + "в корзине"); + devideSum = totalPrice / numberPeople; + } + + Calculator(int numberPeople) { + this.numberPeople = numberPeople; + } +} + + + diff --git a/src/main/java/Main.java b/src/main/java/Main.java index a9198c4..21ef5ce 100644 --- a/src/main/java/Main.java +++ b/src/main/java/Main.java @@ -1,8 +1,56 @@ +import java.util.Scanner; + public class Main { public static void main(String[] args) { + Scanner scanner = new Scanner(System.in); + + int numberPeople; // количество людей + + while (true) { + System.out.println("На скольких человек необходимо разделить счёт"); + numberPeople = scanner.nextInt(); + + if (numberPeople> 1) { + break; + } else if (numberPeople == 1) { //Если пользователь вводит 1 + System.out.println("Это некорректное значение для подсчёта, повторите ввод"); + } + + } + + System.out.println("Сейчас все сделаем"); + Calculator Calculator = new Calculator(numberPeople); + + double prise; + while (true) { + System.out.println("Введите название продукта"); + String product = scanner.next(); + + System.out.println("Введитестоимость в формате: 'рубли.копейки' [10.45, 11.40"); + prise = scanner.nextDouble(); + + Calculator.calcul(new added(product, prise)); + System.out.println("Хотите добавить ещё один товар? Введите команду завершить, для прекращения ввода. Для продлежния введите любое слово или символ"); + String answer = scanner.next(); + if (answer.equalsIgnoreCase("Завершить")) { + break; + } + } + + rubleOptions rubleOptions = new rubleOptions(); + added added = new added(); + + System.out.println(Calculator.cart + "\n" + "К оплате с человека " + Calculator.devideSum + rubleOptions.rubles(added)); + } + } + + + + + + // ваш код начнется здесь // вы не должны ограничиваться только классом Main и можете создавать свои классы по необходимости - System.out.println("Привет Мир"); - } -} + + diff --git a/src/main/java/added.java b/src/main/java/added.java new file mode 100644 index 0000000..59fd262 --- /dev/null +++ b/src/main/java/added.java @@ -0,0 +1,11 @@ +class added { + + String product; + double prise; + + added(String product,double prise) { + this.product = product; + this.prise = prise; + } + +} diff --git a/src/main/java/rubleOptions.java b/src/main/java/rubleOptions.java new file mode 100644 index 0000000..f9cdb89 --- /dev/null +++ b/src/main/java/rubleOptions.java @@ -0,0 +1,13 @@ +public class rubleOptions { + + String rubles(added added) { + double rubles = added.prise; + if (rubles == 1) { + return " рубль"; + } else if (rubles>= 2 && rubles <= 4) { + return " рубля"; + } else + return " рублей"; + } + } + From 6893df25b5b45478c465af29ad49e4f14481aa98 Mon Sep 17 00:00:00 2001 From: 1sleepwalker1 Date: Fri, 2 Dec 2022 23:46:37 +0300 Subject: [PATCH 2/6] =?UTF-8?q?=D0=A0=D0=B0=D0=B1=D0=BE=D1=82=D0=B0=20?= =?UTF-8?q?=D0=BF=D0=BE=D0=BB=D0=BD=D0=B0=D1=8F=20=D1=81=D1=82=D1=80=D0=B0?= =?UTF-8?q?=D0=B4=D0=B0=D0=BD=D0=B8=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/Calculator.java | 3 ++- src/main/java/Main.java | 13 +++++++------ src/main/java/rubleOptions.java | 6 ++++-- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/src/main/java/Calculator.java b/src/main/java/Calculator.java index c328391..04be9fd 100644 --- a/src/main/java/Calculator.java +++ b/src/main/java/Calculator.java @@ -10,8 +10,9 @@ class Calculator { void calcul(added added) { totalPrice = totalPrice + added.prise; cart = cart + "\n" + added.product; - System.out.println(added.product + "в корзине"); + System.out.println(added.product + " - в корзине"); devideSum = totalPrice / numberPeople; + } Calculator(int numberPeople) { diff --git a/src/main/java/Main.java b/src/main/java/Main.java index 21ef5ce..d44c105 100644 --- a/src/main/java/Main.java +++ b/src/main/java/Main.java @@ -1,3 +1,4 @@ +import java.text.DecimalFormat; import java.util.Scanner; public class Main { @@ -13,7 +14,7 @@ public static void main(String[] args) { if (numberPeople> 1) { break; - } else if (numberPeople == 1) { //Если пользователь вводит 1 + } else if (numberPeople <= 1) { //Если пользователь вводит 1 System.out.println("Это некорректное значение для подсчёта, повторите ввод"); } @@ -27,7 +28,7 @@ public static void main(String[] args) { System.out.println("Введите название продукта"); String product = scanner.next(); - System.out.println("Введитестоимость в формате: 'рубли.копейки' [10.45, 11.40"); + System.out.println("Введитестоимость в формате: 'рубли.копейки' 10.45, 11.40"); prise = scanner.nextDouble(); Calculator.calcul(new added(product, prise)); @@ -38,10 +39,10 @@ public static void main(String[] args) { } } - rubleOptions rubleOptions = new rubleOptions(); - added added = new added(); - - System.out.println(Calculator.cart + "\n" + "К оплате с человека " + Calculator.devideSum + rubleOptions.rubles(added)); + rubleOptions RubleOptions = new rubleOptions(); + double value = Calculator.devideSum; + String result = String.format("%.2f",value); + System.out.println(Calculator.cart + "\n" + "К оплате с человека " + result + RubleOptions.rubles(prise)); } } diff --git a/src/main/java/rubleOptions.java b/src/main/java/rubleOptions.java index f9cdb89..a4856cb 100644 --- a/src/main/java/rubleOptions.java +++ b/src/main/java/rubleOptions.java @@ -1,7 +1,8 @@ public class rubleOptions { - String rubles(added added) { - double rubles = added.prise; + + String rubles(double prise) { + double rubles = prise; if (rubles == 1) { return " рубль"; } else if (rubles>= 2 && rubles <= 4) { @@ -9,5 +10,6 @@ String rubles(added added) { } else return " рублей"; } + } From 574a740943b4af045d604032d52735f1ccab22a1 Mon Sep 17 00:00:00 2001 From: 1sleepwalker1 Date: 2022年12月10日 01:16:14 +0300 Subject: [PATCH 3/6] =?UTF-8?q?=D0=A0=D0=B0=D0=B1=D0=BE=D1=82=D0=B0=202?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/Calculator.java | 6 +++--- src/main/java/Main.java | 17 ++++++++++------- src/main/java/rubleOptions.java | 14 +++++++++----- 3 files changed, 22 insertions(+), 15 deletions(-) diff --git a/src/main/java/Calculator.java b/src/main/java/Calculator.java index 04be9fd..28888ed 100644 --- a/src/main/java/Calculator.java +++ b/src/main/java/Calculator.java @@ -2,10 +2,10 @@ class Calculator { - static String cart = "Добавленные товары "; // название продукта в корзине - double totalPrice = 0; // Общая стоимость товара + static String cart = "Добавленные товары "; + double totalPrice = 0; double devideSum; - int numberPeople; // количество людей + int numberPeople; void calcul(added added) { totalPrice = totalPrice + added.prise; diff --git a/src/main/java/Main.java b/src/main/java/Main.java index d44c105..e34faf6 100644 --- a/src/main/java/Main.java +++ b/src/main/java/Main.java @@ -1,4 +1,3 @@ -import java.text.DecimalFormat; import java.util.Scanner; public class Main { @@ -6,7 +5,7 @@ public class Main { public static void main(String[] args) { Scanner scanner = new Scanner(System.in); - int numberPeople; // количество людей + int numberPeople; while (true) { System.out.println("На скольких человек необходимо разделить счёт"); @@ -14,7 +13,7 @@ public static void main(String[] args) { if (numberPeople> 1) { break; - } else if (numberPeople <= 1) { //Если пользователь вводит 1 + } else if (numberPeople <= 1) { System.out.println("Это некорректное значение для подсчёта, повторите ввод"); } @@ -27,9 +26,9 @@ public static void main(String[] args) { while (true) { System.out.println("Введите название продукта"); String product = scanner.next(); - - System.out.println("Введитестоимость в формате: 'рубли.копейки' 10.45, 11.40"); - prise = scanner.nextDouble(); + try { + System.out.println("Введите стоимость в формате: 'рубли.копейки' 10.45, 11.40"); + prise = scanner.nextDouble(); Calculator.calcul(new added(product, prise)); System.out.println("Хотите добавить ещё один товар? Введите команду завершить, для прекращения ввода. Для продлежния введите любое слово или символ"); @@ -37,14 +36,18 @@ public static void main(String[] args) { if (answer.equalsIgnoreCase("Завершить")) { break; } + } catch(Exception e) { + System.out.println(e.getMessage()); + } } rubleOptions RubleOptions = new rubleOptions(); double value = Calculator.devideSum; String result = String.format("%.2f",value); - System.out.println(Calculator.cart + "\n" + "К оплате с человека " + result + RubleOptions.rubles(prise)); + System.out.println(Calculator.cart + "\n" + "К оплате с человека " + result + RubleOptions.rubles(value)); } } + // Привет, не могу исправить заглавную букву класса, выдает ошибку. Такое ощущение, что андроид студио логает. diff --git a/src/main/java/rubleOptions.java b/src/main/java/rubleOptions.java index a4856cb..00c87d9 100644 --- a/src/main/java/rubleOptions.java +++ b/src/main/java/rubleOptions.java @@ -1,15 +1,19 @@ public class rubleOptions { - String rubles(double prise) { - double rubles = prise; + String rubles(double value) { + double rubles = Math.floor(value); if (rubles == 1) { return " рубль"; - } else if (rubles>= 2 && rubles <= 4) { + } else if (rubles == 12 || rubles == 13 || rubles == 14 ) { + return " рублей"; + } else if (rubles%10>= 2 && rubles%10 <= 4) { + return " рубля"; + } else if (rubles%100>= 2 && rubles%100 <= 4) { return " рубля"; - } else + } else { return " рублей"; } - } +} From 891424e61789a4809cb742aa67218bdf770ff8c0 Mon Sep 17 00:00:00 2001 From: 1sleepwalker1 Date: 2022年12月10日 01:16:14 +0300 Subject: [PATCH 4/6] =?UTF-8?q?=D0=A0=D0=B0=D0=B1=D0=BE=D1=82=D0=B0=202?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/Calculator.java | 6 +++--- src/main/java/Main.java | 17 ++++++++++------- src/main/java/rubleOptions.java | 14 +++++++++----- 3 files changed, 22 insertions(+), 15 deletions(-) diff --git a/src/main/java/Calculator.java b/src/main/java/Calculator.java index 04be9fd..28888ed 100644 --- a/src/main/java/Calculator.java +++ b/src/main/java/Calculator.java @@ -2,10 +2,10 @@ class Calculator { - static String cart = "Добавленные товары "; // название продукта в корзине - double totalPrice = 0; // Общая стоимость товара + static String cart = "Добавленные товары "; + double totalPrice = 0; double devideSum; - int numberPeople; // количество людей + int numberPeople; void calcul(added added) { totalPrice = totalPrice + added.prise; diff --git a/src/main/java/Main.java b/src/main/java/Main.java index d44c105..e34faf6 100644 --- a/src/main/java/Main.java +++ b/src/main/java/Main.java @@ -1,4 +1,3 @@ -import java.text.DecimalFormat; import java.util.Scanner; public class Main { @@ -6,7 +5,7 @@ public class Main { public static void main(String[] args) { Scanner scanner = new Scanner(System.in); - int numberPeople; // количество людей + int numberPeople; while (true) { System.out.println("На скольких человек необходимо разделить счёт"); @@ -14,7 +13,7 @@ public static void main(String[] args) { if (numberPeople> 1) { break; - } else if (numberPeople <= 1) { //Если пользователь вводит 1 + } else if (numberPeople <= 1) { System.out.println("Это некорректное значение для подсчёта, повторите ввод"); } @@ -27,9 +26,9 @@ public static void main(String[] args) { while (true) { System.out.println("Введите название продукта"); String product = scanner.next(); - - System.out.println("Введитестоимость в формате: 'рубли.копейки' 10.45, 11.40"); - prise = scanner.nextDouble(); + try { + System.out.println("Введите стоимость в формате: 'рубли.копейки' 10.45, 11.40"); + prise = scanner.nextDouble(); Calculator.calcul(new added(product, prise)); System.out.println("Хотите добавить ещё один товар? Введите команду завершить, для прекращения ввода. Для продлежния введите любое слово или символ"); @@ -37,14 +36,18 @@ public static void main(String[] args) { if (answer.equalsIgnoreCase("Завершить")) { break; } + } catch(Exception e) { + System.out.println(e.getMessage()); + } } rubleOptions RubleOptions = new rubleOptions(); double value = Calculator.devideSum; String result = String.format("%.2f",value); - System.out.println(Calculator.cart + "\n" + "К оплате с человека " + result + RubleOptions.rubles(prise)); + System.out.println(Calculator.cart + "\n" + "К оплате с человека " + result + RubleOptions.rubles(value)); } } + // Привет, не могу исправить заглавную букву класса, выдает ошибку. Такое ощущение, что андроид студио логает. diff --git a/src/main/java/rubleOptions.java b/src/main/java/rubleOptions.java index a4856cb..00c87d9 100644 --- a/src/main/java/rubleOptions.java +++ b/src/main/java/rubleOptions.java @@ -1,15 +1,19 @@ public class rubleOptions { - String rubles(double prise) { - double rubles = prise; + String rubles(double value) { + double rubles = Math.floor(value); if (rubles == 1) { return " рубль"; - } else if (rubles>= 2 && rubles <= 4) { + } else if (rubles == 12 || rubles == 13 || rubles == 14 ) { + return " рублей"; + } else if (rubles%10>= 2 && rubles%10 <= 4) { + return " рубля"; + } else if (rubles%100>= 2 && rubles%100 <= 4) { return " рубля"; - } else + } else { return " рублей"; } - } +} From cd186a179c7dc6ebb3b6813b30cde5bc7318d963 Mon Sep 17 00:00:00 2001 From: 1sleepwalker1 Date: 2022年12月10日 01:24:13 +0300 Subject: [PATCH 5/6] =?UTF-8?q?=D0=A0=D0=B0=D0=B1=D0=BE=D1=82=D0=B0=202?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/.gitignore | 3 + .idea/codeStyles/Project.xml | 123 +++++++++++++++++++++++++++ .idea/codeStyles/codeStyleConfig.xml | 5 ++ .idea/compiler.xml | 6 ++ .idea/gradle.xml | 18 ++++ .idea/misc.xml | 10 +++ .idea/vcs.xml | 6 ++ 7 files changed, 171 insertions(+) create mode 100644 .idea/.gitignore create mode 100644 .idea/codeStyles/Project.xml create mode 100644 .idea/codeStyles/codeStyleConfig.xml create mode 100644 .idea/compiler.xml create mode 100644 .idea/gradle.xml create mode 100644 .idea/misc.xml create mode 100644 .idea/vcs.xml diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..26d3352 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,3 @@ +# Default ignored files +/shelf/ +/workspace.xml diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml new file mode 100644 index 0000000..7643783 --- /dev/null +++ b/.idea/codeStyles/Project.xml @@ -0,0 +1,123 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml new file mode 100644 index 0000000..79ee123 --- /dev/null +++ b/.idea/codeStyles/codeStyleConfig.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..61a9130 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml new file mode 100644 index 0000000..6cec569 --- /dev/null +++ b/.idea/gradle.xml @@ -0,0 +1,18 @@ + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..a47d29e --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,10 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..35eb1dd --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + +
    + + \ No newline at end of file From 3f97e8cbd5bdb65eb0982b4a2bdd072d97e6e964 Mon Sep 17 00:00:00 2001 From: 1sleepwalker1 Date: 2022年12月12日 01:58:11 +0300 Subject: [PATCH 6/6] =?UTF-8?q?=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=B0=203+?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/.gitignore | 3 - .idea/codeStyles/Project.xml | 123 --------------------------- .idea/codeStyles/codeStyleConfig.xml | 5 -- .idea/compiler.xml | 6 -- .idea/gradle.xml | 18 ---- .idea/misc.xml | 10 --- .idea/vcs.xml | 6 -- src/main/java/Calculator.java | 2 +- src/main/java/Main.java | 7 +- src/main/java/added.java | 1 + src/main/java/rubleOptions.java | 12 ++- 11 files changed, 13 insertions(+), 180 deletions(-) delete mode 100644 .idea/.gitignore delete mode 100644 .idea/codeStyles/Project.xml delete mode 100644 .idea/codeStyles/codeStyleConfig.xml delete mode 100644 .idea/compiler.xml delete mode 100644 .idea/gradle.xml delete mode 100644 .idea/misc.xml delete mode 100644 .idea/vcs.xml diff --git a/.idea/.gitignore b/.idea/.gitignore deleted file mode 100644 index 26d3352..0000000 --- a/.idea/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -# Default ignored files -/shelf/ -/workspace.xml diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml deleted file mode 100644 index 7643783..0000000 --- a/.idea/codeStyles/Project.xml +++ /dev/null @@ -1,123 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml deleted file mode 100644 index 79ee123..0000000 --- a/.idea/codeStyles/codeStyleConfig.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml deleted file mode 100644 index 61a9130..0000000 --- a/.idea/compiler.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml deleted file mode 100644 index 6cec569..0000000 --- a/.idea/gradle.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index a47d29e..0000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 35eb1dd..0000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - -
      - - \ No newline at end of file diff --git a/src/main/java/Calculator.java b/src/main/java/Calculator.java index 28888ed..88aea3a 100644 --- a/src/main/java/Calculator.java +++ b/src/main/java/Calculator.java @@ -19,6 +19,6 @@ void calcul(added added) { this.numberPeople = numberPeople; } } - +// diff --git a/src/main/java/Main.java b/src/main/java/Main.java index e34faf6..5363bc9 100644 --- a/src/main/java/Main.java +++ b/src/main/java/Main.java @@ -8,20 +8,19 @@ public static void main(String[] args) { int numberPeople; while (true) { + System.out.println("На скольких человек необходимо разделить счёт"); numberPeople = scanner.nextInt(); - if (numberPeople> 1) { break; } else if (numberPeople <= 1) { System.out.println("Это некорректное значение для подсчёта, повторите ввод"); } - } + System.out.println("Сейчас все сделаем"); - System.out.println("Сейчас все сделаем"); - Calculator Calculator = new Calculator(numberPeople); + Calculator Calculator = new Calculator(numberPeople); double prise; while (true) { System.out.println("Введите название продукта"); diff --git a/src/main/java/added.java b/src/main/java/added.java index 59fd262..77a599b 100644 --- a/src/main/java/added.java +++ b/src/main/java/added.java @@ -9,3 +9,4 @@ class added { } } +// \ No newline at end of file diff --git a/src/main/java/rubleOptions.java b/src/main/java/rubleOptions.java index 00c87d9..b4abff5 100644 --- a/src/main/java/rubleOptions.java +++ b/src/main/java/rubleOptions.java @@ -5,11 +5,11 @@ String rubles(double value) { double rubles = Math.floor(value); if (rubles == 1) { return " рубль"; - } else if (rubles == 12 || rubles == 13 || rubles == 14 ) { + } else if (rubles %100 == 11 || rubles%100 == 12 || rubles%100 == 13 || rubles%100 == 14) { return " рублей"; - } else if (rubles%10>= 2 && rubles%10 <= 4) { - return " рубля"; - } else if (rubles%100>= 2 && rubles%100 <= 4) { + } else if (rubles % 10 == 1) { + return " рубль"; + } else if (rubles % 10>= 2 && rubles % 10 <= 4) { return " рубля"; } else { return " рублей"; @@ -17,3 +17,7 @@ String rubles(double value) { } } + + + +// \ No newline at end of file

      AltStyle によって変換されたページ (->オリジナル) /