Merge CDataStorageSingleLinkedList list into CDataStorageDoubleLinkedList.

Author: nitrocaster

src/xrAICore/Navigation/data_storage_bucket_list.h

@@ -37,7 +37,7 @@ struct CDataStorageBucketList {
 			_data_storage,
 			BucketList<_vertex>::_vertex
 		>											inherited;
-		typedef typename inherited::inherited_base	inherited_base;
+		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;

src/xrAICore/Navigation/data_storage_constructor.h

@@ -18,44 +18,14 @@ template <
 	typename _manager, 
 	typename _builder, 
 	typename _allocator,
-	template <typename _T> class _vertex = CEmptyClassTemplate,
-	template <
-		typename _1,
-		typename _2
-	>
-	class	 _builder_allocator_constructor = CBuilderAllocatorConstructor,
-	template <
-		typename _1, 
-		typename _2,
-		typename _3,
-		template <
-			typename _1,
-			typename _2
-		>
-		class	 _4
-	>
-	class	 _manager_builder_allocator_constructor = CManagerBuilderAllocatorConstructor
+	template <typename _T> class _vertex = CEmptyClassTemplate
 >
 struct CDataStorageConstructor : 
     public _algorithm::template CDataStorage<
-		_manager_builder_allocator_constructor<
-			_manager,
-			_builder,
-			_allocator,
-			_builder_allocator_constructor
-		>,
-		_vertex
-	>
+    CManagerBuilderAllocatorConstructor<_manager, _builder, _allocator>, _vertex>
 {
     typedef typename _algorithm::template CDataStorage<
-		_manager_builder_allocator_constructor<
-			_manager,
-			_builder,
-			_allocator,
-			_builder_allocator_constructor
-		>,
-		_vertex
-	> inherited; 
+		CManagerBuilderAllocatorConstructor<_manager, _builder, _allocator>, _vertex> inherited; 
 
 	typedef typename inherited::CGraphVertex	CGraphVertex;
 	typedef typename CGraphVertex::_index_type	_index_type;

src/xrAICore/Navigation/data_storage_double_linked_list.h

@@ -8,46 +8,47 @@
 
 #pragma once
 
-#include "xrAICore/Navigation/data_storage_single_linked_list.h"
-
 template <bool sorted = false>
-struct CDataStorageDoubleLinkedList {
-
+struct CDataStorageDoubleLinkedList
+{
 	template <template <typename _T> class T1>
-	struct DoubleLinkedList {
+	struct DoubleLinkedList
+    {
 		template<typename T2>
-		struct _vertex : public T1<T2> {
-			T2	*_prev;
-
-			IC	T2	*&prev()
-			{
-				return	(_prev);
-			}
+		struct _vertex : public T1<T2>
+        {
+            T2 *_next;
+			T2 *_prev;
+            T2 *&next() { return _next; }
+			T2 *&prev() { return _prev; }
 		};
 	};
 
 	template <
 		typename _data_storage,
 		template <typename _T> class _vertex = CEmptyClassTemplate
 	>
-	class CDataStorage : public CDataStorageSingleLinkedList<sorted>::CDataStorage<_data_storage,DoubleLinkedList<_vertex>::_vertex> {
+	class CDataStorage : public _data_storage::template CDataStorage<DoubleLinkedList<_vertex>::_vertex>
+    {
 	public:
-		typedef typename CDataStorageSingleLinkedList<sorted>::CDataStorage<
-			_data_storage,
-			DoubleLinkedList<_vertex>::_vertex
-		>											inherited;
-		typedef typename inherited::inherited		inherited_base;
+        typedef typename _data_storage::template CDataStorage<DoubleLinkedList<_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_switch_factor;
+        _dist_type m_max_distance;
+		CGraphVertex m_list_data[2];
+		CGraphVertex *m_list_head;
+		CGraphVertex *m_list_tail;
+		_dist_type m_switch_factor;
 
 	public:
 		IC						CDataStorage		(const u32 vertex_count, const _dist_type _max_distance = _dist_type(u32(-1)));
 		virtual					~CDataStorage		();
 		IC		void			init				();
+		IC		bool			is_opened_empty		() const;
+		IC		void			add_best_closed		();
 		IC		void			set_switch_factor	(const _dist_type _switch_factor);
 		IC		void			add_opened			(CGraphVertex &vertex);
 		IC		void			decrease_opened		(CGraphVertex &vertex, const _dist_type value);

src/xrAICore/Navigation/data_storage_double_linked_list_inline.h

@@ -21,6 +21,7 @@ TEMPLATE_SPECIALIZATION
 IC	CDoubleLinkedList::CDataStorage			(const u32 vertex_count, const _dist_type _max_distance = _dist_type(u32(-1))) :
 	inherited				(vertex_count)
 {
+    m_max_distance			= _max_distance;
 	m_switch_factor			= _dist_type(1);
 }
 
@@ -33,13 +34,24 @@ TEMPLATE_SPECIALIZATION
 IC	void CDoubleLinkedList::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;
 }
 
+TEMPLATE_SPECIALIZATION
+IC	bool CDoubleLinkedList::is_opened_empty		() const
+{
+	return					(m_list_head->next() == m_list_tail);
+}
+
 TEMPLATE_SPECIALIZATION
 IC	void CDoubleLinkedList::add_opened		(CGraphVertex &vertex)
 {
-	inherited_base::add_opened	(vertex);
+	inherited::add_opened	(vertex);
 	if (!sorted) {
 		m_list_head->next()->prev()	= &vertex;
 		vertex.next()				= m_list_head->next();
@@ -106,7 +118,14 @@ IC	void CDoubleLinkedList::remove_best_opened	()
 {
 	VERIFY					(!is_opened_empty());
 	m_list_head->next()->next()->prev()	= m_list_head;
-	inherited::remove_best_opened();
+	m_list_head->next()		= m_list_head->next()->next();
+}
+
+TEMPLATE_SPECIALIZATION
+IC	void CDoubleLinkedList::add_best_closed		()
+{
+	VERIFY					(!is_opened_empty());
+	inherited::add_closed	(*m_list_head->next());
 }
 
 TEMPLATE_SPECIALIZATION

src/xrAICore/Navigation/data_storage_single_linked_list.h

@@ -52,9 +52,7 @@ template <
 		_vertex_manager,
 		_data_storage_base,
 		_vertex_allocator,
-		_Vertex,
-		CBuilderAllocatorConstructor,
-        CManagerBuilderAllocatorConstructor
+		_Vertex
 	> CDataStorage;
 
 protected: