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.

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

Dave #90

Open
wants to merge 85 commits into
base: master
Choose a base branch
from
Open

Dave #90

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
85 commits
Select commit Hold shift + click to select a range
e338f01
gfg
Feb 7, 2020
7efa3c4
added test file
Feb 7, 2020
747f9c3
dsf
Feb 7, 2020
9086101
added outline of basic functions and some sci functions, test push here.
DavidKellyonGitHub Feb 8, 2020
a741fd2
testing push
Feb 8, 2020
a387876
outlined all basic and sci functions, named all methods
DavidKellyonGitHub Feb 8, 2020
bfd2fcd
first test commit
Feb 8, 2020
ebb6473
gitignore DS
Feb 8, 2020
985c295
fixed merge conflicts
Feb 8, 2020
50afc4d
delete ds_Store
Feb 8, 2020
ae48c0b
Merge pull request #3 from ebeech1990/emma
ebeech1990 Feb 8, 2020
67f15c7
Added more test fields
Feb 8, 2020
6008541
added more menu options
Feb 8, 2020
d0573a1
Merge pull request #4 from ebeech1990/emma
ebeech1990 Feb 8, 2020
d312da8
Merge branch 'dev' of https://github.com/ebeech1990/ScientificCalcula…
DavidKellyonGitHub Feb 8, 2020
af394d6
added Classes trying to push
DavidKellyonGitHub Feb 8, 2020
36a04e3
Even more test shells
Feb 8, 2020
58c7b4f
Merge branch 'dev' of https://github.com/ebeech1990/ScientificCalcula…
Feb 8, 2020
d74a46b
completed Basic methods.
DavidKellyonGitHub Feb 8, 2020
5118876
completed Basic methods
DavidKellyonGitHub Feb 8, 2020
933a359
string calc methods
Feb 8, 2020
78da705
Changing test code
Feb 8, 2020
64e000b
Merge pull request #5 from ebeech1990/emma
ebeech1990 Feb 8, 2020
8737a56
completed Sci methods
DavidKellyonGitHub Feb 8, 2020
7bed578
Merge pull request #6 from ebeech1990/gregbranch
gdavis24 Feb 8, 2020
3f465f5
Merge branch 'dev' of https://github.com/ebeech1990/ScientificCalcula…
DavidKellyonGitHub Feb 8, 2020
4f4ec5b
ff
Feb 8, 2020
c8b5fe2
reverted Basic to float methods
DavidKellyonGitHub Feb 8, 2020
b10377e
error-free Basic
DavidKellyonGitHub Feb 8, 2020
0d31b3f
error-free Sci
DavidKellyonGitHub Feb 8, 2020
8a907e1
more test fixing
Feb 8, 2020
9bd35b3
Merge branch 'dev' of https://github.com/ebeech1990/ScientificCalcula…
Feb 8, 2020
46c4d1f
fd
Feb 8, 2020
1c0ca77
dfsa
Feb 8, 2020
c7e0337
attempting to fix mistakes
Feb 8, 2020
2016177
updating tests
Feb 8, 2020
04e19f9
trying to get tests to work
Feb 8, 2020
e4e6ecb
1:00
Feb 8, 2020
47a3949
Merge pull request #7 from ebeech1990/emma
ebeech1990 Feb 8, 2020
34fa0c9
1:00 update
DavidKellyonGitHub Feb 8, 2020
3921e56
Merge pull request #8 from ebeech1990/gregbranch
gdavis24 Feb 8, 2020
6875c90
1:06 update
DavidKellyonGitHub Feb 8, 2020
36d57d6
Merge pull request #9 from ebeech1990/dave
gdavis24 Feb 8, 2020
a01c89e
updated Sci
DavidKellyonGitHub Feb 8, 2020
dff6d9d
most of menu created
Feb 8, 2020
6ba965b
Merge pull request #10 from ebeech1990/emma
ebeech1990 Feb 8, 2020
92ceb65
2:25 All basic tests and most sci tests working
Feb 8, 2020
2520bc9
Merge pull request #11 from ebeech1990/gregbranch
gdavis24 Feb 8, 2020
454860b
Merge branch 'dev' of https://github.com/ebeech1990/ScientificCalcula…
DavidKellyonGitHub Feb 8, 2020
4e75a56
most of ui done
Feb 8, 2020
d6ac7fe
Merge pull request #13 from ebeech1990/emma
ebeech1990 Feb 8, 2020
c511a49
247 commit
DavidKellyonGitHub Feb 8, 2020
84a2f58
Merge pull request #12 from ebeech1990/dave
DavidKellyonGitHub Feb 8, 2020
9f1cbd9
changed float to double
DavidKellyonGitHub Feb 8, 2020
c922925
int to double
Feb 8, 2020
6561b1c
Merge pull request #14 from ebeech1990/emma
ebeech1990 Feb 8, 2020
419b411
mostly working
Feb 9, 2020
b51aace
Merge pull request #15 from ebeech1990/emma
ebeech1990 Feb 9, 2020
cbea784
copy paste from github 1013amSun
DavidKellyonGitHub Feb 9, 2020
7a6effa
changed inverse log and floats to doubles in sci. 10:20
Feb 9, 2020
82d4d8a
Merge pull request #16 from ebeech1990/gregbranch
gdavis24 Feb 9, 2020
453695f
fixed some nav issues
Feb 9, 2020
684132d
Merge pull request #17 from ebeech1990/emma
ebeech1990 Feb 9, 2020
b1391db
added comments 10:46
Feb 9, 2020
f22fc01
Merge pull request #18 from ebeech1990/gregbranch
gdavis24 Feb 9, 2020
15d824d
updated memory in Sci
DavidKellyonGitHub Feb 9, 2020
ce8d8ba
Merge branch 'dev' of https://github.com/ebeech1990/ScientificCalcula…
DavidKellyonGitHub Feb 9, 2020
9e6486c
1106 fixed memclear
DavidKellyonGitHub Feb 9, 2020
5508030
moved most of main to console
Feb 9, 2020
967a873
Merge pull request #19 from ebeech1990/emma
ebeech1990 Feb 9, 2020
0d7b5c9
fixed merge conflicts 1110sun
DavidKellyonGitHub Feb 9, 2020
79668f0
Merge branch 'dev' of https://github.com/ebeech1990/ScientificCalcula…
DavidKellyonGitHub Feb 9, 2020
4ad050d
fixed arg err
Feb 9, 2020
cbc64e9
Merge pull request #20 from ebeech1990/emma
ebeech1990 Feb 9, 2020
eb1edf9
Merge branch 'dev' of https://github.com/ebeech1990/ScientificCalcula…
DavidKellyonGitHub Feb 9, 2020
dfc600a
pushing memstuff
DavidKellyonGitHub Feb 9, 2020
43df2c7
Merge pull request #21 from ebeech1990/dave
DavidKellyonGitHub Feb 9, 2020
bbeb6ce
All tests in, math works except when java is stupid. 12:03
Feb 9, 2020
9672b53
Merge pull request #22 from ebeech1990/gregbranch
gdavis24 Feb 9, 2020
1cad6e5
work damn you
Feb 9, 2020
b63404f
added comments 12:58
Feb 9, 2020
231ec52
Merge pull request #23 from ebeech1990/emma
ebeech1990 Feb 9, 2020
ef2ac75
Merge pull request #24 from ebeech1990/gregbranch
gdavis24 Feb 9, 2020
57fdbfe
resolved memory with console
DavidKellyonGitHub Feb 9, 2020
83ceb41
fixed memory erros
DavidKellyonGitHub Feb 9, 2020
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
5 changes: 3 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
.idea/**/sqlDataSources.xml
.idea/**/dynamic.xml
.idea/**/uiDesigner.xml
.DS_Store

# Gradle:
.idea/**/gradle.xml
Expand Down Expand Up @@ -149,7 +150,7 @@ fabric.properties
.project
.classpath
.settings

.DS_Store

#maven build target
target/
target/
8 changes: 8 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,13 @@
<artifactId>scientific_calculator</artifactId>
<version>1.0-SNAPSHOT</version>

<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13</version>
<scope>test</scope>
</dependency>
</dependencies>

</project>
2 changes: 2 additions & 0 deletions src/.idea/.gitignore

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

6 changes: 6 additions & 0 deletions src/.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/.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/.idea/vcs.xml

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

Binary file added src/main/.DS_Store
Binary file not shown.
Binary file added src/main/java/.DS_Store
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
package com.zipcodewilmington.scientificcalculator;

public class Basic{
public static double add(double a, double b){
double sum = a+b;
return sum;
}
public static double subtract(double a, double b){
double difference = a-b;
return difference;

}
public static double multiply(double a, double b){
double product = a*b;
return product;
}

public static double divide(double a, double b){
double quotient = a/b;
return quotient;
}

public static double square(double a){
double squareResult = (double) Math.pow(a,2);
return squareResult;

}
public static double squareRoot(double a){
double squareRootResult = (double) Math.sqrt(a);
return squareRootResult;
}
public static double exponent(double a, double b){
double exponentResult = (double) Math.pow(a,b);
return exponentResult;
}
public static double inverse(double a){
double inverseResult = 1/a;
return inverseResult;
}
public static double signChange(double a){
double opposite = 0;
if (a > 0){
opposite = a - (2 * Math.abs(a));
} else if(a < 0){
opposite = a + (2 * Math.abs(a));
} else {
opposite = 0;
}

return opposite;
}
}
Loading