A* 휴리스틱 수정

Author: altair823

SPA/ASBQ.cpp

@@ -133,15 +133,16 @@ void ASBQ::makeDistTable() {
 
     for (int i = 0; i < MAX_COLUMN; i++) {
         for (int j = 0; j < MAX_ROW; j++) {
-#if WEIGHT_STD_DIV
+            if (maze->getStandardDeviation() != 0) {
                 distanceTable[i][j] =
-                        ((std::abs(end->getRow() - j)) * WEIGHT_MIN) + ((std::abs(end->getColumn() - i)) * WEIGHT_MIN);
-#else
+                        ((std::abs(end->getRow() - j)) * WEIGHT_MIN) +
+                        ((std::abs(end->getColumn() - i)) * WEIGHT_MIN);
+            } else {
                 distanceTable[i][j] =
-                        ((std::abs(end->getRow() - j)) * WEIGHT_MEAN) + ((std::abs(end->getColumn() - i)) * WEIGHT_MEAN);
-#endif
+                        ((std::abs(end->getRow() - j)) * WEIGHT_MEAN) +
+                        ((std::abs(end->getColumn() - i)) * WEIGHT_MEAN);
+            }
         }
     }
 }
 
-

SPA/ASPQ.cpp

@@ -130,13 +130,15 @@ void ASPQ::makeDistTable() {
 
     for (int i = 0; i < MAX_COLUMN; i++) {
         for (int j = 0; j < MAX_ROW; j++) {
-#if WEIGHT_STD_DIV
+            if (maze->getStandardDeviation() != 0) {
                 distanceTable[i][j] =
-                        ((std::abs(end->getRow() - j)) * WEIGHT_MIN) + ((std::abs(end->getColumn() - i)) * WEIGHT_MIN);
-#else
+                        ((std::abs(end->getRow() - j)) * WEIGHT_MIN) +
+                        ((std::abs(end->getColumn() - i)) * WEIGHT_MIN);
+            } else {
                 distanceTable[i][j] =
-                        ((std::abs(end->getRow() - j)) * WEIGHT_MEAN) + ((std::abs(end->getColumn() - i)) * WEIGHT_MEAN);
-#endif
+                        ((std::abs(end->getRow() - j)) * WEIGHT_MEAN) +
+                        ((std::abs(end->getColumn() - i)) * WEIGHT_MEAN);
+            }
         }
     }
 }

cmake-build-debug/SPA_compare

@@ -1,3 +1,3 @@
-Start testing: Jul 29 01:54 KST
+Start testing: Jul 29 02:36 KST
 ----------------------------------------------------------
-End testing: Jul 29 01:54 KST
+End testing: Jul 29 02:36 KST

cmake-build-debug/Testing/Temporary/LastTest.log

@@ -12,7 +12,6 @@
 
 
 #define INF 10000000  // Maximum weight of edges.
-#define WEIGHT_STD_DIV 0  // Standard deviation of weight.
 #define WEIGHT_MEAN 10  // Mean of weight.
 #define WEIGHT_MAX 20
 #define WEIGHT_MIN 5

declaration.h

@@ -19,14 +19,17 @@ int main(int argc, char * argv []){
     int mainLoopCount = 1;
     int mazeRowSize = DEFAULT_ROW;
     int mazeColumnSize = DEFAULT_COLUMN;
-    if (argc == 4){
+    int standardDeviation = 0;
+    if (argc == 5){
         mainLoopCount = int(std::strtol(argv[1], nullptr, 10));
         mazeRowSize = int(std::strtol(argv[2], nullptr, 10));
         mazeColumnSize = int(std::strtol(argv[3], nullptr, 10));
+        standardDeviation = int(std::strtol(argv[4], nullptr, 10));
     } else if (argc == 2){
         mainLoopCount = int(std::strtol(argv[1], nullptr, 10));
     } else if (argc != 1){
-        std::cout<<"Wrong arguments! The number of arguments must be 1(loop count) or 3(maze row size, maze column size, loop count)."<<std::endl;
+        std::cout<<"Wrong arguments! The number of arguments must be 1(loop count) or 4(maze row size, maze column size, loop count, standard deviation)."<<std::endl;
+        return 1;
     }
 
 
@@ -45,7 +48,7 @@ int main(int argc, char * argv []){
 
         // Make a new maze.
         timer.SetStart();
-        Maze maze(mazeRowSize, mazeColumnSize);
+        Maze maze(mazeRowSize, mazeColumnSize, standardDeviation);
         Eller eller(maze);
         eller.MakeMaze();
         timer.SetEnd();

main.cpp

@@ -62,12 +62,12 @@ bool Eller::ChoiceRandomly() {
 int Eller::GenerateWeightND(){
     std::random_device rd;
     std::mt19937 gen(rd());
-    std::normal_distribution<double> weight_int(WEIGHT_MEAN, WEIGHT_STD_DIV);
-    int weight = -1;
+    std::normal_distribution<double> weight_int(WEIGHT_MEAN, tempMaze->getStandardDeviation());
+    int weight;
     // The Maximum weight is below (mean*2)
-    while (weight <= WEIGHT_MIN || weight >= WEIGHT_MAX) {
+    do {
         weight = (int)std::round(weight_int(gen));
-    }
+    } while (weight <= WEIGHT_MIN || weight >= WEIGHT_MAX);
     return weight;
 }
 

map/Eller.cpp

@@ -18,6 +18,8 @@ class Eller{
 private:
     Maze *tempMaze;
 
+    int STD;
+
     std::set<int> existingSet;
 
     /*

map/Eller.h

@@ -5,9 +5,10 @@
 #include "Maze.h"
 
 
-Maze::Maze(int rowSize, int columnSize) {
+Maze::Maze(int rowSize, int columnSize, int stdInput) {
     maxRow = rowSize;
     maxColumn = columnSize;
+    standardDeviation = stdInput;
     for (int column = 0; column < maxColumn; column++){
         for (int row = 0; row < maxRow; ++row) {
             location[column][row].setRow(row);
@@ -130,5 +131,9 @@ Location *Maze::getLocation(int row, int column) {
     return &(location[column][row]);
 }
 
+int Maze::getStandardDeviation() const {
+    return standardDeviation;
+}
+
 
 

map/Maze.cpp

@@ -19,13 +19,15 @@ class Maze{
 
     int maxRow, maxColumn;
     Location location[MAX_COLUMN][MAX_ROW];
+    int standardDeviation;
 
 public:
-    Maze(int maxRow, int maxColumn);
+    Maze(int maxRow, int maxColumn, int stdInput);
     Maze(const Maze&) = delete;
     int getRowSize();
     int getColumnSize();
     Location* getLocation(int row, int column);
+    int getStandardDeviation() const;
 
     void InitializeMaze();