pull request - #2

Open

charnaexw wants to merge 64 commits into

xt0fer:masterfrom

Professional-Coding-Developments:master

Commits on Jun 27, 2021

Added 1 Sum test.
JeremySabina
committed
b181a67
Connected with Main Application and Console
JeremySabina
committed
8837f22
It Works
JeremySabina
committed
fd36d98
Added Subtraction with test cases <Incomplete>
JeremySabina
committed
2f024f1
Worked on switch statement <Incomplete>
JeremySabina
committed
3bf3e26
Added the start of switch.
charnaexw
committed
3f110d2
Merge pull request #1 from charnaexw/master
charnaexw
authored
67032e4
Tried to fix the switch statement in the Main application.
JeremySabina
committed
a8b9bc0
Worked on switch statement.
JeremySabina
committed
890ec4e
Added COS SIN TAN + inverse
charnaexw
committed
d86c99d
Added another switch(sqrt, sq, factorial, cubed)
charnaexw
committed
322ed80
Adding the MR MC M-
charnaexw
committed
103cd7e
ignore the red.
charnaexw
committed
2b8319e
Testing branches
JeremySabina
committed
3da4d22
Making Chnages.
charnaexw
committed
1139866
Merge branch 'master' into master
JeremySabina
authored
009177c
the struggle
Bobbi-Z
committed
42020a1
Merge remote-tracking branch 'origin/master'
Bobbi-Z
committed
6efee4c
the struggle is real
Bobbi-Z
committed
013a00d
Merge pull request #2 from charnaexw/master
JeremySabina
authored
a187e13
.log maybe
charnaexw
committed
4af3d2a

Commits on Jun 28, 2021

Added Basic Arithmatic test cases
JeremySabina
committed
a3d897a
added Radians.
charnaexw
committed
32a1e29
Merge pull request #4 from charnaexw/master
JeremySabina
authored
26f8601
Merge branch 'master' into master
Bobbi-Z
authored
301d738
Merge pull request #3 from Bobbi-Z/master
Bobbi-Z
authored
4566f5d
This is what we have for science.
charnaexw
committed
92b065e
Fixed up some of the display.
JeremySabina
committed
91eb470
again.
charnaexw
committed
7882cfa
Merge branch 'master' into master
charnaexw
authored
836ac70
Merge pull request #5 from charnaexw/master
charnaexw
authored
b8fc513
Merge pull request #1 from Professional-Coding-Developments/master
charnaexw
authored
035f89a
square root
Bobbi-Z
committed
c9f0b6c
square root test
Bobbi-Z
committed
9b9dc25
square root test
Bobbi-Z
committed
e7307cf
square root test2
Bobbi-Z
committed
c70a2ac
Added some more things to the display.
JeremySabina
committed
ba0e062
Merge branch 'master' of https://github.com/Professional-Coding-Developments/JavaSciCalc
JeremySabina
committed
fe1be29
Merge remote-tracking branch 'origin/master'
Bobbi-Z
committed
31183ba
I greyed out a lot of code but the code that is there should now be consistant with what you have.
charnaexw
committed
03f3aac
Merge pull request #6 from charnaexw/master
charnaexw
authored
9bdb4e0
Added some basic calculator and scientific functionality.
JeremySabina
committed
8d6131c
Merge branch 'master' of https://github.com/Professional-Coding-Developments/JavaSciCalc
JeremySabina
committed
e182dba
fixing tests
Bobbi-Z
committed
60531d5
I'm sleepy.
charnaexw
committed
d39280c
root and square - all tests pass
Bobbi-Z
committed
42e7a08
Add files via upload
Bobbi-Z
authored
28fcabe
Merge branch 'Professional-Coding-Developments:master' into master
Bobbi-Z
authored
21c0fca
Delete TestMainApplication.java
Bobbi-Z
committed
7023e24
Delete CalculatorEngineTest.java
Bobbi-Z
committed
9113a1a
Merge remote-tracking branch 'origin/master'
Bobbi-Z
committed
bd48d04
double check all code
Bobbi-Z
committed
7d29c67
Merge pull request #8 from Bobbi-Z/master
Bobbi-Z
authored
f823789
Add files via upload
Bobbi-Z
authored
7dad93f
Add files via upload
Bobbi-Z
authored
5dd441e
Merge pull request #9 from Bobbi-Z/master
Bobbi-Z
authored
bb4b97e
all my tests pass
charnaexw
committed
030d5ed
Merge pull request #10 from charnaexw/master
charnaexw
authored
7c53258
added static to the class in my code.
charnaexw
committed
f74c1f3
Merge pull request #11 from charnaexw/master
charnaexw
authored
a239c87
Add files via upload
Bobbi-Z
authored
30c242d
Merge pull request #12 from Bobbi-Z/master
Bobbi-Z
authored
e7fd8fe
last minute updates
Bobbi-Z
committed
831537d
Merge pull request #13 from Bobbi-Z/master
Bobbi-Z
authored
600e015