From aefbcb2eb8b5c9b199db6351db9bdaad87a67789 Mon Sep 17 00:00:00 2001
From: s23026062 <melis-damla.sahin@etu.univ-amu.fr>
Date: Fri, 8 Nov 2024 15:15:03 +0100
Subject: [PATCH] =?UTF-8?q?Compl=C3=A9ter=20la=20classe=20Coordinate?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
README.md | 2 +-
src/main/java/matrix/Coordinate.java | 30 +++++++++++++---------------
2 files changed, 15 insertions(+), 17 deletions(-)
diff --git a/README.md b/README.md
index d8169c8..5061ded 100644
--- a/README.md
+++ b/README.md
@@ -19,5 +19,5 @@ jeu de la vie.
## Membre du projet
-- NOM, prénom, du participant
+- SAHIN, Melis Damla, du participant
diff --git a/src/main/java/matrix/Coordinate.java b/src/main/java/matrix/Coordinate.java
index f3e5ac0..8bd8802 100644
--- a/src/main/java/matrix/Coordinate.java
+++ b/src/main/java/matrix/Coordinate.java
@@ -15,8 +15,7 @@ public record Coordinate(int x, int y) {
* @return A new {@link Coordinate} instance.
*/
public static Coordinate of(int x, int y) {
- // TODO: compléter ce fabriquant
- return null;
+ return new Coordinate(x,y);
}
/**
@@ -25,8 +24,7 @@ public record Coordinate(int x, int y) {
* @return The left adjacent {@link Coordinate}.
*/
public Coordinate left() {
- // TODO: à compléter
- return null;
+ return new Coordinate(x-1,y);
}
/**
@@ -35,8 +33,7 @@ public record Coordinate(int x, int y) {
* @return The right adjacent {@link Coordinate}.
*/
public Coordinate right() {
- // TODO: à compléter
- return null;
+ return new Coordinate(x+1, y);
}
/**
@@ -45,8 +42,7 @@ public record Coordinate(int x, int y) {
* @return The above adjacent {@link Coordinate}.
*/
public Coordinate above() {
- // TODO: à compléter
- return null;
+ return new Coordinate(x, y+1);
}
/**
@@ -55,8 +51,7 @@ public record Coordinate(int x, int y) {
* @return The below adjacent {@link Coordinate}.
*/
public Coordinate below() {
- // TODO: à compléter
- return null;
+ return new Coordinate(x, y-1);
}
/**
@@ -73,8 +68,7 @@ public record Coordinate(int x, int y) {
* @return A list of orthogonal neighboring {@link Coordinate}s.
*/
public List<Coordinate> orthogonalNeighbours() {
- // TODO: à compléter
- return List.of();
+ return List.of(left(),right(), above(), below());
}
/**
@@ -92,8 +86,10 @@ public record Coordinate(int x, int y) {
* @return A list of diagonal neighboring {@link Coordinate}s.
*/
public List<Coordinate> diagonalNeighbours() {
- // TODO: à compléter
- return List.of();
+ return List.of(new Coordinate(x-1, y-1),
+ new Coordinate(x-1, y+1),
+ new Coordinate(x+1, y-1),
+ new Coordinate(x+1, y+1));
}
/**
@@ -111,8 +107,10 @@ public record Coordinate(int x, int y) {
* @return A list of all neighboring {@link Coordinate}s.
*/
public List<Coordinate> orthodiagonalNeighbours() {
- // TODO: à compléter
- return List.of();
+ return List.of(left(),right(), above(), below(), new Coordinate(x-1, y-1),
+ new Coordinate(x-1, y+1),
+ new Coordinate(x+1, y-1),
+ new Coordinate(x+1, y+1));
}
@Override
--
GitLab