Skip to content

This is what we have for science. #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jun 28, 2021
Merged

This is what we have for science. #5

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
92b065e
This is what we have for science.
charnaexw Jun 28, 2021
7882cfa
again.
charnaexw Jun 28, 2021
836ac70
Merge branch 'master' into master
charnaexw Jun 28, 2021
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
31 changes: 16 additions & 15 deletions src/main/java/com/zipcodewilmington/scientificcalculator/Scientific.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
/*
package com.zipcodewilmington.scientificcalculator;

import com.sun.codemodel.internal.JSwitch;

public class Scientific {

public static void main(String[] args) {
Expand Down Expand Up @@ -53,10 +51,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":
Expand All @@ -74,23 +74,24 @@ 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;


}

}

}
//<<<<<<< master
//=======
*/


//>>>>>>> master