From efbee21e6b48148452eab604c3707696e50f14ec Mon Sep 17 00:00:00 2001 From: MariVrnk Date: Thu, 5 Mar 2020 04:03:00 +0300 Subject: [PATCH 1/7] New tests --- src/test/java/Calculator/AppTest.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/test/java/Calculator/AppTest.java b/src/test/java/Calculator/AppTest.java index b2340fa..39ef11c 100644 --- a/src/test/java/Calculator/AppTest.java +++ b/src/test/java/Calculator/AppTest.java @@ -52,4 +52,14 @@ public void factTest() throws Exception { public void expTest() throws Exception { assertEquals(1, calc.exponent(0), mistake); } + + @Test + public void absTest() throws Exception { + assertEquals(1, calc.abs(-1), mistake); + } + + @Test + public void lnTest() throws Exception { + assertEquals(0, calc.ln(1), mistake); + } } From 8304bdd38963b25c92d1f80438f69503ac924eb3 Mon Sep 17 00:00:00 2001 From: MariVrnk Date: Thu, 5 Mar 2020 04:05:59 +0300 Subject: [PATCH 2/7] Add log10 function --- src/main/java/Calculator/Calculating.java | 4 ++++ src/main/java/Calculator/Menu.java | 3 +++ 2 files changed, 7 insertions(+) diff --git a/src/main/java/Calculator/Calculating.java b/src/main/java/Calculator/Calculating.java index 50d43d3..4fc2f36 100644 --- a/src/main/java/Calculator/Calculating.java +++ b/src/main/java/Calculator/Calculating.java @@ -63,4 +63,8 @@ public double abs(double a){ public double ln(double a){ return Math.log(a); } + + public double log10(double a){ + return Math.log10(a); + } } \ No newline at end of file diff --git a/src/main/java/Calculator/Menu.java b/src/main/java/Calculator/Menu.java index 9d78713..ad7d214 100644 --- a/src/main/java/Calculator/Menu.java +++ b/src/main/java/Calculator/Menu.java @@ -47,6 +47,9 @@ public void Run(){ case "ln": System.out.println(calc.ln(a)); break; + case "log10": + System.out.println(calc.log10(a)); + break; } } } From 739a5e8c85fbacb5d89f3ab2e321d37c04cc9b98 Mon Sep 17 00:00:00 2001 From: MariVrnk Date: Thu, 5 Mar 2020 04:14:50 +0300 Subject: [PATCH 3/7] Add ceil function --- src/main/java/Calculator/Calculating.java | 4 ++++ src/main/java/Calculator/Menu.java | 3 +++ 2 files changed, 7 insertions(+) diff --git a/src/main/java/Calculator/Calculating.java b/src/main/java/Calculator/Calculating.java index 4fc2f36..e00f348 100644 --- a/src/main/java/Calculator/Calculating.java +++ b/src/main/java/Calculator/Calculating.java @@ -67,4 +67,8 @@ public double ln(double a){ public double log10(double a){ return Math.log10(a); } + + public double ceil(double a){ + return Math.ceil(a); + } } \ No newline at end of file diff --git a/src/main/java/Calculator/Menu.java b/src/main/java/Calculator/Menu.java index ad7d214..d00d6f3 100644 --- a/src/main/java/Calculator/Menu.java +++ b/src/main/java/Calculator/Menu.java @@ -50,6 +50,9 @@ public void Run(){ case "log10": System.out.println(calc.log10(a)); break; + case "ceil": + System.out.println(calc.ceil(a)); + break; } } } From bb904693b7f28c081f54d052d56bbdec8c432cbf Mon Sep 17 00:00:00 2001 From: MariVrnk Date: Thu, 5 Mar 2020 04:17:36 +0300 Subject: [PATCH 4/7] New tests --- src/test/java/Calculator/AppTest.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/test/java/Calculator/AppTest.java b/src/test/java/Calculator/AppTest.java index 39ef11c..4619d23 100644 --- a/src/test/java/Calculator/AppTest.java +++ b/src/test/java/Calculator/AppTest.java @@ -62,4 +62,14 @@ public void absTest() throws Exception { public void lnTest() throws Exception { assertEquals(0, calc.ln(1), mistake); } + + @Test + public void log10Test() throws Exception { + assertEquals(2, calc.log10(100), mistake); + } + + @Test + public void ceilTest() throws Exception { + assertEquals(5, calc.ceil(4.8), mistake); + } } From 7f98ede61b9772becdb2ab8b13b52f1e30e8be30 Mon Sep 17 00:00:00 2001 From: MariVrnk Date: Thu, 5 Mar 2020 05:16:27 +0300 Subject: [PATCH 5/7] Add abs function --- src/main/java/Calculator/Calculating.java | 12 ------------ src/main/java/Calculator/Menu.java | 9 --------- src/test/java/Calculator/AppTest.java | 15 --------------- 3 files changed, 36 deletions(-) diff --git a/src/main/java/Calculator/Calculating.java b/src/main/java/Calculator/Calculating.java index e00f348..7a458d5 100644 --- a/src/main/java/Calculator/Calculating.java +++ b/src/main/java/Calculator/Calculating.java @@ -59,16 +59,4 @@ public double exponent(double a){ public double abs(double a){ return Math.abs(a); } - - public double ln(double a){ - return Math.log(a); - } - - public double log10(double a){ - return Math.log10(a); - } - - public double ceil(double a){ - return Math.ceil(a); - } } \ No newline at end of file diff --git a/src/main/java/Calculator/Menu.java b/src/main/java/Calculator/Menu.java index d00d6f3..d0af7ee 100644 --- a/src/main/java/Calculator/Menu.java +++ b/src/main/java/Calculator/Menu.java @@ -44,15 +44,6 @@ public void Run(){ case "abs": System.out.println(calc.abs(a)); break; - case "ln": - System.out.println(calc.ln(a)); - break; - case "log10": - System.out.println(calc.log10(a)); - break; - case "ceil": - System.out.println(calc.ceil(a)); - break; } } } diff --git a/src/test/java/Calculator/AppTest.java b/src/test/java/Calculator/AppTest.java index 4619d23..7e1f402 100644 --- a/src/test/java/Calculator/AppTest.java +++ b/src/test/java/Calculator/AppTest.java @@ -57,19 +57,4 @@ public void expTest() throws Exception { public void absTest() throws Exception { assertEquals(1, calc.abs(-1), mistake); } - - @Test - public void lnTest() throws Exception { - assertEquals(0, calc.ln(1), mistake); - } - - @Test - public void log10Test() throws Exception { - assertEquals(2, calc.log10(100), mistake); - } - - @Test - public void ceilTest() throws Exception { - assertEquals(5, calc.ceil(4.8), mistake); - } } From 714f04ace6b4d479cce0a94f60ed42ac84eca6cc Mon Sep 17 00:00:00 2001 From: MariVrnk Date: Thu, 5 Mar 2020 05:36:45 +0300 Subject: [PATCH 6/7] New functions --- src/main/java/Calculator/Calculating.java | 12 ++++++++++++ src/main/java/Calculator/Menu.java | 9 +++++++++ src/test/java/Calculator/AppTest.java | 15 +++++++++++++++ 3 files changed, 36 insertions(+) diff --git a/src/main/java/Calculator/Calculating.java b/src/main/java/Calculator/Calculating.java index 7a458d5..e00f348 100644 --- a/src/main/java/Calculator/Calculating.java +++ b/src/main/java/Calculator/Calculating.java @@ -59,4 +59,16 @@ public double exponent(double a){ public double abs(double a){ return Math.abs(a); } + + public double ln(double a){ + return Math.log(a); + } + + public double log10(double a){ + return Math.log10(a); + } + + public double ceil(double a){ + return Math.ceil(a); + } } \ No newline at end of file diff --git a/src/main/java/Calculator/Menu.java b/src/main/java/Calculator/Menu.java index d0af7ee..d00d6f3 100644 --- a/src/main/java/Calculator/Menu.java +++ b/src/main/java/Calculator/Menu.java @@ -44,6 +44,15 @@ public void Run(){ case "abs": System.out.println(calc.abs(a)); break; + case "ln": + System.out.println(calc.ln(a)); + break; + case "log10": + System.out.println(calc.log10(a)); + break; + case "ceil": + System.out.println(calc.ceil(a)); + break; } } } diff --git a/src/test/java/Calculator/AppTest.java b/src/test/java/Calculator/AppTest.java index 7e1f402..4619d23 100644 --- a/src/test/java/Calculator/AppTest.java +++ b/src/test/java/Calculator/AppTest.java @@ -57,4 +57,19 @@ public void expTest() throws Exception { public void absTest() throws Exception { assertEquals(1, calc.abs(-1), mistake); } + + @Test + public void lnTest() throws Exception { + assertEquals(0, calc.ln(1), mistake); + } + + @Test + public void log10Test() throws Exception { + assertEquals(2, calc.log10(100), mistake); + } + + @Test + public void ceilTest() throws Exception { + assertEquals(5, calc.ceil(4.8), mistake); + } } From 2d0d6e66ddf3cf2bca231addfca74513f7e44fa0 Mon Sep 17 00:00:00 2001 From: MariVrnk Date: Thu, 5 Mar 2020 10:26:24 +0300 Subject: [PATCH 7/7] first commit --- src/main/java/Calculator/Calculating.java | 18 +----------------- src/main/java/Calculator/Menu.java | 14 +------------- src/test/java/Calculator/AppTest.java | 22 +--------------------- 3 files changed, 3 insertions(+), 51 deletions(-) diff --git a/src/main/java/Calculator/Calculating.java b/src/main/java/Calculator/Calculating.java index e00f348..fb38b25 100644 --- a/src/main/java/Calculator/Calculating.java +++ b/src/main/java/Calculator/Calculating.java @@ -54,21 +54,5 @@ public double fact(double a){ public double exponent(double a){ return Math.exp(a); - } - - public double abs(double a){ - return Math.abs(a); - } - - public double ln(double a){ - return Math.log(a); - } - - public double log10(double a){ - return Math.log10(a); - } - - public double ceil(double a){ - return Math.ceil(a); - } + } } \ No newline at end of file diff --git a/src/main/java/Calculator/Menu.java b/src/main/java/Calculator/Menu.java index d00d6f3..bf9f396 100644 --- a/src/main/java/Calculator/Menu.java +++ b/src/main/java/Calculator/Menu.java @@ -40,19 +40,7 @@ public void Run(){ break; case "exp": System.out.println(calc.exponent(a)); - break; - case "abs": - System.out.println(calc.abs(a)); - break; - case "ln": - System.out.println(calc.ln(a)); - break; - case "log10": - System.out.println(calc.log10(a)); - break; - case "ceil": - System.out.println(calc.ceil(a)); - break; + break; } } } diff --git a/src/test/java/Calculator/AppTest.java b/src/test/java/Calculator/AppTest.java index 4619d23..c182514 100644 --- a/src/test/java/Calculator/AppTest.java +++ b/src/test/java/Calculator/AppTest.java @@ -51,25 +51,5 @@ public void factTest() throws Exception { @Test public void expTest() throws Exception { assertEquals(1, calc.exponent(0), mistake); - } - - @Test - public void absTest() throws Exception { - assertEquals(1, calc.abs(-1), mistake); - } - - @Test - public void lnTest() throws Exception { - assertEquals(0, calc.ln(1), mistake); - } - - @Test - public void log10Test() throws Exception { - assertEquals(2, calc.log10(100), mistake); - } - - @Test - public void ceilTest() throws Exception { - assertEquals(5, calc.ceil(4.8), mistake); - } + } }