From 66b7a3dcbdee7b54d5905586874299c47579db75 Mon Sep 17 00:00:00 2001
From: p20006624 <linh.PHAM-THI-NGOC.1@etu.univ-amu.fr>
Date: Thu, 9 Nov 2023 11:47:40 +0100
Subject: [PATCH] need one more abstract class
---
src/main/java/model/Cell.java | 51 -------------------------
src/main/java/model/Cloud.java | 8 +++-
src/main/java/model/Extinguish.java | 8 ++++
src/main/java/model/FireFighter.java | 6 ++-
src/main/java/model/Grid.java | 17 +++++++++
src/main/java/model/Mobile.java | 12 ++++++
src/main/java/model/Moutain.java | 12 ++++++
src/main/java/model/Road.java | 12 ++++++
src/main/java/model/Rocks.java | 12 ++++++
src/main/java/model/StablePosition.java | 7 ++++
src/main/java/model/Terrain.java | 12 ++++++
11 files changed, 104 insertions(+), 53 deletions(-)
delete mode 100644 src/main/java/model/Cell.java
create mode 100644 src/main/java/model/Grid.java
create mode 100644 src/main/java/model/Mobile.java
create mode 100644 src/main/java/model/Moutain.java
create mode 100644 src/main/java/model/Road.java
create mode 100644 src/main/java/model/Rocks.java
create mode 100644 src/main/java/model/StablePosition.java
create mode 100644 src/main/java/model/Terrain.java
diff --git a/src/main/java/model/Cell.java b/src/main/java/model/Cell.java
deleted file mode 100644
index 93a7faa..0000000
--- a/src/main/java/model/Cell.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package model;
-
-import util.Position;
-
-import java.util.List;
-
-public class Cell implements State, Board{
- Position position;
- public Cell(Position position){
- this.position = position;
- }
- @Override
- public boolean isOnFire(Position position) {
- return false;
- }
-
- @Override
- public Object getState(Position position) {
- return null;
- }
-
- @Override
- public void setState(Object state, Position position) {
-
- }
-
- @Override
- public int rowCount() {
- return 0;
- }
-
- @Override
- public int columnCount() {
- return 0;
- }
-
- @Override
- public List<Position> updateToNextGeneration() {
- return null;
- }
-
- @Override
- public void reset() {
-
- }
-
- @Override
- public int stepNumber() {
- return 0;
- }
-}
diff --git a/src/main/java/model/Cloud.java b/src/main/java/model/Cloud.java
index ffc1cff..d269ca2 100644
--- a/src/main/java/model/Cloud.java
+++ b/src/main/java/model/Cloud.java
@@ -2,11 +2,17 @@ package model;
import util.Position;
+import java.util.List;
import java.util.Random;
-public class Cloud {
+public class Cloud implements Extinguish{
private final Random randomGenerator = new Random();
private Position randomPosition() {
return new Position(randomGenerator.nextInt(rowCount), randomGenerator.nextInt(columnCount));
}
+
+ @Override
+ public List<Position> updatePosition() {
+ return null;
+ }
}
diff --git a/src/main/java/model/Extinguish.java b/src/main/java/model/Extinguish.java
index f6142e1..8ff1402 100644
--- a/src/main/java/model/Extinguish.java
+++ b/src/main/java/model/Extinguish.java
@@ -1,5 +1,13 @@
package model;
+import util.Position;
+
+import java.util.List;
+
public interface Extinguish {
+ List<Position> updatePosition();
+ List<Position> neighbors();
+ List<Position> getPosition();
+ List<Position> setPosition();
}
diff --git a/src/main/java/model/FireFighter.java b/src/main/java/model/FireFighter.java
index 530cd67..ff00762 100644
--- a/src/main/java/model/FireFighter.java
+++ b/src/main/java/model/FireFighter.java
@@ -5,7 +5,7 @@ import util.Position;
import java.util.List;
import java.util.Set;
-public class FireFighter {
+public class FireFighter implements Extinguish{
private final int initialFirefighterCount;
private List<Position> firefighterPositions;
private Set<Position> firePositions;
@@ -13,4 +13,8 @@ public class FireFighter {
return new Position(randomGenerator.nextInt(rowCount), randomGenerator.nextInt(columnCount));
}
+ @Override
+ public List<Position> updatePosition() {
+ return null;
+ }
}
diff --git a/src/main/java/model/Grid.java b/src/main/java/model/Grid.java
new file mode 100644
index 0000000..e945595
--- /dev/null
+++ b/src/main/java/model/Grid.java
@@ -0,0 +1,17 @@
+package model;
+
+import java.util.Random;
+
+public class Grid {
+ private final int columnCount;
+ private final int rowCount;
+ public Grid(int row,int column){
+ this.columnCount = column;
+ this.rowCount = row;
+ }
+ private final Random randomGenerator = new Random();
+ //ham de lay trang thai cua tung vi tri ban dau
+ //ham update vi tri sau khi da dap lua
+ //ham dap lua:xet vi tri lua;vi tri dia ly, quyet dinh phuong thuc dap lua
+
+}
diff --git a/src/main/java/model/Mobile.java b/src/main/java/model/Mobile.java
new file mode 100644
index 0000000..f08435e
--- /dev/null
+++ b/src/main/java/model/Mobile.java
@@ -0,0 +1,12 @@
+package model;
+
+import util.Position;
+
+import java.util.List;
+
+public class Mobile implements Extinguish{
+ @Override
+ public List<Position> updatePosition() {
+ return null;
+ }
+}
diff --git a/src/main/java/model/Moutain.java b/src/main/java/model/Moutain.java
new file mode 100644
index 0000000..3fbb0f1
--- /dev/null
+++ b/src/main/java/model/Moutain.java
@@ -0,0 +1,12 @@
+package model;
+
+import util.Position;
+
+import java.util.List;
+
+public class Moutain implements StablePosition{
+ @Override
+ public List<Position> stablePosition() {
+ return null;
+ }
+}
diff --git a/src/main/java/model/Road.java b/src/main/java/model/Road.java
new file mode 100644
index 0000000..9a28c25
--- /dev/null
+++ b/src/main/java/model/Road.java
@@ -0,0 +1,12 @@
+package model;
+
+import util.Position;
+
+import java.util.List;
+
+public class Road implements StablePosition{
+ @Override
+ public List<Position> stablePosition() {
+ return null;
+ }
+}
diff --git a/src/main/java/model/Rocks.java b/src/main/java/model/Rocks.java
new file mode 100644
index 0000000..8754271
--- /dev/null
+++ b/src/main/java/model/Rocks.java
@@ -0,0 +1,12 @@
+package model;
+
+import util.Position;
+
+import java.util.List;
+
+public class Rocks implements StablePosition{
+ @Override
+ public List<Position> stablePosition() {
+ return null;
+ }
+}
diff --git a/src/main/java/model/StablePosition.java b/src/main/java/model/StablePosition.java
new file mode 100644
index 0000000..389a618
--- /dev/null
+++ b/src/main/java/model/StablePosition.java
@@ -0,0 +1,7 @@
+package model;
+import util.Position;
+
+import java.util.*;
+public interface StablePosition {
+ List<Position> stablePosition();
+}
diff --git a/src/main/java/model/Terrain.java b/src/main/java/model/Terrain.java
new file mode 100644
index 0000000..f97c754
--- /dev/null
+++ b/src/main/java/model/Terrain.java
@@ -0,0 +1,12 @@
+package model;
+
+import util.Position;
+
+import java.util.List;
+
+public class Terrain implements StablePosition{
+ @Override
+ public List<Position> stablePosition() {
+ return null;
+ }
+}
--
GitLab