From c1da7bd9c21067468bd12a3deb25fcee40403089 Mon Sep 17 00:00:00 2001
From: Rigel <rigelcluciani@gmail.com>
Date: Sun, 11 Feb 2024 23:19:41 -0800
Subject: [PATCH 1/2] 2/11/2024 Assignment 4 CIS-12 Ry Luciani

---
 .idea/misc.xml          |  2 +-
 .idea/vcs.xml           |  6 ++++++
 Java-Assignment-004.iml |  1 +
 src/ExpSum.java         | 17 +++++++++++++++++
 src/Multadd.java        | 26 ++++++++++++++++++++++++++
 5 files changed, 51 insertions(+), 1 deletion(-)
 create mode 100644 .idea/vcs.xml
 create mode 100644 src/ExpSum.java
 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 @@
 <?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-21" 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/ExpSum.java b/src/ExpSum.java
new file mode 100644
index 0000000..7df8096
--- /dev/null
+++ b/src/ExpSum.java
@@ -0,0 +1,17 @@
+public class ExpSum {
+
+    public static double expSum(double x) {
+        double eX = Math.exp(-x);
+        double radical = Math.sqrt(1 - eX);
+        return multadd(x * eX, radical, 0);
+    }
+
+    public static double multadd(double a, double b, double c) {
+        return a * b + c;
+    }
+
+    public static void main(String[] args) {
+        double result = expSum(1.0);
+        System.out.println("The result is: " + result);
+    }
+}
diff --git a/src/Multadd.java b/src/Multadd.java
new file mode 100644
index 0000000..cc254fe
--- /dev/null
+++ b/src/Multadd.java
@@ -0,0 +1,26 @@
+public class Multadd {
+    public static double multadd(double a, double b, double c) {
+        return a * b + c;
+    }
+    public static double expSum(double x) {
+        double eX = Math.exp(-x);
+        double radical = Math.sqrt(1 - eX);
+        return multadd(x * eX, radical, 0);
+    }
+
+    public static void main(String[] args) {
+        double result = multadd(1.0, 2.0, 3.0);
+        System.out.println("The result is: " + result);
+
+            double result1 = multadd(Math.sin(Math.PI / 4), Math.cos(Math.PI / 4) / 2, 0);
+            double result2 = multadd(Math.log10(10), Math.log10(20), 0);
+            System.out.println("Let's do some logarithmic equations");
+            System.out.println("The result of sin(pi/4) + cos(pi/4)/2 is: " + result1);
+            System.out.println("The result of log10(10) + log10(20) is: " + result2);
+
+
+            double result3 = expSum(1.0);
+            System.out.println("The result of the using the expSum method is: " + result3);
+        }
+    }
+

From fc318814f21b71cde2708ac6f5d6fe629d70d5c1 Mon Sep 17 00:00:00 2001
From: Rigel <rigelcluciani@gmail.com>
Date: Sun, 11 Feb 2024 23:20:40 -0800
Subject: [PATCH 2/2] 2/11/2024 Assignment 4 CIS-12 Ry Luciani

---
 src/ExpSum.java | 17 -----------------
 1 file changed, 17 deletions(-)
 delete mode 100644 src/ExpSum.java

diff --git a/src/ExpSum.java b/src/ExpSum.java
deleted file mode 100644
index 7df8096..0000000
--- a/src/ExpSum.java
+++ /dev/null
@@ -1,17 +0,0 @@
-public class ExpSum {
-
-    public static double expSum(double x) {
-        double eX = Math.exp(-x);
-        double radical = Math.sqrt(1 - eX);
-        return multadd(x * eX, radical, 0);
-    }
-
-    public static double multadd(double a, double b, double c) {
-        return a * b + c;
-    }
-
-    public static void main(String[] args) {
-        double result = expSum(1.0);
-        System.out.println("The result is: " + result);
-    }
-}