Compare commits
2 Commits
f4e82b4be4
...
22d28d9e73
| Author | SHA1 | Date | |
|---|---|---|---|
| 22d28d9e73 | |||
| ae5d90f27a |
51
main.cpp
51
main.cpp
|
|
@ -26,21 +26,9 @@ void locateWall(struct maze& maze);
|
||||||
void flood(struct maze* maze, struct mmstats* mmstats) {
|
void flood(struct maze* maze, struct mmstats* mmstats) {
|
||||||
int i, j;
|
int i, j;
|
||||||
int prevNum;
|
int prevNum;
|
||||||
int marked[16][16];
|
int marked[16][16] = { 0 };
|
||||||
std::queue<fill> myqueue;
|
std::queue<fill> myqueue;
|
||||||
|
|
||||||
/*
|
|
||||||
myqueue.push({6,7,0});
|
|
||||||
myqueue.push({6,8,0});
|
|
||||||
myqueue.push({7,6,0});
|
|
||||||
myqueue.push({8,6,0});
|
|
||||||
|
|
||||||
myqueue.push({9,7,0});
|
|
||||||
myqueue.push({9,8,0});
|
|
||||||
myqueue.push({7,9,0});
|
|
||||||
myqueue.push({8,9,0});
|
|
||||||
*/
|
|
||||||
|
|
||||||
myqueue.push({7,7,-1});
|
myqueue.push({7,7,-1});
|
||||||
myqueue.push({7,8,-1});
|
myqueue.push({7,8,-1});
|
||||||
myqueue.push({8,7,-1});
|
myqueue.push({8,7,-1});
|
||||||
|
|
@ -51,6 +39,14 @@ void flood(struct maze* maze, struct mmstats* mmstats) {
|
||||||
API::setText(8, 7, 0);
|
API::setText(8, 7, 0);
|
||||||
API::setText(8, 8, 0);
|
API::setText(8, 8, 0);
|
||||||
|
|
||||||
|
/*
|
||||||
|
for (int x = 0; x < 16; x++) {
|
||||||
|
for (int y = 0; y < 16; y++) {
|
||||||
|
marked[x][y] = 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
*/
|
||||||
|
|
||||||
while (myqueue.size()) {
|
while (myqueue.size()) {
|
||||||
i = myqueue.front().x;
|
i = myqueue.front().x;
|
||||||
j = myqueue.front().y;
|
j = myqueue.front().y;
|
||||||
|
|
@ -83,7 +79,7 @@ void flood(struct maze* maze, struct mmstats* mmstats) {
|
||||||
void flood_start(struct maze* maze, struct mmstats* mmstats) {
|
void flood_start(struct maze* maze, struct mmstats* mmstats) {
|
||||||
int i, j;
|
int i, j;
|
||||||
int prevNum;
|
int prevNum;
|
||||||
int marked[16][16];
|
int marked[16][16] = {0};
|
||||||
std::queue<fill> myqueue;
|
std::queue<fill> myqueue;
|
||||||
|
|
||||||
myqueue.push({0,0,-1});
|
myqueue.push({0,0,-1});
|
||||||
|
|
@ -92,7 +88,7 @@ void flood_start(struct maze* maze, struct mmstats* mmstats) {
|
||||||
i = myqueue.front().x;
|
i = myqueue.front().x;
|
||||||
j = myqueue.front().y;
|
j = myqueue.front().y;
|
||||||
prevNum = myqueue.front().z;
|
prevNum = myqueue.front().z;
|
||||||
//myqueue.pop();
|
myqueue.pop();
|
||||||
|
|
||||||
if (i < 0 || i > W || j < 0 || j > W
|
if (i < 0 || i > W || j < 0 || j > W
|
||||||
|| marked[i][j]==1) {
|
|| marked[i][j]==1) {
|
||||||
|
|
@ -181,7 +177,7 @@ void follow(struct maze maze, class mmstats* mms) {
|
||||||
mms->turn(left);
|
mms->turn(left);
|
||||||
log("bLeft");
|
log("bLeft");
|
||||||
}
|
}
|
||||||
log("error en la matri");
|
//log("error en la matri");
|
||||||
}
|
}
|
||||||
|
|
||||||
int* nextcell(int i, int j, int dir, int ndir[2]) {
|
int* nextcell(int i, int j, int dir, int ndir[2]) {
|
||||||
|
|
@ -283,6 +279,8 @@ int main(int argc, char* argv[]) {
|
||||||
API::setColor(0, 0, 'G');
|
API::setColor(0, 0, 'G');
|
||||||
// API::setText(0, 0, "abc");
|
// API::setText(0, 0, "abc");
|
||||||
mmstats stats;
|
mmstats stats;
|
||||||
|
struct maze maze2;
|
||||||
|
|
||||||
stats.x = 0;
|
stats.x = 0;
|
||||||
stats.y = 0;
|
stats.y = 0;
|
||||||
|
|
||||||
|
|
@ -300,13 +298,26 @@ int main(int argc, char* argv[]) {
|
||||||
updatepos(&stats);
|
updatepos(&stats);
|
||||||
//log(maze.hwalls[stats.x][stats.y]);
|
//log(maze.hwalls[stats.x][stats.y]);
|
||||||
}
|
}
|
||||||
for(;;){
|
for(;;) {
|
||||||
log("returning start");
|
|
||||||
flood_start(&maze, &stats);
|
|
||||||
locateWall(&maze, &stats);
|
locateWall(&maze, &stats);
|
||||||
|
flood_start(&maze, &stats);
|
||||||
|
follow(maze, &stats);
|
||||||
|
if(stats.x == 0 && stats.y == 0) {
|
||||||
|
log("start");
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
//log(stats.x);
|
||||||
|
//log(stats.y);
|
||||||
|
API::moveForward();
|
||||||
|
updatepos(&stats);
|
||||||
|
//log(maze.hwalls[stats.x][stats.y]);
|
||||||
|
}
|
||||||
|
for(;;) {
|
||||||
|
locateWall(&maze, &stats);
|
||||||
|
flood(&maze, &stats);
|
||||||
follow(maze, &stats);
|
follow(maze, &stats);
|
||||||
if(maze.mhtn[stats.x][stats.y] == 0){
|
if(maze.mhtn[stats.x][stats.y] == 0){
|
||||||
log("start");
|
log("Finish");
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
//log(stats.x);
|
//log(stats.x);
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user