Merge branch 'test' into 'master'

Test See merge request !1

Merge branch 'test' into 'master'
Test See merge request !1
rtaniel
2 parents 453ac322 080a0e68
Showing 20 changed files with 166 additions and 64 deletions Show diff stats
.gitignore
grid.data
src/ihm/TablooProto.java
src/kernel/Cell.java
src/kernel/Formula.java
src/kernel/Grid.java
src/kernel/exception/BadSyntaxException.java
src/kernel/exception/CannotDeleteCellException.java
src/kernel/exception/CellNotFoundException.java
src/kernel/exception/CreateCycleException.java
src/kernel/exception/InvalidIntervalException.java
src/kernel/function/Average.java
src/kernel/function/Function.java
src/kernel/function/Sum.java
src/kernel/operation/Addition.java
src/kernel/operation/BinaryOperation.java
src/kernel/operation/Division.java
src/kernel/operation/Multiplication.java
src/kernel/operation/Subtraction.java
src/kernel/test/GridTest.java
-essai.ser
-grid.data
+*.data
 /.idea
 *.iml
 /out
 /bin
 /.metadata
 .project
-.classpath
 \ No newline at end of file
+.classpath
@@ -277,7 +277,7 @@ public class TablooProto extends JPanel {
 	// Exécution de l'interface graphique a partir d'un terminal.
 	public static void main(String[] args) throws ClassNotFoundException, IOException {
 		try {
-			grid = Grid.load();
+			grid = Grid.load("grid.data");
 		} catch (IOException | ClassNotFoundException e) {
 			grid = new Grid();
 		}
@@ -298,7 +298,7 @@ public class TablooProto extends JPanel {
 			@Override
 			public void windowClosing(WindowEvent we) {
 				try {
-					grid.save();
+					grid.save("grid.data");
 				} catch (IOException e) {
 					System.out.println(e.getMessage());
 				}
@@ -5,12 +5,11 @@ import kernel.exception.CreateCycleException;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 public class Cell implements Serializable {
 	private static final long serialVersionUID = 1L;
-	
-	
 	private String column;
 	private int line;
 	private double value;
@@ -72,7 +71,7 @@ public class Cell implements Serializable {
 	public void setFormula(Formula formula) throws CreateCycleException {
 		if (formula.createCycle(this))
-			throw new CreateCycleException();
+			throw new CreateCycleException("L'assignation de la formule " + formula.toString() + " créée un cycle.");
 		this.formula = formula;
 		for (Cell cell : this.formula.getUtilisedCells())
@@ -94,5 +93,20 @@ public class Cell implements Serializable {
 		}
 	}
+	@Override
+	public boolean equals(Object o) {
+		if (this == o)
+			return true;
+		if (!(o instanceof Cell))
+			return false;
+		
+		Cell cell = (Cell) o;
+		
+		return line == cell.line && column.equals(cell.column);
+	}
+	@Override
+	public int hashCode() {
+		return Objects.hash(column, line);
+	}
 }
@@ -6,6 +6,7 @@ public interface Formula {
 	String getDevelopedFormula();
+	@Override
 	String toString();
 	double eval();
@@ -20,46 +20,42 @@ public class Grid implements Serializable {
 	public static LanguageEnum language = LanguageEnum.FR;
 	public void createCell(String column, int line, double value) throws InvalidIntervalException {
-		column = column.toUpperCase();
-		
 		if (!validateInterval(column, line))
 			throw new InvalidIntervalException();
+		
 		String id = this.getCellId(column, line);
 		Cell cell = new Cell(column, line, value);
-		this.cells.put(id, cell);
+		this.cells.put(id, cell);
 	}
 	public void createCell(String column, int line, Formula formula) throws CreateCycleException, InvalidIntervalException {
-		column = column.toUpperCase();
-		
 		if (!validateInterval(column, line))
 			throw new InvalidIntervalException();
+		
 		String id = this.getCellId(column, line);
 		Cell cell = new Cell(column, line, formula);
-		this.cells.put(id, cell);
+		this.cells.put(id, cell);
 	}
 	public void setValue(String column, int line, double value) throws CellNotFoundException {
-		column = column.toUpperCase();
 		this.getCell(column, line).setValue(value);
 	}
 	public void setFormula(String column, int line, Formula formula) throws CellNotFoundException,
 			CreateCycleException {
-		column = column.toUpperCase();
 		this.getCell(column, line).setFormula(formula);
 	}
 	public Cell getCell(String column, int line) throws CellNotFoundException {
-		column = column.toUpperCase();
-		Cell cell = this.cells.get(this.getCellId(column, line));
+		String id = this.getCellId(column, line);
+		Cell cell = this.cells.get(id);
 		if (cell != null)
 			return cell;
 		else
-			throw new CellNotFoundException();
+			throw new CellNotFoundException("La cellule " + id + " n'existe pas.");
 	}
 	public Cell getCell(String id) {
@@ -71,26 +67,21 @@ public class Grid implements Serializable {
 	}
 	public double getValue(String column, int line) throws CellNotFoundException {
-		column = column.toUpperCase();
-		return this.getCell(column, line).getValue();
+		return this.getCell(column.toUpperCase(), line).getValue();
 	}
 	public String getFormulaAsString(String column, int line) throws CellNotFoundException {
-		column = column.toUpperCase();
-		return this.getCell(column, line).toString();
+		return this.getCell(column.toUpperCase(), line).toString();
 	}
 	public String getDevelopedFormula(String column, int line) throws CellNotFoundException {
-		column = column.toUpperCase();
-		return this.getCell(column, line).getDevelopedFormula();
+		return this.getCell(column.toUpperCase(), line).getDevelopedFormula();
 	}
 	private String getCellId(String column, int line) {
-		column = column.toUpperCase();
-		return column + line;
+		return column.toUpperCase() + line;
 	}
-	
 	public int getTotalColumn() {
 		return MAX_COLUMNS.charAt(0) - (int) 'A' + 1;
 	}
@@ -114,10 +105,10 @@ public class Grid implements Serializable {
 			Cell cell = this.getCell(id);
 			if (!cell.getUsedIn().isEmpty())
-				throw new CannotDeleteCellException();
+				throw new CannotDeleteCellException("La cellule " + id + " est utilisée dans une autre case.");
 			cell.updateUsedIn();
-			this.cells.remove(this.getCellId(column, line));
+			this.cells.remove(id);
 		}
 	}
@@ -131,20 +122,21 @@ public class Grid implements Serializable {
 		return ascii;
 	}
-	public void save() throws IOException {
-		File file = new File("grid.data");
+	public void save(String fileName) throws IOException {
+		File file = new File(fileName);
 		ObjectOutputStream stream = new ObjectOutputStream(new FileOutputStream(file));
 		stream.writeObject(this);
 		stream.close();
 	}
-	public static Grid load() throws IOException, ClassNotFoundException {
-		File file = new File("grid.data");
+	public static Grid load(String fileName) throws IOException, ClassNotFoundException {
+		File file = new File(fileName);
 		ObjectInputStream stream = new ObjectInputStream(new FileInputStream(file));
+		Grid grid = (Grid) stream.readObject();
+		stream.close();
-		return (Grid) stream.readObject();
+		return grid;
 	}
-	
 }
@@ -3,6 +3,18 @@ package kernel.exception;
 public class BadSyntaxException extends Exception {
 	public BadSyntaxException() {
-		super("Erreur de syntaxe.");
+		super();
+	}
+	
+	public BadSyntaxException(String message) {
+		super(message);
+	}
+	
+	public BadSyntaxException(Throwable throwable) {
+		super(throwable);
+	}
+	
+	public BadSyntaxException(String message, Throwable throwable) {
+		super(message, throwable);
 	}
 }
@@ -3,6 +3,18 @@ package kernel.exception;
 public class CannotDeleteCellException extends Exception {
 	public CannotDeleteCellException() {
-		super("Cette cellule est utilisée dans une autre cellule.");
+		super();
+	}
+	
+	public CannotDeleteCellException(String message) {
+		super(message);
+	}
+	
+	public CannotDeleteCellException(Throwable throwable) {
+		super(throwable);
+	}
+	
+	public CannotDeleteCellException(String message, Throwable throwable) {
+		super(message, throwable);
 	}
 }
@@ -3,6 +3,18 @@ package kernel.exception;
 public class CellNotFoundException extends Exception {
 	public CellNotFoundException() {
-		super("Vous voulez utiliser une cellule qui n'est pas encore créée.");
+		super();
+	}
+	
+	public CellNotFoundException(String message) {
+		super(message);
+	}
+	
+	public CellNotFoundException(Throwable throwable) {
+		super(throwable);
+	}
+	
+	public CellNotFoundException(String message, Throwable throwable) {
+		super(message, throwable);
 	}
 }
 package kernel.exception;
 public class CreateCycleException extends Exception {
+	
 	public CreateCycleException() {
-		super("L'aasignation de cette formule créée un cycle.");
+		super();
+	}
+	
+	public CreateCycleException(String message) {
+		super(message);
+	}
+	
+	public CreateCycleException(Throwable throwable) {
+		super(throwable);
+	}
+	
+	public CreateCycleException(String message, Throwable throwable) {
+		super(message, throwable);
 	}
 }
 package kernel.exception;
 public class InvalidIntervalException extends Exception {
+	
+	public InvalidIntervalException() {
+		super();
+	}
+	
+	public InvalidIntervalException(String message) {
+		super(message);
+	}
+	
+	public InvalidIntervalException(Throwable throwable) {
+		super(throwable);
+	}
+	
+	public InvalidIntervalException(String message, Throwable throwable) {
+		super(message, throwable);
+	}
 }
@@ -10,12 +10,13 @@ public class Average extends Function {
 	public Average(List<Cell> listCells) {
 		super(listCells);
-		this.names.put(LanguageEnum.FR, "MOYENNE");
-		this.names.put(LanguageEnum.EN, "AVERAGE");
+		this.getNames().put(LanguageEnum.FR, "MOYENNE");
+		this.getNames().put(LanguageEnum.EN, "AVERAGE");
 	}
+	@Override
 	public double eval() {
-		OptionalDouble average = this.listCells.stream().mapToDouble(Cell::getValue).average();
+		OptionalDouble average = this.getUtilisedCells().stream().mapToDouble(Cell::getValue).average();
 		return average.isPresent() ? average.getAsDouble() : 0.;
 	}
@@ -14,8 +14,8 @@ import java.util.stream.Collectors;
 abstract public class Function implements Formula, Serializable {
 	private static final long serialVersionUID = 1L;
-	public Map<LanguageEnum, String> names = new HashMap<>();
-	public List<Cell> listCells;
+	private Map<LanguageEnum, String> names = new HashMap<>();
+	private List<Cell> listCells;
 	public Function(List<Cell> listCells) {
 		this.listCells = listCells;
@@ -23,6 +23,11 @@ abstract public class Function implements Formula, Serializable {
 	abstract public double eval();
+	public Map<LanguageEnum, String> getNames() {
+		return this.names;
+	}
+	
+	@Override
 	public String getDevelopedFormula() {
 		return names.get(Grid.language) + "("
 				+ this.listCells.stream()
@@ -30,6 +35,7 @@ abstract public class Function implements Formula, Serializable {
 				.collect(Collectors.joining(",")) + ")";
 	}
+	@Override
 	public String toString() {
 		return names.get(Grid.language) + "("
 				+ this.listCells.stream()
@@ -37,18 +43,21 @@ abstract public class Function implements Formula, Serializable {
 				.collect(Collectors.joining(",")) + ")";
 	}
+	@Override
 	public boolean createCycle(Cell cell) {
-		if (!this.listCells.contains(cell)) {
-			for (Cell currentCell : this.listCells)
-				if (currentCell.containFormula() && currentCell.getFormula().createCycle(cell))
-					return true;
-		} else
-			return true;
-		
-		return false;
+		return this.listCells.contains(cell) || this.generateIndirectCycle(cell);
 	}
+	@Override
 	public List<Cell> getUtilisedCells() {
 		return this.listCells;
 	}
+	
+	private boolean generateIndirectCycle(Cell cell) {
+		for (Cell currentCell : this.listCells)
+			if (currentCell.containFormula() && currentCell.getFormula().createCycle(cell))
+				return true;
+		
+		return false;
+	}
 }
@@ -9,11 +9,12 @@ public class Sum extends Function {
 	public Sum(List<Cell> listCells) {
 		super(listCells);
-		this.names.put(LanguageEnum.FR, "SOMME");
-		this.names.put(LanguageEnum.EN, "SUM");
+		this.getNames().put(LanguageEnum.FR, "SOMME");
+		this.getNames().put(LanguageEnum.EN, "SUM");
 	}
+	@Override
 	public double eval() {
-		return this.listCells.stream().mapToDouble(Cell::getValue).sum();
+		return this.getUtilisedCells().stream().mapToDouble(Cell::getValue).sum();
 	}
 }
@@ -8,11 +8,13 @@ public class Addition extends BinaryOperation {
 		super(leftCell, rightCell);
 	}
+	@Override
 	public String getOperator() {
 		return "+";
 	}
+	@Override
 	public double eval() {
-		return this.leftCell.getValue() + this.rightCell.getValue();
+		return this.getLeftCell().getValue() + this.getRightCell().getValue();
 	}
 }
@@ -10,8 +10,8 @@ import java.util.List;
 abstract public class BinaryOperation implements Formula, Serializable {
 	private static final long serialVersionUID = 1L;
-	protected Cell leftCell;
-	protected Cell rightCell;
+	private Cell leftCell;
+	private Cell rightCell;
 	public BinaryOperation(Cell leftCell, Cell rightCell) {
 		this.leftCell = leftCell;
@@ -22,14 +22,25 @@ abstract public class BinaryOperation implements Formula, Serializable {
 	abstract public String getOperator();
+	public Cell getLeftCell() {
+		return this.leftCell;
+	}
+	
+	public Cell getRightCell() {
+		return this.rightCell;
+	}
+	
+	@Override
 	public String getDevelopedFormula() {
 		return "(" + this.leftCell.getDevelopedFormula() + this.getOperator() + this.rightCell.getDevelopedFormula() + ")";
 	}
+	@Override
 	public String toString() {
 		return "(" + this.leftCell.getId() + this.getOperator() + this.rightCell.getId() + ")";
 	}
+	@Override
 	public boolean createCycle(Cell cell) {
 		if (this.leftCell.containFormula() && !this.rightCell.containFormula())
 			return this.leftCell.getFormula().createCycle(cell);
@@ -43,6 +54,7 @@ abstract public class BinaryOperation implements Formula, Serializable {
 		return (cell.getId().equals(this.rightCell.getId()) || cell.getId().equals(this.leftCell.getId()));
 	}
+	@Override
 	public List<Cell> getUtilisedCells() {
 		List<Cell> cells = new ArrayList<>();
 		cells.add(this.leftCell);
@@ -8,11 +8,13 @@ public class Division extends BinaryOperation {
 		super(leftCell, rightCell);
 	}
+	@Override
 	public String getOperator() {
 		return "/";
 	}
+	@Override
 	public double eval() {
-		return this.leftCell.getValue() / this.rightCell.getValue();
+		return this.getLeftCell().getValue() / this.getRightCell().getValue();
 	}
 }
@@ -8,11 +8,13 @@ public class Multiplication extends BinaryOperation {
 		super(leftCell, rightCell);
 	}
+	@Override
 	public String getOperator() {
 		return "*";
 	}
+	@Override
 	public double eval() {
-		return this.leftCell.getValue() * this.rightCell.getValue();
+		return this.getLeftCell().getValue() * this.getRightCell().getValue();
 	}
 }
@@ -8,11 +8,13 @@ public class Subtraction extends BinaryOperation {
 		super(leftCell, rightCell);
 	}
+	@Override
 	public String getOperator() {
 		return "-";
 	}
+	@Override
 	public double eval() {
-		return this.leftCell.getValue() - this.rightCell.getValue();
+		return this.getLeftCell().getValue() - this.getRightCell().getValue();
 	}
 }
@@ -213,9 +213,9 @@ public class GridTest {
 			CreateCycleException {
 		this.createCellsWithFormula();
-		this.grid.save();
+		this.grid.save("test.data");
-		Grid g = Grid.load();
+		Grid g = Grid.load("test.data");
 		Cell cell = g.getCell("A", 1);