avec serialisation

[mandjemb]
1 parent 5731029f
Showing 10 changed files with 195 additions and 39 deletions Show diff stats
essai.ser
src/app/Application.java
src/app/ApplicationDeserialization.java
src/kernel/Cell.java
src/kernel/Grid.java
src/kernel/exception/CycleFoundedException.java
src/kernel/exception/InvalidIntervalLineColumnEception.java
src/kernel/function/Function.java
src/kernel/operation/BinaryOperation.java
src/kernel/test/Test.java -> src/kernel/test/CellTest.java
@@ -4,24 +4,38 @@ import kernel.Cell;
 import kernel.Grid;
 import kernel.exception.CellNotFoundException;
 import kernel.exception.CreateCycleException;
+import kernel.exception.InvalidIntervalLineColumnEception;
 import kernel.function.Average;
 import kernel.function.Sum;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.ObjectOutputStream;
+import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
-public class Application {
-    public static void main(String[] args) {
-        Grid grid = new Grid();
+public class Application implements Serializable{
+
+    public static void main(String[] args) throws IOException {
+
+    	 File fichier =  new File("essai.ser") ;
+
+    	  // ouverture d'un flux sur un fichier
+    	 ObjectOutputStream oos =  new ObjectOutputStream(new FileOutputStream(fichier)) ;
+        
+    	 Grid grid = new Grid();
         // Création
         System.out.println("Création de quelques cases...");
-        grid.createCell("A", 1, 10.);
-        grid.createCell("B", 1, 0.);
-        grid.createCell("A", 2, 5.);
+
         try {
+            grid.createCell("A", 1, 10.);
+            grid.createCell("B", 1, 0.);
+            grid.createCell("A", 2, 5.);
             List<Cell> sumList = new ArrayList<>();
             sumList.add(grid.getCell("A", 1));
             sumList.add(grid.getCell("A", 2));
@@ -38,6 +52,9 @@ public class Application {
         } catch (CreateCycleException exception) {
             System.out.println(exception.toString());
         }
+    	 catch (InvalidIntervalLineColumnEception exception) {
+    		 System.out.println(exception.toString());
+    	}
         // Affichage
         List<Cell> cells = grid.getCells();
@@ -64,5 +81,23 @@ public class Application {
         System.out.println("Affichage des valeurs après modification :");
         for (Cell cell : cells)
             System.out.println(cell.getId() + ": " + cell.getValue());
+        
+
+        // sérialization de l'objet
+          
+        oos.writeObject(grid);
+        oos.close();
     }
+    
+
+
+
+
+
+
+
+
+
+ 
+ 
 }
@@ -0,0 +1,38 @@
+package app;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.util.List;
+
+import kernel.Cell;
+import kernel.Grid;
+
+public class ApplicationDeserialization {
+	public static void main(String[] args) throws IOException, ClassNotFoundException {
+		File fichier =  new File("essai.ser") ;
+
+		 // ouverture d'un flux sur un fichier
+		ObjectInputStream ois =  new ObjectInputStream(new FileInputStream(fichier)) ;
+				
+		 // désérialization de l'objet
+		Grid grid = (Grid)ois.readObject() ;
+		// Affichage
+        List<Cell> cells = grid.getCells();
+
+        System.out.println("Affichage des valeurs :");
+        for (Cell cell : cells)
+            System.out.println(cell.getId() + ": " + cell.getValue());
+
+        System.out.println("Affichage des formules :");
+        for (Cell cell : cells)
+            System.out.println(cell.getId() + ": " + cell.toString());
+
+        System.out.println("Affichage des formules développées :");
+        for (Cell cell : cells)
+            System.out.println(cell.getId() + ": " + cell.getDevelopedFormula());
+		ois.close();
+	}
+
+}
 package kernel;
 import kernel.exception.CreateCycleException;
+import kernel.exception.InvalidIntervalLineColumnEception;
+import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
-public class Cell {
-
+public class Cell implements Serializable{
+	final int MAX_LIGNES=20;
+	
     private String column;
     private Integer line;
     private Double value;
     private Formula formula;
     private List<Cell> usedIn = new ArrayList<>();
-    public Cell(String column, Integer line, Double value) {
-        this.column = column;
-        this.line = line;
-        this.setValue(value);
+    public Cell(String column, Integer line, Double value) throws InvalidIntervalLineColumnEception {
+    	column=column.toUpperCase();
+    	if ((line>= 1 && line<=MAX_LIGNES) || (column.compareTo("A")>=0 && column.compareTo("Z")<=0)){
+    		 this.column = column;
+    	     this.line = line;
+    	     this.setValue(value);
+    	}
+    	else
+    		throw new InvalidIntervalLineColumnEception();
     }
-    public Cell(String column, Integer line, Formula formula) throws CreateCycleException {
-        this.column = column;
-        this.line = line;
-        this.setFormula(formula);
+    public Cell(String column, Integer line, Formula formula) throws CreateCycleException,InvalidIntervalLineColumnEception {
+    	column=column.toUpperCase();
+    	if ((line>= 1 && line<=MAX_LIGNES) || (column.compareTo("A")>=0 && column.compareTo("Z")<=0)){
+    		 this.column = column;
+    	     this.line = line;
+    	     this.setFormula(formula);
+    	}
+    	else
+    		throw new InvalidIntervalLineColumnEception();
+        
     }
     public Double getValue() {
@@ -2,18 +2,20 @@ package kernel;
 import kernel.exception.CellNotFoundException;
 import kernel.exception.CreateCycleException;
+import kernel.exception.InvalidIntervalLineColumnEception;
+import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-public class Grid {
+public class Grid implements Serializable {
     private Map<String, Cell> cells = new HashMap<>();
     public static LanguageEnum language = LanguageEnum.FR;
-    public String createCell(String column, Integer line, Double value) {
+    public String createCell(String column, Integer line, Double value) throws InvalidIntervalLineColumnEception {
         String id = this.getCellId(column, line);
         Cell cell = new Cell(column, line, value);
@@ -22,7 +24,7 @@ public class Grid {
         return id;
     }
-    public String createCell(String column, Integer line, Formula formula) throws CreateCycleException {
+    public String createCell(String column, Integer line, Formula formula) throws CreateCycleException, InvalidIntervalLineColumnEception {
         String id = this.getCellId(column, line);
         Cell cell = new Cell(column, line, formula);
@@ -1,5 +0,0 @@
-package kernel.exception;
-
-public class CycleFoundedException extends Exception {
-
-}
@@ -0,0 +1,5 @@
+package kernel.exception;
+
+public class InvalidIntervalLineColumnEception extends Exception {
+
+}
@@ -5,13 +5,14 @@ import kernel.Formula;
 import kernel.Grid;
 import kernel.LanguageEnum;
+import java.io.Serializable;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
-abstract public class Function implements Formula {
+abstract public class Function implements Formula,Serializable {
     public Map<LanguageEnum, String> names = new HashMap<>();
     public List<Cell> listCells;
@@ -20,7 +20,7 @@ abstract public class BinaryOperation implements Formula {
     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() {
@@ -6,11 +6,13 @@ import java.util.ArrayList;
 import java.util.List;
 import kernel.Cell;
+import kernel.exception.CreateCycleException;
+import kernel.function.Average;
 import kernel.function.Sum;
 import kernel.operation.Addition;
-public class Test {
+public class CellTest {
 	@org.junit.Test
 	public void CreateCellValueTest() {
@@ -23,7 +25,7 @@ public class Test {
 	@org.junit.Test
-	public void CreateCellBinaryOperationTest() {
+	public void CreateCellBinaryOperationTest() throws CreateCycleException {
 		Cell A1= new Cell("A",1,25.);
 		Cell A2= new Cell("A",2,35.);
@@ -35,7 +37,7 @@ public class Test {
 		assertEquals(A3.getUsedIn().size(),0);
 		assertEquals(A3.getId(),"A3");
-		assertEquals(A3.toString(),"A1 + A2");
+		assertEquals(A3.toString(),"A1+A2");
 		assertEquals(A1.getUsedIn().size(),1);
 		assertEquals(A2.getUsedIn().size(),1);
@@ -44,7 +46,7 @@ public class Test {
 	@org.junit.Test
-	public void CreateCellFunctionTest() {
+	public void CreateCellFunctionTest() throws CreateCycleException {
 		Cell A1= new Cell("A",1,25.);
 		Cell A2= new Cell("A",2,35.);
 		Cell A3= new Cell("A",3,new Addition(A1,A2));
@@ -62,7 +64,7 @@ public class Test {
 		assertEquals(A4.toString(),"SOMME(A1,A2,A3,A5)");
-		assertEquals(A4.getDevelopedFormula(),"SOMME(A1,A2,A1 + A2,A5)");
+		assertEquals(A4.getDevelopedFormula(),"SOMME(A1,A2,(A1+A2),A5)");
 		assertEquals(A1.getUsedIn().size(),2);
 		assertEquals(A2.getUsedIn().size(),2);
 		assertEquals(A3.getUsedIn().size(),1);
@@ -73,7 +75,7 @@ public class Test {
 	@org.junit.Test
-	public void ModifyCellValueTest() {
+	public void ModifyCellValueTest() throws CreateCycleException {
 		Cell A1= new Cell("A",1,25.);
 		Cell A2= new Cell("A",2,35.);
 		Cell A3= new Cell("A",3,new Addition(A1,A2));
@@ -87,7 +89,7 @@ public class Test {
 	}
 	@org.junit.Test
-	public void ModifyCellFormulaTest() {
+	public void ModifyCellFormulaTest() throws CreateCycleException {
 		Cell A1= new Cell("A",1,25.);
 		Cell A2= new Cell("A",2,35.);
 		Cell A3= new Cell("A",3,new Addition(A1,A2));
@@ -103,6 +105,11 @@ public class Test {
 		assertEquals(A4.containFormula(),true);
 		assertEquals(A4.getUsedIn().size(),0);
+		assertEquals(A1.getUsedIn().size(),2);
+		assertEquals(A2.getUsedIn().size(),2);
+		assertEquals(A3.getUsedIn().size(),1);
+		assertEquals(A5.getUsedIn().size(),1);
+		
 		assertEquals(A1.containFormula(),false);
 		A1.setFormula(new Addition(A2,A5));
 		assertEquals(A1.containFormula(),true);
@@ -111,14 +118,13 @@ public class Test {
 		assertEquals(A3.getValue(),115.,0);
 		assertEquals(A4.getValue(),275.,0);
-		assertEquals(A1.getUsedIn().size(),2);
-		assertEquals(A2.getUsedIn().size(),2);
-		assertEquals(A3.getUsedIn().size(),1);
-		assertEquals(A5.getUsedIn().size(),1);
+
-		assertEquals(A1.toString(),"A2 + A5");
-		assertEquals(A4.getDevelopedFormula(),"SOMME(A2 + A5,A2,A1 + A2,A5)");
+		assertEquals(A1.toString(),"A2+A5");
+		assertEquals(A1.getDevelopedFormula(),"(A2+A5)");
+		assertEquals(A4.toString(),"SOMME(A1,A2,A3,A5)");
+		assertEquals(A4.getDevelopedFormula(),"SOMME((A2+A5),A2,((A2+A5)+A2),A5)");
 		assertEquals(A1.getUsedIn().size(),2);
@@ -129,5 +135,65 @@ public class Test {
 	}
+	@org.junit.Test(expected=CreateCycleException.class)
+	public void DirectCycleBynaryOperation() throws CreateCycleException {
+		Cell A1= new Cell("A",1,25.);
+		Cell A2= new Cell("A",2,35.);
+		try{
+			A1.setFormula(new Addition(A1,A2));
+		}
+		catch(CreateCycleException ex){
+			throw ex;
+		}
+	}
+	
+	
+	@org.junit.Test(expected=CreateCycleException.class)
+	public void DirectCycleFunction() throws CreateCycleException {
+		Cell A2= new Cell("A",2,25.);
+		Cell B2= new Cell("B",2,35.);
+		Cell A3= new Cell("A",3,0.5);
+		List<Cell> sumList = new ArrayList<>();
+        sumList.add(A2);
+        sumList.add(B2);
+        sumList.add(A3);
+ 
+		try{
+			B2.setFormula(new Sum(sumList));
+		}
+		catch(CreateCycleException ex){
+			throw ex;
+		}
+	}
+	
+	@org.junit.Test(expected=CreateCycleException.class)
+	public void IndirectCycle() throws CreateCycleException {
+		Cell A1= new Cell("A",1,25.);
+		Cell A2= new Cell("A",2,5.);
+		Cell B4= new Cell("B",4,new Addition(A1,A2));
+		Cell A4= new Cell("A",4,0.);
+		Cell A3= new Cell("A",3,0.5);
+		Cell B2= new Cell("B",2,12.);
+		
+		List<Cell> sumList = new ArrayList<>();
+        sumList.add(A2);
+        sumList.add(B2);
+        sumList.add(A3);
+        Cell B6= new Cell("B",6,new Sum(sumList));
+        
+		List<Cell> averageList = new ArrayList<>();
+		averageList.add(B6);
+		averageList.add(B4);
+		averageList.add(A4);
+        Cell C6= new Cell("C",6,new Average(averageList));
+        
+		try{
+			B2.setFormula(new Addition(A1,C6));
+		}
+		catch(CreateCycleException ex){
+			throw ex;
+		}
+	}
+	
 }