From e36c57693fa5132549ce90b4e6f8198769281910 Mon Sep 17 00:00:00 2001 From: Joe Hendricks Date: Wed, 7 Feb 2018 00:12:20 -0500 Subject: [PATCH 1/2] sum or product --- src/main/java/Main.java | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/src/main/java/Main.java b/src/main/java/Main.java index 1dbc0cb..285ba5e 100644 --- a/src/main/java/Main.java +++ b/src/main/java/Main.java @@ -1,9 +1,28 @@ /** * Created by iyasuwatts on 10/17/17. */ +import java.util.Scanner; + public class Main { public static void main(String[] args){ + Scanner scanNum = new Scanner(System.in); + Scanner scanString = new Scanner(System.in); + + System.out.println("Enter a number: "); + + int userNumber = scanNum.nextInt(); + + System.out.println("Would you like to multiply or add " + userNumber + " to 1.... please enter multiply or add: "); + + String userString = scanString.nextLine(); + + if (userString.equals("add")) { + System.out.println("Your total is: " + (userNumber + 1)); + } else if (userString.equals("multiply")) { + System.out.println("Your total is: " + (userNumber * 1)); + } + } } From a2b006890426159b24ba88ae504742b93de104d3 Mon Sep 17 00:00:00 2001 From: Joe Hendricks Date: Wed, 7 Feb 2018 13:48:03 -0500 Subject: [PATCH 2/2] fixed to run correctly --- src/main/java/Main.java | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/src/main/java/Main.java b/src/main/java/Main.java index 285ba5e..0d9751e 100644 --- a/src/main/java/Main.java +++ b/src/main/java/Main.java @@ -14,14 +14,29 @@ public static void main(String[] args){ int userNumber = scanNum.nextInt(); - System.out.println("Would you like to multiply or add " + userNumber + " to 1.... please enter multiply or add: "); + System.out.println("Would you like to multiply or add " + userNumber + " between 1.... please enter multiply or add: "); String userString = scanString.nextLine(); + int totalSum = 0; + if (userString.equals("add")) { - System.out.println("Your total is: " + (userNumber + 1)); - } else if (userString.equals("multiply")) { - System.out.println("Your total is: " + (userNumber * 1)); + for (int i = 0; i <= userNumber; i++) { + totalSum += i; + } + + System.out.println("Your added total is: " + (totalSum)); + + } else if (userString.equals("multiply")){ + + int totalProduct = 0; + for (int x = 1; x <= userNumber; x++){ + totalProduct = (userNumber * x) + totalProduct; + } + + System.out.println("Your multiplied total is: " + totalProduct); + + } }