Merge CDataStorageDoubleLinkedList into CDataStorageBucketList.

Author: nitrocaster

src/xrAICore/Navigation/data_storage_bucket_list.h

@@ -8,8 +8,6 @@
 
 #pragma once
 
-#include "xrAICore/Navigation/data_storage_double_linked_list.h"
-
 template <
 	typename	_path_id_type,
 	typename	_bucket_id_type,
@@ -19,30 +17,38 @@ template <
 struct CDataStorageBucketList {
 
 	template <template <typename _T> class T1>
-	struct BucketList {
+	struct BucketList
+    {
 		template<typename T2>
-		struct _vertex : public T1<T2> {
-			_path_id_type	m_path_id;
-			_bucket_id_type	m_bucket_id;
+		struct _vertex : public T1<T2>
+        {
+            T2 *_next;
+			T2 *_prev;
+            _path_id_type m_path_id;
+            _bucket_id_type m_bucket_id;
+            T2 *&next() { return _next; }
+			T2 *&prev() { return _prev; }
 		};
 	};
 
 	template <
 		typename _data_storage,
 		template <typename _T> class _vertex = CEmptyClassTemplate
 	>
-	class CDataStorage : public CDataStorageDoubleLinkedList<false>::CDataStorage<_data_storage,BucketList<_vertex>::_vertex> {
+	class CDataStorage : public _data_storage::template CDataStorage<BucketList<_vertex>::_vertex>
+    {
 	public:
-		typedef typename CDataStorageDoubleLinkedList<false>::CDataStorage<
-			_data_storage,
-			BucketList<_vertex>::_vertex
-		>											inherited;
-		typedef typename inherited::inherited	inherited_base;
-		typedef typename inherited::CGraphVertex	CGraphVertex;
-		typedef typename CGraphVertex::_dist_type	_dist_type;
-		typedef typename CGraphVertex::_index_type	_index_type;
+        typedef typename _data_storage::template CDataStorage<BucketList<_vertex>::_vertex> inherited;
+        typedef typename inherited::CGraphVertex	CGraphVertex;
+        typedef typename CGraphVertex::_dist_type	_dist_type;
+        typedef typename CGraphVertex::_index_type	_index_type;
 
 	protected:
+        _dist_type m_max_distance;
+        CGraphVertex m_list_data[2];
+        CGraphVertex *m_list_head;
+        CGraphVertex *m_list_tail;
+        _dist_type m_switch_factor;
 		_dist_type				m_min_bucket_value;
 		_dist_type				m_max_bucket_value;
 		CGraphVertex			*m_buckets[bucket_count];
@@ -53,6 +59,7 @@ struct CDataStorageBucketList {
 		virtual					~CDataStorage		();
 		IC		void			init				();
 		IC		void			add_best_closed		();
+        IC		void			set_switch_factor   (const _dist_type _switch_factor);
 		IC		bool			is_opened_empty		();
 		IC		u32				compute_bucket_id	(CGraphVertex &vertex) const;
 		IC		void			verify_buckets		() const;

src/xrAICore/Navigation/data_storage_bucket_list_inline.h

@@ -26,6 +26,8 @@ TEMPLATE_SPECIALIZATION
 IC	CBucketList::CDataStorage			(const u32 vertex_count) :
 		inherited(vertex_count)
 {
+    m_max_distance			= _dist_type(-1);
+	m_switch_factor			= _dist_type(1);
 	m_min_bucket_value		= _dist_type(0);
 	m_max_bucket_value		= _dist_type(1000);
 	ZeroMemory				(m_buckets,bucket_count*sizeof(CGraphVertex*));
@@ -40,6 +42,12 @@ TEMPLATE_SPECIALIZATION
 IC	void CBucketList::init				()
 {
 	inherited::init			();
+	ZeroMemory				(m_list_data,2*sizeof(CGraphVertex));
+	m_list_head				= m_list_data;
+	m_list_tail				= m_list_data + 1;
+	m_list_head->next()		= m_list_tail;
+	m_list_tail->f()		= m_max_distance;
+	m_list_tail->prev()		= m_list_head;
 	m_min_bucket_id			= bucket_count;
 	if (clear_buckets)
 		ZeroMemory			(m_buckets,bucket_count*sizeof(CGraphVertex*));
@@ -49,7 +57,15 @@ TEMPLATE_SPECIALIZATION
 IC	void CBucketList::add_best_closed	()
 {
 	VERIFY					(!is_opened_empty());
-	inherited_base::add_closed	(*m_buckets[m_min_bucket_id]);
+	inherited::add_closed	(*m_buckets[m_min_bucket_id]);
+}
+
+TEMPLATE_SPECIALIZATION
+IC	void CBucketList::set_switch_factor	(const _dist_type _switch_factor)
+{
+	if (!sorted)
+		NODEFAULT;
+	m_switch_factor			= _switch_factor;
 }
 
 TEMPLATE_SPECIALIZATION
@@ -175,7 +191,7 @@ TEMPLATE_SPECIALIZATION
 IC	void CBucketList::add_opened		(CGraphVertex &vertex)
 {
 //	ai().m_visited_nodes.push_back	(vertex.index());
-	inherited_base::add_opened	(vertex);
+	inherited::add_opened	(vertex);
 	add_to_bucket				(vertex,compute_bucket_id(vertex));
 	verify_buckets				();
 }

src/xrAICore/Navigation/data_storage_double_linked_list.h

@@ -268,8 +268,6 @@
     <ClInclude Include="Navigation\data_storage_bucket_list.h" />
     <ClInclude Include="Navigation\data_storage_bucket_list_inline.h" />
     <ClInclude Include="Navigation\data_storage_constructor.h" />
-    <ClInclude Include="Navigation\data_storage_double_linked_list.h" />
-    <ClInclude Include="Navigation\data_storage_double_linked_list_inline.h" />
     <ClInclude Include="Navigation\dijkstra.h" />
     <ClInclude Include="Navigation\dijkstra_inline.h" />
     <ClInclude Include="Navigation\edge_path.h" />

src/xrAICore/Navigation/data_storage_double_linked_list_inline.h

@@ -219,12 +219,6 @@
     <ClInclude Include="Navigation\data_storage_bucket_list_inline.h">
       <Filter>AI\Navigation\Pathfinding\DataStorages\PriorityQueues</Filter>
     </ClInclude>
-    <ClInclude Include="Navigation\data_storage_double_linked_list.h">
-      <Filter>AI\Navigation\Pathfinding\DataStorages\PriorityQueues</Filter>
-    </ClInclude>
-    <ClInclude Include="Navigation\data_storage_double_linked_list_inline.h">
-      <Filter>AI\Navigation\Pathfinding\DataStorages\PriorityQueues</Filter>
-    </ClInclude>
     <ClInclude Include="Navigation\vertex_allocator_fixed.h">
       <Filter>AI\Navigation\Pathfinding\DataStorages\VertexAllocators</Filter>
     </ClInclude>