From cb915c5ed3fb4489d026216510969db648996d1a Mon Sep 17 00:00:00 2001
From: EL GAOUAL Zaid <zaid.el-gaoual@etu.univ-amu.fr>
Date: Wed, 9 Nov 2022 11:34:53 +0100
Subject: [PATCH] CellGridIterator nextcell
---
app/src/main/java/model/CellGridIterator.java | 16 +++++++++++-----
1 file changed, 11 insertions(+), 5 deletions(-)
diff --git a/app/src/main/java/model/CellGridIterator.java b/app/src/main/java/model/CellGridIterator.java
index 97d702e..8372f82 100644
--- a/app/src/main/java/model/CellGridIterator.java
+++ b/app/src/main/java/model/CellGridIterator.java
@@ -4,9 +4,13 @@ import java.util.Iterator;
public class CellGridIterator implements Iterator<Cell> {
public ArrayGrid grid;
+ public int row;
+ public int column;
public CellGridIterator(ArrayGrid grid) {
this.grid=grid;
+ this.row=0;
+ this.column=0;
}
@Override
@@ -16,12 +20,14 @@ public class CellGridIterator implements Iterator<Cell> {
@Override
public Cell next() {
- for(int i = 0; i < grid.getNumberOfRows() ; i++) {
- for(int j = 0; j < grid.getNumberOfColumns(); j++) {
-
- }
+ if (row>=0 && row< grid.getNumberOfRows()-1){
+ this.row=row+1;
+ }
+ else if(row== grid.getNumberOfRows()-1 && column< grid.getNumberOfColumns()-1){
+ this.row=0;
+ this.column+=1;
}
- return Cell;
+ return grid.getCell(column,row);
}
}
--
GitLab