From f991394ed425d723e359c4eb8daf3c810a3cbf1a Mon Sep 17 00:00:00 2001 From: Nila U Kumar Date: Thu, 7 Nov 2024 16:08:52 -0500 Subject: [PATCH 1/2] Changed switch statement to use if-else statement --- src/Test1.java | 35 +++++++++++++++-------------------- 1 file changed, 15 insertions(+), 20 deletions(-) diff --git a/src/Test1.java b/src/Test1.java index 3c3c38d..7f59981 100644 --- a/src/Test1.java +++ b/src/Test1.java @@ -9,26 +9,21 @@ public class Test1 { public static double basicCalculator(final Operation operation, final int num1, final int num2){ double result = 0; - switch(operation) { - case ADD: - // if operation = ADD, return the sum - result = num1 + num2; - break; - case SUBTRACT: - result = num1 - num2; - break; - case MULTIPLY: - result = num1 * num2; - break; - case DIVIDE: - if (num2 == 0) { - System.out.println("Can't divide by 0"); - } else { - result = ((double)num1) / num2; - } - break; - } - return result; + if (operation == Operation.ADD) { + result = num1 + num2; + } else if (operation == Operation.SUBTRACT) { + result = num1 - num2; + } else if (operation == Operation.MULTIPLY) { + result = num1 * num2; + } else if (operation == Operation.DIVIDE) { + if (num2 == 0) { + System.out.println("Can't divide by 0"); + } else { + result = ((double)num1) / num2; + } + } + + return result; } public static void main(final String[] args) { From 8d31f2cf8c9be311424dc042d9ebf335ec12bbfd Mon Sep 17 00:00:00 2001 From: Nila Kumar Date: Thu, 7 Nov 2024 16:13:28 -0500 Subject: [PATCH 2/2] Update Test1.java --- src/Test1.java | 27 +++++++-------------------- 1 file changed, 7 insertions(+), 20 deletions(-) diff --git a/src/Test1.java b/src/Test1.java index 3c3c38d..a07f505 100644 --- a/src/Test1.java +++ b/src/Test1.java @@ -1,37 +1,24 @@ -import java.util.*; - -enum Operation -{ - ADD, SUBTRACT, MULTIPLY, DIVIDE -} -public class Test1 { - - public static double basicCalculator(final Operation operation, final int num1, final int num2){ +public static double basicCalculator(Operation operation, int num1, int num2){ double result = 0; switch(operation) { case ADD: - // if operation = ADD, return the sum - result = num1 + num2; + System.out.println("CS193 sucks"); break; case SUBTRACT: - result = num1 - num2; + System.out.println("CS193 is not everyone's favorite class"); break; case MULTIPLY: - result = num1 * num2; + System.out.println("The CS193 lecturers do not want us to thrive in CS"); break; case DIVIDE: if (num2 == 0) { - System.out.println("Can't divide by 0"); + System.out.println("Error: u suck"); } else { - result = ((double)num1) / num2; + result = num1 / num2; } break; } - return result; - } - public static void main(final String[] args) { - System.out.println(basicCalculator(Operation.DIVIDE, 1, 2)); + return result; } -}