merge

Remi
1 parent 0c16a45a
Showing 14 changed files with 95 additions and 71 deletions Show diff stats
.gitignore
.project
src/app/Application.java
src/kernel/Cell.java
src/kernel/Formula.java
src/kernel/Grid.java
src/kernel/exception/CreateCycleException.java
src/kernel/exception/DivisionByZeroException.java
src/kernel/function/Function.java
src/kernel/operation/Addition.java
src/kernel/BinaryOperation.java -> src/kernel/operation/BinaryOperation.java
src/kernel/operation/Division.java
src/kernel/operation/Multiplication.java
src/kernel/operation/Subtraction.java
@@ -3,3 +3,5 @@
 /out
 /bin
 /.metadata
+.project
+.classpath
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>projetPPO_taniel_andjembe</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
@@ -3,6 +3,7 @@ package app;
 import kernel.Cell;
 import kernel.Grid;
 import kernel.exception.CellNotFoundException;
+import kernel.exception.CreateCycleException;
 import kernel.function.Average;
 import kernel.function.Sum;
  
@@ -34,6 +35,8 @@ public class Application {
             grid.createCell("B", 2, new Average(averageList));
         } catch (CellNotFoundException exception) {
             System.out.println(exception.getMessage());
+        } catch (CreateCycleException exception) {
+            System.out.println(exception.toString());
         }
  
         // Affichage
@@ -50,5 +53,16 @@ public class Application {
         System.out.println("Affichage des formules développées :");
         for (Cell cell : cells)
             System.out.println(cell.getId() + ": " + cell.getDevelopedFormula());
+
+        // Propagation
+        try {
+            grid.setValue("A", 1, 20.);
+        } catch (CellNotFoundException exception) {
+            System.out.println("exception");
+        }
+
+        System.out.println("Affichage des valeurs après modification :");
+        for (Cell cell : cells)
+            System.out.println(cell.getId() + ": " + cell.getValue());
     }
 }
 package kernel;
  
+import kernel.exception.CreateCycleException;
+
 import java.util.ArrayList;
 import java.util.List;
  
@@ -14,10 +16,10 @@ public class Cell {
     public Cell(String column, Integer line, Double value) {
         this.column = column;
         this.line = line;
-        this.value = value;
+        this.setValue(value);
     }
  
-    public Cell(String column, Integer line, Formula formula) {
+    public Cell(String column, Integer line, Formula formula) throws CreateCycleException {
         this.column = column;
         this.line = line;
         this.setFormula(formula);
@@ -48,27 +50,36 @@ public class Cell {
     }
  
     public void updateValue() {
-        this.value = this.formula.eval();
+        if (this.containFormula())
+            this.value = this.formula.eval();
     }
  
     public Boolean containFormula() {
         return this.formula != null;
     }
  
-    public void setFormula(Formula formula) {
-    	
-        this.formula = formula;
-        this.updateValue();
-        this.spread();
+    public void setFormula(Formula formula) throws CreateCycleException {
+        if (formula.createCycle(this))
+            throw new CreateCycleException();
+        else {
+            this.formula = formula;
+            for (Cell cell : this.formula.getUtilisedCells())
+                cell.usedIn.add(this);
+            this.updateValue();
+            this.spreadValue();
+        }
     }
  
     public void setValue(Double value) {
         this.value = value;
-        this.spread();
+        this.formula = null;
+        this.spreadValue();
     }
  
-    private void spread() {
-        for (Cell cell : this.usedIn)
+    private void spreadValue() {
+        for (Cell cell : this.usedIn) {
             cell.updateValue();
+            cell.spreadValue();
+        }
     }
 }
 package kernel;
  
-abstract public class Formula {
+import java.util.List;
  
-    abstract public String getDevelopedFormula();
+public interface Formula {
  
-    abstract public String toString();
+    String getDevelopedFormula();
  
-    abstract public Double eval();
+    String toString();
  
-    abstract public Boolean createCycle(Cell cell);
+    Double eval();
+
+    Boolean createCycle(Cell cell);
+
+    List<Cell> getUtilisedCells();
 }
 package kernel;
  
 import kernel.exception.CellNotFoundException;
+import kernel.exception.CreateCycleException;
  
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -21,7 +22,7 @@ public class Grid {
         return id;
     }
  
-    public String createCell(String column, Integer line, Formula formula) {
+    public String createCell(String column, Integer line, Formula formula) throws CreateCycleException {
         String id = this.getCellId(column, line);
         Cell cell = new Cell(column, line, formula);
  
@@ -34,7 +35,8 @@ public class Grid {
         this.getCell(column, line).setValue(value);
     }
  
-    public void setFormula(String column, Integer line, Formula formula) throws CellNotFoundException {
+    public void setFormula(String column, Integer line, Formula formula) throws CellNotFoundException,
+            CreateCycleException {
         this.getCell(column, line).setFormula(formula);
     }
  
@@ -0,0 +1,4 @@
+package kernel.exception;
+
+public class CreateCycleException extends Exception {
+}
@@ -1,5 +0,0 @@
-package kernel.exception;
-
-public class DivisionByZeroException extends Exception{
-
-}
@@ -6,16 +6,15 @@ import kernel.Grid;
 import kernel.LanguageEnum;
  
 import java.util.HashMap;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
-import java.util.ArrayList;
-import java.util.Iterator;
  
-abstract public class Function extends Formula {
+abstract public class Function implements Formula {
  
-    protected Map<LanguageEnum, String> names = new HashMap<>();
-    protected List<Cell> listCells;
+    public Map<LanguageEnum, String> names = new HashMap<>();
+    public List<Cell> listCells;
  
     public Function(List<Cell> listCells) {
         this.listCells = listCells;
@@ -38,21 +37,21 @@ abstract public class Function extends Formula {
     }
  
     public Boolean createCycle(Cell cell) {
- 
-    	boolean cycle=false;
-        if (!this.listCells.contains(cell)){
-        	Iterator<Cell> it=listCells.iterator();
-        	while (it.hasNext() &&!cycle){
-        		if (it.next().containFormula()){
-        			cycle=it.next().getFormula().createCycle(cell);
-        		}
-        	}
-        	return cycle;
-        	
-        }
-        else
-        	return true;
-    	
-    	
+        boolean cycle = false;
+        if (!this.listCells.contains(cell)) {
+            Iterator<Cell> it = listCells.iterator();
+            while (it.hasNext() && !cycle) {
+                Cell currentCell = it.next();
+                if (currentCell.containFormula()) {
+                    cycle = currentCell.getFormula().createCycle(cell);
+                }
+            }
+            return cycle;
+        } else
+            return true;
+    }
+
+    public List<Cell> getUtilisedCells() {
+        return this.listCells;
     }
 }
 package kernel.operation;
  
-import kernel.BinaryOperation;
 import kernel.Cell;
  
 public class Addition extends BinaryOperation {
-package kernel;
+package kernel.operation;
  
-abstract public class BinaryOperation extends Formula {
+import kernel.Cell;
+import kernel.Formula;
+
+import java.util.ArrayList;
+import java.util.List;
+
+abstract public class BinaryOperation implements Formula {
  
     protected Cell leftCell;
     protected Cell rightCell;
@@ -11,16 +17,16 @@ abstract public class BinaryOperation extends Formula {
         this.rightCell = rightCell;
     }
  
+    abstract public Double eval();
+
     public String getDevelopedFormula() {
-        return this.leftCell.getDevelopedFormula() + " " + this.operator + " " + this.rightCell.getDevelopedFormula();
+        return this.leftCell.getDevelopedFormula() + this.operator + this.rightCell.getDevelopedFormula();
     }
  
     public String toString() {
-        return this.leftCell.toString() + " " + this.operator + " " + this.rightCell.toString();
+        return this.leftCell.getId() + this.operator + this.rightCell.getId();
     }
  
-    abstract public Double eval();
-
     public Boolean createCycle(Cell cell) {
         if (this.leftCell.containFormula() && !this.rightCell.containFormula())
             return this.leftCell.getFormula().createCycle(cell);
@@ -37,4 +43,12 @@ abstract public class BinaryOperation extends Formula {
  
         }
     }
+
+    public List<Cell> getUtilisedCells() {
+        List<Cell> cells = new ArrayList<>();
+        cells.add(this.leftCell);
+        cells.add(this.rightCell);
+
+        return cells;
+    }
 }
 package kernel.operation;
  
-import kernel.BinaryOperation;
 import kernel.Cell;
  
 public class Division extends BinaryOperation {
 package kernel.operation;
  
-import kernel.BinaryOperation;
 import kernel.Cell;
  
 public class Multiplication extends BinaryOperation {
 package kernel.operation;
  
-import kernel.BinaryOperation;
 import kernel.Cell;
  
 public class Subtraction extends BinaryOperation {