Version 1.3

- added decimal functionality (changed int to double)
This commit is contained in:
Chris's Razer Blade 2021-01-22 12:38:27 -05:00
parent ddc615456a
commit 1bfae42460
2 changed files with 15 additions and 19 deletions

View File

@ -1,37 +1,33 @@
package com.company;
public class Calc {
//constructor of num variables
int num1;
int num2;
public static String main(String op,int num1,int num2) {
return "";
}
//math functions
public static void print(String text){
System.out.println(text);
}
public static int add(String num1, String num2){
int add1 = Integer.parseInt(num1);
int add2 = Integer.parseInt(num2);
public static double add(String num1, String num2){
double add1 = Double.parseDouble(num1);
double add2 = Double.parseDouble(num2);
return add1 + add2;
}
public static int sub(String num1, String num2){
int sub1 = Integer.parseInt(num1);
int sub2 = Integer.parseInt(num2);
public static double sub(String num1, String num2){
double sub1 = Double.parseDouble(num1);
double sub2 = Double.parseDouble(num2);
return sub1 - sub2;
}
public static int mul(String num1, String num2){
int mul1 = Integer.parseInt(num1);
int mul2 = Integer.parseInt(num2);
public static double mul(String num1, String num2){
double mul1 = Double.parseDouble(num1);
double mul2 = Double.parseDouble(num2);
return mul1 * mul2;
}
public static int div(String num1, String num2){
int div1 = Integer.parseInt(num1);
int div2 = Integer.parseInt(num2);
public static double div(String num1, String num2){
double div1 = Double.parseDouble(num1);
double div2 = Double.parseDouble(num2);
if (div2 == 0 || div1 == 0){
print("cant divide by zero");
print("error code:");

View File

@ -5,7 +5,7 @@ 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) {