From 92b065e56cb79c1e28b095429614eefd5011d634 Mon Sep 17 00:00:00 2001 From: charnaexw Date: Sun, 27 Jun 2021 22:23:48 -0400 Subject: [PATCH 1/2] This is what we have for science. --- .../CalculatorDisplay.java | 1 + .../scientificcalculator/Scientific.java | 32 ++++++++----------- 2 files changed, 15 insertions(+), 18 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/scientificcalculator/CalculatorDisplay.java b/src/main/java/com/zipcodewilmington/scientificcalculator/CalculatorDisplay.java index d24bf2c..cdd6234 100644 --- a/src/main/java/com/zipcodewilmington/scientificcalculator/CalculatorDisplay.java +++ b/src/main/java/com/zipcodewilmington/scientificcalculator/CalculatorDisplay.java @@ -1,4 +1,5 @@ package com.zipcodewilmington.scientificcalculator; public class CalculatorDisplay { + } diff --git a/src/main/java/com/zipcodewilmington/scientificcalculator/Scientific.java b/src/main/java/com/zipcodewilmington/scientificcalculator/Scientific.java index 91b512c..1fabee0 100644 --- a/src/main/java/com/zipcodewilmington/scientificcalculator/Scientific.java +++ b/src/main/java/com/zipcodewilmington/scientificcalculator/Scientific.java @@ -1,7 +1,5 @@ package com.zipcodewilmington.scientificcalculator; -import com.sun.codemodel.internal.JSwitch; - public class Scientific { public static void main(String[] args) { @@ -52,10 +50,12 @@ public static void main(String[] args) { case "!x": long fact = 1; for (int i = 2; i <= firstNum; i++) { - value = fact * i;} + value = fact * i; + } break; default: - System.out.println("ERR");} + System.out.println("ERR"); + } switch (operator) { case ".log": @@ -73,22 +73,18 @@ public static void main(String[] args) { case "Ln": value = Math.log(firstNum); break; - default - System.out.println("ERR");} - public Double (value){ - if (Math.toRadians(value)) - - - - - - - + System.out.println("ERR"); } + public static boolean isRadian ( double input){ + double to180 = (input + ((180 / Math.PI) - input)); + // 57 is 180 degrees rounded to whole number + if (Math.round(to180) == 57) { + return true; + } else { + } + return false; + } } - } - - From 7882cfa6f240ab4852958297a809ffd44c5c7c41 Mon Sep 17 00:00:00 2001 From: charnaexw Date: Sun, 27 Jun 2021 22:42:13 -0400 Subject: [PATCH 2/2] again. --- .../scientificcalculator/CalculatorDisplay.java | 1 - .../zipcodewilmington/scientificcalculator/Scientific.java | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/scientificcalculator/CalculatorDisplay.java b/src/main/java/com/zipcodewilmington/scientificcalculator/CalculatorDisplay.java index cdd6234..d24bf2c 100644 --- a/src/main/java/com/zipcodewilmington/scientificcalculator/CalculatorDisplay.java +++ b/src/main/java/com/zipcodewilmington/scientificcalculator/CalculatorDisplay.java @@ -1,5 +1,4 @@ package com.zipcodewilmington.scientificcalculator; public class CalculatorDisplay { - } diff --git a/src/main/java/com/zipcodewilmington/scientificcalculator/Scientific.java b/src/main/java/com/zipcodewilmington/scientificcalculator/Scientific.java index 1fabee0..b539e78 100644 --- a/src/main/java/com/zipcodewilmington/scientificcalculator/Scientific.java +++ b/src/main/java/com/zipcodewilmington/scientificcalculator/Scientific.java @@ -82,8 +82,8 @@ public static boolean isRadian ( double input){ if (Math.round(to180) == 57) { return true; } else { - } - return false; + }return false; + } }