From afb102d66ab297da6abaa254790934a748cf238a Mon Sep 17 00:00:00 2001 From: dianasinenchenko Date: Fri, 2 Dec 2016 04:14:24 +0200 Subject: [PATCH 1/4] 1 not all (without "Fine") --- .../java/introduction/pr1/Bob.java | 21 ++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/src/main/java/school/lemon/changerequest/java/introduction/pr1/Bob.java b/src/main/java/school/lemon/changerequest/java/introduction/pr1/Bob.java index e8c7aec..8605058 100644 --- a/src/main/java/school/lemon/changerequest/java/introduction/pr1/Bob.java +++ b/src/main/java/school/lemon/changerequest/java/introduction/pr1/Bob.java @@ -1,10 +1,29 @@ package school.lemon.changerequest.java.introduction.pr1; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + public class Bob { public static String hey(String phrase) { - return ""; + String tabul = "\\s"; + Pattern patternPharse = Pattern.compile(tabul); + Matcher matcherPharse = patternPharse.matcher(phrase); + if (phrase.equals(matcherPharse)) { + return "Fine."; + } + + else if (phrase.equals(phrase.toUpperCase())) { + return "Chill out!"; + } + + else if (phrase.endsWith("?")) { + return "Yeap."; + } + + + else return "Whatever."; } } From 9d37dfc35bdb6fbcc8f41f178ea6fcec6ddd9b73 Mon Sep 17 00:00:00 2001 From: dianasinenchenko Date: Fri, 2 Dec 2016 05:07:25 +0200 Subject: [PATCH 2/4] 2 not all Calculator --- .../introduction/pr1/ConsoleCalculator.java | 55 ++++++++++++++++++- 1 file changed, 54 insertions(+), 1 deletion(-) diff --git a/src/main/java/school/lemon/changerequest/java/introduction/pr1/ConsoleCalculator.java b/src/main/java/school/lemon/changerequest/java/introduction/pr1/ConsoleCalculator.java index da96e86..068e1ce 100644 --- a/src/main/java/school/lemon/changerequest/java/introduction/pr1/ConsoleCalculator.java +++ b/src/main/java/school/lemon/changerequest/java/introduction/pr1/ConsoleCalculator.java @@ -1,9 +1,62 @@ package school.lemon.changerequest.java.introduction.pr1; +import java.util.Scanner; + public class ConsoleCalculator { + public int Add(int scannetFirstNumInt, int scannetSecondNumInt, String scannerOperations) { + if (scannerOperations.equals("add")) + { + return scannetFirstNumInt + scannetSecondNumInt;} + return 0; + } - public static void main(String[] args) { + public int Sub(int scannerFirstNum, int scannerSecondNum) { + return scannerFirstNum - scannerSecondNum; + } + public int Mul(int scannerFirstNum, int scannerSecondNum) { + return scannerFirstNum * scannerSecondNum; } + + public int Div(int scannerFirstNum, int scannerSecondNum) { + return scannerFirstNum / scannerSecondNum; + } + + + public static void main(String[] args) { + System.out.println("Console calculator:"); + System.out.println("Enter 'add' to perform addition."); + System.out.println("Enter 'sub' to perform subtraction."); + System.out.println("Enter 'mul' to perform multiplication."); + System.out.println("Enter 'div' to perform division."); + System.out.println("Enter 'exit' to exit."); + System.out.println("Enter 'help' to see help message."); + System.out.println("Make your choice."); + Scanner scannerOperations = new Scanner(System.in); + + + System.out.println("Enter first number:"); + Scanner scannerFirstNum = new Scanner(System.in); + int scannetFirstNumInt; + if (scannerFirstNum.hasNextInt()) { + scannetFirstNumInt = scannerFirstNum.nextInt();} + + System.out.println("Enter second number:"); + Scanner scannerSecondNum = new Scanner(System.in); + int scannetSecondNumInt; + if (scannerSecondNum.hasNextInt()) { + scannetSecondNumInt = scannerSecondNum.nextInt();} + + + ConsoleCalculator resultat = new ConsoleCalculator(); + + System.out.println("Result of" + resultat); + System.out.println("Make your choice."); + Scanner scannerOperationsSecond = new Scanner(System.in); + System.out.println("Make your choice."); + + } + + } From d8f383c0217c8afdd9126432b752d2413b8fbfbe Mon Sep 17 00:00:00 2001 From: dianasinenchenko Date: Fri, 2 Dec 2016 05:17:29 +0200 Subject: [PATCH 3/4] 1 not all (with some problem) (UpperCase numbers) --- .../java/introduction/pr1/Bob.java | 21 ++++++++----------- 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/src/main/java/school/lemon/changerequest/java/introduction/pr1/Bob.java b/src/main/java/school/lemon/changerequest/java/introduction/pr1/Bob.java index 8605058..53e03cd 100644 --- a/src/main/java/school/lemon/changerequest/java/introduction/pr1/Bob.java +++ b/src/main/java/school/lemon/changerequest/java/introduction/pr1/Bob.java @@ -7,23 +7,20 @@ public class Bob { public static String hey(String phrase) { - String tabul = "\\s"; - Pattern patternPharse = Pattern.compile(tabul); - Matcher matcherPharse = patternPharse.matcher(phrase); - if (phrase.equals(matcherPharse)) { - return "Fine."; - } - else if (phrase.equals(phrase.toUpperCase())) { - return "Chill out!"; - } - else if (phrase.endsWith("?")) { + if (phrase.equals(phrase.toUpperCase()) ) { + return "Chill out!"; + } + else if (phrase.endsWith("?")) { return "Yeap."; } + String trimmed = phrase.trim(); + if (trimmed.isEmpty()) { + return "Fine."; + } - - else return "Whatever."; + return "Whatever."; } } From c8141fa3efb838d8369cd31641c4f864302764fe Mon Sep 17 00:00:00 2001 From: dianasinenchenko Date: Fri, 2 Dec 2016 05:32:01 +0200 Subject: [PATCH 4/4] 3 done (HammingDistance) --- .../java/introduction/pr1/HammingDistance.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/main/java/school/lemon/changerequest/java/introduction/pr1/HammingDistance.java b/src/main/java/school/lemon/changerequest/java/introduction/pr1/HammingDistance.java index b8a218f..6cf4519 100644 --- a/src/main/java/school/lemon/changerequest/java/introduction/pr1/HammingDistance.java +++ b/src/main/java/school/lemon/changerequest/java/introduction/pr1/HammingDistance.java @@ -2,6 +2,14 @@ public class HammingDistance { public static int compute(String a, String a1) { + if (a.length() == a1.length()) { + int numbers = 0; + for (int i = 0; i < a.length(); i++) { + if (a.charAt(i) != a1.charAt(i)) + numbers++; + } + return numbers; + } return -1; } }