From f996672b8dae1f13839c1a5ab79ccce8c7d93624 Mon Sep 17 00:00:00 2001
From: Jaime Ortiz <jaimeortiz0724@gmail.com>
Date: Sun, 11 Feb 2024 10:46:29 -0800
Subject: [PATCH 1/2] assignment-004 finished

---
 .idea/misc.xml          |  2 +-
 .idea/vcs.xml           |  6 ++++++
 Java-Assignment-004.iml |  1 +
 src/Multadd.java        | 20 ++++++++++++++++++++
 4 files changed, 28 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..cbbff6a 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-20" 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..c768433
--- /dev/null
+++ b/src/Multadd.java
@@ -0,0 +1,20 @@
+import java.lang.Math;
+public class Multadd {
+    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)));
+    }
+
+    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), 1/2.0, Math.cos(Math.PI/4)));
+
+        System.out.println(multadd(Math.log10(10), 1.0, Math.log10(20)));
+
+        System.out.println(expSum(1.0));
+
+    }
+}

From 5ef8437aa4d933bede9d08fe67e77e8dfb792946 Mon Sep 17 00:00:00 2001
From: Jaime Ortiz <jaimeortiz0724@gmail.com>
Date: Sun, 11 Feb 2024 10:48:39 -0800
Subject: [PATCH 2/2] assignment-004 finished

---
 src/Multadd.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Multadd.java b/src/Multadd.java
index c768433..a6ecacd 100644
--- a/src/Multadd.java
+++ b/src/Multadd.java
@@ -1,4 +1,5 @@
 import java.lang.Math;
+
 public class Multadd {
     public static double multadd(double a, double b, double c){
         return a * b + c;