THN

app/src/main/java/model/ColoredCellIerator.java → app/src/main/java/model/ColoredCellIterator.java

@@ -7,36 +7,40 @@ import util.SetUtil;
 
 import java.util.*;
 
-public class ColoredCellIerator {/*implements Iterator<Cell> {
+public class ColoredCellIterator implements Iterator<Cell> {
 
-    Color color;
-    List<Cell> cells;
+    private final Color color;
     Set<Cell> visitedCells;
     Set<Cell> pendingCells=new HashSet<Cell>();
 
 
-    public ColoredCellIerator(Cell startCell){
+    public ColoredCellIterator(Cell startCell){
         this.color=startCell.getColor();
         this.visitedCells= new HashSet<Cell>();
-        this.pendingCells.add(startCell);
-
+        pendingCells.add(startCell);
     }
+
     @Override
     public boolean hasNext() {
-        if (this.pendingCells.size()==0) return false;
-        return true;
+
+        return !pendingCells.isEmpty();
     }
 
     @Override
     public Cell next() {
-        for( int i=0; i< this.pendingCells.size();i++){
-            if (SetUtil.anyElement(this.pendingCells)!= SetUtil.anyElement(this.visitedCells)&&(SetUtil.anyElement(this.pendingCells).getColor()==this.color){
-                //this.visitedCells.add(SetUtil.anyElement())
-            }
+
+        Cell pendingElement=SetUtil.anyElement(pendingCells);
+
+        for(Cell cell: pendingElement.getNeighbours()){
+            if( cell.getColor()==this.color&& !(visitedCells.contains(pendingElement)))
+                pendingCells.add(cell);
         }
 
+        visitedCells.add(pendingElement);
+        pendingCells.remove(pendingElement);
+        return pendingElement;
 
 
-        return null;
-    }*/
+
+    }
 }

app/src/main/java/model/DistinctColorGenerator.java

@@ -17,7 +17,7 @@ public class DistinctColorGenerator implements ColorGenerator {
 
         List<Cell> neighbors = new ArrayList<>();
 
-        System.out.println(neighbors.size());
+        //System.out.println(neighbors.size());
 
         List<Color> neighbor_colors = new ArrayList<Color>();
 

app/src/test/java/model/DistinctColorGeneratorTest.java

@@ -19,7 +19,7 @@ class DistinctColorGeneratorTest {
 
     @Test
     void testNextColorWithTooFewAvailableColor() {
-        DistinctColorGenerator colorGeneratorOne = new DistinctColorGenerator(Color.RED, List.of(Color.RED));
+        DistinctColorGenerator colorGeneratorOne = new DistinctColorGenerator( List.of(Color.RED),Color.RED);
         grid.color(colorGeneratorOne);
         assertThat(grid.getCell(0,0).getColor()).isEqualTo(Color.RED);
         assertThat(grid.getCell(1,1).getColor()).isEqualTo(Color.RED);
@@ -29,7 +29,7 @@ class DistinctColorGeneratorTest {
     @Test
     void testNextColorWithEnoughAvailableColor(){
         Color defaultColor = Color.BLACK;
-        DistinctColorGenerator colorGenerator = new DistinctColorGenerator(defaultColor, List.of(Color.RED,Color.BLUE,Color.YELLOW, Color.ORANGE));
+        DistinctColorGenerator colorGenerator = new DistinctColorGenerator( List.of(Color.RED,Color.BLUE,Color.YELLOW, Color.ORANGE),defaultColor);
         grid.color(colorGenerator);
         for(Cell cell: grid){
             assertThat(cell.getNeighbours().stream().map(c-> c.getColor())).doesNotContain(cell.getColor());