Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 34 additions & 7 deletions src/com/javarush/module2/lesson02/calc/MathRunner.java
Original file line number Diff line number Diff line change
@@ -1,11 +1,38 @@
package com.javarush.module2.lesson02.calc;

import com.javarush.module2.lesson02.calc.types.Var;
import com.javarush.module2.lesson02.calc.types.VariableTypes;

public class MathRunner {
public static void main(String[] args) {
Var left=new Scalar(3);
Var right=new Vector("[1,2,3,4]");
// Var right=new Scalar(2);
Var result = right.add(right);
System.out.println(result);
}
public static void main(String[] args) {
String[] arguments = {"[[1,2,3],[4,5,6]]","*","[1,2,3]"};
Var left = VariableTypes.getVar(arguments[ 0 ]);
String operation = arguments[ 1 ];
Var right = VariableTypes.getVar(arguments[ 2 ]);

Var result = null;
switch ( operation ) {
case "+":
result = left.add(right);
break;
case "-":
result = left.sub(right);
break;
case "*":
result = left.mul(right);
break;
case "/":
result = left.div(right);
break;
default:
System.out.println("Invalid operation");
break;
}

for ( int i = 0; i < arguments.length; i++ ) {
System.out.print(arguments[i] + " ");
}

System.out.println("= " + result);
}
}
10 changes: 0 additions & 10 deletions src/com/javarush/module2/lesson02/calc/Operation.java

This file was deleted.

59 changes: 0 additions & 59 deletions src/com/javarush/module2/lesson02/calc/Scalar.java

This file was deleted.

24 changes: 0 additions & 24 deletions src/com/javarush/module2/lesson02/calc/Var.java

This file was deleted.

52 changes: 0 additions & 52 deletions src/com/javarush/module2/lesson02/calc/Vector.java

This file was deleted.

2 changes: 1 addition & 1 deletion src/com/javarush/module2/lesson02/calc/api/Add.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.javarush.module2.lesson02.calc.api;

import com.javarush.module2.lesson02.calc.Var;
import com.javarush.module2.lesson02.calc.types.Var;

public interface Add {
Var add(Var other);
Expand Down
2 changes: 1 addition & 1 deletion src/com/javarush/module2/lesson02/calc/api/Div.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.javarush.module2.lesson02.calc.api;

import com.javarush.module2.lesson02.calc.Var;
import com.javarush.module2.lesson02.calc.types.Var;

public interface Div {
Var div(Var other);
Expand Down
2 changes: 1 addition & 1 deletion src/com/javarush/module2/lesson02/calc/api/Mul.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.javarush.module2.lesson02.calc.api;

import com.javarush.module2.lesson02.calc.Var;
import com.javarush.module2.lesson02.calc.types.Var;

public interface Mul {
Var mul(Var other);
Expand Down
5 changes: 5 additions & 0 deletions src/com/javarush/module2/lesson02/calc/api/Operation.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
package com.javarush.module2.lesson02.calc.api;

public interface Operation extends Add, Sub, Mul, Div {

}
2 changes: 1 addition & 1 deletion src/com/javarush/module2/lesson02/calc/api/Sub.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.javarush.module2.lesson02.calc.api;

import com.javarush.module2.lesson02.calc.Var;
import com.javarush.module2.lesson02.calc.types.Var;

public interface Sub {
Var sub(Var other);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.javarush.module2.lesson02.calc;
package com.javarush.module2.lesson02.calc.exception;

public class CalcException extends RuntimeException {

Expand Down
Loading