Trinh Tong
|
18501e8ab7
|
Fixed Memory Method
|
6 vuotta sitten |
trtong
|
434b97f838
|
Merge branch 'master' of laurengreen/ZCW-MacroLabs-OOP-ScientificCalculator into master
|
6 vuotta sitten |
Lauren Green
|
bd9cb08325
|
fixed merge
|
6 vuotta sitten |
Lauren Green
|
76341efe89
|
added log
|
6 vuotta sitten |
Trinh Tong
|
79238f4d16
|
Added testing for baseOptions
|
6 vuotta sitten |
trtong
|
b738e021b3
|
Merge branch 'master' of mdimarino/ZCW-MacroLabs-OOP-ScientificCalculator into master
|
6 vuotta sitten |
Trinh Tong
|
8004e80829
|
Added memory statements to console
|
6 vuotta sitten |
Michelle DiMarino
|
c4d9abf6d7
|
added factorial method
|
6 vuotta sitten |
Trinh Tong
|
c4030f2464
|
repulled info from repo
|
6 vuotta sitten |
trtong
|
3fa2b863a9
|
Merge branch 'master' of mdimarino/ZCW-MacroLabs-OOP-ScientificCalculator into master
|
6 vuotta sitten |
Trinh Tong
|
1a1d0e033b
|
udpated from repo
|
6 vuotta sitten |
Michelle DiMarino
|
d558eeedba
|
merge conflict resolved
|
6 vuotta sitten |
trtong
|
e18dd70128
|
Merge branch 'master' of laurengreen/ZCW-MacroLabs-OOP-ScientificCalculator into master
|
6 vuotta sitten |
Lauren Green
|
bd40934a5e
|
fixed merge conflicts
|
6 vuotta sitten |
Michelle DiMarino
|
992c2ddccf
|
added square root
|
6 vuotta sitten |
trtong
|
49d5555735
|
Merge branch 'master' of mdimarino/ZCW-MacroLabs-OOP-ScientificCalculator into master
|
6 vuotta sitten |
Trinh Tong
|
aad32b341f
|
updating memory functions
|
6 vuotta sitten |
Lauren Green
|
80fc55d1bb
|
added error message for inverse of 0
|
6 vuotta sitten |
Michelle DiMarino
|
3a4803888a
|
fixed realAdvanced menu
|
6 vuotta sitten |
Trinh Tong
|
084e369965
|
updating memory functions
|
6 vuotta sitten |
Trinh Tong
|
6865188e15
|
updating memory functions
|
6 vuotta sitten |
Michelle DiMarino
|
c4d8b4c8ed
|
added option 5 to console
|
6 vuotta sitten |
Lauren Green
|
e9d881ac1d
|
JK now I actually fixed error for div by 0
|
6 vuotta sitten |
Lauren Green
|
4b0251ec7e
|
Fixed division by 0 print
|
6 vuotta sitten |
Michelle DiMarino
|
c23491b360
|
added test classes and absolute value
|
6 vuotta sitten |
Lauren Green
|
598f39de3c
|
Test Classes added as well as making it so answer is not printed when dividing by 0
|
6 vuotta sitten |
Trinh Tong
|
475d56ca95
|
EVERYTHING COMING TOGETHER
|
6 vuotta sitten |
trtong
|
a9b3412439
|
Merge branch 'master' of mdimarino/ZCW-MacroLabs-OOP-ScientificCalculator into master
|
6 vuotta sitten |
Michelle DiMarino
|
15f265553c
|
advanced calculations
|
6 vuotta sitten |
Trinh Tong
|
95cd8c62f1
|
Updated console and methods connecting to it
|
6 vuotta sitten |
Trinh Tong
|
a38b96c2df
|
Updated console and methods connecting to it
|
6 vuotta sitten |
Trinh Tong
|
260e7ec856
|
Updated console and methods connecting to it
|
6 vuotta sitten |
Trinh Tong
|
1f1b2ca166
|
Updated console and methods connecting to it
|
6 vuotta sitten |
Trinh Tong
|
90ad91b48d
|
fixed merging conflict
|
6 vuotta sitten |
Trinh Tong
|
ef4bf7bf1b
|
Fixed merge conflict
|
6 vuotta sitten |
Trinh Tong
|
7ef139a76b
|
Updated memory methods
|
6 vuotta sitten |
trtong
|
cc2a9c2b7f
|
Merge branch 'master' of laurengreen/ZCW-MacroLabs-OOP-ScientificCalculator into master
|
6 vuotta sitten |
Lauren Green
|
0ab5b28c57
|
updated methods with return statements
|
6 vuotta sitten |
Trinh Tong
|
811c55cfba
|
Updated return values for methods
|
6 vuotta sitten |
trtong
|
c3f98976f9
|
Merge branch 'master' of laurengreen/ZCW-MacroLabs-OOP-ScientificCalculator into master
|
6 vuotta sitten |
Lauren Green
|
d67c5f1bf7
|
merge changes
|
6 vuotta sitten |
Trinh Tong
|
5b0bd69a84
|
fixed merged conflict
|
6 vuotta sitten |
Trinh Tong
|
54331f2395
|
Updated methods
|
6 vuotta sitten |
Lauren Green
|
38e751ae44
|
changed each operation to seperate methods
|
6 vuotta sitten |
Trinh Tong
|
017503a29c
|
Updated methods
|
6 vuotta sitten |
Trinh Tong
|
a8b6847c56
|
Updated methods
|
6 vuotta sitten |
Trinh Tong
|
bb2de360b6
|
Updated methods
|
6 vuotta sitten |
Trinh Tong
|
2a95b38180
|
Updated Main Menu
|
6 vuotta sitten |
Trinh Tong
|
a446339267
|
Tested and updated methods
|
6 vuotta sitten |
Trinh Tong
|
0ac93ed99e
|
Tested and updated methods
|
6 vuotta sitten |