Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
76 commits
Select commit Hold shift + click to select a range
0fcddf6
Scanners set up and perfect example test
Oct 19, 2019
975c765
updated test
Oct 19, 2019
83158a0
organized methods
Oct 19, 2019
3dc513b
Finished Division Test
Oct 19, 2019
c165353
multiplication test bug fixed
Oct 19, 2019
e4466df
Organized folders
Oct 19, 2019
353b77c
Addition and Chris' first upload
Oct 19, 2019
deb2ac5
updated addition
Oct 19, 2019
5c38535
Finished Squared
Oct 19, 2019
aefc722
Exponent class added to calculator
Oct 19, 2019
dc0749f
Inverse finished and housecleaned
Oct 19, 2019
0c16cde
Exponent Class/test added
Oct 19, 2019
109db75
Exponent class/test
Oct 19, 2019
c0dd73d
Finshed the positive to negative
Oct 19, 2019
ea97c83
updated sqrt
Oct 19, 2019
3c0d27c
; fixed
Oct 19, 2019
654bf29
Added Value and Operator input
Oct 19, 2019
5e3d5cf
Operator and Value Scanner input
Oct 19, 2019
ce2a5dc
updated pull
Oct 19, 2019
3b06979
bla bla
Oct 19, 2019
0abf621
changes
Oct 19, 2019
09f9c59
Merge branch 'master' of https://github.com/rond556/ScientificCalcula…
Oct 19, 2019
00f4bf7
Finished Factorials
Oct 19, 2019
03bcb8e
Finished Sine
Oct 19, 2019
52a08b8
General housecleaning in the tests
Oct 19, 2019
fea62ae
General housekeeping in the tests
Oct 19, 2019
17b1383
Finished cosine
Oct 19, 2019
72a8739
Finished Tangent
Oct 19, 2019
4645cf5
Added inverse Sine
Oct 20, 2019
c9edc8a
added inverse of Cosine
Oct 20, 2019
e3105d0
added inverse of tangent
Oct 20, 2019
7c3884b
Added Logarithsm
Oct 20, 2019
e086e85
added inverse logarithms
Oct 20, 2019
84d8bb0
finished most math operators and attempted need2Values array
Oct 20, 2019
459e03f
tweeked the need2Values array and began basic math operations
Oct 20, 2019
36693cd
finished for the night
Oct 20, 2019
b981a7b
okay, seriously finished for the night
Oct 20, 2019
8a568a8
Morning updates
Oct 20, 2019
d9ea9ca
few updates
Oct 20, 2019
7e4bbb3
added option to return to main menu
Oct 20, 2019
9f91b2c
added a return statement. Still buggy
Oct 20, 2019
081a423
added more math functions
Oct 20, 2019
8c5a9f7
finished entering math operators
Oct 20, 2019
2be4e1e
subtle changes
Oct 20, 2019
75f85ab
Inverse test fixed
Oct 20, 2019
93b19c7
fixed factorial test and class
Oct 20, 2019
a765507
updated
Oct 20, 2019
81fcd7f
loop fixed
Oct 20, 2019
65d161b
pulling new updated from ron
Oct 20, 2019
f9b5956
fixed that damn bug
Oct 20, 2019
9c90e4c
working hard
Oct 20, 2019
0ea44c3
finished input string error in the value
Oct 20, 2019
d423498
fixed the loop... again
Oct 20, 2019
ec11e20
DegreesToRadians
Oct 20, 2019
d3fcd51
DegreesToRadians
Oct 20, 2019
20e71e7
DegreesToRadius
Oct 20, 2019
cebe417
pulling
Oct 20, 2019
432f9c8
fixed merge
Oct 20, 2019
d553f7b
converted selection to numbers
Oct 20, 2019
5bdf493
fixed typos
Oct 20, 2019
a332c67
fixed inverse
Oct 20, 2019
700dbc7
general housekeeping
Oct 20, 2019
a88ee46
final draft?
Oct 21, 2019
7f1e17d
major overhaul to classes and tests
Oct 21, 2019
6d1efa8
final draft of the night. Still want to use the getStringInput and ge…
Oct 21, 2019
69d3c42
added inputChecker test
Oct 21, 2019
4fe1c9c
incorporated Degrees and Radians
Oct 21, 2019
1af99c6
Wrapping up for the night
Oct 21, 2019
fd10c28
finished?
Oct 21, 2019
282f468
implemented the console
Oct 21, 2019
4705c29
further cleaning
Oct 21, 2019
831f5e8
swapped expected and actual
Oct 21, 2019
d29741e
added a UML Diagram
Oct 21, 2019
e2ded27
added features
Oct 21, 2019
00cdf45
Got to the moon
Oct 21, 2019
95f4339
fix average loop
Oct 21, 2019
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
Binary file not shown.
Binary file added UML.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
13 changes: 12 additions & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,17 @@
<groupId>com.zipcodewilmington</groupId>
<artifactId>scientific_calculator</artifactId>
<version>1.0-SNAPSHOT</version>

<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>test</scope>
</dependency>
</dependencies>
<properties>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
</properties>

</project>
6 changes: 6 additions & 0 deletions src/main/.idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions src/main/.idea/modules.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions src/main/.idea/vcs.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

115 changes: 115 additions & 0 deletions src/main/.idea/workspace.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions src/main/java/com/.idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions src/main/java/com/.idea/modules.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions src/main/java/com/.idea/vcs.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

117 changes: 117 additions & 0 deletions src/main/java/com/.idea/workspace.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading