lucien/java-laser-game
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

optimizations and comments

Browse source
This commit is contained in:
Lukian LEIZOUR 2024-02-28 18:39:36 +01:00
parent b4f887e0c1
commit e7422c0311
2 changed files with 33 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

48
AppLaser.java
View file

@ -1,39 +1,35 @@
// Antoine CRETUAL, Lukian LEIZOUR, 14/02/2024 // Antoine CRETUAL, Lukian LEIZOUR, 14/02/2024
public class AppLaser { public class AppLaser {
public static void main(String [] args) { public static void main(String [] args) {
int start_i = 3;
int start_j = 1;
int start_dir = 10;
int firstState_i = 0;
int firstState_j = 0;
if (start_dir == 10) { // definitions of the starting position and the universe dimensions
firstState_i = start_i - 1;
firstState_j = start_j;
}
else if (start_dir == 11) {
firstState_i = start_i + 1;
firstState_j = start_j;
}
else if (start_dir == 12) {
firstState_i = start_i;
firstState_j = start_j + 1;
}
else if (start_dir == 13) {
firstState_i = start_i;
firstState_j = start_j - 1;
}
int start_i = 3;
int start_j = 1;
int start_dir = 11;
int universe_width = 6;
int universe_height = 6;
int firstState_i = start_i;
int firstState_j = start_j;
if (start_dir == 10) firstState_i = start_i - 1;
else if (start_dir == 11) firstState_i = start_i + 1;
else if (start_dir == 12) firstState_j = start_j + 1;
else if (start_dir == 13) firstState_j = start_j - 1;
// creation of the stack, the universe and the first state
Stack <Situation> stack = new Stack <Situation>(); Stack <Situation> stack = new Stack <Situation>();
Universe universe = new Universe(universe_width + 2, universe_height + 2, start_i, start_j, start_dir);
Situation currentState = new Situation(firstState_i, firstState_j, start_dir, 0);
Universe universe = new Universe(8, 8, start_i, start_j, start_dir); // obstacles creation
Situation previousState, currentState = new Situation(firstState_i, firstState_j, start_dir, 0); universe.addObstacle(2, 3);
universe.addObstacle(3, 3);
//universe.addObstacle(4, 4); universe.addObstacle(2, 4);
universe.addObstacle(3, 4);
universe.print(); universe.print();

49
Universe.java
View file

@ -4,42 +4,35 @@ public class Universe {
// Atributes // Atributes
private int[][] grid; private int[][] grid;
private int length, height; private int width, height;
private int boxes_to_fill; private int boxes_to_fill;
// Constructors // Constructors
public Universe(int length, int height, int i_start, int j_start, int dir_start) { public Universe(int width, int height, int i_start, int j_start, int dir_start) {
this.grid = new int[height][length]; this.grid = new int[height][width];
this.height = height; this.height = height;
this.length = length; this.width = width;
this.boxes_to_fill = (width - 2) * (height - 2) - 1;
int i, j; int i, j;
for (i = 1; i < this.height - 1; i++) { for (i = 1; i < this.height - 1; i++) {
for (j = 1; j < this.length - 1; j++) { for (j = 1; j < this.width - 1; j++) {
this.grid[i][j] = 0; this.grid[i][j] = 0;
} }
} }
for (i = 0; i < this.height; i++) { for (i = 0; i < this.height; i++) {
this.grid[i][0] = -1; this.grid[i][0] = -1;
this.grid[i][length - 1] = -1; this.grid[i][width - 1] = -1;
} }
for (j = 0; j < this.length; j++) { for (j = 0; j < this.width; j++) {
this.grid[0][j] = -1; this.grid[0][j] = -1;
this.grid[height - 1][j] = -1; this.grid[height - 1][j] = -1;
} }
this.grid[i_start][j_start] = dir_start; this.grid[i_start][j_start] = dir_start;
this.boxes_to_fill = 0;
for (i = 1; i < this.height - 1; i++) {
for (j = 1; j < this.length - 1; j++) {
if (this.grid[i][j] == 0) this.boxes_to_fill++;
}
}
} }
// Methods // Methods
@ -47,6 +40,7 @@ public class Universe {
public void addObstacle(int pos_i, int pos_j) { public void addObstacle(int pos_i, int pos_j) {
if (this.grid[pos_i][pos_j] == 0) { if (this.grid[pos_i][pos_j] == 0) {
this.grid[pos_i][pos_j] = -1; this.grid[pos_i][pos_j] = -1;
this.boxes_to_fill--;
} }
else {} else {}
} }
@ -151,23 +145,7 @@ public class Universe {
int d = s.direction; int d = s.direction;
int c = possibleChoices(s); int c = possibleChoices(s);
// adding the miror // new status of the box
/*switch (c) {
case 1:
this.grid[i][j] = 1;
break;
case 2:
this.grid[i][j] = 2;
break;
case 3:
this.grid[i][j] = 3;
break;
default:
}*/
if (c == 1 && (d == 10 || d == 11)) this.grid[i][j] = 1; if (c == 1 && (d == 10 || d == 11)) this.grid[i][j] = 1;
if (c == 1 && (d == 12 || d == 13)) this.grid[i][j] = 2; if (c == 1 && (d == 12 || d == 13)) this.grid[i][j] = 2;
@ -207,14 +185,10 @@ public class Universe {
return this.boxes_to_fill - 1 == 0; return this.boxes_to_fill - 1 == 0;
} }
/*public Situation restore(Situation current, Situation prev) {
}*/
public void print() { public void print() {
int i, j; int i, j;
for (i = 0; i < this.height; i++) { for (i = 0; i < this.height; i++) {
for (j = 0; j < this.length; j++) { for (j = 0; j < this.width; j++) {
switch (this.grid[i][j]) { switch (this.grid[i][j]) {
case -1: case -1:
System.out.printf(" X"); System.out.printf(" X");
@ -258,7 +232,6 @@ public class Universe {
default: default:
System.out.printf("%3d", this.grid[i][j]); System.out.printf("%3d", this.grid[i][j]);
} }
} }
System.out.print("\n"); System.out.print("\n");