Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 25 additions & 25 deletions week01/src/main/java/com/github/javabaz/Calculator.java
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
package com.github.javabaz;

public class Calculator {

// NOTE : Don't edit this file!;
// copy past this file and rename new file with your own code!


public int add(int a, int b) {
// todo
}

public int subtract(int a, int b) {
// todo
}

public int multiply(int a, int b) {
// todo
}

public int divide(int a, int b) {
// todo
}
}

//package com.github.javabaz;
//
//public class Calculator {
//
// // NOTE : Don't edit this file!;
// // copy past this file and rename new file with your own code!
//
//
// public int add(int a, int b) {
// // todo
// }
//
// public int subtract(int a, int b) {
// // todo
// }
//
// public int multiply(int a, int b) {
// // todo
// }
//
// public int divide(int a, int b) {
// // todo
// }
//}
//
39 changes: 39 additions & 0 deletions week01/src/main/java/com/github/javabaz/Calculator32.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
package com.github.javabaz;

public class Calculator32 {


public int add(int a, int b) {
return a + b;
}

public int subtract(int a, int b) {
return a-b;
}

public int multiply(int a, int b) {
return a * b;
}

public int divide(int a, int b) {
if(b !=0){
return a / b;
}else {
throw new ArithmeticException("Cannot divide by zero");
}

}

public double power(int a , int b){
return Math.pow(a,b);
}

public double mod (int a , int b){
return a%b;
}

public double sqrt (int a){
return Math.sqrt(a);
}
}

9 changes: 9 additions & 0 deletions week01/src/main/java/com/github/javabaz/Main.java
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,14 @@ public static void main(String[] args) {
Hello, world!
Welcome to week 1 :D
""");

Calculator32 calc=new Calculator32();

System.out.println(calc.divide(10,2));
System.out.println(calc.multiply(5,3));

System.out.println(calc.sqrt(20));


}
}
4 changes: 2 additions & 2 deletions week01/src/test/java/com/github/javabaz/CalculatorTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@
class CalculatorTest {


private Calculator calculator;
private Calculator32 calculator;

@BeforeEach
void setUp() {
calculator = new Calculator();
calculator = new Calculator32();
}

@Test
Expand Down