Skip to content
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

Completed Scientific Calculator Project #105

Open
wants to merge 15 commits into
base: master
Choose a base branch
from
+1,055 −10
Open

Completed Scientific Calculator Project #105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
0602287
Created/Tested switchDisplayMode + switchUnitsMode (#1)
xyuan04 Feb 27, 2021
f74aad3
Jorge branch (#2)
jorget93 Feb 28, 2021
8b79455
Jorge branch (#4)
jorget93 Feb 28, 2021
535948f
Theresa (#5)
theresa-christina Feb 28, 2021
aa03d7f
Lenasbranch (#6)
CodeHere21 Feb 28, 2021
467dc9c
deleted duplicate code (#7)
xyuan04 Feb 28, 2021
c873109
cleaned up testClass
Feb 28, 2021
49a06b7
Branch xiong (#8)
xyuan04 Feb 28, 2021
ca71b63
Branch xiong (#9)
xyuan04 Feb 28, 2021
e180b40
Lenasbranch (#10)
CodeHere21 Feb 28, 2021
bd1eb01
Kellybranch (#11)
KellyPorter02 Feb 28, 2021
0e13d1b
Branch xiong (#12)
xyuan04 Feb 28, 2021
a5d173e
Branch xiong (#13)
xyuan04 Mar 1, 2021
ae77392
removed case 98 in loop (#14)
xyuan04 Mar 1, 2021
e40d8f9
Branch xiong (#15)
xyuan04 Mar 1, 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
Binary file added .DS_Store
View file
Open in desktop
Binary file not shown.
22 changes: 22 additions & 0 deletions MainApplication.uml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
<Diagram>
<ID>JAVA</ID>
<OriginalElement>com.zipcodewilmington.scientificcalculator.MainApplication</OriginalElement>
<nodes>
<node x="-59.0" y="-267.0">com.zipcodewilmington.scientificcalculator.MainApplication</node>
</nodes>
<notes />
<edges />
<settings layout="Hierarchic Group" zoom="0.5013009540329575" x="99.0" y="299.5" />
<SelectedNodes>
<node>com.zipcodewilmington.scientificcalculator.MainApplication</node>
</SelectedNodes>
<Categories>
<Category>Fields</Category>
<Category>Constructors</Category>
<Category>Methods</Category>
</Categories>
<SCOPE>All</SCOPE>
<VISIBILITY>private</VISIBILITY>
</Diagram>

22 changes: 22 additions & 0 deletions TestMainApplication.uml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
<Diagram>
<ID>JAVA</ID>
<OriginalElement>com.zipcodewilmington.scientific_calculator.TestMainApplication</OriginalElement>
<nodes>
<node x="0.0" y="0.0">com.zipcodewilmington.scientific_calculator.TestMainApplication</node>
</nodes>
<notes />
<edges />
<settings layout="Hierarchic Group" zoom="0.6666666666666666" x="33.0" y="453.5" />
<SelectedNodes>
<node>com.zipcodewilmington.scientific_calculator.TestMainApplication</node>
</SelectedNodes>
<Categories>
<Category>Fields</Category>
<Category>Constructors</Category>
<Category>Methods</Category>
</Categories>
<SCOPE>All</SCOPE>
<VISIBILITY>private</VISIBILITY>
</Diagram>

32 changes: 32 additions & 0 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,38 @@
<groupId>com.zipcodewilmington</groupId>
<artifactId>scientific_calculator</artifactId>
<version>1.0-SNAPSHOT</version>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>8</source>
<target>8</target>
</configuration>
</plugin>
</plugins>
</build>
<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>test</scope>
</dependency>
</dependencies>


</project>
Binary file added src/.DS_Store
View file
Open in desktop
Binary file not shown.
Binary file added src/main/.DS_Store
View file
Open in desktop
Binary file not shown.
Binary file added src/main/java/.DS_Store
View file
Open in desktop
Binary file not shown.
Binary file added src/main/java/com/.DS_Store
View file
Open in desktop
Binary file not shown.
Binary file added src/main/java/com/zipcodewilmington/.DS_Store
View file
Open in desktop
Binary file not shown.
15 changes: 12 additions & 3 deletions src/main/java/com/zipcodewilmington/scientificcalculator/Console.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,20 @@ public static String getStringInput(String prompt) {
return userInput;
}


public static Integer getIntegerInput(String prompt) {
return null;
Scanner scanner = new Scanner(System.in);
println(prompt);
int userInput = scanner.nextInt();
return userInput;
}

public static Double getDoubleInput(String prompt) {
return null;
Scanner scanner = new Scanner(System.in);
println(prompt);
double userInput = scanner.nextDouble();
return userInput;
}
}


}
Loading