From 3fe791fce79969dcd675d52b2bfe1374be58e4c3 Mon Sep 17 00:00:00 2001 From: michailidm Date: Sat, 22 Jan 2022 18:01:30 +0200 Subject: [PATCH 1/3] Added new class + test for each operation & other changes --- .idea/.gitignore | 8 + .idea/.name | 1 + .idea/misc.xml | 6 + .idea/modules.xml | 8 + .idea/runConfigurations.xml | 10 ++ .idea/vcs.xml | 6 + devops_calculator.iml | 21 +++ src/main/java/calculator/Addition.java | 27 ++++ src/main/java/calculator/App.java | 142 ++++++++++++------ src/main/java/calculator/BinaryOperation.java | 26 ++++ src/main/java/calculator/Calculator.java | 110 ++++++++++++++ src/main/java/calculator/Cosine.java | 26 ++++ src/main/java/calculator/Division.java | 27 ++++ src/main/java/calculator/Exponential.java | 26 ++++ src/main/java/calculator/Multiplication.java | 27 ++++ src/main/java/calculator/Operation.java | 32 ++++ src/main/java/calculator/Sine.java | 26 ++++ src/main/java/calculator/SquareRoot.java | 26 ++++ src/main/java/calculator/Subtraction.java | 27 ++++ src/main/java/calculator/Tangent.java | 26 ++++ src/main/java/calculator/UnaryOperation.java | 17 +++ src/test/java/calculator/AdditionTest.java | 28 ++++ src/test/java/calculator/CalculatorTest.java | 42 ------ src/test/java/calculator/CosineTest.java | 34 +++++ src/test/java/calculator/DivisionTest.java | 29 ++++ src/test/java/calculator/ExponentialTest.java | 34 +++++ .../java/calculator/MultiplicationTest.java | 29 ++++ src/test/java/calculator/SineTest.java | 34 +++++ src/test/java/calculator/SquareRootTest.java | 34 +++++ src/test/java/calculator/SubtractionTest.java | 29 ++++ src/test/java/calculator/TangentTest.java | 34 +++++ 31 files changed, 863 insertions(+), 89 deletions(-) create mode 100644 .idea/.gitignore create mode 100644 .idea/.name create mode 100644 .idea/misc.xml create mode 100644 .idea/modules.xml create mode 100644 .idea/runConfigurations.xml create mode 100644 .idea/vcs.xml create mode 100644 devops_calculator.iml create mode 100644 src/main/java/calculator/Addition.java create mode 100644 src/main/java/calculator/BinaryOperation.java create mode 100644 src/main/java/calculator/Calculator.java create mode 100644 src/main/java/calculator/Cosine.java create mode 100644 src/main/java/calculator/Division.java create mode 100644 src/main/java/calculator/Exponential.java create mode 100644 src/main/java/calculator/Multiplication.java create mode 100644 src/main/java/calculator/Operation.java create mode 100644 src/main/java/calculator/Sine.java create mode 100644 src/main/java/calculator/SquareRoot.java create mode 100644 src/main/java/calculator/Subtraction.java create mode 100644 src/main/java/calculator/Tangent.java create mode 100644 src/main/java/calculator/UnaryOperation.java create mode 100644 src/test/java/calculator/AdditionTest.java create mode 100644 src/test/java/calculator/CosineTest.java create mode 100644 src/test/java/calculator/DivisionTest.java create mode 100644 src/test/java/calculator/ExponentialTest.java create mode 100644 src/test/java/calculator/MultiplicationTest.java create mode 100644 src/test/java/calculator/SineTest.java create mode 100644 src/test/java/calculator/SquareRootTest.java create mode 100644 src/test/java/calculator/SubtractionTest.java create mode 100644 src/test/java/calculator/TangentTest.java diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..73f69e0 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,8 @@ +# Default ignored files +/shelf/ +/workspace.xml +# Datasource local storage ignored files +/dataSources/ +/dataSources.local.xml +# Editor-based HTTP Client requests +/httpRequests/ diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..9f714fc --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +devops_calculator \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..91fd695 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..5f18975 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml new file mode 100644 index 0000000..797acea --- /dev/null +++ b/.idea/runConfigurations.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 diff --git a/devops_calculator.iml b/devops_calculator.iml new file mode 100644 index 0000000..b187d53 --- /dev/null +++ b/devops_calculator.iml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/java/calculator/Addition.java b/src/main/java/calculator/Addition.java new file mode 100644 index 0000000..7046445 --- /dev/null +++ b/src/main/java/calculator/Addition.java @@ -0,0 +1,27 @@ +package calculator; + +/** + * The Addition class represents the operation of addition. + */ +public class Addition extends BinaryOperation { + + public Addition() { + this.name = "Addition"; + this.operator = "+"; + } + + public Addition(double a, double b) { + this(); + this.firstOperand = a; + this.secondOperand = b; + } + + public double perform() { + return this.firstOperand + this.secondOperand; + } + + public String showOperationExpression() { + return this.firstOperand + " + " + (this.secondOperand < 0? "(": "") + this.secondOperand + (this.secondOperand < 0? ")": ""); + } + +} diff --git a/src/main/java/calculator/App.java b/src/main/java/calculator/App.java index 0ae3ba7..a2257d3 100644 --- a/src/main/java/calculator/App.java +++ b/src/main/java/calculator/App.java @@ -2,57 +2,105 @@ import java.util.*; public class App { - public static void main(String args[]) + public static void main(String[] args) { - int choice, flag=0; - double num1,num2; - Scanner scan = new Scanner(System.in); + Calculator calculator = new Calculator(); + calculator.initialise(); + + int choice; + boolean validInput; + double num1 = 0, num2 = 0; System.out.println("Calculator"); + do { - System.out.println("1 for Addition\n2 for Subtraction\n3 for Multiplication\n4 for Division\n"); - System.out.print("Enter your choice: "); - choice = scan.nextInt(); - if (choice > 4 || choice <1) { - flag = 1; - System.out.println("Invalid choice, exiting\n"); + choice = calculator.chooseAction(); + + if (choice == 0) { + System.out.println("Exiting, Bye"); + return; } - else if (flag != 1){ - System.out.println("Enter two numbers"); - System.out.print("Enter number 1: "); - num1 = scan.nextDouble(); - System.out.print("Enter number 2: "); - num2 = scan.nextDouble(); - - switch(choice) { - case 1: System.out.println(num1+" + "+num2+" = "+Add(num1, num2)); - break; - case 2: System.out.println(num1+" - "+num2+" = "+Subtract(num1, num2)); - break; - case 3: System.out.println(num1+" * "+num2+" = "+Multiply(num1, num2)); - break; - case 4: System.out.println(num1+" / "+num2+" = "+Divide(num1, num2)); - break; - default: System.out.println("Exiting, Bye"); - flag=1; + + Scanner scan = new Scanner(System.in); + + // BINARY OPERATIONS (+, -, *, /) + if (calculator.getOperations().get(choice - 1) instanceof BinaryOperation) { + System.out.println("Enter two numbers"); + + validInput = false; + while (!validInput) { + try { + System.out.print("Enter number 1: "); + num1 = scan.nextDouble(); + } catch (Exception e) { + System.out.println("Invalid number, please try again."); + scan.nextLine(); + continue; + } + validInput = true; + } + + validInput = false; + while (!validInput) { + try { + System.out.print("Enter number 2: "); + num2 = scan.nextDouble(); + } catch (Exception e) { + System.out.println("Invalid number, please try again."); + scan.nextLine(); + continue; + } + validInput = true; } } - System.out.println("\n"); - }while(flag==0); - } - - static double Add(double a, double b) { - return a + b; - } - static double Subtract(double a, double b) { - return a - b; - } - static double Multiply(double a, double b) { - return a * b; - } - static double Divide(double a, double b) { - if (b == 0) { - throw new IllegalArgumentException("Divisor cannot be zero, Exiting"); - } - else return a / b; + + // UNARY OPERATIONS (sin, cos, tan, sqrt, exp) + if (calculator.getOperations().get(choice - 1) instanceof UnaryOperation) { + validInput = false; + while (!validInput) { + try { + System.out.print("Enter number" + ((choice == 5 || choice == 6 || choice == 7)? " (in radians)": "") + ": "); + num1 = scan.nextDouble(); + } catch (Exception e) { + System.out.println("Invalid number, please try again."); + scan.nextLine(); + continue; + } + validInput = true; + } + } + + // Remove sign from zero + + if (num1 == -0) { + num1 = 0; + } + + if (num2 == -0) { + num2 = 0; + } + + // Set operand(s) to the chosen operation, + // perform the operation and + // print the results. + + double result; + Operation chosenOperation = calculator.getOperations().get(choice - 1); + if (chosenOperation instanceof UnaryOperation) { + ((UnaryOperation) chosenOperation).setOperand(num1); + + result = chosenOperation.perform(); + System.out.println(chosenOperation.showOperationExpression() + " = " + result); + + } else if (chosenOperation instanceof BinaryOperation) { + ((BinaryOperation) chosenOperation).setFirstOperand(num1); + ((BinaryOperation) chosenOperation).setSecondOperand(num2); + + result = chosenOperation.perform(); + System.out.println(chosenOperation.showOperationExpression() + " = " + result); + } + + } while (choice != 0); + } -} \ No newline at end of file + +} diff --git a/src/main/java/calculator/BinaryOperation.java b/src/main/java/calculator/BinaryOperation.java new file mode 100644 index 0000000..9f47bbd --- /dev/null +++ b/src/main/java/calculator/BinaryOperation.java @@ -0,0 +1,26 @@ +package calculator; + +/** + * The BinaryOperation class represents a binary operation. + */ +abstract public class BinaryOperation extends Operation { + double firstOperand; + double secondOperand; + + public double getFirstOperand() { + return firstOperand; + } + + public void setFirstOperand(double firstOperand) { + this.firstOperand = firstOperand; + } + + public double getSecondOperand() { + return secondOperand; + } + + public void setSecondOperand(double secondOperand) { + this.secondOperand = secondOperand; + } + +} diff --git a/src/main/java/calculator/Calculator.java b/src/main/java/calculator/Calculator.java new file mode 100644 index 0000000..f2c3b4a --- /dev/null +++ b/src/main/java/calculator/Calculator.java @@ -0,0 +1,110 @@ +package calculator; + +import java.util.ArrayList; +import java.util.Scanner; + +/** + * The Calculator class represents a calculator. + */ +public class Calculator { + private ArrayList operations; + + public Calculator() { + this.operations = new ArrayList<>(); + } + + public ArrayList getOperations() { + return operations; + } + + /** + * Adds a new operation to the list of operations of the calculator. + * @param operation + */ + public void addOperation(Operation operation) { + this.operations.add(operation); + } + + /** + * Initialises the calculator by adding all the operations the calculator can perform. + */ + public void initialise() { + Addition addition = new Addition(); + this.addOperation(addition); + + Subtraction subtraction = new Subtraction(); + this.addOperation(subtraction); + + Multiplication multiplication = new Multiplication(); + this.addOperation(multiplication); + + Division division = new Division(); + this.addOperation(division); + + Sine sine = new Sine(); + this.addOperation(sine); + + Cosine cosine = new Cosine(); + this.addOperation(cosine); + + Tangent tangent = new Tangent(); + this.addOperation(tangent); + + SquareRoot squareRoot = new SquareRoot(); + this.addOperation(squareRoot); + + Exponential exponential = new Exponential(); + this.addOperation(exponential); + } + + /** + * This function prints all the actions the calculator can perform, + * along with the number that corresponds to each action. + */ + public void showActions() { + System.out.println("0 to Exit"); + + Calculator calculator = new Calculator(); + calculator.initialise(); + int i = 1; + for (Operation operation : calculator.getOperations()) { + System.out.println(i + " for " + operation.getName()); + i++; + } + } + + /** + * This function receives user input about which action to perform. + * @return the choice of the user (integer) + */ + public int chooseAction() { + Scanner scan = new Scanner(System.in); + int choice = -1; + boolean validChoice = false; + + while (!validChoice) { + try { + System.out.println(); + showActions(); + System.out.print("Enter your choice: "); + choice = scan.nextInt(); + } + catch (Exception e) { + System.out.println("Invalid choice, please try again."); + scan.nextLine(); + continue; + } + + Calculator calculator = new Calculator(); + calculator.initialise(); + + if (choice > calculator.getOperations().size() || choice < 0) { + System.out.println("Invalid choice, please try again."); + scan.nextLine(); + continue; + } + validChoice = true; + } + return choice; + } +} diff --git a/src/main/java/calculator/Cosine.java b/src/main/java/calculator/Cosine.java new file mode 100644 index 0000000..9f2a916 --- /dev/null +++ b/src/main/java/calculator/Cosine.java @@ -0,0 +1,26 @@ +package calculator; + +/** + * The Cosine class represents the cosine function. + */ +public class Cosine extends UnaryOperation { + + public Cosine() { + this.name = "Cosine"; + this.operator = "cos"; + } + + public Cosine(double a) { + this(); + this.operand = a; + } + + public double perform() { + return Math.cos(this.operand); + } + + public String showOperationExpression() { + return "cos(" + this.operand + ")"; + } + +} diff --git a/src/main/java/calculator/Division.java b/src/main/java/calculator/Division.java new file mode 100644 index 0000000..a710d43 --- /dev/null +++ b/src/main/java/calculator/Division.java @@ -0,0 +1,27 @@ +package calculator; + +/** + * The Division class represents the operation of division. + */ +public class Division extends BinaryOperation { + + public Division() { + this.name = "Division"; + this.operator = "/"; + } + + public Division(double a, double b) { + this(); + this.firstOperand = a; + this.secondOperand = b; + } + + public double perform() { + return this.firstOperand / this.secondOperand; + } + + public String showOperationExpression() { + return this.firstOperand + " / " + (this.secondOperand < 0? "(": "") + this.secondOperand + (this.secondOperand < 0? ")": ""); + } + +} diff --git a/src/main/java/calculator/Exponential.java b/src/main/java/calculator/Exponential.java new file mode 100644 index 0000000..5e20fa2 --- /dev/null +++ b/src/main/java/calculator/Exponential.java @@ -0,0 +1,26 @@ +package calculator; + +/** + * The Exponential class represents the exponential operation. + */ +public class Exponential extends UnaryOperation { + + public Exponential() { + this.name = "Exponential"; + this.operator = "exp"; + } + + public Exponential(double a) { + this(); + this.operand = a; + } + + public double perform() { + return Math.exp(this.operand); + } + + public String showOperationExpression() { + return "exp(" + this.operand + ")"; + } + +} diff --git a/src/main/java/calculator/Multiplication.java b/src/main/java/calculator/Multiplication.java new file mode 100644 index 0000000..3ffd531 --- /dev/null +++ b/src/main/java/calculator/Multiplication.java @@ -0,0 +1,27 @@ +package calculator; + +/** + * The Multiplication class represents the operation of multiplication. + */ +public class Multiplication extends BinaryOperation { + + public Multiplication() { + this.name = "Multiplication"; + this.operator = "*"; + } + + public Multiplication(double a, double b) { + this(); + this.firstOperand = a; + this.secondOperand = b; + } + + public double perform() { + return this.firstOperand * this.secondOperand; + } + + public String showOperationExpression() { + return this.firstOperand + " * " + (this.secondOperand < 0? "(": "") + this.secondOperand + (this.secondOperand < 0? ")": ""); + } + +} diff --git a/src/main/java/calculator/Operation.java b/src/main/java/calculator/Operation.java new file mode 100644 index 0000000..c643e6b --- /dev/null +++ b/src/main/java/calculator/Operation.java @@ -0,0 +1,32 @@ +package calculator; + +/** + * The Operation class represents an arithmetic operation. + */ +abstract public class Operation { + protected String name; + protected String operator; + + public String getName() { + return this.name; + } + + public String getOperator() { + return operator; + } + + /** + * Shows the representation of the operation. + * Something like toString(). + * For example, if the operation is addition, the function will print + * first operand + second operand + * Another example: if the operation is sine, the function will print + * sin(operand) + */ + abstract public String showOperationExpression(); + + /** Performs the operation. + * @return the result of the operation + */ + abstract public double perform(); +} diff --git a/src/main/java/calculator/Sine.java b/src/main/java/calculator/Sine.java new file mode 100644 index 0000000..71275f5 --- /dev/null +++ b/src/main/java/calculator/Sine.java @@ -0,0 +1,26 @@ +package calculator; + +/** + * The Sine class represents the sine function. + */ +public class Sine extends UnaryOperation { + + public Sine() { + this.name = "Sine"; + this.operator = "sin"; + } + + public Sine(double a) { + this(); + this.operand = a; + } + + public double perform() { + return Math.sin(this.operand); + } + + public String showOperationExpression() { + return "sin(" + this.operand + ")"; + } + +} diff --git a/src/main/java/calculator/SquareRoot.java b/src/main/java/calculator/SquareRoot.java new file mode 100644 index 0000000..9f98c38 --- /dev/null +++ b/src/main/java/calculator/SquareRoot.java @@ -0,0 +1,26 @@ +package calculator; + +/** + * The SquareRoot class represents the square root operation. + */ +public class SquareRoot extends UnaryOperation { + + public SquareRoot() { + this.name = "Square Root"; + this.operator = "√"; + } + + public SquareRoot(double a) { + this(); + this.operand = a; + } + + public double perform() { + return Math.sqrt(this.operand); + } + + public String showOperationExpression() { + return "√" + this.operand; + } + +} diff --git a/src/main/java/calculator/Subtraction.java b/src/main/java/calculator/Subtraction.java new file mode 100644 index 0000000..001de2c --- /dev/null +++ b/src/main/java/calculator/Subtraction.java @@ -0,0 +1,27 @@ +package calculator; + +/** + * The Subtraction class represents the operation of subtraction. + */ +public class Subtraction extends BinaryOperation { + + public Subtraction() { + this.name = "Subtraction"; + this.operator = "-"; + } + + public Subtraction(double a, double b) { + this(); + this.firstOperand = a; + this.secondOperand = b; + } + + public double perform() { + return this.firstOperand - this.secondOperand; + } + + public String showOperationExpression() { + return this.firstOperand + " - " + (this.secondOperand < 0? "(": "") + this.secondOperand + (this.secondOperand < 0? ")": ""); + } + +} diff --git a/src/main/java/calculator/Tangent.java b/src/main/java/calculator/Tangent.java new file mode 100644 index 0000000..fdc9bb3 --- /dev/null +++ b/src/main/java/calculator/Tangent.java @@ -0,0 +1,26 @@ +package calculator; + +/** + * The Tangent class represents the tangent function. + */ +public class Tangent extends UnaryOperation { + + public Tangent() { + this.name = "Tangent"; + this.operator = "tan"; + } + + public Tangent(double a) { + this(); + this.operand = a; + } + + public double perform() { + return Math.tan(this.operand); + } + + public String showOperationExpression() { + return "tan(" + this.operand + ")"; + } + +} diff --git a/src/main/java/calculator/UnaryOperation.java b/src/main/java/calculator/UnaryOperation.java new file mode 100644 index 0000000..2312deb --- /dev/null +++ b/src/main/java/calculator/UnaryOperation.java @@ -0,0 +1,17 @@ +package calculator; + +/** + * The UnaryOperation class represents a unary operation. + */ +abstract public class UnaryOperation extends Operation { + double operand; + + public double getOperand() { + return operand; + } + + public void setOperand(double operand) { + this.operand = operand; + } + +} diff --git a/src/test/java/calculator/AdditionTest.java b/src/test/java/calculator/AdditionTest.java new file mode 100644 index 0000000..e44c1a2 --- /dev/null +++ b/src/test/java/calculator/AdditionTest.java @@ -0,0 +1,28 @@ +package calculator; + +import org.junit.Assert; +import org.junit.jupiter.api.Assertions; + +import static org.junit.jupiter.api.Assertions.*; + +class AdditionTest { + + @org.junit.jupiter.api.BeforeEach + void setUp() { + Addition addition = new Addition(); + } + + @org.junit.jupiter.api.Test + void perform() { + double a = 15.0; + double b = 20.0; + Addition addition = new Addition(a, b); + double expectedResult = 35.0; + double result = addition.perform(); + assertEquals(expectedResult, result, 0); + } + + @org.junit.jupiter.api.Test + void showOperationExpression() { + } +} \ No newline at end of file diff --git a/src/test/java/calculator/CalculatorTest.java b/src/test/java/calculator/CalculatorTest.java index e02740f..9576e32 100644 --- a/src/test/java/calculator/CalculatorTest.java +++ b/src/test/java/calculator/CalculatorTest.java @@ -13,46 +13,4 @@ public void setUp() { calculator = new App(); } - @Test - public void testAdd() { - double a = 15.0; - double b = 20.0; - double expectedResult = 35.0; - double result = calculator.Add(a, b); - Assert.assertEquals(expectedResult, result, 0); - } - - @Test - public void testSubtract() { - double a = 34; - double b = 12; - double expectedResult = 22; - double result = calculator.Subtract(a, b); - Assert.assertEquals(expectedResult, result, 0); - } - - @Test - public void testMultiply() { - double a = 18.5; - double b = 12.6; - double expectedResult = 233.1; - double result = calculator.Multiply(a, b); - Assert.assertEquals(expectedResult, result, 0); - } - - @Test - public void testDivide() { - double a = 60.0; - double b = 12.0; - double expectedResult = 5.0; - double result = calculator.Divide(a, b); - Assert.assertEquals(expectedResult, result, 0.0001); - } - - @Test(expected = IllegalArgumentException.class) - public void testDivideByZero() { - int a = 25; - int b = 0; - calculator.Divide(a, b); - } } diff --git a/src/test/java/calculator/CosineTest.java b/src/test/java/calculator/CosineTest.java new file mode 100644 index 0000000..3c09026 --- /dev/null +++ b/src/test/java/calculator/CosineTest.java @@ -0,0 +1,34 @@ +package calculator; + +import org.junit.Assert; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.*; + +class CosineTest { + + @BeforeEach + void setUp() { + } + + @Test + void perform() { + double a = 0.0; + Cosine cosine = new Cosine(a); + double expectedResult = 1.0; + double result = cosine.perform(); + assertEquals(expectedResult, result, 0); + + a = 89.0; + cosine = new Cosine(a); + expectedResult = 0.51017704494; + result = cosine.perform(); + assertEquals(expectedResult, result, 0.00000000001); + } + + @Test + void showOperationExpression() { + } +} \ No newline at end of file diff --git a/src/test/java/calculator/DivisionTest.java b/src/test/java/calculator/DivisionTest.java new file mode 100644 index 0000000..81964c9 --- /dev/null +++ b/src/test/java/calculator/DivisionTest.java @@ -0,0 +1,29 @@ +package calculator; + +import org.junit.Assert; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.*; + +class DivisionTest { + + @BeforeEach + void setUp() { + } + + @Test + void perform() { + double a = 60.0; + double b = 12.0; + Division division = new Division(a, b); + double expectedResult = 5.0; + double result = division.perform(); + assertEquals(expectedResult, result, 0.0001); + } + + @Test + void showOperationExpression() { + } +} \ No newline at end of file diff --git a/src/test/java/calculator/ExponentialTest.java b/src/test/java/calculator/ExponentialTest.java new file mode 100644 index 0000000..f3e18d7 --- /dev/null +++ b/src/test/java/calculator/ExponentialTest.java @@ -0,0 +1,34 @@ +package calculator; + +import org.junit.Assert; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.*; + +class ExponentialTest { + + @BeforeEach + void setUp() { + } + + @Test + void perform() { + double a = 0; + Exponential exponential = new Exponential(a); + double expectedResult = 1.0; + double result = exponential.perform(); + assertEquals(expectedResult, result, 0); + + a = 2.4; + exponential = new Exponential(a); + expectedResult = 11.0231763806; + result = exponential.perform(); + assertEquals(expectedResult, result, 0.0000000001); + } + + @Test + void showOperationExpression() { + } +} \ No newline at end of file diff --git a/src/test/java/calculator/MultiplicationTest.java b/src/test/java/calculator/MultiplicationTest.java new file mode 100644 index 0000000..d62bfdb --- /dev/null +++ b/src/test/java/calculator/MultiplicationTest.java @@ -0,0 +1,29 @@ +package calculator; + +import org.junit.Assert; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.*; + +class MultiplicationTest { + + @BeforeEach + void setUp() { + } + + @Test + void perform() { + double a = 18.5; + double b = 12.6; + Multiplication multiplication = new Multiplication(a, b); + double expectedResult = 233.1; + double result = multiplication.perform(); + assertEquals(expectedResult, result, 0); + } + + @Test + void showOperationExpression() { + } +} \ No newline at end of file diff --git a/src/test/java/calculator/SineTest.java b/src/test/java/calculator/SineTest.java new file mode 100644 index 0000000..72a7155 --- /dev/null +++ b/src/test/java/calculator/SineTest.java @@ -0,0 +1,34 @@ +package calculator; + +import org.junit.Assert; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.*; + +class SineTest { + + @BeforeEach + void setUp() { + } + + @Test + void perform() { + double a = 0.0; + Sine sine = new Sine(a); + double expectedResult = 0.0; + double result = sine.perform(); + assertEquals(expectedResult, result, 0); + + a = 52.0; + sine = new Sine(a); + expectedResult = 0.98662759204; + result = sine.perform(); + assertEquals(expectedResult, result, 0.00000000001); + } + + @Test + void showOperationExpression() { + } +} \ No newline at end of file diff --git a/src/test/java/calculator/SquareRootTest.java b/src/test/java/calculator/SquareRootTest.java new file mode 100644 index 0000000..cfecbb3 --- /dev/null +++ b/src/test/java/calculator/SquareRootTest.java @@ -0,0 +1,34 @@ +package calculator; + +import org.junit.Assert; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.*; + +class SquareRootTest { + + @BeforeEach + void setUp() { + } + + @Test + void perform() { + double a = 4.0; + SquareRoot squareRoot = new SquareRoot(a); + double expectedResult = 2.0; + double result = squareRoot.perform(); + assertEquals(expectedResult, result, 0); + + a = 2.5; + squareRoot = new SquareRoot(a); + expectedResult = 1.58113883008; + result = squareRoot.perform(); + assertEquals(expectedResult, result, 0.00000000001); + } + + @Test + void showOperationExpression() { + } +} \ No newline at end of file diff --git a/src/test/java/calculator/SubtractionTest.java b/src/test/java/calculator/SubtractionTest.java new file mode 100644 index 0000000..b0826cf --- /dev/null +++ b/src/test/java/calculator/SubtractionTest.java @@ -0,0 +1,29 @@ +package calculator; + +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.*; + +class SubtractionTest { + + @BeforeEach + void setUp() { + } + + @Test + void perform() { + double a = 34; + double b = 12; + Subtraction subtraction = new Subtraction(a, b); + double expectedResult = 22; + double result = subtraction.perform(); + Assertions.assertEquals(expectedResult, result, 0); + } + + @Test + void showOperationExpression() { + } +} \ No newline at end of file diff --git a/src/test/java/calculator/TangentTest.java b/src/test/java/calculator/TangentTest.java new file mode 100644 index 0000000..188be4b --- /dev/null +++ b/src/test/java/calculator/TangentTest.java @@ -0,0 +1,34 @@ +package calculator; + +import org.junit.Assert; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.*; + +class TangentTest { + + @BeforeEach + void setUp() { + } + + @Test + void perform() { + double a = 0.0; + Tangent tangent = new Tangent(a); + double expectedResult = 0.0; + double result = tangent.perform(); + assertEquals(expectedResult, result, 0); + + a = 89.9; + tangent = new Tangent(a); + expectedResult = -2.62003383987; + result = tangent.perform(); + assertEquals(expectedResult, result, 0.00000000001); + } + + @Test + void showOperationExpression() { + } +} \ No newline at end of file From bf38aee1cc59f932f2c82b025c869be52b8cb5ea Mon Sep 17 00:00:00 2001 From: michailidm Date: Mon, 31 Jan 2022 13:57:43 +0200 Subject: [PATCH 2/3] Eliminated .0 from integer numbers, input locale -> US, new class TrigonometricOperation & more tests --- .../classes/calculator/Addition.class | Bin 0 -> 1115 bytes .../classes/calculator/App.class | Bin 0 -> 2959 bytes .../classes/calculator/BinaryOperation.class | Bin 0 -> 728 bytes .../classes/calculator/Calculator.class | Bin 0 -> 3470 bytes .../classes/calculator/Cosine.class | Bin 0 -> 954 bytes .../classes/calculator/Division.class | Bin 0 -> 1115 bytes .../classes/calculator/Exponential.class | Bin 0 -> 966 bytes .../classes/calculator/Multiplication.class | Bin 0 -> 1139 bytes .../classes/calculator/Operation.class | Bin 0 -> 874 bytes .../classes/calculator/Sine.class | Bin 0 -> 946 bytes .../classes/calculator/SquareRoot.class | Bin 0 -> 1092 bytes .../classes/calculator/Subtraction.class | Bin 0 -> 1127 bytes .../classes/calculator/Tangent.class | Bin 0 -> 958 bytes .../calculator/TrigonometricOperation.class | Bin 0 -> 322 bytes .../classes/calculator/UnaryOperation.class | Bin 0 -> 501 bytes .../calculator/AdditionTest.class | Bin 0 -> 1488 bytes .../test-classes/calculator/AppTest.class | Bin 0 -> 467 bytes .../calculator/CalculatorTest.class | Bin 0 -> 505 bytes .../test-classes/calculator/CosineTest.class | Bin 0 -> 1349 bytes .../calculator/DivisionTest.class | Bin 0 -> 1383 bytes .../calculator/ExponentialTest.class | Bin 0 -> 1379 bytes .../calculator/MultiplicationTest.class | Bin 0 -> 1408 bytes .../test-classes/calculator/SineTest.class | Bin 0 -> 1337 bytes .../calculator/SquareRootTest.class | Bin 0 -> 1391 bytes .../calculator/SubtractionTest.class | Bin 0 -> 1390 bytes .../test-classes/calculator/TangentTest.class | Bin 0 -> 1355 bytes .idea/compiler.xml | 16 ++++++ .idea/misc.xml | 9 +++- devops_calculator.iml | 39 ++++++++++++-- src/main/java/calculator/Addition.java | 4 +- src/main/java/calculator/App.java | 34 ++++++------- src/main/java/calculator/BinaryOperation.java | 4 +- src/main/java/calculator/Calculator.java | 26 +++++++--- src/main/java/calculator/Cosine.java | 4 +- src/main/java/calculator/Division.java | 2 +- src/main/java/calculator/Exponential.java | 2 +- src/main/java/calculator/Multiplication.java | 2 +- src/main/java/calculator/Operation.java | 20 +++++++- src/main/java/calculator/Sine.java | 4 +- src/main/java/calculator/SquareRoot.java | 2 +- src/main/java/calculator/Subtraction.java | 2 +- src/main/java/calculator/Tangent.java | 4 +- .../calculator/TrigonometricOperation.java | 7 +++ src/main/java/calculator/UnaryOperation.java | 2 +- src/test/java/calculator/AdditionTest.java | 40 +++++++++++---- src/test/java/calculator/CosineTest.java | 19 +++++++ src/test/java/calculator/DivisionTest.java | 19 +++++++ src/test/java/calculator/ExponentialTest.java | 20 ++++++++ .../java/calculator/MultiplicationTest.java | 19 +++++++ src/test/java/calculator/SineTest.java | 19 +++++++ src/test/java/calculator/SquareRootTest.java | 20 ++++++++ src/test/java/calculator/SubtractionTest.java | 19 +++++++ src/test/java/calculator/TangentTest.java | 19 +++++++ target/classes/META-INF/MANIFEST.MF | 5 -- .../devops_calculator/pom.properties | 7 --- .../calculator/devops_calculator/pom.xml | 48 ------------------ target/classes/calculator/App.class | Bin 2394 -> 0 bytes 57 files changed, 321 insertions(+), 116 deletions(-) create mode 100644 ${project.build.directory}/classes/calculator/Addition.class create mode 100644 ${project.build.directory}/classes/calculator/App.class create mode 100644 ${project.build.directory}/classes/calculator/BinaryOperation.class create mode 100644 ${project.build.directory}/classes/calculator/Calculator.class create mode 100644 ${project.build.directory}/classes/calculator/Cosine.class create mode 100644 ${project.build.directory}/classes/calculator/Division.class create mode 100644 ${project.build.directory}/classes/calculator/Exponential.class create mode 100644 ${project.build.directory}/classes/calculator/Multiplication.class create mode 100644 ${project.build.directory}/classes/calculator/Operation.class create mode 100644 ${project.build.directory}/classes/calculator/Sine.class create mode 100644 ${project.build.directory}/classes/calculator/SquareRoot.class create mode 100644 ${project.build.directory}/classes/calculator/Subtraction.class create mode 100644 ${project.build.directory}/classes/calculator/Tangent.class create mode 100644 ${project.build.directory}/classes/calculator/TrigonometricOperation.class create mode 100644 ${project.build.directory}/classes/calculator/UnaryOperation.class create mode 100644 ${project.build.directory}/test-classes/calculator/AdditionTest.class create mode 100644 ${project.build.directory}/test-classes/calculator/AppTest.class create mode 100644 ${project.build.directory}/test-classes/calculator/CalculatorTest.class create mode 100644 ${project.build.directory}/test-classes/calculator/CosineTest.class create mode 100644 ${project.build.directory}/test-classes/calculator/DivisionTest.class create mode 100644 ${project.build.directory}/test-classes/calculator/ExponentialTest.class create mode 100644 ${project.build.directory}/test-classes/calculator/MultiplicationTest.class create mode 100644 ${project.build.directory}/test-classes/calculator/SineTest.class create mode 100644 ${project.build.directory}/test-classes/calculator/SquareRootTest.class create mode 100644 ${project.build.directory}/test-classes/calculator/SubtractionTest.class create mode 100644 ${project.build.directory}/test-classes/calculator/TangentTest.class create mode 100644 .idea/compiler.xml create mode 100644 src/main/java/calculator/TrigonometricOperation.java delete mode 100644 target/classes/META-INF/MANIFEST.MF delete mode 100644 target/classes/META-INF/maven/calculator/devops_calculator/pom.properties delete mode 100644 target/classes/META-INF/maven/calculator/devops_calculator/pom.xml delete mode 100644 target/classes/calculator/App.class diff --git a/${project.build.directory}/classes/calculator/Addition.class b/${project.build.directory}/classes/calculator/Addition.class new file mode 100644 index 0000000000000000000000000000000000000000..0ff08827ffdc0d89bf7f1a81dda72fc997f0aa1c GIT binary patch literal 1115 zcmZuv+fvg|6kVscq$Rx&Zi=FSm!?6e7rX&pfT}N5A8?pqdN;sbrtpxRebzZ^?X~wgzyJLB1z;Yl84RJQ!bn3$Nrfr@GZ}`W%&y5W zt6(mJG>Q@~%j~*}8!B$9xTRuV0=E_1QE*ovwdA-?_)s8jl-30jt6tp}$X6ZLe$j4j z+WsqRvq40!dNr%DZuyQ}_rOHB;{*aDRc_VV4J-8g@^ZcIgpTJf3M7q6MT!cGUxnYM zfYP%4EzfU81&NIXJKp=31T9H=@}cG1LBLF4*eF%sSnsTI!*aLFYoYJB+Z4^Ng;wqD zbE_43P;gHmv*xw^n*G#~Mze;@;kv8#u#-{fDGdR zqlN;qI73A15^)yeTuIS$J<$!sktCLhpqQl&)PBhVB?tMwb>!$xN=}kUT2E4D z=P?nL$>RdEIP;4<)%89f^+Idr9xLoYt$iiCYdRINMvocI92uR$bWhtXzuhicEmC7v;n buoa~L(tuDngBTYIF26nnC@oTHX^}#qLR)G955w-X9oWvSv$N28 zz!P{x@CZ`H0~(2mF#(e$icv_sGR6y|H(vNZj0yGmX7(@$n%Il^X5RPxp7(i=-5;-h z^BsV@@M#n)F`(dqD9SKUfgRYXVlaxW7?P4<6}#j)62*fURj@mXO6*avS6V(4MHL>d zz$186zUd0~sYs|u%Ik&{jVTycF(F?~75fz&P>_nE5d$hFNi8FfAXCD|kY|lLC=@P0MsU1wzd&y9B};?W7@aQ@?2$+q0AV3};B+ zm!c%rZzuHBF5NNZcU~BFC(Mk%oPMej*_7_uPHR^>y^c7Ox@ie4Xx`JmUq7g~rgUq( zb~dI?Br_ySR+t1=<10B+w`=TDh1sNo>Fj_(1Ui?Nf?_c$Z zFxRV1Ffkfl!*NOGgo4*Kyn#10yoI*~76xFtO-pyCi(tg*wOqrAyNB#Jlfb5tP2tP@ z@A&GDxQ2Hm;gdMUte2XiSb2fPeU?}HJjjZ8I%Vh?BknrWaebT(wMxUglJ~XPYdYcr z^#Ojv|Dab}^5(Z-ch*cL4M!%jNAcm&^@)@)|=wm}^DT8P}jy$d<#CpRj8o*tberBBnSS^P2-h7?@9uoy{@p zO86tj<-iWF8aLcx5?JEe=9a){bvcec-EU@GI`FA`ja3wr6z@xyefewNQt+ddq^RAl zPjV{e6>x)FgBg|^r4*94ApETGc3nOY#u`+}UE`&{=R}Z71@kY zuxiR<2Cl9PMqFAZ}rb;@<2r_+X&6j*tqtY24%e3z1x z>e_``M>F{vNSttUj|@=ZE*!HRmc2GJVIL}%sCO#O&6)9*WOc@zOsCAT>FwTt$};o> z%aE@<_bVN2GM$WHY3XGSC4)x7wvryQmBeDK;Qu@MSH{lg=Hl}Xe#w)=fbwM*A@)h?_28P7ZTBD(clMh@Hj(dAWub zq0XCUuu^`_%VB($F>s0-(? zRHotfb{R?Ds}wXzH_e{+x@Zn91&54cTRuCz5+Wucmicdy9G3q-u*R9IqvsLAeoW&@ z)M5so;|rd@h;pIw3_&);A86xKfy&<`)hzk~%;E2q7#5)hO_+yfTDGAM-KfV9Zoyt^ zl30Q<+)Cu7aBw^Em(xQN4%7MtwBQ();RO5gZ8p6s;H%Z5S3^7!jK> zDje()k7KVmf``O$JR;tKF1|%lTqaA|=*Jn^Va%n+wTRMt;cW~LlTimk^iq)hjGcMe zW=63N_wq)YIEwY?WR8Z!1i5ZN1${K-wHy=j?xr7Ad`xA*E75|A=(^FaG|*jz1Zfz&6HKhV6d? D6+OQc literal 0 HcmV?d00001 diff --git a/${project.build.directory}/classes/calculator/BinaryOperation.class b/${project.build.directory}/classes/calculator/BinaryOperation.class new file mode 100644 index 0000000000000000000000000000000000000000..1b1c6309ad8cf26d3281e2d40236bbb7291c118a GIT binary patch literal 728 zcmZ{i&rZTX5XQglUnxZp5ESv?N#r0GZyF9tI1xQyxG$yZ8f?wBnD|u2L}TK?2k@bc zvxT5EB~4~$zTKJcx0`UIvOz;7vaQbC=Nv6U(O!JzP#q+DJkVa=<(@@OQGt8XvB9SVrUL% z%bQJk9LmnQ2)KMs=EouoPHEV!ANN;4$cs>lQCc@zJq1yshT$q^iO!}ZXBf_;=l6xe ztEOy^@A(sVk%QyHg6(1hHbY}QCyn^Gxx_aP=sit(WQ|rDM46#x(Q1OJ`4sb1b!cTu zZGV8hQli17XeFYB0_E=f05(yiimr(*it}b|zSn+(_L6GOXEv8nSu}T{(??eA!*^(Z z)(#Rj} zqG5+n@4!#v_?Z}gu3**zo6oG zal9y|zZaffQt<}`no}`d!?PT_s-P!-&R8(AHP0$%54*0hl((whh=N4XnzaqD=9&tI z*0b54FB#=ht!#LXn?1gYI5Nt;t@|z8@i z#`#*=vnpk)BnzovbJ+G+lal7~8Ee6+e%1BSV3{V-D$ApwGmKN@5>>4w$5(cRm1A;| zYSlCBS=06ubcgjP{Z$%h)eAMlHBUGWZJG*OTvO1j&0MTFHi1Z(f~Mrh8yaC)opUZ8 zmL#$MT7yajipBp4Hc8PlO6QLm71>oP{-{7N%{flh^!Lf$q@BW)gCkI8yxH-^l35Y# z(@nHmGFYpwP#f^qkTRH4pb%Z3!qZP1LjT6sno+93+g9tf@Y zRpwa@tp$}ObD_mXDVw7Ul}^RWI$pu6JUn~So|7J5w0O_HrehheH-n9>9e5q%xLd~? zcvHt;@Rp9h;%{uUkmI#u$=;Hz%0d=B*Rp4i)U5K1>FW49-c}GxpLN`{5Z=*o1@G#3 z5AQPFMlFK+>UbY@QK_pcKG5+YKGLy*e~3U?n{Uekj@zE;rk7aiwBHIjBL5Sw>-ZRF zR}0+SQwp|D*s@)MExXf|vT0P!wC66RjakF8hjsi*1om%%(a}if`1Com#M6^(#5zI$ z;__uH^I{=?1Ae1QpT7ObF1BL`rMOh}%z18bYQzfq-g2_{lPiymnZ`U@+waZhWuEei zFe;17E9}VUS>A|oYb~PQrki&)QevxfMzvrr(mUS`3@&O*p?lRn96S%1QK^_VbL$_N z2rl`r7MG|)>qQh|qp2B06nupgjCrI!@?ee`UUvqR8IaL%dy+#Rr1p`Xds^+TI&HyvCbtL?TYurIGSrVorNSqKCa9qs9 zdsg1(mrQKsC&69(+M#oCyKvl3DS`uN<(yX$pNF_|A6hsAx-(ayWL6M4a}_P`BT6y$ zj@)sW&m^LJZs2nx+WFVTkDnu4(fz#`!%<3#II{F{i1REZfg8)bhv?g!L?D2Kb8vfO zb1c~Ghj$P4yyy5lM7ty072&7}kij}yPd7pmpEbZ{B+xI>dVR|PjeD5d*NGDm_o|Pl z6ewxj_1Fqj<{8gt2%1=dMxpIkX15e{3L6TUAt`L6(4LECQc)>(Q0&abGO3splN7sh zt(jD-6uT+*0 zKJ3ID*n>N9J4<+wMI2}O3M}49vNJ_KOU$-R>Rr-)8Ta5(a(9GiXZxPW!Q$`Xvq;1!J&fTLCK03UUYy2*tkx86!Wlfo58^VvYrlbSGS17C zrtmE?uZSzr=N6w5D@NawSFkC$xsLu7Y+=S<%SR88Rt3*vA1B)sUUl1Z zQChEH2MurPujA(A&N>DJ*Sk2@ks-|E5oP)Me+6GHvV*oU0x*j>VL8 z6O8^8BNrTGn9(ploJALi=A8`K=pa`QlQSMjJ`GHhjS}_kh+M-a6E-L610V@LQLOtO+-1v<%p z7qjVM7AgLWxRD`mXV8O~rTsj2Sln}tU2~qCl-WNHYkPq^U0PMS>cPeWD!52#QSvs* zs_!GSvzQ}q1=%S_C4;qq!A^Rzh{_iR{hpT$_ArVvJ+??LQ)s=09ue=lssY?caaD{s6d-=LSkx)Nvz+Dcsbtq`tQdibbU@8>peK z!8VXnVYk)yjyhh^v8s%QhPxW>31l}s--})dOxEiA0+}s&=n52@p6|ZxcMsfP&pGJO zV>M;V>Fhg!r|i_3iP~N$Fx}))tKV@V88o(J$lPZ{)wUH;IDEGSw4NIr$)FooqFoN# z^3yvyoye2^%g?>Q4MS=IGqrm2gY(g8bR7S%O8ykqIhuFF9k^ECJfCG(s(uX}= t$3mL_IvyOT{6_BmDGVz=fN3k(02irR1&RTR-_CK%XSkIiw-QHH{{!twwEO@7 literal 0 HcmV?d00001 diff --git a/${project.build.directory}/classes/calculator/Division.class b/${project.build.directory}/classes/calculator/Division.class new file mode 100644 index 0000000000000000000000000000000000000000..81b374b9c26ab3211cc94cfe19489ba0814cc1f3 GIT binary patch literal 1115 zcmZuv+fvg|6kVscq#?Z!iXe&>yflqMz2FTH6{@~eeZXOc@#)Y8INBziBt`iXAAHtF zb%w%>&iDa-l)6tEYNs%n?Ci77*=w)8PJaLS@e9BL)-;Tvq{2+YKv{()zt=PhC7E59 zVNSukhBQhNuE^|$ikm8Kskp6TK>~La+*NRoA+;FI;DdA!$~tl9X|JtMqO$ zC~e!@cD+{Ekgy4V*M0wrKps%h(+_RW_GLLk!7SI_@;zQ@a%ZQq9(cmpA=1ox!0Yc` z@OG#{!F>j8-R*dF`iF`kg*Vx>sMCIjeG*0G9NhOtwoXP6p5SB1m9{r;2;`Qc{dyu(|e&%;|Z zv+9NhxgLYQEj&L6shkE)>)UnLY4q1wU$ojyvAy5BJh~gRda8{n-fr8HVa`11^2v(G z45=k>dv}2u`n$&HrvwsY2l-6#46U9cMj0?_9f4U!tc$p1B)Uj`CoqNyiUyScD#bK3 zdh!^-Bq4gQ5N9z(D@l4TBHctBNy2hOnzBk=C|0=(b(k_slsO{JBa6|HvPgwg7E#LV zJf_1oIb5JDPWeR?qc#iSEP!SmP=^C@{wr1YM5n^4!hle%FLVa85yNMaDW|XfM0)dx zh$Pb?Mh>AH848j#`|%T0Bl`tOBPSt=^^W}C%^&X`V)PsF#Y5wI8YTxc)FKU+=!}Jg atswoE1Tck6j?qHFU+bWSXA1wfeNY` zYy(*pc2j+CspAzLtIDWpxUJ!iKxV`B-RPM>s#4t*NIwsnj=)6S^_@4p_MQ{IlY1UL zRy}A)Z&!w{vJ+=IYPns3nL3XeJx@kKSbK5U34F(oT5q}Hkm zHeq2>V0^@HVh!so=NxuSE^gh#Js>Q0`6v&+hzLrsIxJs@pBRd^O z1*}xgFX;Tvl6hDq*LB++&)q*7{#Su%{+sg%wi5-zePe+)roamaq`@nINy;f&FEK_9 zDA>mkwl&sA%C^#dT=+)k7^W#LrT{u+76zX@#!;ll944ZK8CnWDn?Sdb;sY3jX6)rY zv{PCxKFN_bL0.@ULzaG=wk^pl>h tVm`@#6%P)Se*1K literal 0 HcmV?d00001 diff --git a/${project.build.directory}/classes/calculator/Multiplication.class b/${project.build.directory}/classes/calculator/Multiplication.class new file mode 100644 index 0000000000000000000000000000000000000000..f66e60d19768d5ec56e719358bd87511d68b32a4 GIT binary patch literal 1139 zcmZ`%+fvg|6kVscq#?8=fZRk2UYbUsUhoEp3RPcvDd3Elrb6?1H45q>z5im^Ds8nw|JoNm^YTF4#%Mo=R3eR0&NSoEFq-LDn zD!rQwO3U`QJii%@C2SADk@l~J zyuQ22Tagk4cNw%bukF|ECql{{JSk&VQs@}MFhlNSNyk0RlPXKc0_JrrVp7L_Op>VH zxyx)sBg=&u{3pA|@vDdaiDGqie&1ZBX0bx3v_i4KyMk?J7*g}?+xC>qoP zs1&o%=qaENqlD<)MvP&cR+4lgCfz_1X~ObEnz2e9C|0=xwU;tSlzAd8Acuj7vPg~8 z7E{XXEGDBdd7PsxN%?sc<1us5Spd!2rwRK|cRx{gS9B)o8agIaI}$pD>6qaI$&{zB zeM5HRkccGH0s0Q08~qd{Y3|*7s7CH1(nelF66r#q*iev=Lb3?zeqx-|#jzvDE+9UDUAIX5 z09%lds95j;d=o;PnS?^Yn|o*O+;i?ZGxqnNU%vski`@z=Y?V>OO%-lca1Glk>{z&M z!4WVcIq?P7x<~R@x}l85?jTKqXnaqg6i@v`rg0)rydOkC`aq!2Y9A2wFn&%{y&FV+ zFPjYgi9{qF#mPj=+!v_Lg2^-tMz7}@1unMsa|hU@$ij5)oNgoS zNkEWfd5}u)#Zx)eZY;C}DuXynJpXZ^EZ5GY+);OEqYB$b31u4<724>iuqn{U^DnUS z=j!{zBi~EUm40ioj%Aqn{gE>9B*%og#RsIO_TohwrbU@k%^QH;ynxy*ujsq+Qm z6Bh<*izd}t=UTP00V`N#=GTD>jOW3hVSMD_-{5L4xRDDk{0pxC4>swQU@$kau9a+H zbD`u7?U}4?IL^u2ckf|4C#NubA5d~mvDDjB`~~f7P4{(pDZBKuM=n>->abp8&m~?` jK`|}-s?}v&;hZMz%}=lLybNRY2TY5n4BYqyhryqf literal 0 HcmV?d00001 diff --git a/${project.build.directory}/classes/calculator/Sine.class b/${project.build.directory}/classes/calculator/Sine.class new file mode 100644 index 0000000000000000000000000000000000000000..9570e4ba6802bf4140f1010bf1ca9a0a7aecaba1 GIT binary patch literal 946 zcmZXSYj4tE6vzJ$AT3?x(p^xe4yJQZ-O$au(-%5tVo+bOEb(Or9XtkFQi_*Pr6#f& zP5c0UDC7Sr%~&8!PtQ5eIlpsx`uE?jKLGCHseuAkbzI9JkLx-7{21kC-i|WuW4m$p) zcXT?T^u3p#`+++cP!m|FRO=s{k4~-YcO)l5be*;G*`EX=c- za+uh{HVX`-XL3i|ChlQb!+jHLc)*g=)aOIlZMgxnnNczE5RXhe28)TRi5;wP4^x8) zl+Sqf1KIXHzvr^a=IJoxc}_1{*>pvsbw3)~XIU*$y_P_B68OdmJLBzfOKGRycU8bf zWp*dCYl;VAmFz(F`dxYSWqgMMi@c6m1ltMy@rqIA-%;St1*E|1#ysT$tyf4;0}A#D zgl#28NZM9vgmd5NOkk1HVhW&BW?=BiV-8F7nBzngaett`bca^I%7#WUQ}DYq0wmHz{0eX+Ix literal 0 HcmV?d00001 diff --git a/${project.build.directory}/classes/calculator/SquareRoot.class b/${project.build.directory}/classes/calculator/SquareRoot.class new file mode 100644 index 0000000000000000000000000000000000000000..9f9936a7ea2afae99a0ef8cfec7a0cc55a3c2fc8 GIT binary patch literal 1092 zcmZuv(Nfbu6g}IPCJmu25vV9?QIR$ZRYXNWw1D_hbjB((>eJE&h_*@DrYe8nCphZ6 zkLrvRM`!#1Kf@1E?9MYqX5X z$kcEi7ZglrNMKAZlPU@-F3O5aDyAfKS;4e|D-7{D+p)cQhG;Io$`D(0s}@75WINWq zR(;J95BXY+5ToQ)cx{ynTkb=t|*kZT3lEUT-Tc=y4;dvWt`q6 z2Bl$%byw7VHQHyIo9@f|1ai-Iojb1@!fG}tVi?HfOV9WVUZ`$f_tV@Agfj3}7Z zF^8Mf(m~aQmR+k_LdQIA(G)ob=(vp{#d#eI$TAEbIzGejKKzlx#rEE)4C#Y9WR}D0 zzS9R&G`Q;eF1dnC^h2l0kn9w$aBq_snp?sPTqk$qywR{^-9)b2%WiwaK}jsxwCjzU zy}ljX02+{fV>bnL<+;JH!6@A=gKj4f1CyrHI!L>_h)@Ldo4a795!pf1G-5mG`AlF0 zL$n%n1W;*BK%*y(UStT-gM&DVVcJR3VqVxb7k;cvO9Vi{Pq@PI=TZ;J7KGP5> zQFX{9qvIGME`}308FEgAjjHAsC|{v|q!U4ZajF2RcY0FydOC${c>W!F{JP?IBp&ZV zGh%J@O0MLa_fQS}1A2@;2}!Jt-oh&@q|_(Q5p UA@?J+QE>X{AsCgM@y9v)7s1)lg#Z8m literal 0 HcmV?d00001 diff --git a/${project.build.directory}/classes/calculator/Subtraction.class b/${project.build.directory}/classes/calculator/Subtraction.class new file mode 100644 index 0000000000000000000000000000000000000000..81287980b00715599484fbd02c5909f0fbc3bf1c GIT binary patch literal 1127 zcmZuv+fvg|6kVscq#?8=Tt(4>m!{EDFL(n4g{m)AAL=l}_;lI^h_*@RBvttnAAHtF zb%w%>&iDa-l)6tEu~V2#cJ^8O?6ucfC%=Aw{|R6Tn;OPZP+_KFps2!<->Vvhg3PYT zP*Sj{A&r8B%QCyJ;)aTwDsHJ*lE7^RcNE-ZNUb`q6Ra`B&EghAV$*Bd4B4vV+RwY~ zx-DMvdW#UF>NR+4iwj4tBQO!{IX=Tol}e3niwB-4*ShsU@J8Tx?g~TFtW+c~+H0&pi)S4U6uqgX=Okk2>WB}K3AIqetq+~bKOW|1n%{rh72T*svP{#6e#_LcbJp>cf;GXol`k%o)3 d$3ntZkp4pgm_jDUXrbWJt5Y!AaydNNmA_3A*P8$U literal 0 HcmV?d00001 diff --git a/${project.build.directory}/classes/calculator/Tangent.class b/${project.build.directory}/classes/calculator/Tangent.class new file mode 100644 index 0000000000000000000000000000000000000000..16b7180507f250e7efe8638b2b0052dd7f9a3928 GIT binary patch literal 958 zcmZXSYj4tE6vzM1Kw7%WrMsX`9Zct-x}lqQr!REQ#Gt;|vc#9qpo1D{Nhw}Fm6`}M zn)m_yP{#jL8dxArPtQ5eIlpsx`uE?jKLGCHsewG!bX-d#hwD1l)%S)$v8J>Q17%b+ z*ap%n?56tOQpcM*wvIPrr{REl^i@4fuo4V+$&8hPbP?SuR%t8KEX2VvlPP4bKbzaP|{eOL8k#&xz-pa}~L ztPuN5Y-5LILg|@Y){cpLSkZ9b#5x|Z@HG2*-)%RXfE_cVY~mpvnRpDA6crP@SmpS$ z6AF~hIs>=qdw$1ZxApNAD|H@3XQNsa``MGYNbn!`5hxTvtkVyN(Lj zEYB`yc3<&Ktdi-uoo?Gb`7*jsfhFF{EQ0NX{%F@I@lVO~M+1`J>{y^&r1c7O)PTHw z3SnDw10-xKIl#H^bk1Rk(qamrQ>J0?$zdML^q8YW6mWr-f?kZF`$+Hs3_?@(#sJ!c zmWfU>q-Dv=MWkg`VsuPW+9j-zC2$#6V&-<-sBZs&_7nP7W{mnvF#;TD(vv>!=_*#^ q{MXUoK=C)y?@wV^^Fx@nf(>z=s+FM_BKvKMTR6ilj=9Ass`MX*&9=M% literal 0 HcmV?d00001 diff --git a/${project.build.directory}/classes/calculator/TrigonometricOperation.class b/${project.build.directory}/classes/calculator/TrigonometricOperation.class new file mode 100644 index 0000000000000000000000000000000000000000..686c49b43b5abb634917a54264f84783aec81e58 GIT binary patch literal 322 zcmaivy-EW?6ot>->`$_;M(jeW#YQbmV;4yyq*_don0|I0^vY&N#@T?6WhJEW0emR& zZU~Yh;0%1+bLMa^^Zm2=0&s)V6dfEVI7!ea#J6nNPY9ih%OxSavyYn4FWBh&W>spp zP-QL7Sz#+xFO}m~@66CY^Bdv3kf*AtmA7uRaQtMAU1{&Qn!ReLJX911 z8y=2bzo@m!5F#Sv|CSO4dzlBL-230cFh?N&Y!AtmMqw;!wADa#^$GeABS0dI#ctUZ QX4^SJ52+}^kuX5^3q+qzG5`Po literal 0 HcmV?d00001 diff --git a/${project.build.directory}/classes/calculator/UnaryOperation.class b/${project.build.directory}/classes/calculator/UnaryOperation.class new file mode 100644 index 0000000000000000000000000000000000000000..15b8e0c36d89d95af10fba224474a72ff726a5fe GIT binary patch literal 501 zcmZ{gO)mpc6o%h3pLz|Yts+)dsteuNk#00r6Bg+Hb~@q8m@Cs6iC-lWBC+rT{3vnm z%!Cp)=kuQPyyw1uyuJb0$A*A|P6Ia9d~|)R6MTIeXEL1h+&sJ^UIL re-5u;wH_X_65F8qJI}Db(Sjv_AueMKzFX#AjW^QF9Y%GlB(^^R)}>U4 literal 0 HcmV?d00001 diff --git a/${project.build.directory}/test-classes/calculator/AdditionTest.class b/${project.build.directory}/test-classes/calculator/AdditionTest.class new file mode 100644 index 0000000000000000000000000000000000000000..eda288276695490a2690f60e808aa90e9ff9e52c GIT binary patch literal 1488 zcmcIk+fEZv6kP|})3MfaE0-!_z0z`Nxm5%dTP+2#LIgrICMH7}VMyuJ=~R96L;ML} zfM{a+?5khm4;a^(sen@BlatJxeb(8Rwf8#h*B_t00GL7{h%2})GfD3F$jp>y1TYk@bk@EHin}NoLmSE~MeE3b>~N=4E~D+oXCl+?VzIFOQ6d zYyb}ecqkz6nq||O7if(qHU)eSt!+b~tzedomD>K6VQ=VLB_f>#tEiVYb=y??2IzBk z&8k4Oz@uWVq&t?K%5HC)j%k%QjH)vy5ULpVE6d(j+i?M*^Ud+y643O9t3Y?N42%vN z?4q=7tFT0siB!*f`Wrn}(#t!kb;mZ#JERm`w`z9L$eU^^9jCiZ zD(?_txGK=qWFqP)7s3Ma0W5~Fghv8_sdQ{OHk}S(0?P_}%#pcRd~`aUoJ_Fb=u|rC zc?tN(=srf$P4cVu1lmtHuWs#ecnpf?a!TAlLkm}IiV$l)rfjup*o{$!ba%7xx~7*n zS;a&d?ktkn2=S3d3$F7kJrFl& zhZ^=x+~N)xWN?cc{DFQ!BJl`XmLl*ie};TMm^egW)*pd3BcuKU1ZT89*{6k%aQ-C! z00N9VM>0WZIFBw?>B9w53^RY5TX&w>nHyeRAF((RMK@H4g@qr@aL zoI{e9#@4((#<&9Ge`6i`opt!1th>mX-LZBTdRV!aHT%dq`X5+N9JBt;-jsBvnsEf} z5p;6Sh0e&6;RAH9jEo+k=lH1CJ&K+=y7()q|Bs_^*p0Y+3O*4lj}8{TOlbyaU18HP zT;c^t@T!ck>2XSQn*+#Ephcnu%JY;bFDS`NiczE#yYy0*X~=7$A!?XDNS+ VyjVS0XUrt!JuRT%Ke)P_>7O^k3n>5q literal 0 HcmV?d00001 diff --git a/${project.build.directory}/test-classes/calculator/AppTest.class b/${project.build.directory}/test-classes/calculator/AppTest.class new file mode 100644 index 0000000000000000000000000000000000000000..97076b7224f87e3d363d5e7111839f21ef9ef1a1 GIT binary patch literal 467 zcmZuuJx{|h6g;PC10m4TmXD5XEdv=~10h97Oc6*B1&Pf~t=3g)SB?X}iwVTQ58y{3 zUeZb(z{9ie?!EKL{{H#=0&szW4;TABy6Ac6dpKZdT}dVFHA7=KN*UZ6JrNA;SSoQ> zF2=$ne4G>0jdjNJlp9&$HR;-!EExJRNm-e5t4$a!mx(CsCDFx9m-!@8#j7w+(#{f7 zlGEU!R8}rTDho+gky6@nE43o0POQx|oR<_ST)X&>x-^-%l~syh?S3}rFFZgKEf0qQ zj&Mu~|ArvLsxi#Dnuhn|xyUS0n=7KC5QZq9*N0U;clbO?ae@ZDRka+j>LRKhp^$b) zd-L=i?5&o!s8%xIW1DKQY9O>jh(eR<)Whe5>S6Z-&Suyr8T2VGdjA;gl2+O8)n;v~ G4m!UaYF;e> literal 0 HcmV?d00001 diff --git a/${project.build.directory}/test-classes/calculator/CalculatorTest.class b/${project.build.directory}/test-classes/calculator/CalculatorTest.class new file mode 100644 index 0000000000000000000000000000000000000000..0fa296d8de16ef145bc2bd423a66965b8c1c79e3 GIT binary patch literal 505 zcmY+A%}&BV6otjVMsLb0emRq zX(a-i`!{pGGjqRxKE42)V&8?0hJzg!78+%guL#5GRNRw;F(7fi)U}N=D9vrOEZfUxz(F z%%#>0;w?Y+80~!MV4b!1cL5uyvZD#bRxUn6AwTn4pRgWhD7>S%U}U#ILWRl&$D4Du N<}S6IS!cAc{R`t~Xe9su literal 0 HcmV?d00001 diff --git a/${project.build.directory}/test-classes/calculator/CosineTest.class b/${project.build.directory}/test-classes/calculator/CosineTest.class new file mode 100644 index 0000000000000000000000000000000000000000..f0ef5019c0f4c5d58be69fbc45e3c1be2a8642e4 GIT binary patch literal 1349 zcmZ`(Sx*yD7(Extv?)#5$|^4GQ~!V6|7R~S+{b!MvQi~b3Jg0CjN z0AgZz_Qk&-iHW}gy#`X_+d8SQ$ynJ`@X7__OyMFG40vJ^V4^+XJcE0}W?Zx9ykpLcQ@4Yw> zz_=fe{Fo5XCe4iLP79Rl(WHQH!P=DqRS7dAS96Cu(%v+7(nM+#R?0{x4ck=b0_b!1 zO-GKmUdxaz2XIX*f^<2g^4`tGHOqS1OGL~z&rj=oJd&08! z;s-g>;F>jEX~&JM8K0LgEL$!aseLx`XQj>Kp@1;>ERuN28zfLyI-Lb!d6bnYSMIJ$ zCzp1aZx=SL|Cv{y-019Euh%%v1EDH^KvwOanWlK z(W5uX@6oTJ`I!@?NHmFiXyi9qeSCaq3j}U)7w22>UD102@tK=4v~txvFo@gShw=%y zgS$L|ty-9+iu?Ge;*!GfwL(!SY-6Ho+s-#={Z*4ML<2--!Yf}9MeZ?FvRy4X)^Qg>81-BmsH=(Gn-S&c82OJ7nI=)C zaRe2LLV;=-rqGEllC5N<8$Bpzmm%oHeC*Z79$ln;C8?LS%8e^YznP_Mey#*X5Tc|+ zZTLywF{)Pk2ToC)$7?*it^|*Gc*8$ZCCw)rsrKCnWUY0ch7sydCqyxbKu+W&tCy#u;IrgWR=_|Z+w(otY!Ex z?}vf~C8xC<@^(|Xdtv^^&*)mxk44;4a)tM9P|1~!T|>o^%)2eaca-DO_c{5fSXPb; zos7FGaz3p1uqvS3HfyG{EN~_k-xlz!S-Xb7xuRJ!Hk$`KhW$j}snQcFT4lYut=p!& zx1AoRVm1UuiVT&TRo$`dbl!YpHcYGb#ArB60^Wwvc1|YP_;+V_h#-Sjbm5Y+erpgwB)a*%458+wBB~d$Axe zXuPW%Wyjbp8I5Mu;mCH|i2kQ}Yy)AsfI9?n~bT zfq?6aB^R=(xi}jpGuc!ti#ks;eOe&gqrRL+VBm!Fqn&*!LQpK9ms{uVspn|#Evz&e zhTYy&KzA?eubX<6i&Kbq3uv);FG(h1UEWsHrPH4HHbxQUpFlny9ts80p_S%W@as(+ zL42gqhpT)muG5b(+JROAuHiawzzu@?T<|1s5_}36>;j55aGZ&<>;%8yDmq0z(Ceos zp`q`-2G7P9D9`%kU8y;!HzOq47P82+p&1 z7;##X{xa*cdYgp@B0@;fr?5glwMj6m!+V-lz~4%T_b+Bi zEltT+Lr}v2ITu5rhm(gG+MG&$g7!Bw?1sXpLXi&Y!at#4&_!JAa-WP{z#tn(5#&k- zxlB3mMeZ%mk)}B43^z4T;(3aFk5U&IdCXy7F#3{%mN{gF<4JiEts&a-1l^n@ZWR$h?qX6gB9i!`S?UN&%5L4=sxdzJi%fh0 zm1unO!9QS(F~-EiC;x)+%(kS2%O*2BbLP98b7tEw|K5KDFoyXE5=e(J6hRe+)ie^p zD8{sz>e1lQW_qGOKHs$eYE$1|{`~g!!@f4N`iZ$fEix+MvPu}&KCS+K@$1HGy%txr zSHZc8mFpx9a4uNBbkkwd1lPy!H*J9|zR2b7ST*nM$le;mVNygBRS%uA&gd2n7 znN(&xNiiy7h>O;ft12x5XDWPeZ*0>IUbnHJZk=~eGcTQd1+$(f-SRcX%wV(lq-f@O zYnrjJ5ERgj|bOetdLo1S(P|tSlq}xHFofO_hu{~V% zayA0OL!2iuK*@ucrvb|t!X1iQ!wBy4kL&?5ffaov>SZgUJXZ$r2hM1N`O4NT4H%#) MhYb*{t3IF9f5RIVYXATM literal 0 HcmV?d00001 diff --git a/${project.build.directory}/test-classes/calculator/MultiplicationTest.class b/${project.build.directory}/test-classes/calculator/MultiplicationTest.class new file mode 100644 index 0000000000000000000000000000000000000000..33cb8e47bd9de25ceffc6122694b210c7046437f GIT binary patch literal 1408 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 literal 0 HcmV?d00001 diff --git a/${project.build.directory}/test-classes/calculator/SubtractionTest.class b/${project.build.directory}/test-classes/calculator/SubtractionTest.class new file mode 100644 index 0000000000000000000000000000000000000000..73c6c2d62ddd0677295727b3eae4730cf416fd35 GIT binary patch literal 1390 zcmZ`&TTc^V5IrBX+qE>6ODW}|RzzumwkQ*hMcvxfiWPdg^JYn_6g10_=cd!+lnq;8D9=!- zUeO%WO6}B(j-{0x!>sP=wzDAMwRPupO`w0fUUiH^yiBFFFcDZkUDepng=-OOC#` zt=sjAL+)177`mZ*lR%$cHa~B%xjXIJQH?m8b4yhYv`<>9qE+`(JC0>k_u0q4W7e&b zo-?Fwp-XxsB_Mzy+z|+0FPn@m2k;0hKCA|i#Tuzkr=yAJY&w7xa?-ah5O965#B4e_ z6=&PTbUN9{qUMuKpA;ClzJ(+v(0MWZR`Gz+5Esj4<#)iZf$~PLU&^v=>sE7d0nI(E zeXMI0?olD$Ef9*uuhV8U*5Yk6UAXFr7ZAk&{|0$^cvCJ2+@+P`Tk!22JAwE{qYd}? zR9vT@Fd)!Kz|G1B*9mJ!4{xs0!NrA%Rb~A+{Ss4uk`xqiG|R%5rXH% z4=8U(<0tUVdqYs?lz#6q{BvqViKxL-bX*L17e3;;$*2b^LVWfjf-nj6VU$*s(Ir-A z?dA*~j4%@86e^=}TJ0`s4CC+;(TNHA6jr!}1TB^Mjj5A-OSR6Y{=+P(q#>sbArL~4 z6X&}-UydK6YjYxTithiR9yio`B@{kKMJ|Pcjbi;R?hD#Ebg}Uef*hucdys?&Nifd+ zOmI7oIrIz#&XVdnN#q%MMS|}beNS2?BvB@nD65P$NHpaMGDk`wSoaOHC%NY^c8Hmz NP_0r3c9Gx8lYjd*3Zno3 literal 0 HcmV?d00001 diff --git a/${project.build.directory}/test-classes/calculator/TangentTest.class b/${project.build.directory}/test-classes/calculator/TangentTest.class new file mode 100644 index 0000000000000000000000000000000000000000..af645a2ee67d7cac56f379dd7462e253c7f727b5 GIT binary patch literal 1355 zcmZ`(OHUI~7(D}JN=j2+BNRmC&6GzA2qN-+6j>CAfHiD1L%G6`GE--!3U2gIxX`^@ z6E}dG7}l=+10*K?0+$-kZA)k@PIB+ud+zr*=iF(({rUVAzz7xs2qWglU;t$plGAVi zw=ts5CXe3od8eNFetlnwPd!qn-v54eezfyOon1d;E>MY4nQ%uYjHzeqKVF{S|DaXk zuKGH6E+fYMxaY@&0(H`~OmA92xgJR>@GaOoLP2%Hw8U!mU|Tqw#&()WUBXTo>7?P9 za$f*_-k#|y2q$=y%BBs^c4C``wJR)dQ@9?>SGdA^m{HKQp0zylKqO7qWd59G*`DE< zw#D@JgzfCc_Os-{Ib(Xli5VF)HZPvqj))tnJr?q3gv0HD0>$81B;w^eDbTLy&y5lgdkY{PR*YnOcj z8+O)7i6v9|R8yosDuaV)LNhZpkBvrx=);`E<`q;?s6H?@ z8XX;rP=wqKa?wy)QSv8+OO9*X`*eWUsxQjhKgywrrlp>KNTG7bwT0TAw8UqE_xr*_v@Lkb+0_7tYWoY57=D+}M za2?DC;3jTy2bOAPluYj9kjW*9p`t{kkl4mRS+<>T(EE!bpNLixnF%d_LD^Q%3CdSP zlNx?oEiWb(H)^ zh)k2H)Hs3)NufZs3{&Vt7s*!fq#HdbXO$u7#C)vP#~NLveIcorxzddbNk17SZGIvJ zX$VqMqAs-3cZ}-Q{()1}4+(SjHe8P}C-dvBf{E$CN6q=*?3vSW(4uX#juJjMkYiZB5XCewtEj LfWo@+^NIci9<~jb literal 0 HcmV?d00001 diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..ee128bc --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 91fd695..f1755fe 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,6 +1,13 @@ - + + + + \ No newline at end of file diff --git a/devops_calculator.iml b/devops_calculator.iml index b187d53..d740aba 100644 --- a/devops_calculator.iml +++ b/devops_calculator.iml @@ -1,5 +1,5 @@ - + @@ -7,15 +7,44 @@ - - - + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/java/calculator/Addition.java b/src/main/java/calculator/Addition.java index 7046445..ddcde32 100644 --- a/src/main/java/calculator/Addition.java +++ b/src/main/java/calculator/Addition.java @@ -1,5 +1,7 @@ package calculator; +import java.text.DecimalFormat; + /** * The Addition class represents the operation of addition. */ @@ -21,7 +23,7 @@ public double perform() { } public String showOperationExpression() { - return this.firstOperand + " + " + (this.secondOperand < 0? "(": "") + this.secondOperand + (this.secondOperand < 0? ")": ""); + return simplifyNumber(this.firstOperand) + " + " + (this.secondOperand < 0? "(": "") + simplifyNumber(this.secondOperand) + (this.secondOperand < 0? ")": ""); } } diff --git a/src/main/java/calculator/App.java b/src/main/java/calculator/App.java index a2257d3..855c8f3 100644 --- a/src/main/java/calculator/App.java +++ b/src/main/java/calculator/App.java @@ -5,7 +5,6 @@ public class App public static void main(String[] args) { Calculator calculator = new Calculator(); - calculator.initialise(); int choice; boolean validInput; @@ -13,6 +12,7 @@ public static void main(String[] args) System.out.println("Calculator"); do { + // Choose an action choice = calculator.chooseAction(); if (choice == 0) { @@ -20,12 +20,17 @@ public static void main(String[] args) return; } - Scanner scan = new Scanner(System.in); + Operation chosenOperation = calculator.getOperations().get(choice - 1); + System.out.println(chosenOperation.getName()); + Scanner scan = new Scanner(System.in).useLocale(Locale.US); + + // Scan operand(s) of the chosen operation // BINARY OPERATIONS (+, -, *, /) - if (calculator.getOperations().get(choice - 1) instanceof BinaryOperation) { + if (chosenOperation instanceof BinaryOperation) { System.out.println("Enter two numbers"); + // first operand validInput = false; while (!validInput) { try { @@ -39,6 +44,7 @@ public static void main(String[] args) validInput = true; } + // second operand validInput = false; while (!validInput) { try { @@ -54,11 +60,11 @@ public static void main(String[] args) } // UNARY OPERATIONS (sin, cos, tan, sqrt, exp) - if (calculator.getOperations().get(choice - 1) instanceof UnaryOperation) { + if (chosenOperation instanceof UnaryOperation) { validInput = false; while (!validInput) { try { - System.out.print("Enter number" + ((choice == 5 || choice == 6 || choice == 7)? " (in radians)": "") + ": "); + System.out.print("Enter number" + ((chosenOperation instanceof TrigonometricOperation)? " (in radians)": "") + ": "); num1 = scan.nextDouble(); } catch (Exception e) { System.out.println("Invalid number, please try again."); @@ -69,34 +75,26 @@ public static void main(String[] args) } } - // Remove sign from zero - - if (num1 == -0) { - num1 = 0; - } - - if (num2 == -0) { - num2 = 0; - } - // Set operand(s) to the chosen operation, // perform the operation and // print the results. double result; - Operation chosenOperation = calculator.getOperations().get(choice - 1); + chosenOperation = calculator.getOperations().get(choice - 1); if (chosenOperation instanceof UnaryOperation) { ((UnaryOperation) chosenOperation).setOperand(num1); result = chosenOperation.perform(); - System.out.println(chosenOperation.showOperationExpression() + " = " + result); + + System.out.println(chosenOperation.showOperationExpression() + " = " + chosenOperation.simplifyNumber(result)); } else if (chosenOperation instanceof BinaryOperation) { ((BinaryOperation) chosenOperation).setFirstOperand(num1); ((BinaryOperation) chosenOperation).setSecondOperand(num2); result = chosenOperation.perform(); - System.out.println(chosenOperation.showOperationExpression() + " = " + result); + + System.out.println(chosenOperation.showOperationExpression() + " = " + chosenOperation.simplifyNumber(result)); } } while (choice != 0); diff --git a/src/main/java/calculator/BinaryOperation.java b/src/main/java/calculator/BinaryOperation.java index 9f47bbd..64f1adf 100644 --- a/src/main/java/calculator/BinaryOperation.java +++ b/src/main/java/calculator/BinaryOperation.java @@ -4,8 +4,8 @@ * The BinaryOperation class represents a binary operation. */ abstract public class BinaryOperation extends Operation { - double firstOperand; - double secondOperand; + protected double firstOperand; + protected double secondOperand; public double getFirstOperand() { return firstOperand; diff --git a/src/main/java/calculator/Calculator.java b/src/main/java/calculator/Calculator.java index f2c3b4a..1534fe7 100644 --- a/src/main/java/calculator/Calculator.java +++ b/src/main/java/calculator/Calculator.java @@ -1,6 +1,7 @@ package calculator; import java.util.ArrayList; +import java.util.Locale; import java.util.Scanner; /** @@ -11,6 +12,7 @@ public class Calculator { public Calculator() { this.operations = new ArrayList<>(); + this.initialise(); } public ArrayList getOperations() { @@ -19,7 +21,7 @@ public ArrayList getOperations() { /** * Adds a new operation to the list of operations of the calculator. - * @param operation + * @param operation the operation to be added */ public void addOperation(Operation operation) { this.operations.add(operation); @@ -27,8 +29,20 @@ public void addOperation(Operation operation) { /** * Initialises the calculator by adding all the operations the calculator can perform. + * Available operations are: + *
    + *
  • Addition
    • + *
  • Subtraction
    • + *
  • Multiplication
    • + *
  • Division
    • + *
  • Sine
    • + *
  • Cosine
    • + *
  • Tangent
    • + *
  • Square Root
    • + *
  • Exponential
    • + *
*/ - public void initialise() { + private void initialise() { Addition addition = new Addition(); this.addOperation(addition); @@ -65,7 +79,6 @@ public void showActions() { System.out.println("0 to Exit"); Calculator calculator = new Calculator(); - calculator.initialise(); int i = 1; for (Operation operation : calculator.getOperations()) { System.out.println(i + " for " + operation.getName()); @@ -74,11 +87,11 @@ public void showActions() { } /** - * This function receives user input about which action to perform. - * @return the choice of the user (integer) + * This function receives user input (an integer >= 0) about which action to perform. + * @return the choice of the user (integer >= 0) */ public int chooseAction() { - Scanner scan = new Scanner(System.in); + Scanner scan = new Scanner(System.in).useLocale(Locale.US); int choice = -1; boolean validChoice = false; @@ -96,7 +109,6 @@ public int chooseAction() { } Calculator calculator = new Calculator(); - calculator.initialise(); if (choice > calculator.getOperations().size() || choice < 0) { System.out.println("Invalid choice, please try again."); diff --git a/src/main/java/calculator/Cosine.java b/src/main/java/calculator/Cosine.java index 9f2a916..9775353 100644 --- a/src/main/java/calculator/Cosine.java +++ b/src/main/java/calculator/Cosine.java @@ -3,7 +3,7 @@ /** * The Cosine class represents the cosine function. */ -public class Cosine extends UnaryOperation { +public class Cosine extends TrigonometricOperation { public Cosine() { this.name = "Cosine"; @@ -20,7 +20,7 @@ public double perform() { } public String showOperationExpression() { - return "cos(" + this.operand + ")"; + return "cos(" + simplifyNumber(this.operand) + ")"; } } diff --git a/src/main/java/calculator/Division.java b/src/main/java/calculator/Division.java index a710d43..77bd5f3 100644 --- a/src/main/java/calculator/Division.java +++ b/src/main/java/calculator/Division.java @@ -21,7 +21,7 @@ public double perform() { } public String showOperationExpression() { - return this.firstOperand + " / " + (this.secondOperand < 0? "(": "") + this.secondOperand + (this.secondOperand < 0? ")": ""); + return simplifyNumber(this.firstOperand) + " / " + (this.secondOperand < 0? "(": "") + simplifyNumber(this.secondOperand) + (this.secondOperand < 0? ")": ""); } } diff --git a/src/main/java/calculator/Exponential.java b/src/main/java/calculator/Exponential.java index 5e20fa2..6a1817e 100644 --- a/src/main/java/calculator/Exponential.java +++ b/src/main/java/calculator/Exponential.java @@ -20,7 +20,7 @@ public double perform() { } public String showOperationExpression() { - return "exp(" + this.operand + ")"; + return "exp(" + simplifyNumber(this.operand) + ")"; } } diff --git a/src/main/java/calculator/Multiplication.java b/src/main/java/calculator/Multiplication.java index 3ffd531..cd899d2 100644 --- a/src/main/java/calculator/Multiplication.java +++ b/src/main/java/calculator/Multiplication.java @@ -21,7 +21,7 @@ public double perform() { } public String showOperationExpression() { - return this.firstOperand + " * " + (this.secondOperand < 0? "(": "") + this.secondOperand + (this.secondOperand < 0? ")": ""); + return simplifyNumber(this.firstOperand) + " * " + (this.secondOperand < 0? "(": "") + simplifyNumber(this.secondOperand) + (this.secondOperand < 0? ")": ""); } } diff --git a/src/main/java/calculator/Operation.java b/src/main/java/calculator/Operation.java index c643e6b..1105302 100644 --- a/src/main/java/calculator/Operation.java +++ b/src/main/java/calculator/Operation.java @@ -16,7 +16,7 @@ public String getOperator() { } /** - * Shows the representation of the operation. + * Shows the numeric expression containing the operation. * Something like toString(). * For example, if the operation is addition, the function will print * first operand + second operand @@ -29,4 +29,22 @@ public String getOperator() { * @return the result of the operation */ abstract public double perform(); + + /** + * Simplifies the number given. Specifically: + *
    + *
  • removes redundant zeros (e.g. 45.0 -> 45)
    • + *
  • removes minus sign if it is minus zero.(-0 -> 0)
    • + *
+ */ + public String simplifyNumber(double number) { + String resultString; + if (number == (int) number) { + resultString = String.valueOf((int) number); + } else { + resultString = String.valueOf(number); + } + return resultString; + } + } diff --git a/src/main/java/calculator/Sine.java b/src/main/java/calculator/Sine.java index 71275f5..3256f3a 100644 --- a/src/main/java/calculator/Sine.java +++ b/src/main/java/calculator/Sine.java @@ -3,7 +3,7 @@ /** * The Sine class represents the sine function. */ -public class Sine extends UnaryOperation { +public class Sine extends TrigonometricOperation { public Sine() { this.name = "Sine"; @@ -20,7 +20,7 @@ public double perform() { } public String showOperationExpression() { - return "sin(" + this.operand + ")"; + return "sin(" + simplifyNumber(this.operand) + ")"; } } diff --git a/src/main/java/calculator/SquareRoot.java b/src/main/java/calculator/SquareRoot.java index 9f98c38..610976a 100644 --- a/src/main/java/calculator/SquareRoot.java +++ b/src/main/java/calculator/SquareRoot.java @@ -20,7 +20,7 @@ public double perform() { } public String showOperationExpression() { - return "√" + this.operand; + return "√" + (this.operand < 0? "(": "") + simplifyNumber(this.operand) + (this.operand < 0? ")": ""); } } diff --git a/src/main/java/calculator/Subtraction.java b/src/main/java/calculator/Subtraction.java index 001de2c..5fd7451 100644 --- a/src/main/java/calculator/Subtraction.java +++ b/src/main/java/calculator/Subtraction.java @@ -21,7 +21,7 @@ public double perform() { } public String showOperationExpression() { - return this.firstOperand + " - " + (this.secondOperand < 0? "(": "") + this.secondOperand + (this.secondOperand < 0? ")": ""); + return simplifyNumber(this.firstOperand) + " - " + (this.secondOperand < 0? "(": "") + simplifyNumber(this.secondOperand) + (this.secondOperand < 0? ")": ""); } } diff --git a/src/main/java/calculator/Tangent.java b/src/main/java/calculator/Tangent.java index fdc9bb3..2632319 100644 --- a/src/main/java/calculator/Tangent.java +++ b/src/main/java/calculator/Tangent.java @@ -3,7 +3,7 @@ /** * The Tangent class represents the tangent function. */ -public class Tangent extends UnaryOperation { +public class Tangent extends TrigonometricOperation { public Tangent() { this.name = "Tangent"; @@ -20,7 +20,7 @@ public double perform() { } public String showOperationExpression() { - return "tan(" + this.operand + ")"; + return "tan(" + simplifyNumber(this.operand) + ")"; } } diff --git a/src/main/java/calculator/TrigonometricOperation.java b/src/main/java/calculator/TrigonometricOperation.java new file mode 100644 index 0000000..7240f11 --- /dev/null +++ b/src/main/java/calculator/TrigonometricOperation.java @@ -0,0 +1,7 @@ +package calculator; + +/** + * The TrigonometricOperation class represents a trigonometric operation. + */ +abstract public class TrigonometricOperation extends UnaryOperation { +} diff --git a/src/main/java/calculator/UnaryOperation.java b/src/main/java/calculator/UnaryOperation.java index 2312deb..dfdcf22 100644 --- a/src/main/java/calculator/UnaryOperation.java +++ b/src/main/java/calculator/UnaryOperation.java @@ -4,7 +4,7 @@ * The UnaryOperation class represents a unary operation. */ abstract public class UnaryOperation extends Operation { - double operand; + protected double operand; public double getOperand() { return operand; diff --git a/src/test/java/calculator/AdditionTest.java b/src/test/java/calculator/AdditionTest.java index e44c1a2..80431d6 100644 --- a/src/test/java/calculator/AdditionTest.java +++ b/src/test/java/calculator/AdditionTest.java @@ -1,19 +1,11 @@ package calculator; -import org.junit.Assert; -import org.junit.jupiter.api.Assertions; - import static org.junit.jupiter.api.Assertions.*; class AdditionTest { - @org.junit.jupiter.api.BeforeEach - void setUp() { - Addition addition = new Addition(); - } - @org.junit.jupiter.api.Test - void perform() { + void performTest1() { double a = 15.0; double b = 20.0; Addition addition = new Addition(a, b); @@ -22,7 +14,37 @@ void perform() { assertEquals(expectedResult, result, 0); } + @org.junit.jupiter.api.Test + void performTest2() { + double a = 15.0; + double b = -20.0; + Addition addition = new Addition(a, b); + double expectedResult = -5.0; + double result = addition.perform(); + assertEquals(expectedResult, result, 0); + } + @org.junit.jupiter.api.Test void showOperationExpression() { + Addition addition = new Addition(45, 75); + String expectedResult = "45 + 75"; + String result = addition.showOperationExpression(); + assertEquals(expectedResult, result); + + addition = new Addition(45, -75.3); + expectedResult = "45 + (-75.3)"; + result = addition.showOperationExpression(); + assertEquals(expectedResult, result); + + addition = new Addition(-45.5, 75); + expectedResult = "-45.5 + 75"; + result = addition.showOperationExpression(); + assertEquals(expectedResult, result); + + addition = new Addition(0, 0.0); + expectedResult = "0 + 0"; + result = addition.showOperationExpression(); + assertEquals(expectedResult, result); + } } \ No newline at end of file diff --git a/src/test/java/calculator/CosineTest.java b/src/test/java/calculator/CosineTest.java index 3c09026..f7dff1f 100644 --- a/src/test/java/calculator/CosineTest.java +++ b/src/test/java/calculator/CosineTest.java @@ -30,5 +30,24 @@ void perform() { @Test void showOperationExpression() { + Cosine cosine = new Cosine(75); + String expectedResult = "cos(75)"; + String result = cosine.showOperationExpression(); + assertEquals(expectedResult, result); + + cosine = new Cosine(-75.57); + expectedResult = "cos(-75.57)"; + result = cosine.showOperationExpression(); + assertEquals(expectedResult, result); + + cosine = new Cosine(-0.0); + expectedResult = "cos(0)"; + result = cosine.showOperationExpression(); + assertEquals(expectedResult, result); + + cosine = new Cosine(0); + expectedResult = "cos(0)"; + result = cosine.showOperationExpression(); + assertEquals(expectedResult, result); } } \ No newline at end of file diff --git a/src/test/java/calculator/DivisionTest.java b/src/test/java/calculator/DivisionTest.java index 81964c9..5689312 100644 --- a/src/test/java/calculator/DivisionTest.java +++ b/src/test/java/calculator/DivisionTest.java @@ -25,5 +25,24 @@ void perform() { @Test void showOperationExpression() { + Division division = new Division(45, 75); + String expectedResult = "45 / 75"; + String result = division.showOperationExpression(); + assertEquals(expectedResult, result); + + division = new Division(45, -75.3); + expectedResult = "45 / (-75.3)"; + result = division.showOperationExpression(); + assertEquals(expectedResult, result); + + division = new Division(-45.5, 75); + expectedResult = "-45.5 / 75"; + result = division.showOperationExpression(); + assertEquals(expectedResult, result); + + division = new Division(0, 0.0); + expectedResult = "0 / 0"; + result = division.showOperationExpression(); + assertEquals(expectedResult, result); } } \ No newline at end of file diff --git a/src/test/java/calculator/ExponentialTest.java b/src/test/java/calculator/ExponentialTest.java index f3e18d7..0b39326 100644 --- a/src/test/java/calculator/ExponentialTest.java +++ b/src/test/java/calculator/ExponentialTest.java @@ -30,5 +30,25 @@ void perform() { @Test void showOperationExpression() { + Exponential exponential = new Exponential(75); + String expectedResult = "exp(75)"; + String result = exponential.showOperationExpression(); + assertEquals(expectedResult, result); + + exponential = new Exponential(-75.57); + expectedResult = "exp(-75.57)"; + result = exponential.showOperationExpression(); + assertEquals(expectedResult, result); + + exponential = new Exponential(-0.0); + expectedResult = "exp(0)"; + result = exponential.showOperationExpression(); + assertEquals(expectedResult, result); + + exponential = new Exponential(0); + expectedResult = "exp(0)"; + result = exponential.showOperationExpression(); + assertEquals(expectedResult, result); + } } \ No newline at end of file diff --git a/src/test/java/calculator/MultiplicationTest.java b/src/test/java/calculator/MultiplicationTest.java index d62bfdb..ecfa939 100644 --- a/src/test/java/calculator/MultiplicationTest.java +++ b/src/test/java/calculator/MultiplicationTest.java @@ -25,5 +25,24 @@ void perform() { @Test void showOperationExpression() { + Multiplication multiplication = new Multiplication(45, 75); + String expectedResult = "45 * 75"; + String result = multiplication.showOperationExpression(); + assertEquals(expectedResult, result); + + multiplication = new Multiplication(45, -75.3); + expectedResult = "45 * (-75.3)"; + result = multiplication.showOperationExpression(); + assertEquals(expectedResult, result); + + multiplication = new Multiplication(-45.5, 75); + expectedResult = "-45.5 * 75"; + result = multiplication.showOperationExpression(); + assertEquals(expectedResult, result); + + multiplication = new Multiplication(0, 0.0); + expectedResult = "0 * 0"; + result = multiplication.showOperationExpression(); + assertEquals(expectedResult, result); } } \ No newline at end of file diff --git a/src/test/java/calculator/SineTest.java b/src/test/java/calculator/SineTest.java index 72a7155..f5a0940 100644 --- a/src/test/java/calculator/SineTest.java +++ b/src/test/java/calculator/SineTest.java @@ -30,5 +30,24 @@ void perform() { @Test void showOperationExpression() { + Sine sine = new Sine(75); + String expectedResult = "sin(75)"; + String result = sine.showOperationExpression(); + assertEquals(expectedResult, result); + + sine = new Sine(-75.57); + expectedResult = "sin(-75.57)"; + result = sine.showOperationExpression(); + assertEquals(expectedResult, result); + + sine = new Sine(-0.0); + expectedResult = "sin(0)"; + result = sine.showOperationExpression(); + assertEquals(expectedResult, result); + + sine = new Sine(0); + expectedResult = "sin(0)"; + result = sine.showOperationExpression(); + assertEquals(expectedResult, result); } } \ No newline at end of file diff --git a/src/test/java/calculator/SquareRootTest.java b/src/test/java/calculator/SquareRootTest.java index cfecbb3..a30cad0 100644 --- a/src/test/java/calculator/SquareRootTest.java +++ b/src/test/java/calculator/SquareRootTest.java @@ -30,5 +30,25 @@ void perform() { @Test void showOperationExpression() { + SquareRoot squareRoot = new SquareRoot(75); + String expectedResult = "√75"; + String result = squareRoot.showOperationExpression(); + assertEquals(expectedResult, result); + + squareRoot = new SquareRoot(-75.57); + expectedResult = "√(-75.57)"; + result = squareRoot.showOperationExpression(); + assertEquals(expectedResult, result); + + squareRoot = new SquareRoot(-0.0); + expectedResult = "√0"; + result = squareRoot.showOperationExpression(); + assertEquals(expectedResult, result); + + squareRoot = new SquareRoot(0); + expectedResult = "√0"; + result = squareRoot.showOperationExpression(); + assertEquals(expectedResult, result); + } } \ No newline at end of file diff --git a/src/test/java/calculator/SubtractionTest.java b/src/test/java/calculator/SubtractionTest.java index b0826cf..ce1c673 100644 --- a/src/test/java/calculator/SubtractionTest.java +++ b/src/test/java/calculator/SubtractionTest.java @@ -25,5 +25,24 @@ void perform() { @Test void showOperationExpression() { + Subtraction subtraction = new Subtraction(45, 75); + String expectedResult = "45 - 75"; + String result = subtraction.showOperationExpression(); + Assertions.assertEquals(expectedResult, result); + + subtraction = new Subtraction(45, -75.3); + expectedResult = "45 - (-75.3)"; + result = subtraction.showOperationExpression(); + Assertions.assertEquals(expectedResult, result); + + subtraction = new Subtraction(-45.5, 75); + expectedResult = "-45.5 - 75"; + result = subtraction.showOperationExpression(); + Assertions.assertEquals(expectedResult, result); + + subtraction = new Subtraction(0, 0.0); + expectedResult = "0 - 0"; + result = subtraction.showOperationExpression(); + Assertions.assertEquals(expectedResult, result); } } \ No newline at end of file diff --git a/src/test/java/calculator/TangentTest.java b/src/test/java/calculator/TangentTest.java index 188be4b..87a9fa4 100644 --- a/src/test/java/calculator/TangentTest.java +++ b/src/test/java/calculator/TangentTest.java @@ -30,5 +30,24 @@ void perform() { @Test void showOperationExpression() { + Tangent tangent = new Tangent(75); + String expectedResult = "tan(75)"; + String result = tangent.showOperationExpression(); + assertEquals(expectedResult, result); + + tangent = new Tangent(-75.57); + expectedResult = "tan(-75.57)"; + result = tangent.showOperationExpression(); + assertEquals(expectedResult, result); + + tangent = new Tangent(-0.0); + expectedResult = "tan(0)"; + result = tangent.showOperationExpression(); + assertEquals(expectedResult, result); + + tangent = new Tangent(0); + expectedResult = "tan(0)"; + result = tangent.showOperationExpression(); + assertEquals(expectedResult, result); } } \ No newline at end of file diff --git a/target/classes/META-INF/MANIFEST.MF b/target/classes/META-INF/MANIFEST.MF deleted file mode 100644 index 92de182..0000000 --- a/target/classes/META-INF/MANIFEST.MF +++ /dev/null @@ -1,5 +0,0 @@ -Manifest-Version: 1.0 -Built-By: swatinmurthy -Build-Jdk: 11.0.4 -Created-By: Maven Integration for Eclipse - diff --git a/target/classes/META-INF/maven/calculator/devops_calculator/pom.properties b/target/classes/META-INF/maven/calculator/devops_calculator/pom.properties deleted file mode 100644 index cfb1f88..0000000 --- a/target/classes/META-INF/maven/calculator/devops_calculator/pom.properties +++ /dev/null @@ -1,7 +0,0 @@ -#Generated by Maven Integration for Eclipse -#Sat May 09 08:02:23 IST 2020 -m2e.projectLocation=/Users/swatinmurthy/eclipse-workspace/devops_calculator -m2e.projectName=devops_calculator -groupId=calculator -artifactId=devops_calculator -version=1.0-SNAPSHOT diff --git a/target/classes/META-INF/maven/calculator/devops_calculator/pom.xml b/target/classes/META-INF/maven/calculator/devops_calculator/pom.xml deleted file mode 100644 index 5bd1034..0000000 --- a/target/classes/META-INF/maven/calculator/devops_calculator/pom.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - - 4.0.0 - - calculator - devops_calculator - 1.0-SNAPSHOT - - devops_calculator - - http://www.example.com - - - UTF-8 - 1.8 - 1.8 - - - - - junit - junit - 3.8.1 - test - - - junit - junit - 4.12 - test - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.7.0 - - 1.8 - 1.8 - - - - - diff --git a/target/classes/calculator/App.class b/target/classes/calculator/App.class deleted file mode 100644 index 6c45bf457da28f564a3b60ea35ecb1af8e3c7039..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2394 zcmah~-*XdH6#j00bhmL^LMWxsN*BbEKp;|n2&Ju*ra-ZULav6H>E`s zf6VygyCW~o=z}x*;K)PE*cpBIPw?Gw#%G_Y-`!0iG@T(cH}~Fi&;8Ch_k8Eb2)#{EO-JfgO+1?!vf)CYFZ#N z>K4ry!f4eHMT@|e3Cl4r)yjFZddV$E>zu8@4Oxc**75(!6JuHFRQ!KuCga z4 ztL43_QSc>4eaU3a_N@1#4d3QgMK;j5(fJ)tB5_RWICit%5nAOGnch z4oQEazCZF^G8*2(5qjvDi{7}yu$lL96-W70l>=fjAK9N2J*}PH7kbQy-H?vTn_%4eexA3~jv9KcFjkM_|WBa-6MMcG0ZH zFoID9XJ2N5Pah3gj4>2?T{ADw%E!*8nn@PJFwRRl^r;wUy!t^pIgEETOkk1)U{orm zQxrI~S*n`g>TZ!_!?-LVrUZI6v%9XS;;J+{M56-NG`t6vS(sU8T9VmpDl3t$YnZ_e z0o8K@k_dDpH;F~X2NLX%4|ZF_9SNqcb4Gt~lJDGP`g>({83SlQb)DPLX>*hWphY-H9pN}NarGE8KHWk08R zRy84l$84-~lB6x?8HKq?qvCfG1um~L43SsxiNM|$v>3N-vt-yK)l#i&I^Nh~!K}!N zQ1M8h*DnZ`lk6X^r{_)mfmwCadOfBX9^yP1nPZ6*%yX7(WGdU@VTq4DOih@*6KLUz zeUJYNcNxxtbM(Lp)L*#>Ay!ucFTBRJ7ASCTroesnJi3A4Q@k@||dt`(yPRC+as& zUX;?o_1&px_fK>Ke{o31BOJRqCOIB*{7mgt49}#V;>-%pB`z%EVpnt-ml9XFN_9n_ zBFEh_-j{aqc!T=QX7yVQ>T?^^KWtXdH>eM8P&b>^OAYFN{P*Zr@G>@6J>NcCm1zn4 zX?fs>%8#F)h8VvS8YOM$V^Y#g%L%rolh}$gNMMxh{{lKNh3&Xb&D+?4S#+U{UHBT^ zc#0mZ^6T&q5&lK5=!7nIVviWZUU7lle+v7=RqPix*vW4rsI+ahmWLF*dbQ57ut38Xj5vBhXDC}Kzl$m-&9m)1@9;0m)4`&jeuHdsj`jW0h l4XDx1892@a1tgG_8${aiJkpMOq%sX*h&T;=&SeN+{0|p*@x%ZC From 701566d4960658b8c6a0f9659ff4352797ee5a7f Mon Sep 17 00:00:00 2001 From: michailidm Date: Thu, 3 Feb 2022 13:27:58 +0200 Subject: [PATCH 3/3] FINAL - renamed showOperationExpression() to showExpression() --- .../classes/calculator/Addition.class | Bin 1115 -> 1106 bytes .../classes/calculator/App.class | Bin 2959 -> 2950 bytes .../classes/calculator/Cosine.class | Bin 954 -> 945 bytes .../classes/calculator/Division.class | Bin 1115 -> 1106 bytes .../classes/calculator/Exponential.class | Bin 966 -> 957 bytes .../classes/calculator/Multiplication.class | Bin 1139 -> 1130 bytes .../classes/calculator/Operation.class | Bin 874 -> 865 bytes .../classes/calculator/Sine.class | Bin 946 -> 937 bytes .../classes/calculator/SquareRoot.class | Bin 1092 -> 1083 bytes .../classes/calculator/Subtraction.class | Bin 1127 -> 1118 bytes .../classes/calculator/Tangent.class | Bin 958 -> 949 bytes .../calculator/AdditionTest.class | Bin 1488 -> 1505 bytes .../test-classes/calculator/CosineTest.class | Bin 1349 -> 1366 bytes .../calculator/DivisionTest.class | Bin 1383 -> 1400 bytes .../calculator/ExponentialTest.class | Bin 1379 -> 1396 bytes .../calculator/MultiplicationTest.class | Bin 1408 -> 1425 bytes .../test-classes/calculator/SineTest.class | Bin 1337 -> 1354 bytes .../calculator/SquareRootTest.class | Bin 1391 -> 1408 bytes .../calculator/SubtractionTest.class | Bin 1390 -> 1407 bytes .../test-classes/calculator/TangentTest.class | Bin 1355 -> 1372 bytes src/main/java/calculator/Addition.java | 2 +- src/main/java/calculator/App.java | 4 ++-- src/main/java/calculator/Cosine.java | 2 +- src/main/java/calculator/Division.java | 2 +- src/main/java/calculator/Exponential.java | 2 +- src/main/java/calculator/Multiplication.java | 2 +- src/main/java/calculator/Operation.java | 6 +++--- src/main/java/calculator/Sine.java | 2 +- src/main/java/calculator/SquareRoot.java | 2 +- src/main/java/calculator/Subtraction.java | 2 +- src/main/java/calculator/Tangent.java | 2 +- src/test/java/calculator/AdditionTest.java | 8 ++++---- src/test/java/calculator/CosineTest.java | 10 ++++------ src/test/java/calculator/DivisionTest.java | 10 ++++------ src/test/java/calculator/ExponentialTest.java | 10 ++++------ .../java/calculator/MultiplicationTest.java | 10 ++++------ src/test/java/calculator/SineTest.java | 10 ++++------ src/test/java/calculator/SquareRootTest.java | 10 ++++------ src/test/java/calculator/SubtractionTest.java | 9 ++++----- src/test/java/calculator/TangentTest.java | 10 ++++------ 40 files changed, 50 insertions(+), 65 deletions(-) diff --git a/${project.build.directory}/classes/calculator/Addition.class b/${project.build.directory}/classes/calculator/Addition.class index 0ff08827ffdc0d89bf7f1a81dda72fc997f0aa1c..ea49bc02658f2c942eeecf2f022f1224f8802e0f 100644 GIT binary patch delta 16 Xcmcc3afxHXO;*0*jQsMA&r6sAJfH^( delta 25 gcmcb_ahqepO+NABjQn!{g4CkKlFaMLzN3jQn!{g4CkKlFan+a diff --git a/${project.build.directory}/classes/calculator/Subtraction.class b/${project.build.directory}/classes/calculator/Subtraction.class index 81287980b00715599484fbd02c5909f0fbc3bf1c..fcceca0607890f0fb6c6a771c09f50981bc2c7ed 100644 GIT binary patch delta 16 XcmaFPagSrd9ag^LjQsMAuWFeAK12sG delta 25 gcmcb|@tkAA9X|2mjQn!{g4CkKlFai_@% diff --git a/${project.build.directory}/classes/calculator/Tangent.class b/${project.build.directory}/classes/calculator/Tangent.class index 16b7180507f250e7efe8638b2b0052dd7f9a3928..6803b004eb9883253a6422e4a82265fc050f99e0 100644 GIT binary patch delta 16 YcmdnTzLkB#SysN{jQsMAw;wYB069|!Bme*a delta 25 hcmdnWzK?yvSw8XNjQn!{g4CkKlFa{g9jM)W2Q(7#J8#7<@N!@iTFFF?jPZcrf@(R%BYn&sUt0U+!8_P?TC+oSC1u J`6v@NGXTGt5RL!< delta 37 tcmaFJeSw?n)W2Q(7#J8#7<@Kz@iTE4F?jJXcrbWRR%BYX`34gwGXUaA3U&Yh diff --git a/${project.build.directory}/test-classes/calculator/CosineTest.class b/${project.build.directory}/test-classes/calculator/CosineTest.class index f0ef5019c0f4c5d58be69fbc45e3c1be2a8642e4..31336d6bab5f692807cc24a1eb01c3a45364a831 100644 GIT binary patch delta 180 zcmX@gb&ZSb)W2Q(7#J8#7+f}T{bA&AWN_kPuxD_d%*WKj&sUt0U+!8_P?TC+oSC0D zc?MHCBgbR`W(!81$)3zjngR?=41x^Y3_=Wi48jZ|Kq$i?#-P9;&Y;O4!Jx+=2{cxU z!Hz+C@)zb)j`Bd23P6>LK($Ihc@+j_22}<%Ak=11XD|Tjv1ZT$s@7(3X3$~q0O}89 V&}Rq%%0x04GQ=?$P5#f~1^~C+AT9s^ delta 164 zcmcb{b(D+i)W2Q(7#J8#7@Rk9{bA(LW^m+TuxD_Z%*WI-c{NihBiCd_W(!8X$x+Nr znnDar48jcD3?dAC45C0%j6sG$fYd zUWP%8K^Dl82g)cg=rAZU7&0g^m@%j@xG<@8EL(IewLntH?VvJUz(dYyX;uX|(Apc4<3WWvOhApVYms8$z z?nnRX`uq2M0d2;2J)qeJ3?1|tsiJmsIgRb%Jh>cCYs1(b_UfUXO*U0CcT5hoF<(n= zG(6bx;>3qvh!Z45h!SCHMC3L~kC^gW-h-r=DKXRHW@OKiB~L-9P^2MEm$KLuMpT(e RKc~(@mL*MAv{b@6{R2ub9y%Am3|n8VTTsTNLXj#qjirEv>lTBZ|fh1ozBou!lTr(1TOe)*GGzX>}nQ>yynWc{MyFZOi B7^MIJ diff --git a/${project.build.directory}/test-classes/calculator/MultiplicationTest.class b/${project.build.directory}/test-classes/calculator/MultiplicationTest.class index 33cb8e47bd9de25ceffc6122694b210c7046437f..679ab9456d0d6475f62239c433e3d0948094e669 100644 GIT binary patch delta 164 zcmZqRp2*F0>ff$?3=9k=44xagOqe*_7~FXnTo^niyD=@|=PS<0FL$jdC`v6Z&dkr7 z{EVrbkz;Zkvjrp1Yd zUWP%8K^Dl8XV7F&V9;SuWH4k)!{ JoovPG1^}D39en@* delta 148 zcmbQp-N4Ot>ff$?3=9k=3?3V~Oqe+I8QgdnTo~LZyD=@A{FAAak!x~3vjrpH zl0pnD48jZ?3?e{MltF?)j6t43oI#yIVzLg)Jx3V^J_cC^K?XUnxHN+zgC>I#gARi- tgCT diff --git a/${project.build.directory}/test-classes/calculator/SineTest.class b/${project.build.directory}/test-classes/calculator/SineTest.class index 831025cd40d7332f7429242f496d0d57666223c3..69720245ec5480e2054f2a17bddc806e2d92b4d1 100644 GIT binary patch delta 180 zcmdnVb&8AY)W2Q(7#J8#7+f}TePZNrWN_kPuxD_d%)->g&sUt0U+!8_P?TC+oSC0D zxreEokz+Covjrp1WLxGYO#ucb20;dH1|bGM24MyfAe3PcV^ClaXV7GjV9;Zb1R5*F zV85Nb21GZ+B%STkq=RckXiGw3jQ0QCnl V=re=>Wg;028R8g>CVyse0|11BAH)Cv delta 164 zcmX@bwUdkM)W2Q(7#J8#7@Rk9ePZO$W^m+TuxD_Z%)-<)c|KDqBiCe6W(!8X$$rdD znnDar48jcD3?dAC45C0%j6sG$fePTNbs(w1pbb=S03@v$bbzXL8JvN7J%A#C42BFL3`Pu*48{y`3?`FVSls}= C#2GID diff --git a/${project.build.directory}/test-classes/calculator/SquareRootTest.class b/${project.build.directory}/test-classes/calculator/SquareRootTest.class index 326c2e03fb5a088af8cc5e794d007a7f5d105dea..fbd8e4a6f3c2d1512b200b13ed1211ada5b579d0 100644 GIT binary patch delta 180 zcmWNH%L)Ne06>pHX^gi#%lpxI8eZAb!nb z80JlEehnk}z23l*=xMa{?36=}fKYk*Lw)p{W~eCTYnF;rch@FOfjmWQN>nJ*5;{~F zQ^TWq+Vh2MlqU2{(+`iW@NDD9wpEXZg9X;L1v^GvOb9 CAQ-&> diff --git a/${project.build.directory}/test-classes/calculator/SubtractionTest.class b/${project.build.directory}/test-classes/calculator/SubtractionTest.class index 73c6c2d62ddd0677295727b3eae4730cf416fd35..7f2651c5b4150640b5f3d66ac236d6608d27bc93 100644 GIT binary patch delta 164 zcmWNK%L)Ne06>o!%1n&B$(y_%rG%~Wtl3yA8!1xAEXEJ`g8Ko!!PdeDSX=u9pMcxh zolc#P{?qm6_x=Dn%x-#7agUjJ7%~+-kEgX|Z4Z0#Qf!ANOttUuii^67 z`*9M$O;8ddMwko{%0z|cd=C;BB=M7yE=__gRdO`Q)22X|qWqMY$lj#FoEi)2EM>8x K$%dAwxW<3|$sP6p delta 148 zcmey*^^S|{)W2Q(7#J8#7(6y|sWNfsGq~|ExG=a+HfNeY`8iW5BiH0uW(!8X$`k7>Ssk0;P#bT>8K-e=&X$58q8tJ`I5_NVdra9mr~cE3|M{iNAd&}eH;H8UUh$`q(e)1f4GnIRRX R($A@}kY!1O6-{NcP5vw{9%TRk delta 164 zcmWNJI|{;36hu#66y!xx7!^Me{9z1H@smOjlo$|O!Nx}1gd4E8dMin5;R50oT#I;{ z!!Vqgul{JA|6Xq(Ce5^^N)bt!9ed-cr^(da(k8IimTPYIBdnnCaH!%^6V~x*(4|R8 ziy3XX@!8TbP9aZvV)n%x$YvtoString(). * For example, if the operation is addition, the function will print - * first operand + second operand + * first_operand + second_operand * Another example: if the operation is sine, the function will print * sin(operand) */ - abstract public String showOperationExpression(); + abstract public String showExpression(); /** Performs the operation. * @return the result of the operation diff --git a/src/main/java/calculator/Sine.java b/src/main/java/calculator/Sine.java index 3256f3a..f407bf3 100644 --- a/src/main/java/calculator/Sine.java +++ b/src/main/java/calculator/Sine.java @@ -19,7 +19,7 @@ public double perform() { return Math.sin(this.operand); } - public String showOperationExpression() { + public String showExpression() { return "sin(" + simplifyNumber(this.operand) + ")"; } diff --git a/src/main/java/calculator/SquareRoot.java b/src/main/java/calculator/SquareRoot.java index 610976a..0dc5c37 100644 --- a/src/main/java/calculator/SquareRoot.java +++ b/src/main/java/calculator/SquareRoot.java @@ -19,7 +19,7 @@ public double perform() { return Math.sqrt(this.operand); } - public String showOperationExpression() { + public String showExpression() { return "√" + (this.operand < 0? "(": "") + simplifyNumber(this.operand) + (this.operand < 0? ")": ""); } diff --git a/src/main/java/calculator/Subtraction.java b/src/main/java/calculator/Subtraction.java index 5fd7451..0871faf 100644 --- a/src/main/java/calculator/Subtraction.java +++ b/src/main/java/calculator/Subtraction.java @@ -20,7 +20,7 @@ public double perform() { return this.firstOperand - this.secondOperand; } - public String showOperationExpression() { + public String showExpression() { return simplifyNumber(this.firstOperand) + " - " + (this.secondOperand < 0? "(": "") + simplifyNumber(this.secondOperand) + (this.secondOperand < 0? ")": ""); } diff --git a/src/main/java/calculator/Tangent.java b/src/main/java/calculator/Tangent.java index 2632319..21d1dcd 100644 --- a/src/main/java/calculator/Tangent.java +++ b/src/main/java/calculator/Tangent.java @@ -19,7 +19,7 @@ public double perform() { return Math.tan(this.operand); } - public String showOperationExpression() { + public String showExpression() { return "tan(" + simplifyNumber(this.operand) + ")"; } diff --git a/src/test/java/calculator/AdditionTest.java b/src/test/java/calculator/AdditionTest.java index 80431d6..5d6f611 100644 --- a/src/test/java/calculator/AdditionTest.java +++ b/src/test/java/calculator/AdditionTest.java @@ -28,22 +28,22 @@ void performTest2() { void showOperationExpression() { Addition addition = new Addition(45, 75); String expectedResult = "45 + 75"; - String result = addition.showOperationExpression(); + String result = addition.showExpression(); assertEquals(expectedResult, result); addition = new Addition(45, -75.3); expectedResult = "45 + (-75.3)"; - result = addition.showOperationExpression(); + result = addition.showExpression(); assertEquals(expectedResult, result); addition = new Addition(-45.5, 75); expectedResult = "-45.5 + 75"; - result = addition.showOperationExpression(); + result = addition.showExpression(); assertEquals(expectedResult, result); addition = new Addition(0, 0.0); expectedResult = "0 + 0"; - result = addition.showOperationExpression(); + result = addition.showExpression(); assertEquals(expectedResult, result); } diff --git a/src/test/java/calculator/CosineTest.java b/src/test/java/calculator/CosineTest.java index f7dff1f..a87333d 100644 --- a/src/test/java/calculator/CosineTest.java +++ b/src/test/java/calculator/CosineTest.java @@ -1,7 +1,5 @@ package calculator; -import org.junit.Assert; -import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -32,22 +30,22 @@ void perform() { void showOperationExpression() { Cosine cosine = new Cosine(75); String expectedResult = "cos(75)"; - String result = cosine.showOperationExpression(); + String result = cosine.showExpression(); assertEquals(expectedResult, result); cosine = new Cosine(-75.57); expectedResult = "cos(-75.57)"; - result = cosine.showOperationExpression(); + result = cosine.showExpression(); assertEquals(expectedResult, result); cosine = new Cosine(-0.0); expectedResult = "cos(0)"; - result = cosine.showOperationExpression(); + result = cosine.showExpression(); assertEquals(expectedResult, result); cosine = new Cosine(0); expectedResult = "cos(0)"; - result = cosine.showOperationExpression(); + result = cosine.showExpression(); assertEquals(expectedResult, result); } } \ No newline at end of file diff --git a/src/test/java/calculator/DivisionTest.java b/src/test/java/calculator/DivisionTest.java index 5689312..65c317d 100644 --- a/src/test/java/calculator/DivisionTest.java +++ b/src/test/java/calculator/DivisionTest.java @@ -1,7 +1,5 @@ package calculator; -import org.junit.Assert; -import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -27,22 +25,22 @@ void perform() { void showOperationExpression() { Division division = new Division(45, 75); String expectedResult = "45 / 75"; - String result = division.showOperationExpression(); + String result = division.showExpression(); assertEquals(expectedResult, result); division = new Division(45, -75.3); expectedResult = "45 / (-75.3)"; - result = division.showOperationExpression(); + result = division.showExpression(); assertEquals(expectedResult, result); division = new Division(-45.5, 75); expectedResult = "-45.5 / 75"; - result = division.showOperationExpression(); + result = division.showExpression(); assertEquals(expectedResult, result); division = new Division(0, 0.0); expectedResult = "0 / 0"; - result = division.showOperationExpression(); + result = division.showExpression(); assertEquals(expectedResult, result); } } \ No newline at end of file diff --git a/src/test/java/calculator/ExponentialTest.java b/src/test/java/calculator/ExponentialTest.java index 0b39326..50c2886 100644 --- a/src/test/java/calculator/ExponentialTest.java +++ b/src/test/java/calculator/ExponentialTest.java @@ -1,7 +1,5 @@ package calculator; -import org.junit.Assert; -import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -32,22 +30,22 @@ void perform() { void showOperationExpression() { Exponential exponential = new Exponential(75); String expectedResult = "exp(75)"; - String result = exponential.showOperationExpression(); + String result = exponential.showExpression(); assertEquals(expectedResult, result); exponential = new Exponential(-75.57); expectedResult = "exp(-75.57)"; - result = exponential.showOperationExpression(); + result = exponential.showExpression(); assertEquals(expectedResult, result); exponential = new Exponential(-0.0); expectedResult = "exp(0)"; - result = exponential.showOperationExpression(); + result = exponential.showExpression(); assertEquals(expectedResult, result); exponential = new Exponential(0); expectedResult = "exp(0)"; - result = exponential.showOperationExpression(); + result = exponential.showExpression(); assertEquals(expectedResult, result); } diff --git a/src/test/java/calculator/MultiplicationTest.java b/src/test/java/calculator/MultiplicationTest.java index ecfa939..7368e6f 100644 --- a/src/test/java/calculator/MultiplicationTest.java +++ b/src/test/java/calculator/MultiplicationTest.java @@ -1,7 +1,5 @@ package calculator; -import org.junit.Assert; -import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -27,22 +25,22 @@ void perform() { void showOperationExpression() { Multiplication multiplication = new Multiplication(45, 75); String expectedResult = "45 * 75"; - String result = multiplication.showOperationExpression(); + String result = multiplication.showExpression(); assertEquals(expectedResult, result); multiplication = new Multiplication(45, -75.3); expectedResult = "45 * (-75.3)"; - result = multiplication.showOperationExpression(); + result = multiplication.showExpression(); assertEquals(expectedResult, result); multiplication = new Multiplication(-45.5, 75); expectedResult = "-45.5 * 75"; - result = multiplication.showOperationExpression(); + result = multiplication.showExpression(); assertEquals(expectedResult, result); multiplication = new Multiplication(0, 0.0); expectedResult = "0 * 0"; - result = multiplication.showOperationExpression(); + result = multiplication.showExpression(); assertEquals(expectedResult, result); } } \ No newline at end of file diff --git a/src/test/java/calculator/SineTest.java b/src/test/java/calculator/SineTest.java index f5a0940..6b3b9da 100644 --- a/src/test/java/calculator/SineTest.java +++ b/src/test/java/calculator/SineTest.java @@ -1,7 +1,5 @@ package calculator; -import org.junit.Assert; -import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -32,22 +30,22 @@ void perform() { void showOperationExpression() { Sine sine = new Sine(75); String expectedResult = "sin(75)"; - String result = sine.showOperationExpression(); + String result = sine.showExpression(); assertEquals(expectedResult, result); sine = new Sine(-75.57); expectedResult = "sin(-75.57)"; - result = sine.showOperationExpression(); + result = sine.showExpression(); assertEquals(expectedResult, result); sine = new Sine(-0.0); expectedResult = "sin(0)"; - result = sine.showOperationExpression(); + result = sine.showExpression(); assertEquals(expectedResult, result); sine = new Sine(0); expectedResult = "sin(0)"; - result = sine.showOperationExpression(); + result = sine.showExpression(); assertEquals(expectedResult, result); } } \ No newline at end of file diff --git a/src/test/java/calculator/SquareRootTest.java b/src/test/java/calculator/SquareRootTest.java index a30cad0..44d9a3d 100644 --- a/src/test/java/calculator/SquareRootTest.java +++ b/src/test/java/calculator/SquareRootTest.java @@ -1,7 +1,5 @@ package calculator; -import org.junit.Assert; -import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -32,22 +30,22 @@ void perform() { void showOperationExpression() { SquareRoot squareRoot = new SquareRoot(75); String expectedResult = "√75"; - String result = squareRoot.showOperationExpression(); + String result = squareRoot.showExpression(); assertEquals(expectedResult, result); squareRoot = new SquareRoot(-75.57); expectedResult = "√(-75.57)"; - result = squareRoot.showOperationExpression(); + result = squareRoot.showExpression(); assertEquals(expectedResult, result); squareRoot = new SquareRoot(-0.0); expectedResult = "√0"; - result = squareRoot.showOperationExpression(); + result = squareRoot.showExpression(); assertEquals(expectedResult, result); squareRoot = new SquareRoot(0); expectedResult = "√0"; - result = squareRoot.showOperationExpression(); + result = squareRoot.showExpression(); assertEquals(expectedResult, result); } diff --git a/src/test/java/calculator/SubtractionTest.java b/src/test/java/calculator/SubtractionTest.java index ce1c673..aa7472c 100644 --- a/src/test/java/calculator/SubtractionTest.java +++ b/src/test/java/calculator/SubtractionTest.java @@ -5,7 +5,6 @@ import org.junit.jupiter.api.Test; import static org.junit.Assert.assertEquals; -import static org.junit.jupiter.api.Assertions.*; class SubtractionTest { @@ -27,22 +26,22 @@ void perform() { void showOperationExpression() { Subtraction subtraction = new Subtraction(45, 75); String expectedResult = "45 - 75"; - String result = subtraction.showOperationExpression(); + String result = subtraction.showExpression(); Assertions.assertEquals(expectedResult, result); subtraction = new Subtraction(45, -75.3); expectedResult = "45 - (-75.3)"; - result = subtraction.showOperationExpression(); + result = subtraction.showExpression(); Assertions.assertEquals(expectedResult, result); subtraction = new Subtraction(-45.5, 75); expectedResult = "-45.5 - 75"; - result = subtraction.showOperationExpression(); + result = subtraction.showExpression(); Assertions.assertEquals(expectedResult, result); subtraction = new Subtraction(0, 0.0); expectedResult = "0 - 0"; - result = subtraction.showOperationExpression(); + result = subtraction.showExpression(); Assertions.assertEquals(expectedResult, result); } } \ No newline at end of file diff --git a/src/test/java/calculator/TangentTest.java b/src/test/java/calculator/TangentTest.java index 87a9fa4..24bb907 100644 --- a/src/test/java/calculator/TangentTest.java +++ b/src/test/java/calculator/TangentTest.java @@ -1,7 +1,5 @@ package calculator; -import org.junit.Assert; -import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -32,22 +30,22 @@ void perform() { void showOperationExpression() { Tangent tangent = new Tangent(75); String expectedResult = "tan(75)"; - String result = tangent.showOperationExpression(); + String result = tangent.showExpression(); assertEquals(expectedResult, result); tangent = new Tangent(-75.57); expectedResult = "tan(-75.57)"; - result = tangent.showOperationExpression(); + result = tangent.showExpression(); assertEquals(expectedResult, result); tangent = new Tangent(-0.0); expectedResult = "tan(0)"; - result = tangent.showOperationExpression(); + result = tangent.showExpression(); assertEquals(expectedResult, result); tangent = new Tangent(0); expectedResult = "tan(0)"; - result = tangent.showOperationExpression(); + result = tangent.showExpression(); assertEquals(expectedResult, result); } } \ No newline at end of file