diff --git a/.idea/misc.xml b/.idea/misc.xml index 639900d..172df7b 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..35eb1dd --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/Java-Assignment-004.iml b/Java-Assignment-004.iml index b46c0dd..e1006ff 100644 --- a/Java-Assignment-004.iml +++ b/Java-Assignment-004.iml @@ -5,6 +5,7 @@ + \ No newline at end of file diff --git a/src/Multadd.java b/src/Multadd.java new file mode 100644 index 0000000..1598ff3 --- /dev/null +++ b/src/Multadd.java @@ -0,0 +1,18 @@ +public class Multadd { + public static double multadd(double a, double b, double c){ + return a * b + c; + } +public static double expSum(double e){ + return multadd(e, Math.exp(-e), Math.sqrt(1 - Math.exp(-e))); +} + public static void main (String[] args) { + double test = multadd(1.0, 2.0, 3.0); + System.out.println("multadd test: " + test); + double sinCos = multadd(Math.sin(Math.PI / 4), 1.0, Math.cos(Math.PI / 4) / 2); + System.out.println("sinCos: " + sinCos); + double log = multadd(Math.log10(10), 1, Math.log10(20)); + System.out.println("Log: " + log); + double expTest = expSum(3.0); + System.out.println("expSum: " + expTest); + } +}