From aca1280d6a6e7a6360b91a43dab697aacbef2065 Mon Sep 17 00:00:00 2001
From: Molly-19 <severdiamolly@gmail.com>
Date: Sat, 10 Feb 2024 22:54:00 -0800
Subject: [PATCH] Molly Severdia Java Assignment 004

---
 .idea/misc.xml          |  2 +-
 .idea/vcs.xml           |  6 ++++++
 Java-Assignment-004.iml |  1 +
 src/Multadd.java        | 31 +++++++++++++++++++++++++++++++
 4 files changed, 39 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 @@
 <?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/Multadd.java b/src/Multadd.java
new file mode 100644
index 0000000..fdb1b72
--- /dev/null
+++ b/src/Multadd.java
@@ -0,0 +1,31 @@
+public class Multadd {
+
+    public static double multadd(double a, double b, double c) {
+        return a*b+c;
+    }
+
+    public static double expsum(double x){
+        double b = Math.exp(-x);
+        double c = Math.sqrt(1-Math.exp(-x));
+        return multadd(x,b,c);
+    }
+
+    public static void main(String[] args){
+        //trig calculation
+        double a1 = 1.0;
+        double b1 = Math.sin(Math.PI/4);
+        double c1 = (Math.cos(Math.PI/4))/2;
+        double result1 = multadd(a1, b1, c1);
+        System.out.println("result1 = " + result1);
+
+        //log calculation
+        double a2 = 1.0;
+        double b2 = Math.log10(10);
+        double c2 = Math.log10(20);
+        double result2 = multadd(a2, b2, c2);
+        System.out.println("result2 = " + result2);
+
+        //exp calculation
+        System.out.println(expsum(2.3));
+    }
+}