From 883bcc6d9820ad8f8e5095b42a602d18e84a48a0 Mon Sep 17 00:00:00 2001
From: Shuulker <JosephSparrowRoberts26@gmail.com>
Date: Sun, 11 Feb 2024 19:19:37 -0800
Subject: [PATCH 1/2] Completed Java Assignment 004

---
 .idea/misc.xml          |  2 +-
 .idea/vcs.xml           |  6 ++++++
 Java-Assignment-004.iml |  1 +
 src/multadd.java        | 18 ++++++++++++++++++
 4 files changed, 26 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..172df7b 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_21" default="true" project-jdk-name="openjdk-19" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
 </project>
\ 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 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>
\ 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 @@
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
     </content>
+    <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
 </module>
\ No newline at end of file
diff --git a/src/multadd.java b/src/multadd.java
new file mode 100644
index 0000000..ed5d569
--- /dev/null
+++ b/src/multadd.java
@@ -0,0 +1,18 @@
+public class multadd {
+
+    public static double expSum(double x) {
+        return multadd(x, Math.exp(-x), Math.sqrt(1 - Math.exp(-x)));
+    }
+
+    public static double multadd(double a, double b, double c) {
+        return a + b * c;
+    }
+
+    public static void main(String[] args) {
+        System.out.println(multadd(1.0,2.0,3.0));
+        System.out.println(multadd(Math.sin(Math.PI/4),(Math.cos(Math.PI/4.0))/2.0, 1.0));
+        System.out.println(multadd(Math.log(10.0),Math.log(20.0),1.0));
+
+        System.out.println(expSum(1.0));
+    }
+}

From 19a8c4c15e4881e1fd5d2e0abe9a45bc618749e1 Mon Sep 17 00:00:00 2001
From: Shuulker <JosephSparrowRoberts26@gmail.com>
Date: Mon, 12 Feb 2024 17:15:21 -0800
Subject: [PATCH 2/2] Completed Java Assignment 004

---
 src/multadd.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/multadd.java b/src/multadd.java
index ed5d569..61f0d7b 100644
--- a/src/multadd.java
+++ b/src/multadd.java
@@ -1,7 +1,7 @@
 public class multadd {
 
     public static double expSum(double x) {
-        return multadd(x, Math.exp(-x), Math.sqrt(1 - Math.exp(-x)));
+        return multadd(x*Math.exp(-x),Math.sqrt(1 - Math.exp(-x)),1.0);
     }
 
     public static double multadd(double a, double b, double c) {