Exo 1 TP4

src/main/java/formula/Calculator.java

@@ -3,51 +3,42 @@ package formula;
 import java.util.Stack;
 
 public class Calculator {
-    String[] formule;
-    Stack<Formula> stackFormula;
-    public Calculator(String... formule){
-        this.formule = formule;
-        calculate();
-        System.out.println(stackFormula.peek().asValue());
+    AbstractFormulaFactory factory;
+    public Calculator(AbstractFormulaFactory factory){
+        this.factory = factory;
     }
-
-    boolean isDouble(String string){
-        try {
-            Double.parseDouble(string);
-            return true;
+    Formula analyze(String... tokens){
+        Stack<Formula> stack = new Stack<>();
+        for (String token : tokens){
+            analyzeToken(token,stack);
         }
-        catch (NumberFormatException e){return false;}
+        return stack.pop();
     }
 
-    void calculateProduct(){
-        Formula[] variables = new Formula[2];
-        variables[0] = stackFormula.pop();
-        variables[1] = stackFormula.pop();
+    void analyzeToken(String token, Stack<Formula> stack){
+        if (token == "*")
+            analyzeProduct(stack);
+        else if (token == "+")
+            analyzeSum(stack);
+        else analyzeInt(token,stack);
+    }
 
-        Formula product = new Product(variables);
+    void analyzeSum(Stack<Formula> stack){
+        Formula var1 = stack.pop();
+        Formula var2 = stack.pop();
+        stack.push(factory.createSum(var1,var2));
+    };
+    void analyzeProduct(Stack<Formula> stack){
+        Formula var1 = stack.pop();
+        Formula var2 = stack.pop();
+        stack.push(factory.createProduct(var1,var2));
+    };
 
-        stackFormula.push(product);
+    void analyzeInt(String token, Stack<Formula> stack){
+        stack.push(factory.createConstant(Double.parseDouble(token)));
+    };
 }
 
-    void calculateSum(){
-        Formula[] variables = new Formula[2];
-        variables[0] = stackFormula.pop();
-        variables[1] = stackFormula.pop();
 
-        Formula sum = new Sum(variables);
-
-        stackFormula.push(sum);
-    }
-    public void calculate(){
-        for (String s : formule) {
-            if (isDouble(s)) {
-                Formula var = new Constant(Double.parseDouble(s));
-                stackFormula.push(var);}
-
-            if (s.equals("*")) calculateProduct();
-            if (s.equals("+")) calculateSum();
-        }
-    }
-}
 
 

src/main/java/formula/Product.java

 package formula;
 
-public class Product extends VariadicOperator{
+public class Product implements Operator{
+
 
-    public Product(Formula[] formulas){
-        super(formulas);
-    }
     @Override
     public String symbol() {
         return "*";
@@ -16,7 +14,8 @@ public class Product extends VariadicOperator{
     }
 
     @Override
-    public double cumulativeValue(double accumulator, double value) {
-        return accumulator*value;
+    public double cumulativeValue(double value, double accumulator) {
+        return value*accumulator;
     }
 }
+

src/main/java/formula/Sum.java

 package formula;
 
-public class Sum extends VariadicOperator{
+public class Sum implements Operator{
 
-    public Sum(Formula... formulas){
-        super(formulas);
-    }
     @Override
     public String symbol() {
         return "+";