Merging multiply and main

.gitignore

@@ -1,23 +1,27 @@
-# Compiled class file
-*.class
-
-# Log file
-*.log
-
-# BlueJ files
-*.ctxt
-
-# Mobile Tools for Java (J2ME)
-.mtj.tmp/
-
-# Package Files #
-*.jar
-*.war
-*.nar
-*.ear
-*.zip
-*.tar.gz
-*.rar
-
-# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
-hs_err_pid*
+# Compiled class file
+*.class
+
+# Log file
+*.log
+
+# BlueJ files
+*.ctxt
+
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
+# Package Files #
+*.jar
+*.war
+*.nar
+*.ear
+*.zip
+*.tar.gz
+*.rar
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*
+.vs/ProjectSettings.json
+.vs/cs319-spring22-git-lab/v16/.suo
+.vs/ProjectSettings.json
+.vs/cs319-spring22-git-lab/v16/.suo

.vs/ProjectSettings.json

@@ -0,0 +1,3 @@
+{
+  "CurrentProjectSetting": null
+}

.vs/VSWorkspaceState.json

@@ -0,0 +1,6 @@
+{
+  "ExpandedNodes": [
+    ""
+  ],
+  "PreviewInSolutionExplorer": false
+}

Main.java

@@ -1,5 +1,17 @@
-public class Main {
-    public static void main(String[] args) {
-
-    }
-}
+public class Main {
+    public static void main(String[] args) {
+        NewCalculator calculator = new NewCalculator();
+        // Try division
+        calculator.Divide(100, 12);
+        System.out.println(calculator.getLastResult());
+        // Try addition
+        calculator.Add(10, 35);
+        System.out.println(calculator.getLastResult());
+        // Try subtraction
+        calculator.Subtract(50, 15);
+        System.out.println(calculator.getLastResult());
+	// Try Multiplication
+	calculator.Multiply(10, 30);
+	System.out.println(calculator.getLastResult());
+        }
+}

NewCalculator.java

@@ -1,27 +1,32 @@
-public class NewCalculator {
-    private double lastResult;
-
-    public NewCalculator(){
-        this.lastResult = 0;
-    }
-
-    public double getLastResult(){
-        return this.lastResult;
-    }
-
-    public double Add(double x, double y){
-        this.lastResult = x + y;
-        return this.lastResult;
-    }
-
-    public double Subtract (double x, double y){
-        this.lastResult = x - y;
-        return this.lastResult;
-    }
-
-    public double Divide(double dividend, double divisor){
-        this.lastResult = dividend % divisor;
-        return this.lastResult;
-    }
-
-}
+public class NewCalculator {
+    private double lastResult;
+
+    public NewCalculator(){
+        this.lastResult = 0;
+    }
+
+    public double getLastResult(){
+        return this.lastResult;
+    }
+
+    public double Add(double x, double y){
+        this.lastResult = x + y;
+        return this.lastResult;
+    }
+
+    public double Subtract (double x, double y){
+        this.lastResult = x - y;
+        return this.lastResult;
+    }
+
+    public double Divide(double dividend, double divisor){
+        this.lastResult = dividend % divisor;
+        return this.lastResult;
+    }
+
+    public double Multiply(double x, double y){
+	this.lastResult = x * y;
+	return this.lastResult;
+    }
+
+}

README.md

@@ -1,2 +1,2 @@
-# cs319-spring22-git-lab
-This is the base repository that CS 319 students will fork and work with as part of their Git lab assignment
+# cs319-spring22-git-lab
+This is the base repository that CS 319 students will fork and work with as part of their Git lab assignment