From 76c01747b0769106345325fc99f8fb74e105059a Mon Sep 17 00:00:00 2001 From: OLEH Date: Tue, 28 May 2019 20:06:25 +0300 Subject: [PATCH 1/9] test commit --- src/hw/one/Main.java | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 src/hw/one/Main.java diff --git a/src/hw/one/Main.java b/src/hw/one/Main.java new file mode 100644 index 0000000..48f6684 --- /dev/null +++ b/src/hw/one/Main.java @@ -0,0 +1,7 @@ +package hw.one; + +public class Main { + public static void main(String[] args) { + System.out.println("Hello World!!! Dimon - pokemon"); + } +} From 0c986ec81a37d52980a940bd84bd69311528dccf Mon Sep 17 00:00:00 2001 From: OLEH Date: Wed, 29 May 2019 21:18:47 +0300 Subject: [PATCH 2/9] task 01 homework 01 add --- out/production/MyWayJava/Main.class | Bin 519 -> 0 bytes src/hw/one/GameScore.java | 16 ++++++++++++++++ src/hw/one/Main.java | 2 +- 3 files changed, 17 insertions(+), 1 deletion(-) delete mode 100644 out/production/MyWayJava/Main.class create mode 100644 src/hw/one/GameScore.java diff --git a/out/production/MyWayJava/Main.class b/out/production/MyWayJava/Main.class deleted file mode 100644 index d52786f5cadde942522c619d89b3b058c49d945f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 519 zcmZuuO;5r=5Pb`U(pm*U@LRzXnrKhP1ICNSQ~gLVTs$q<;9@^WDJK3bJ!s;=AK;HN zz7`WCVGlDqZ)V<`+5P_c`~q-{JrjAX7^tFFz^aKgtn1j&u_=&0Re_4n1hUQjj(~O^ zKDYu!M+NTn*zda0o$Pu<%1+pmUPneMiT^+?epDlJI9E~yEq43#0=4G7Gmy{H_GHkv z+i|3Vek)~{QJ?jdIcWj29gd@(d#MsRBVjyBNG#|m=-9HbjU7&Qq5LqYAJ&KAlgpcq zT?=(ID4w(kl%~oz-GSSSXQ1}WD0Y2r8;+T%PR3NBeajhRPU=dZdsI@6Sy(_HCPf}K zs?B-(p@AIVIXM}y90gi~kxeh?a|a&~uW8z(&8MKi0`JzOfPRsYfh81)B+Vx&8L>BH c%Gq~lQv#DIAWI$XABlkymWlJvXfvq%0;B|J5C8xG diff --git a/src/hw/one/GameScore.java b/src/hw/one/GameScore.java new file mode 100644 index 0000000..4cd8094 --- /dev/null +++ b/src/hw/one/GameScore.java @@ -0,0 +1,16 @@ +package hw.one; + +public class GameScore { + + public static int GameForecastCalculator(int teamAscore, int teamBscore, int teamAscoreGuess, int teamBscoreGuess) { + + if (teamAscore == teamAscoreGuess && teamBscore == teamBscoreGuess) { + return 2; + } else if ((teamAscore > teamBscore && teamAscoreGuess > teamBscoreGuess) + || (teamAscore < teamBscore && teamAscoreGuess < teamBscoreGuess) + || (teamAscore == teamBscore && teamAscoreGuess == teamBscoreGuess)) { + return 1; + } + return 0; + } +} diff --git a/src/hw/one/Main.java b/src/hw/one/Main.java index 48f6684..21b0ac7 100644 --- a/src/hw/one/Main.java +++ b/src/hw/one/Main.java @@ -2,6 +2,6 @@ public class Main { public static void main(String[] args) { - System.out.println("Hello World!!! Dimon - pokemon"); + System.out.println(GameScore.GameForecastCalculator(3, 1, 3, 1)); } } From ab6f45638d0358310fc2aa78604e34416ea54642 Mon Sep 17 00:00:00 2001 From: OLEH Date: Thu, 30 May 2019 15:49:28 +0300 Subject: [PATCH 3/9] task 03 homework 01 add --- src/hw/one/Main.java | 6 +++++- src/hw/one/PowNumber.java | 29 +++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 src/hw/one/PowNumber.java diff --git a/src/hw/one/Main.java b/src/hw/one/Main.java index 21b0ac7..8b71456 100644 --- a/src/hw/one/Main.java +++ b/src/hw/one/Main.java @@ -2,6 +2,10 @@ public class Main { public static void main(String[] args) { - System.out.println(GameScore.GameForecastCalculator(3, 1, 3, 1)); + + } + } + + diff --git a/src/hw/one/PowNumber.java b/src/hw/one/PowNumber.java new file mode 100644 index 0000000..523afb0 --- /dev/null +++ b/src/hw/one/PowNumber.java @@ -0,0 +1,29 @@ +package hw.one; + +public class PowNumber { + public static double sqrtNum(int number) { + double result; + return result = number * number; + } + + public static double cubeNum(int number) { + double result; + return result = number * number * number; + } + + + public static double PowNum(int number, int pow) { + double result = 1; + if (pow > 0) { + for (int i = pow; i > 0; i--) { + result *= number; + } + } else if (pow < 0) { + for (int i = pow; i < 0; i++) { + result /= number; + } + } + return result; + } + +} From 44e63a5f0a62eac4e2b3b4df39361404f9a0ac78 Mon Sep 17 00:00:00 2001 From: OLEH Date: Thu, 30 May 2019 20:23:01 +0300 Subject: [PATCH 4/9] task 02 homework 01 add finish task!!! --- src/hw/one/DiamondBuilder.java | 44 ++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 src/hw/one/DiamondBuilder.java diff --git a/src/hw/one/DiamondBuilder.java b/src/hw/one/DiamondBuilder.java new file mode 100644 index 0000000..a5fba50 --- /dev/null +++ b/src/hw/one/DiamondBuilder.java @@ -0,0 +1,44 @@ +package hw.one; + +public class DiamondBuilder { + public static void drawDiamond(int givenNum) { + + int rowLenght = givenNum; + int stars = 1; + int space = rowLenght - stars; + + for (int i = 0; i <= rowLenght / 2; i++) { + + for (int j = space; j > 0; j--) { + System.out.print(" "); + } + + for (int k = 0; k < stars; k++) { + System.out.print("*"); + } + stars += 2; + space--; + + System.out.println(); + } + space = rowLenght - stars; + stars = rowLenght - space; + + for (int i = 0; i <= rowLenght / 2 - 1; i++) { + + for (int j = space; j > 0; j--) { + System.out.print(" "); + } + + for (int k = rowLenght - stars; k >= 1; k--) { + System.out.print("*"); + } + stars -= 2; + space++; + + System.out.println(); + } + } +} + + From 07d762377efbe12895290cd01efd523b359f7952 Mon Sep 17 00:00:00 2001 From: OLEH Date: Sun, 2 Jun 2019 16:36:37 +0300 Subject: [PATCH 5/9] DiamondBuilder changed --- src/hw/one/DiamondBuilder.java | 28 +++++++++------------------- src/hw/one/Main.java | 8 ++++++++ 2 files changed, 17 insertions(+), 19 deletions(-) diff --git a/src/hw/one/DiamondBuilder.java b/src/hw/one/DiamondBuilder.java index a5fba50..3ebcbe1 100644 --- a/src/hw/one/DiamondBuilder.java +++ b/src/hw/one/DiamondBuilder.java @@ -3,42 +3,32 @@ public class DiamondBuilder { public static void drawDiamond(int givenNum) { - int rowLenght = givenNum; - int stars = 1; - int space = rowLenght - stars; - for (int i = 0; i <= rowLenght / 2; i++) { + int stars = 1; + int space = givenNum - stars; + for (int i = 0; i <= givenNum / 2; i++) { for (int j = space; j > 0; j--) { System.out.print(" "); } - for (int k = 0; k < stars; k++) { System.out.print("*"); } stars += 2; space--; - System.out.println(); } - space = rowLenght - stars; - stars = rowLenght - space; - for (int i = 0; i <= rowLenght / 2 - 1; i++) { - - for (int j = space; j > 0; j--) { + for (int i = 0; i <= givenNum / 2; i++) { + stars -= 2; + space++; + for (int j = 0; j < space; j++) { System.out.print(" "); } - - for (int k = rowLenght - stars; k >= 1; k--) { + for (int k = 0; k < stars; k++) { System.out.print("*"); } - stars -= 2; - space++; - System.out.println(); } } -} - - +} \ No newline at end of file diff --git a/src/hw/one/Main.java b/src/hw/one/Main.java index 8b71456..65c36ea 100644 --- a/src/hw/one/Main.java +++ b/src/hw/one/Main.java @@ -3,6 +3,14 @@ public class Main { public static void main(String[] args) { + DiamondBuilder.drawDiamond(7); + + int a =4; + +// for (int i = 0; i < 5; i++) { +// a++; +// } +// System.out.println(a); } From ce57de2272fbdf5f8349316e0238e28db93874e4 Mon Sep 17 00:00:00 2001 From: OLEH Date: Sun, 2 Jun 2019 19:38:18 +0300 Subject: [PATCH 6/9] HomeWork 01 Task added Task 01, 03 edited --- src/hw/one/DiamondBuilder.java | 4 ++-- src/hw/one/GameScore.java | 12 ++++-------- src/hw/one/Main.java | 21 ++++++++++++--------- src/hw/one/PowNumber.java | 10 +++------- 4 files changed, 21 insertions(+), 26 deletions(-) diff --git a/src/hw/one/DiamondBuilder.java b/src/hw/one/DiamondBuilder.java index 3ebcbe1..da4d3ad 100644 --- a/src/hw/one/DiamondBuilder.java +++ b/src/hw/one/DiamondBuilder.java @@ -3,7 +3,6 @@ public class DiamondBuilder { public static void drawDiamond(int givenNum) { - int stars = 1; int space = givenNum - stars; @@ -18,7 +17,8 @@ public static void drawDiamond(int givenNum) { space--; System.out.println(); } - + stars -= 2; + space++; for (int i = 0; i <= givenNum / 2; i++) { stars -= 2; space++; diff --git a/src/hw/one/GameScore.java b/src/hw/one/GameScore.java index 4cd8094..faad4ee 100644 --- a/src/hw/one/GameScore.java +++ b/src/hw/one/GameScore.java @@ -1,16 +1,12 @@ package hw.one; public class GameScore { - public static int GameForecastCalculator(int teamAscore, int teamBscore, int teamAscoreGuess, int teamBscoreGuess) { - if (teamAscore == teamAscoreGuess && teamBscore == teamBscoreGuess) { - return 2; - } else if ((teamAscore > teamBscore && teamAscoreGuess > teamBscoreGuess) + return ((teamAscore == teamAscoreGuess && teamBscore == teamBscoreGuess) ? + 2:((teamAscore > teamBscore && teamAscoreGuess > teamBscoreGuess) || (teamAscore < teamBscore && teamAscoreGuess < teamBscoreGuess) - || (teamAscore == teamBscore && teamAscoreGuess == teamBscoreGuess)) { - return 1; - } - return 0; + || (teamAscore == teamBscore && teamAscoreGuess == teamBscoreGuess) ? + 1: 0)); } } diff --git a/src/hw/one/Main.java b/src/hw/one/Main.java index 65c36ea..7d9bce5 100644 --- a/src/hw/one/Main.java +++ b/src/hw/one/Main.java @@ -2,16 +2,19 @@ public class Main { public static void main(String[] args) { - + //Test Diamond: DiamondBuilder.drawDiamond(7); - - int a =4; - -// for (int i = 0; i < 5; i++) { -// a++; -// } -// System.out.println(a); - + //Test GameScore: + System.out.println(GameScore.GameForecastCalculator(2, 1, + 2, 1)); + System.out.println(GameScore.GameForecastCalculator(1, 1, + 3, 3)); + System.out.println(GameScore.GameForecastCalculator(2, 1, + 1, 4)); + //Test PowNumber: + System.out.println(PowNumber.sqrtNum(4)); + System.out.println(PowNumber.cubeNum(4)); + System.out.println(PowNumber.powNum(4,4)); } } diff --git a/src/hw/one/PowNumber.java b/src/hw/one/PowNumber.java index 523afb0..9d4903b 100644 --- a/src/hw/one/PowNumber.java +++ b/src/hw/one/PowNumber.java @@ -2,17 +2,14 @@ public class PowNumber { public static double sqrtNum(int number) { - double result; - return result = number * number; + return number * number; } public static double cubeNum(int number) { - double result; - return result = number * number * number; + return number * number * number; } - - public static double PowNum(int number, int pow) { + public static double powNum(int number, int pow) { double result = 1; if (pow > 0) { for (int i = pow; i > 0; i--) { @@ -25,5 +22,4 @@ public static double PowNum(int number, int pow) { } return result; } - } From 0feddef6d3d93639cee719e5fa5eb6ece8b26e90 Mon Sep 17 00:00:00 2001 From: OLEH Date: Sun, 2 Jun 2019 19:39:31 +0300 Subject: [PATCH 7/9] HomeWork 01 Task added Task 01, 03 edited --- src/hw/one/DiamondBuilder.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/hw/one/DiamondBuilder.java b/src/hw/one/DiamondBuilder.java index da4d3ad..50881b6 100644 --- a/src/hw/one/DiamondBuilder.java +++ b/src/hw/one/DiamondBuilder.java @@ -31,4 +31,4 @@ public static void drawDiamond(int givenNum) { System.out.println(); } } -} \ No newline at end of file +} From ebc75a75c4f5610ec2df4398636158555da90760 Mon Sep 17 00:00:00 2001 From: OLEH Date: Sun, 2 Jun 2019 19:40:39 +0300 Subject: [PATCH 8/9] HomeWork 01 Task added Task 01, 03 edited --- src/hw/one/Main.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/hw/one/Main.java b/src/hw/one/Main.java index 7d9bce5..0635742 100644 --- a/src/hw/one/Main.java +++ b/src/hw/one/Main.java @@ -16,7 +16,4 @@ public static void main(String[] args) { System.out.println(PowNumber.cubeNum(4)); System.out.println(PowNumber.powNum(4,4)); } - } - - From f75ef69d4bae95fbe5bafc0d1fb6f58608659308 Mon Sep 17 00:00:00 2001 From: OLEH Date: Sun, 2 Jun 2019 19:40:57 +0300 Subject: [PATCH 9/9] HomeWork 01 Task added Task 01, 03 edited --- src/hw/one/DiamondBuilder.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/hw/one/DiamondBuilder.java b/src/hw/one/DiamondBuilder.java index 50881b6..82d4335 100644 --- a/src/hw/one/DiamondBuilder.java +++ b/src/hw/one/DiamondBuilder.java @@ -2,7 +2,6 @@ public class DiamondBuilder { public static void drawDiamond(int givenNum) { - int stars = 1; int space = givenNum - stars;