working priority queue

2 files changed, 11 insertions, 19 deletions

diff --git a/src/astar.cpp b/src/astar.cpp
index e40a436..9dd9332 100644
--- a/src/astar.cpp
+++ b/src/astar.cpp
@@ -4,17 +4,6 @@ Node::Node() : previous_node(NULL), f_score(-1), g_score(0), h_score(-1) {
 	update_f_score();
 }
 
-Node::Node(Node *prev_node) : previous_node(prev_node), f_score(-1), g_score(0), h_score(-1) {
-	update_f_score();
-}
-
-Node::Node(Node *prev_node, int g) : previous_node(prev_node), f_score(-1), g_score(g), h_score(-1) {
-	update_f_score();
-}
-
-Node::~Node() {
-}
-
 bool operator<(const Node& n1, const Node& n2) {
 	if(n1.f_score == n2.f_score)
 		return n1.h_score < n2.h_score;
diff --git a/src/main.cpp b/src/main.cpp
index bd647c2..e679134 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -15,19 +15,22 @@
 
 #include <iostream>
 #include <cstdlib>
+#include <vector>
 
 using namespace std;
 
 int main(int argc, char *argv[]) {
-	PriorityQueue<int> pq;
+	PriorityQueue<Node> pq;
 
-	pq.push(5);
-	pq.push(2);
-	pq.push(3);
-	pq.push(8);
-	pq.push(19);
-	pq.push(1);
+	Node n, n2, n3, n4, n5, n6;
+	pq.push(n);
+	pq.push(n2);
+	pq.push(n3);
+	pq.push(n4);
+	pq.push(n5);
+	pq.push(n6);
+
+	cout << "Node in first queue: " << pq.pop() << endl;
 
-	cout << pq.pop() << " " << pq.pop() << " " << pq.pop() << endl;
 	return 0;
 }