Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .idea/misc.xml

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

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

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

1 change: 1 addition & 0 deletions Java-Assignment-004.iml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>
31 changes: 31 additions & 0 deletions src/Multadd.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
public class Multadd {

public static double multadd(double a, double b, double c) {
return a*b+c;
}

public static double expsum(double x){
double b = Math.exp(-x);
double c = Math.sqrt(1-Math.exp(-x));
return multadd(x,b,c);
}

public static void main(String[] args){
//trig calculation
double a1 = 1.0;
double b1 = Math.sin(Math.PI/4);
double c1 = (Math.cos(Math.PI/4))/2;
double result1 = multadd(a1, b1, c1);
System.out.println("result1 = " + result1);

//log calculation
double a2 = 1.0;
double b2 = Math.log10(10);
double c2 = Math.log10(20);
double result2 = multadd(a2, b2, c2);
System.out.println("result2 = " + result2);

//exp calculation
System.out.println(expsum(2.3));
}
}