heuristic method

.vscode/launch.json

@@ -0,0 +1,7 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": []
+}

.vscode/tasks.json

@@ -10,7 +10,7 @@
                 "*.cpp",
                 "-lncursesw",
                 "-o",
-                "${fileDirname}/${fileBasenameNoExtension}"
+                "${fileDirname}/main"
             ],
             "options": {
                 "cwd": "${fileDirname}"

dijstra_algorithm.cpp

@@ -1,6 +1,7 @@
 #include "dijstra_algorithm.h"
 #include "mnode.h"
 #include <chrono>
+#include <cmath>
 #include <functional>
 #include <ncurses.h>
 #include <queue>
@@ -9,6 +10,11 @@
 using std::priority_queue;
 using std::make_pair;
 
+int DIJAlgorithm::Heuristic(const MNode& nodeA , const MNode& nodeB) const
+{
+	return std::abs(nodeA.mapIndex_X - nodeB.mapIndex_X) + std::abs(nodeA.mapIndex_Y - nodeB.mapIndex_Y);
+}
+
 map<int, int> DIJAlgorithm::Resolve()
 {
 	Map& aMap = GetMap();
@@ -24,13 +30,11 @@ map<int, int> DIJAlgorithm::Resolve()
         return solveMap;	
 	}
 	priority_queue<MNode, vector<MNode>, std::greater<MNode>> waveQueue;
-	map<int, int> curCostMap;
-	curCostMap.insert(make_pair(aMap.GetNodeNum(startNode), 0));
 	waveQueue.push(startNode);
-	int meetIndex = 0;
 	while(!waveQueue.empty())
 	{
 		const MNode checkNode = waveQueue.top();
+		waveQueue.pop();
 		if(checkNode == endNode)
 		{
 			break;
@@ -40,27 +44,23 @@ map<int, int> DIJAlgorithm::Resolve()
 		{
 			int ckNodeNum = aMap.GetNodeNum(checkNode);
 			int nextNodeNum = aMap.GetNodeNum(nextNode);
-			int nextCurCost = curCostMap[ckNodeNum] + nextNode.nodeCost;
-			map<int, int>::const_iterator citer = curCostMap.find(nextNodeNum);
-			if(citer == curCostMap.cend() || nextCurCost < citer->second)
+			map<int, int>::const_iterator citer = solveMap.find(nextNodeNum);
+			if(citer == solveMap.cend() && nextNode != startNode)
 			{
-				curCostMap[nextNodeNum] = nextCurCost;
-				nextNode.CurCostSetter(nextCurCost);
-				nextNode.MISetter(meetIndex);
+				nextNode.CurCostSetter(Heuristic(endNode, nextNode));
 				if(nextNode!=startNode && nextNode!=endNode)
 				{
 					// nextNode.NStateSetter(ENodeState::FINDDING);
 					// aMap.Draw(nextNode, EDrawType::STATE);
-					aMap.Draw(nextNode.curCost, nextNode.mapIndex_Y, nextNode.mapIndex_X);
+					aMap.Draw(nextNode.index, nextNode.mapIndex_Y, nextNode.mapIndex_X);
 					refresh();
 				}
-				std::this_thread::sleep_for(std::chrono::milliseconds(30));
+				std::this_thread::sleep_for(std::chrono::milliseconds(100));
 				waveQueue.push(nextNode);
 				solveMap.insert(make_pair(nextNodeNum, ckNodeNum));
-				meetIndex += 1;
 			}
 		}
-		waveQueue.pop();
+		// waveQueue.pop();
 	}
 	return solveMap;
 }

dijstra_algorithm.h

@@ -2,6 +2,7 @@
 #define _DIJ_ALGORITHM_H
 #include "algorithm.h"
 #include "map.h"
+#include "mnode.h"
 #include <map>
 #include <vector>
 using std::map;
@@ -14,5 +15,6 @@ class DIJAlgorithm : public Algorithm
 		DIJAlgorithm(Map& _map, MNode& _start, MNode& _end):Algorithm(_map, _start, _end){}
 		map<int, int> Resolve() override;
 		vector<int> FindPath(map<int, int>&) override;
+		int Heuristic(const MNode&, const MNode&)const;
 };
 #endif

map.cpp

@@ -172,6 +172,7 @@ void Map::buildNodes(map<int, MNode>& nMap)
         MNode node = MNode(ipair.first, ipair.second);
 		node.NTypeSetter(ENodeType::NORMAL);
 		node.NStateSetter(ENodeState::NONE);
+        node.index = i;
         nodeMap.insert({i, node});
     }
 }

mnode.h

@@ -191,26 +191,12 @@ struct MNode
 
 	bool operator<(const MNode& node) const
 	{
-        if(curCost < node.curCost)
-        {
-            return true;
-        }
-        else 
-        {
-            return meetIndex < node.meetIndex;
-        }
+        return curCost < node.curCost;
 	}
 
 	bool operator>(const MNode& node) const
 	{
-        if(curCost > node.curCost)
-        {
-            return true;
-        }
-        else
-        {
-            return meetIndex > node.meetIndex;
-        }
+		return curCost > node.curCost;
 	}
 
     void NTypeSetter(ENodeType ntype)