Got calculator working

tealminivan · Sep 27, 2020 · 09e822e · 09e822e
1 parent e3adcaa
commit 09e822e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/src/main/java/Calculator.java b/src/main/java/Calculator.java
@@ -3,27 +3,27 @@
 
 public class Calculator{
     public double add(double x, double y){
-        return 0.0;
+        return x+y;
     }
 
     public double subtract(double x, double y){
-        return 0.0;
+        return x-y;
     }
 
     public double multiply(double x, double y){
-        return 0.0;
+        return x*y;
     }
 
     public double divide(double x, double y){
-        return 0.0;
+        return x/y;
     }
 
     public double squareRoot(double x){
-        return 0.0;
+        return Math.sqrt(x);
     }
 
     public double power(double x, int power){
-        return 0.0;
+        return Math.pow(x,power);
     }
 
     public static void main(String args[]){