From 98f6df884b30cdef47362e238207fb2ed0a9e76a Mon Sep 17 00:00:00 2001
From: ctrebeau <ctrebeau@pasteur.fr>
Date: Wed, 2 Dec 2020 14:38:21 +0100
Subject: [PATCH] Refactor : Sand's island status changed : -1 for unexplored ,
0, for small island and 1 for big island
---
.../pasteur/ida/zellige/utils/islandSearch/IslandSearch.java | 2 +-
.../java/fr/pasteur/ida/zellige/utils/islandSearch/Sand.java | 4 ++--
.../java/fr/pasteur/ida/zellige/utils/islandSearch/World.java | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/main/java/fr/pasteur/ida/zellige/utils/islandSearch/IslandSearch.java b/src/main/java/fr/pasteur/ida/zellige/utils/islandSearch/IslandSearch.java
index e4ba0df2..fa190284 100644
--- a/src/main/java/fr/pasteur/ida/zellige/utils/islandSearch/IslandSearch.java
+++ b/src/main/java/fr/pasteur/ida/zellige/utils/islandSearch/IslandSearch.java
@@ -109,7 +109,7 @@ public class IslandSearch
for ( int x = 0; x < world.getWidth(); x++ )
{
Sand sand = world.getSand( x, y, z );
- if ( sand != null && sand.getIslandStatus() == - 1 )
+ if ( sand != null && sand.getIslandStatus() == 0 )
{
Utils.setPosition( access, x, y, z );
access.get().setZero();
diff --git a/src/main/java/fr/pasteur/ida/zellige/utils/islandSearch/Sand.java b/src/main/java/fr/pasteur/ida/zellige/utils/islandSearch/Sand.java
index 320f00ad..58942ce0 100644
--- a/src/main/java/fr/pasteur/ida/zellige/utils/islandSearch/Sand.java
+++ b/src/main/java/fr/pasteur/ida/zellige/utils/islandSearch/Sand.java
@@ -18,7 +18,7 @@ public class Sand
/**
* If the Sand belongs to an island or not.
*/
- private int islandStatus = 0;
+ private int islandStatus = -1;
private boolean noVisited = true;
@@ -38,7 +38,7 @@ public class Sand
/**
*
- * @return 0, if the status as not benn set yet, 1 if it's not an island and -1 otherwise
+ * @return -1, if the status as not been set yet, 1 if it's not an island and 0 otherwise
*/
public int getIslandStatus()
{
diff --git a/src/main/java/fr/pasteur/ida/zellige/utils/islandSearch/World.java b/src/main/java/fr/pasteur/ida/zellige/utils/islandSearch/World.java
index 6ac4b751..f49b355e 100644
--- a/src/main/java/fr/pasteur/ida/zellige/utils/islandSearch/World.java
+++ b/src/main/java/fr/pasteur/ida/zellige/utils/islandSearch/World.java
@@ -35,7 +35,7 @@ public class World
{
Sand sand = getSand( x, y, z );
- if ( sand != null && sand.getIslandStatus() == 0 )
+ if ( sand != null && sand.getIslandStatus() == -1 )
{
setIslandStatus( sand );
}
@@ -222,7 +222,7 @@ public class World
{
if ( size == 0 )
{
- island.forEach( sand1 -> sand1.setIslandStatus( - 1 ) );
+ island.forEach( sand1 -> sand1.setIslandStatus( 0 ) );
}
else
{
--
GitLab