Merge pull request 'Alpha to main' (#1) from Alpha into master

Reviewed-on: https://kitsunehosting.net/gitea/chris/JavaCalc/pulls/1

src/com/company/Calc.java

@@ -1,42 +1,58 @@
 package com.company;
 
+
 public class Calc {
-    int num1;
+    public static void print(String text) { //this is a small function to makes it easier to print out to terminal
-    int num2;
+        System.out.println(text); //similar to python output
-
-
-    public static String main(String op,int num1,int num2) {
-
-        return "";
     }
-
     //math functions
-    public static void print(String text){
+    public static double add(String num1, String num2){
-        System.out.println(text);
+        double add1 = Double.parseDouble(num1);
-    }
+        double add2 = Double.parseDouble(num2);
-    public static int add(String num1, String num2){
-        int add1 = Integer.parseInt(num1);
-        int add2 = Integer.parseInt(num2);
         return add1 + add2;
     }
-    public static int sub(String num1, String num2){
+    public static double sub(String num1, String num2){
-        int sub1 = Integer.parseInt(num1);
+        double sub1 = Double.parseDouble(num1);
-        int sub2 = Integer.parseInt(num2);
+        double sub2 = Double.parseDouble(num2);
         return sub1 - sub2;
     }
-    public static int mul(String num1, String num2){
+    public static double mul(String num1, String num2){
-        int mul1 = Integer.parseInt(num1);
+        double mul1 = Double.parseDouble(num1);
-        int mul2 = Integer.parseInt(num2);
+        double mul2 = Double.parseDouble(num2);
         return mul1 * mul2;
     }
-    public static int div(String num1, String num2){
+
-        int div1 = Integer.parseInt(num1);
+    public static double div(String num1, String num2){
-        int div2 = Integer.parseInt(num2);
+        double div1 = Double.parseDouble(num1);
+        double div2 = Double.parseDouble(num2);
         if (div2 == 0 || div1 == 0){
             print("cant divide by zero");
+            print("error code:");
             return -1;
         }
         return div1 / div2;
     }
+    public static String mulRound(String num1, String num2){
+        double mul1 = Double.parseDouble(num1);
+        double mul2 = Double.parseDouble(num2);
+        return Math.round(mul1 * mul2) + "rounded";
+    }
+    public static String divRemain(String num1, String num2){
+        double div1 = Double.parseDouble(num1);
+        double div2 = Double.parseDouble(num2);
+        if (div2 == 0){
+            print("cant divide by zero");
+            print("error code:");
+            return "-1";
+        }
+        else if (div1 == 0)
+            return "0";
+        else {
+            int div1I = (int) div1;
+            int div2I = (int) div2;
+            int divT = div1I / div2I;
+            return divT + " with remainder of: " + div1 % div2;
+        }
 
+    }
 }

src/com/company/Main.java

@@ -5,11 +5,10 @@ import java.util.Scanner;
 public class Main {
     @SuppressWarnings("InfiniteLoopStatement")
     public static void main(String[] args) {
-        int total = 0;
+        double total = 0;
         String num1;
         String num2;
         while (true) {
-
             Scanner in = new Scanner(System.in);
             System.out.println("Enter first number: ");
             num1 = in.nextLine();
@@ -24,6 +23,8 @@ public class Main {
             System.out.println("Inputs complete");
             System.out.println("Please input operator");
             System.out.println("+ , - , * or x , /");
+            System.out.println("'for rounded multiplication: use '*r', 'Xr' or 'xr'");
+            System.out.println("'for remainder division: use '/R' or '/r'");
             String op = in.nextLine();
 
             switch (op) {
@@ -43,6 +44,8 @@ public class Main {
                     total = Calc.div(num1, num2);
                     System.out.println(total);
                 }
+                case "*/", "xR", "xr" -> System.out.println(Calc.mulRound(num1, num2));
+                case "/R", "/r" -> System.out.println(Calc.divRemain(num1, num2));
                 default -> System.out.println("Unexpected value: '" + op + "' ...restarting program");
             }
         }