maece/HSG-MCS-HS21_tapas
1
0
Fork 0
Code Issues 14 Pull Requests Packages Projects Releases 6 Wiki Activity

bugfixes + env variables

Browse Source
This commit is contained in:
Marcel
2021-11-17 21:35:38 +01:00
parent 9d75a87dd6
commit 6fe4b4dfbe
22 changed files with 130 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
executor-computation/src/main/java/ch/unisg/executorcomputation/executor/domain/Executor.java
View File

@@ -21,8 +21,6 @@ public class Executor extends ExecutorBase {
protected
String execution(String inputData) {
System.out.println(inputData);
String operator = "";
if (inputData.contains("+")) {
operator = "+";
@@ -30,34 +28,34 @@ public class Executor extends ExecutorBase {
operator = "-";
} else if (inputData.contains("*")) {
operator = "*";
} else {
return "invalid data";
}
// System.out.println(operator);
double result = Double.NaN;
// double result = Double.NaN;
// System.out.print(inputData.split("+"));
// int a = Integer.parseInt(inputData.split(operator)[0]);
// int b = Integer.parseInt(inputData.split(operator)[1]);
// // try {
// // TimeUnit.SECONDS.sleep(20);
// // } catch (InterruptedException e) {
// // e.printStackTrace();
// // }
// if (operator.equalsIgnoreCase("+")) {
// result = a + b;
// } else if (operator.equalsIgnoreCase("*")) {
// result = a * b;
// } else if (operator.equalsIgnoreCase("-")) {
// result = a - b;
// try {
// TimeUnit.SECONDS.sleep(5);
// } catch (InterruptedException e) {
// e.printStackTrace();
// }
// System.out.println("Result: " + result);
double result = 0.0;
if (operator.equalsIgnoreCase("+")) {
String[] parts = inputData.split("\\+");
double a = Double.parseDouble(parts[0]);
double b = Double.parseDouble(parts[1]);
result = a + b;
} else if (operator.equalsIgnoreCase("*")) {
String[] parts = inputData.split("\\*");
double a = Double.parseDouble(parts[0]);
double b = Double.parseDouble(parts[1]);
result = a * b;
} else if (operator.equalsIgnoreCase("-")) {
String[] parts = inputData.split("-");
double a = Double.parseDouble(parts[0]);
double b = Double.parseDouble(parts[1]);
result = a - b;
}
return Double.toString(result);
}