diff --git a/src/main/java/model/Element.java b/src/main/java/model/Element.java index 970a92f8e79754a7f50e4ab8b9a095faf73e78e0..c6f37a309f8e3d36d5e576f2050300c8b01c8038 100644 --- a/src/main/java/model/Element.java +++ b/src/main/java/model/Element.java @@ -1,12 +1,15 @@ package model; +import util.Position; + import java.util.List; +import java.util.Random; public abstract class Element { public void setPosition(){ } - public Position getPosition(){ + public List<Position> getPosition(){ return null; } @@ -16,4 +19,5 @@ public abstract class Element { private List<util.Position> neighbors(util.Position position){ return null; } + private final Random randomGenerator = new Random(); } diff --git a/src/main/java/model/Grid.java b/src/main/java/model/Grid.java index e945595f244825a046d170967e18ebbb215b14d3..649fa28723ff376d19d337fd5fea678d8204f7e5 100644 --- a/src/main/java/model/Grid.java +++ b/src/main/java/model/Grid.java @@ -5,11 +5,16 @@ import java.util.Random; public class Grid { private final int columnCount; private final int rowCount; + private int[][] grid ; public Grid(int row,int column){ this.columnCount = column; this.rowCount = row; + grid = new int[rowCount][columnCount]; } - private final Random randomGenerator = new Random(); + public State getState(Position position){ + return null; + } + //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/Position.java b/src/main/java/model/Position.java deleted file mode 100644 index 8e623ede31415cfcf892182c0192c658267763cc..0000000000000000000000000000000000000000 --- a/src/main/java/model/Position.java +++ /dev/null @@ -1,6 +0,0 @@ -package model; - -public class Position { - int row; - int column; -} diff --git a/src/main/java/model/Terrain.java b/src/main/java/model/Terrain.java deleted file mode 100644 index f97c754117eb438aa59598f746c77cad0aef1554..0000000000000000000000000000000000000000 --- a/src/main/java/model/Terrain.java +++ /dev/null @@ -1,12 +0,0 @@ -package model; - -import util.Position; - -import java.util.List; - -public class Terrain implements StablePosition{ - @Override - public List<Position> stablePosition() { - return null; - } -}