global refactor

Remi
1 parent 4fe45579
Showing 27 changed files with 266 additions and 353 deletions Show diff stats
.Rhistory
rapport.md
src/app/Application.java
src/kernel/BinaryOperation.java
src/noyau/Case.java -> src/kernel/Cell.java
src/kernel/Formula.java
src/noyau/Grille.java -> src/kernel/Grid.java
src/kernel/exception/CellNotFoundException.java
src/kernel/exception/DivisionByZeroException.java
src/kernel/function/Average.java
src/kernel/function/Function.java
src/kernel/function/Sum.java
src/kernel/operation/Addition.java
src/kernel/operation/Division.java
src/kernel/operation/Multiplication.java
src/kernel/operation/Subtraction.java
src/noyau/Addition.java
src/noyau/Division.java
src/noyau/Fonctions.java
src/noyau/Formule.java
@@ -4,10 +4,10 @@
 Le but du projet est de réaliser un tableur "basique" mais facilement
 extensible, l'application sera divisée en 2 parties :
-* le noyau
+* le kernel
 * la partie graphique
-Le noyau s'occupera de toutes les opérations de notre grille, les cases
+Le kernel s'occupera de toutes les opérations de notre grid, les cases
 ne pourront contenir que des réels ou des formules(opération binaire ou
 des fonctions acceptant des plages de cases).
@@ -21,7 +21,7 @@ abstraites sont en italique :
 ### PSEUDO-JAVA CREATION GRILLE,CASES
-Voici un exemple de création d'une grille et de l'ajout / modification /
+Voici un exemple de création d'une grid et de l'ajout / modification /
 affichage de plusieurs types de case :
 ```java
@@ -54,7 +54,7 @@ class Application {
         g.getValeur("a",1); //Affichera 100.0
         g.getValeur("a",4); //Affichera (100+50+150)=100
         g.getFormuleAsString("b",2); //Affichera MOYENNE(a4,a2,a3)
-        g.getFormuleDeveloppe("b",2); //Affichera MOYENNE(Somme(a1,a2,a3),a2,(a1+a2))
+        g.getFormuleDeveloppe("b",2); Sum
     }
 }
 ```
@@ -62,7 +62,7 @@ class Application {
 ### CHOIX STRUCTURE DE DONNÉES
 Nous devons choisir une structure de donnée pour stocker les cases dans 
-notre grille, nous savons déjà que nous allons utiliser ne collection
+notre grid, nous savons déjà que nous allons utiliser ne collection
 pour les stocker,voici celles que nous connaissons:
 - des tableaux
 - des listes
@@ -70,7 +70,7 @@ pour les stocker,voici celles que nous connaissons:
 - des sets
 D'après le schéma UML ci-dessus, nous allons donc utiliser une `HashMap` 
-pour stocker les cases de notre grille :
+pour stocker les cases de notre grid :
 * Pour rechercher une case et, effectuer des opérations dessus ce sera 
 plus facile, la clé de la Map sera une chaine de caractère (String) qui 
 représente la coordonnée de cette case (c'est-à-dire la concaténation 
@@ -180,12 +180,12 @@ class Case{
   }
 }
-// Exemple pour Moyenne
+Average
 class Moyenne {
     List<Case> listCases = new ArrayList<Case>();
     String getFormuleDeveloppe() {
-        return "Moyenne(" + listCases.stream().map(c -> c.getFormuleDeveloppe()).collect((Collectors).joining(", ")) + ")";
+        return Average + listCases.stream().map(c -> c.getFormuleDeveloppe()).collect((Collectors).joining(", ")) + ")";
     }
 }
@@ -354,7 +354,7 @@ class Case {
   }
 }
-// Exemple pour OperationBinaire
+BinaryOperation
 class OperationBinaire {
     Case gauche;
     Case droite;
 package app;
-import noyau.Grille;
+import kernel.Grid;
 public class Application {
     public static void main(String[] args) {
-        Grille grille = new Grille();
+        Grid grid = new Grid();
         System.out.println("Hello world!");
     }
@@ -0,0 +1,40 @@
+package kernel;
+
+abstract public class BinaryOperation extends Formula {
+
+    protected Cell leftCell;
+    protected Cell rightCell;
+    protected String operator;
+
+    public BinaryOperation(Cell leftCell, Cell rightCell) {
+        this.leftCell = leftCell;
+        this.rightCell = rightCell;
+    }
+
+    public String getDevelopedFormula() {
+        return this.leftCell.getDevelopedFormula() + " " + this.operator + " " + this.rightCell.getDevelopedFormula();
+    }
+
+    public String toString() {
+        return this.leftCell.toString() + " " + this.operator + " " + this.rightCell.toString();
+    }
+
+    abstract public Double eval();
+
+    public Boolean createCycle(Cell cell) {
+        if (this.leftCell.containFormula() && !this.rightCell.containFormula())
+            return this.leftCell.getFormula().createCycle(cell);
+        else {
+            if (!this.leftCell.containFormula() && this.rightCell.containFormula())
+                return this.rightCell.getFormula().createCycle(cell);
+            else {
+                if (this.leftCell.containFormula() && this.rightCell.containFormula())
+                    return this.leftCell.getFormula().createCycle(cell) && this.rightCell.getFormula().createCycle(cell);
+                else {
+                    return (cell.getId().equals(this.rightCell.getId()) || cell.getId().equals(this.leftCell.getId()));
+                }
+            }
+
+        }
+    }
+}
-package noyau;
+package kernel;
 import java.util.ArrayList;
 import java.util.List;
-public class Case {
+public class Cell {
     private String column;
     private Integer line;
     private Double value;
-    private Formule formula;
-    private List<Case> usedIn = new ArrayList<>();
+    private Formula formula;
+    private List<Cell> usedIn = new ArrayList<>();
-    public Case(String column, Integer line, Double value) {
+    public Cell(String column, Integer line, Double value) {
         this.column = column;
         this.line = line;
         this.value = value;
     }
-    public Case(String column, Integer line, Formule formula) {
+    public Cell(String column, Integer line, Formula formula) {
         this.column = column;
         this.line = line;
         this.formula = formula;
     }
-    public double getValue() {
+    public Double getValue() {
         return this.value;
     }
-    
-    public List<Case> getUsedIn() {
-        return this.usedIn;
-    }
-    public void setValue(Double value) {
-        this.value = value;
-        this.spread();
+    public Formula getFormula() {
+        return this.formula;
     }
-    public void updateValue() {
-
+    public String getDevelopedFormula() {
+        return containFormula() ? this.formula.getDevelopedFormula() : this.toString();
     }
     public String getId() {
         return this.column + this.line.toString();
     }
-    public Boolean containFormula() {
-        return this.formula != null;
+    public List<Cell> getUsedIn() {
+        return this.usedIn;
     }
-    
+    public String toString() {
+        return containFormula() ? this.formula.toString() : this.getId();
+    }
-    public Formule getFormula() {
-        return this.formula;
+    public void updateValue() {
+        this.value = this.formula.eval();
+    }
+
+    public Boolean containFormula() {
+        return this.formula != null;
     }
-    public void setFormula(Formule formula) {
+    public void setFormula(Formula formula) {
         this.formula = formula;
         this.spread();
     }
+    public void setValue(Double value) {
+        this.value = value;
+        this.spread();
+    }
+
     private void spread() {
-        for (Case cell : this.usedIn)
+        for (Cell cell : this.usedIn)
             cell.updateValue();
     }
 }
@@ -0,0 +1,12 @@
+package kernel;
+
+abstract public class Formula {
+
+    abstract public String getDevelopedFormula();
+
+    abstract public String toString();
+
+    abstract public Double eval();
+
+    abstract public Boolean createCycle(Cell cell);
+}
-package noyau;
+package kernel;
-import noyau.exception.CellNotFoundException;
+import kernel.exception.CellNotFoundException;
 import java.util.HashMap;
 import java.util.Map;
-public class Grille {
+public class Grid {
-    private Map<String, Case> cases = new HashMap<>();
+    private Map<String, Cell> cells = new HashMap<>();
-    public String createCase(String column, Integer line, Double value) {
+    public String createCell(String column, Integer line, Double value) {
         String id = this.getId(column, line);
-        Case cell = new Case(column, line, value);
+        Cell cell = new Cell(column, line, value);
-        this.cases.put(id, cell);
+        this.cells.put(id, cell);
         return id;
     }
-    public String createCase(String column, Integer line, Formule formula) {
+    public String createCell(String column, Integer line, Formula formula) {
         String id = this.getId(column, line);
-        Case cell = new Case(column, line, formula);
+        Cell cell = new Cell(column, line, formula);
-        this.cases.put(id, cell);
+        this.cells.put(id, cell);
         return id;
     }
     public void setValue(String column, Integer line, Double value) throws CellNotFoundException {
-        Case cell = this.getCase(column, line);
+        Cell cell = this.getCell(column, line);
         try {
             cell.setValue(value);
@@ -37,8 +37,8 @@ public class Grille {
         }
     }
-    public void setFormula(String column, Integer line, Formule formula) throws CellNotFoundException {
-        Case cell = this.getCase(column, line);
+    public void setFormula(String column, Integer line, Formula formula) throws CellNotFoundException {
+        Cell cell = this.getCell(column, line);
         try {
             cell.setFormula(formula);
@@ -47,12 +47,12 @@ public class Grille {
         }
     }
-    public Case getCase(String column, Integer line) {
-        return this.cases.get(this.getId(column, line));
+    public Cell getCell(String column, Integer line) {
+        return this.cells.get(this.getId(column, line));
     }
-    public Double getValeur(String column, Integer line) throws CellNotFoundException {
-        Case cell = this.getCase(column, line);
+    public Double getValue(String column, Integer line) throws CellNotFoundException {
+        Cell cell = this.getCell(column, line);
         try {
             return cell.getValue();
@@ -61,11 +61,11 @@ public class Grille {
         }
     }
-    public String getFormuleAsString(String column, Integer line) throws CellNotFoundException {
-        Case cell = this.getCase(column, line);
+    public String getFormulaAsString(String column, Integer line) throws CellNotFoundException {
+        Cell cell = this.getCell(column, line);
         try {
-            return cell.getValue();
+            return cell.getFormula().toString();
         } catch (NullPointerException exception) {
             throw new CellNotFoundException();
         }
@@ -0,0 +1,4 @@
+package kernel.exception;
+
+public class CellNotFoundException extends Exception {
+}
@@ -0,0 +1,5 @@
+package kernel.exception;
+
+public class DivisionByZeroException extends Exception{
+
+}
@@ -0,0 +1,31 @@
+package kernel.function;
+
+import kernel.Cell;
+
+import java.util.OptionalDouble;
+import java.util.stream.Collectors;
+
+public class Average extends Function {
+
+    public String toString() {
+        return "MOYENNE(" + this.listCells.stream()
+                .map(Cell::getId)
+                .collect(Collectors.joining(","))
+                + ")";
+    }
+
+    public String getDevelopedFormula() {
+        return "MOYENNE(" + this.listCells.stream()
+                .map(Cell::getDevelopedFormula)
+                .collect(Collectors.joining(","))
+                + ")";
+    }
+
+    public Double eval() {
+        OptionalDouble average = this.listCells.stream()
+                .mapToDouble(Cell::getValue)
+                .average();
+
+        return average.isPresent() ? average.getAsDouble() : 0.;
+    }
+}
@@ -0,0 +1,21 @@
+package kernel.function;
+
+import kernel.Cell;
+import kernel.Formula;
+
+import java.util.ArrayList;
+
+abstract public class Function extends Formula {
+
+    protected ArrayList<Cell> listCells = new ArrayList<>();
+
+    abstract public String getDevelopedFormula();
+
+    abstract public String toString();
+
+    abstract public Double eval();
+
+    public Boolean createCycle(Cell cell) {
+        return this.listCells.contains(cell);
+    }
+}
@@ -0,0 +1,29 @@
+package kernel.function;
+
+import kernel.Cell;
+import kernel.function.Function;
+
+import java.util.stream.Collectors;
+
+public class Sum extends Function {
+
+    public String toString() {
+        return "SOMME(" + this.listCells.stream()
+                .map(Cell::getId)
+                .collect(Collectors.joining(","))
+                + ")";
+    }
+
+    public String getDevelopedFormula() {
+        return "SOMME(" + this.listCells.stream()
+                .map(Cell::getDevelopedFormula)
+                .collect(Collectors.joining(","))
+                + ")";
+    }
+
+    public Double eval() {
+        return this.listCells.stream()
+                .mapToDouble(Cell::getValue)
+                .sum();
+    }
+}
@@ -0,0 +1,16 @@
+package kernel.operation;
+
+import kernel.BinaryOperation;
+import kernel.Cell;
+
+public class Addition extends BinaryOperation {
+
+    public Addition(Cell leftCell, Cell rightCell) {
+        super(leftCell, rightCell);
+        this.operator = "+";
+    }
+
+    public Double eval() {
+        return this.leftCell.getValue() + this.rightCell.getValue();
+    }
+}
@@ -0,0 +1,16 @@
+package kernel.operation;
+
+import kernel.BinaryOperation;
+import kernel.Cell;
+
+public class Division extends BinaryOperation {
+
+    public Division(Cell leftCell, Cell rightCell) {
+        super(leftCell, rightCell);
+        this.operator = "/";
+    }
+
+    public Double eval() {
+        return this.leftCell.getValue() / this.rightCell.getValue();
+    }
+}
@@ -0,0 +1,16 @@
+package kernel.operation;
+
+import kernel.BinaryOperation;
+import kernel.Cell;
+
+public class Multiplication extends BinaryOperation {
+
+    public Multiplication(Cell leftCell, Cell rightCell) {
+        super(leftCell, rightCell);
+        this.operator = "*";
+    }
+
+    public Double eval() {
+        return this.leftCell.getValue() * this.rightCell.getValue();
+    }
+}
@@ -0,0 +1,16 @@
+package kernel.operation;
+
+import kernel.BinaryOperation;
+import kernel.Cell;
+
+public class Subtraction extends BinaryOperation {
+
+    public Subtraction(Cell leftCell, Cell rightCell) {
+        super(leftCell, rightCell);
+        this.operator = "-";
+    }
+
+    public Double eval() {
+        return this.leftCell.getValue() - this.rightCell.getValue();
+    }
+}
@@ -1,34 +0,0 @@
-package noyau;
-
-import java.util.stream.Collectors;
-
-public class Addition extends OperationBinaire {
-	
-	Addition(Case g,Case d){
-		gauche=g;
-		droite=d;
-	}
-	
-	
-	public double eval() {
-		
-		if (!creerCycle(gauche) && !creerCycle(droite))
-			return (double) gauche.getValue() + droite.getValue();
-		else
-			return 0;
-		
-	}
-	
-	
-	public String toString(){
-		
-		return gauche.getId() +" + " + droite.getId() ;
-	}
-	
-	
-	public String getFormuleDeveloppe(){
-		
-		return "";
-	}
-
-}
@@ -1,47 +0,0 @@
-package noyau;
-
-import noyau.exception.CellNotFoundException;
-import noyau.exception.DivisionByZeroException;
-
-public class Division extends OperationBinaire{
-	
-	Division(Case g,Case d){
-		gauche=g;
-		droite=d;
-	}
-	
-	
-	
-	public double eval() throws DivisionByZeroException {
-		
-		try{
-			if (!creerCycle(gauche) && !creerCycle(droite))
-				
-				return gauche.getValue()/droite.getValue();
-			else 
-				return 0;
-		}
-		catch(ArithmeticException ex){
-			throw new DivisionByZeroException();
-		}
-		
-		
-		
-		
-		
-	}
-	
-	
-	public String toString(){
-		
-		return gauche.getId() +" / " + droite.getId() ;
-	}
-	
-	
-	
-	public String getFormuleDeveloppe(){
-		
-		return "";
-	}
-
-}
@@ -1,25 +0,0 @@
-package noyau;
-
-import java.util.*;
-
-abstract public class Fonctions extends Formule {
-	
-	ArrayList<Case> listCases = new ArrayList<Case>();
-	
-	abstract public String getFormuleDeveloppe();
-	
-
-	
-	public boolean  creerCycle(Case uneCase){
-		
-		return listCases.contains(uneCase);
-
-
-			
-			
-			
-	
-	}
-	
-	
-}
@@ -1,11 +0,0 @@
-package noyau;
-
-import noyau.exception.DivisionByZeroException;
-
-abstract public class Formule   {
-
-	abstract public String toString();
-	abstract public double eval() throws DivisionByZeroException;
-	abstract public boolean creerCycle(Case uneCase);
-	
-}
@@ -1,35 +0,0 @@
-package noyau;
-
-import java.util.stream.Collectors;
-
-public class Moyenne extends Fonctions{
-	
-
-	public String toString(){
-		
-		return "MOYENNE(" + listCases.stream()
-		        .map( n -> n.getId() )
-		        .collect( Collectors.joining( "," ) )
-		        +")";
-	}
-	
-	public String getFormuleDeveloppe(){
-		
-		return "";
-	}
-	
-	public double eval() {
-	    
-		double val=0.0;
-
-	    try{
-	    	for(int i=0; i<listCases.size(); i++)
-	    		val += listCases.get(i).getValue();
-
-	    	return (double)val/listCases.size();
-	    }
-	    catch(ArithmeticException ex){
-	    	return 0.0;
-	    }
-	}
-}
@@ -1,32 +0,0 @@
-package noyau;
-
-public class Multiplication extends OperationBinaire{
-	
-	Multiplication(Case g,Case d){
-		gauche=g;
-		droite=d;
-	}
-	
-	
-	public double eval() {
-		
-		if (!creerCycle(gauche) && !creerCycle(droite))
-			return gauche.getValue() * droite.getValue();
-		else
-			return 0;
-	}
-	
-	
-	public String toString(){
-		
-		return gauche.getId() +" * " + droite.getId() ;
-	}
-	
-	
-	
-	public String getFormuleDeveloppe(){
-		
-		return "";
-	}
-
-}
@@ -1,41 +0,0 @@
-package noyau;
-
-
-import noyau.exception.DivisionByZeroException;
-
-
-
-abstract public class OperationBinaire extends Formule {
-
-	Case droite;
-	Case gauche;
-	
-	abstract public String getFormuleDeveloppe();
-	
-	abstract public double eval() throws DivisionByZeroException;
-	
-	public boolean  creerCycle(Case uneCase){
-		
-
-		if (droite.containFormula() && !gauche.containFormula())
-			return droite.getFormula().creerCycle(uneCase);
-		else {
-			if (!droite.containFormula() && gauche.containFormula())
-				return gauche.getFormula().creerCycle(uneCase);
-			else{ 
-				if (droite.containFormula() && gauche.containFormula())
-					return gauche.getFormula().creerCycle(uneCase) && droite.getFormula().creerCycle(uneCase);
-				else{
-					return (uneCase.getId()==droite.getId() || uneCase.getId()==gauche.getId());
-				}				
-			}		
-					
-		}	
-		
-
-			
-			
-			
-	
-	}
-}
@@ -1,31 +0,0 @@
-package noyau;
-
-import java.util.*;
-import java.util.stream.Collectors;
-
-public class Somme extends Fonctions{
-
-	public String toString(){
-		
-		return "SOMME(" + listCases.stream()
-		        .map( n -> n.getId() )
-		        .collect( Collectors.joining( "," ) )
-		        +")";
-	}
-	
-	public String getFormuleDeveloppe(){
-		
-		return "";
-	}
-	
-	public double eval() {
-	    
-		double val=0;
-
-	    if (listCases.size() != 0)
-	    	for(int i=0; i<listCases.size(); i++)
-	    		val += listCases.get(i).getValue();
-
-	    return val;
-	}
-}
@@ -1,34 +0,0 @@
-package noyau;
-
-public class Soustraction extends OperationBinaire{
-	
-	Soustraction(Case g,Case d){
-		gauche=g;
-		droite=d;
-	}
-	
-	
-	
-	public double eval() {
-		
-		if (!creerCycle(gauche) && !creerCycle(droite))
-			return gauche.getValue() - droite.getValue();
-		else 
-			return 0;
-	}
-	
-	
-	
-	
-	public String toString(){
-		
-		return gauche.getId() +" - " + droite.getId() ;
-	}
-	
-	
-	public String getFormuleDeveloppe(){
-		
-		return "";
-	}
-
-}
@@ -1,4 +0,0 @@
-package noyau.exception;
-
-public class CellNotFoundException extends Exception {
-}
@@ -1,5 +0,0 @@
-package noyau.exception;
-
-public class DivisionByZeroException extends Exception{
-
-}