X-Git-Url: https://ruin.nu/git/?p=popboot.git;a=blobdiff_plain;f=planner.h;h=8d116933f14a6d0122aaa0182ca22f21686ca277;hp=ab8f4ee27774f4df9e13283a67b1c744619a18f5;hb=a1941ebc8535c578f0989f847794917096274f8e;hpb=7b9821d42d980e5788bbc65563973eddd6e4c40d

diff --git a/planner.h b/planner.h
index ab8f4ee..8d11693 100644
--- a/planner.h
+++ b/planner.h
@@ -3,53 +3,37 @@
 
 #include <ext/hash_map>
 #include <vector>
+#include <queue>
+#include <pthread.h>
+#include <semaphore.h>
 #include "action.h"
 
 class Node;
 
-
-
-namespace __gnu_cxx {
-
-    template< typename CharT, typename Traits, typename Alloc >
-    struct hash< std::basic_string<CharT, Traits, Alloc> > {
-        size_t operator()(const std::basic_string<CharT, Traits, Alloc>& s) const {
-            
-           const std::collate<CharT>& c = std::use_facet< std::collate<CharT> >(std::locale());
-           
-           return c.hash(s.c_str(), s.c_str() + s.size());
-
-}
-
-    };
-
-    template< typename CharT, typename Traits, typename Alloc >
-    struct hash< const std::basic_string<CharT, Traits, Alloc> > { //yes you need this version aswell!
-
-size_t operator()(const std::basic_string<CharT, Traits, Alloc>& s) const {
-       
-          const std::collate<CharT>& c = std::use_facet< std::collate<CharT> >(std::locale());
-      
-          return c.hash(s.c_str(), s.c_str() + s.size());
-        }
-
-    };
-};
-
 class Planner {
 	public:
-		Planner(std::vector<Action> actions, literals init, literals goal);
+		Planner(std::vector<Action> actions, Literals init, Literals goal);
 		~Planner();
 
 		void execute();
 
+
 	protected:
 
 		void makePlan(Node* node);
 		void addNode(Node* node);
+
+		sem_t _nodes;
+		sem_t _list;
+		std::queue<Node*> _executedNodes;
 		
 		Node* _start;
-		__gnu_cxx::hash_map<std::string,Node*> _addedNodes;
-		__gnu_cxx::hash_map<std::string,Action> _actions;
+		Node* _finish;
+		__gnu_cxx::hash_map<std::string,Node*> _addedEffects;
+		__gnu_cxx::hash_map<std::string,Action*> _actionEffects;
+		Literals _init;
+		Literals _goal;
+		std::vector<Node*> _addedNodes;
+		std::vector<Action*> _actions;
 };
 #endif