From 915e043fbaa1f16f27e50b5d288172f40d28c174 Mon Sep 17 00:00:00 2001 From: csprtheghst Date: Sun, 11 Feb 2024 17:35:17 -0800 Subject: [PATCH] Completed Java Assignment 004 --- .idea/misc.xml | 2 +- .idea/vcs.xml | 6 ++++++ Java-Assignment-004.iml | 1 + src/Multadd.java | 24 ++++++++++++++++++++++++ 4 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 .idea/vcs.xml create mode 100644 src/Multadd.java diff --git a/.idea/misc.xml b/.idea/misc.xml index 639900d..69ace3f 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..c1f0ca0 --- /dev/null +++ b/src/Multadd.java @@ -0,0 +1,24 @@ +public class Multadd { + + public static void main(String[] args) { + + System.out.println("Testing multadd with simple parameters:"); + System.out.println("1.0 * 2.0 + 3.0 = " + multadd(1.0, 2.0, 3.0)); + + double result1 = multadd(1.0, Math.sin(Math.PI/4), Math.cos(Math.PI/4)/2); + double result2 = multadd(1.0, Math.log10(10), Math.log10(20)); + + System.out.println("\nComputing specific expressions using multadd:"); + System.out.println("sin(pi/4) + cos(pi/4)/2 = " + result1); + System.out.println("log10(10) + log10(20) = " + result2); + + System.out.println("\nComputing using expSum method:"); + System.out.println("expSum(2.0) = " + expSum(2.0)); + } + public static double multadd(double a, double b, double c) { + return a * b + c; + } + public static double expSum(double x) { + return multadd(x, Math.exp(-x), Math.sqrt(1 - Math.exp(-x))); + } +}