Skip to content

Inverse cosine function #75

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

Closed
wants to merge 2 commits into from
Closed

Inverse cosine function #75

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
09080b5
added inverse cosine function
YenYuen Aug 1, 2022
a129cc4
added inverseCos test
YenYuen Aug 1, 2022
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
11 changes: 11 additions & 0 deletions .classpath
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
<attributes>
<attribute name="module" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/5"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
</classpath>
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,4 @@
# Mac OS System
.DS_Store*
._*
/bin/
17 changes: 17 additions & 0 deletions .project
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>Simple-Java-Calculator</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
</projectDescription>
5 changes: 4 additions & 1 deletion src/simplejavacalculator/Calculator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ public enum BiOperatorModes {
}

public enum MonoOperatorModes {
square, squareRoot, oneDividedBy, cos, sin, tan ,log , rate, abs
square, squareRoot, oneDividedBy, cos, sin, tan, inverseCos ,log , rate, abs
}

private Double num1, num2;
Expand Down Expand Up @@ -109,6 +109,9 @@ public Double calculateMono(MonoOperatorModes newMode, Double num) {

return Math.tan(Math.toRadians(num));
}
if(newMode == MonoOperatorModes.inverseCos) {
return Math.toDegrees(Math.acos(num));
}
if (newMode == MonoOperatorModes.log) {
return log10(num);
}
Expand Down
11 changes: 9 additions & 2 deletions src/simplejavacalculator/UI.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ public class UI implements ActionListener {
private final JTextArea text;
private final JButton but[], butAdd, butMinus, butMultiply, butDivide,
butEqual, butCancel, butSquareRoot, butSquare, butOneDividedBy,
butCos, butSin, butTan, butxpowerofy, butlog, butrate, butabs, butBinary;
butCos, butSin, butTan, butInverseCos, butxpowerofy, butlog, butrate, butabs, butBinary;
private final Calculator calc;

private final String[] buttonValue = {"0", "1", "2", "3", "4", "5", "6",
Expand Down Expand Up @@ -99,7 +99,8 @@ public UI() throws IOException {
butOneDividedBy = new JButton("1/x");
butCos = new JButton("Cos");
butSin = new JButton("Sin");
butTan = new JButton("Tan");
butTan = new JButton("Tan");
butInverseCos = new JButton("Cos^-1");
butxpowerofy = new JButton("x^y");
butlog = new JButton("log10(x)");
butrate = new JButton("x%");
Expand Down Expand Up @@ -135,6 +136,7 @@ public void init() {
butCos.setFont(font);
butSin.setFont(font);
butTan.setFont(font);
butInverseCos.setFont(font);
butxpowerofy.setFont(font);
butlog.setFont(font);
butrate.setFont(font);
Expand Down Expand Up @@ -184,6 +186,7 @@ public void init() {
panelSub7.add(butCos);
panelSub7.add(butSin);
panelSub7.add(butTan);
panelSub7.add(butInverseCos);
panel.add(panelSub7);

panelSub8.add(butlog);
Expand All @@ -205,6 +208,7 @@ public void init() {
butCos.addActionListener(this);
butSin.addActionListener(this);
butTan.addActionListener(this);
butInverseCos.addActionListener(this);
butxpowerofy.addActionListener(this);
butlog.addActionListener(this);
butrate.addActionListener(this);
Expand Down Expand Up @@ -279,6 +283,9 @@ public void actionPerformed(ActionEvent e) {

if (source == butTan)
writer(calc.calculateMono(Calculator.MonoOperatorModes.tan, reader()));

if (source == butInverseCos)
writer(calc.calculateMono(Calculator.MonoOperatorModes.inverseCos, reader()));

if (source == butlog)
writer(calc.calculateMono(Calculator.MonoOperatorModes.log, reader()));
Expand Down
6 changes: 6 additions & 0 deletions src/simplejavacalculatorTest/CalculatorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,12 @@ void CalculateMonoTanTest() {
Assertions.assertEquals(1.0, calculator.calculateMono(Calculator.MonoOperatorModes.tan, java.lang.Math.PI / 4), 0.0000000001);
}

@Test
void CalculateMonoInverseCosTest() {
Calculator calculator = new Calculator();
Assertions.assertEquals(90.0, calculator.calculateMono(Calculator.MonoOperatorModes.inverseCos, 0.0), 0.0000000001);
}

@Test
void CalculateMonoLogTest() {
Calculator calculator = new Calculator();
Expand Down