King_DuckZ
/
DoorKeeper
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Buildfix in tileiterator + unit test.

This commit is contained in:
King_DuckZ 2015-08-16 20:33:44 +02:00
parent cb9e4bce19
commit b01fad0314
5 changed files with 59 additions and 140 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
include/doorkeeper/components/tileiterator.hpp
View File

@ -3,20 +3,19 @@
#include "doorkeeper/primitivetypes.hpp"
#include "doorkeeper/implem/helpers.hpp"
#include "doorkeeper/components/tilecoords.hpp"
#include <boost/iterator/iterator_facade.hpp>
#include <iterator>
#include <vector>
#include <type_traits>
#include <cstdint>
#include <utility>
namespace dk {
template <typename T, uint32_t D, typename T1>
class TileIterator;
namespace implem {
template <uint32_t D>
size_t get_index_from_pos ( const Vector<D>& parPos, const Vector<D>& parSize ) a_pure;
template <typename I, typename O>
struct TypeWithQualifiers {
typedef typename std::conditional<std::is_volatile<I>::value && std::is_const<I>::value,
@ -30,37 +29,26 @@ namespace dk {
>::type
>::type result;
};
#if defined(NDEBUG)
template <>
size_t get_index_from_pos<2> ( const Vector<2>& parPos, const Vector<2>& parSize ) a_pure;
#endif
template <uint32_t D>
Vector<D> buildPastEndCoordinate ( const Vector<D>& parFrom, const Vector<D>& parTo ) a_pure;
template <typename T, uint32_t D, typename T1>
const Vector<D>& get_from_from_iterator ( const TileIterator<T, D, T1>& parIterator );
} //namespace implem
template <typename T, uint32_t D, typename T1=typename std::remove_cv<T>::type>
class TileIterator : public boost::iterator_facade<TileIterator<T, D>, T, boost::bidirectional_traversal_tag> {
friend class boost::iterator_core_access;
friend const Vector<D>& implem::get_from_from_iterator<> ( const TileIterator& parIterator );
typedef std::vector<T1> vector_type;
typedef typename implem::TypeWithQualifiers<T, vector_type>::result qualif_vector_type;
public:
typedef Vector<D> coords;
typedef TileCoords<D> TileCoordsType;
typedef typename TileCoordsType::coords coords;
TileIterator ( void );
TileIterator ( void ) = default;
TileIterator ( const TileIterator& parOther ) = default;
TileIterator ( TileIterator&& parOther ) = default;
TileIterator ( qualif_vector_type* parData, const coords& parFrom, const coords& parTo );
TileIterator ( qualif_vector_type* parData, const coords& parFrom, const coords& parTo, const coords& parAreaFrom, const coords& parAreaTo );
TileIterator ( qualif_vector_type* parData, const coords& parFrom, const coords& parTo, const coords& parAreaFrom, const coords& parAreaTo, const coords& parSubdiv );
TileIterator ( qualif_vector_type* parData, const coords& parArea );
TileIterator ( qualif_vector_type* parData, const coords& parStart, const coords& parArea );
~TileIterator ( void ) = default;
const coords& abs_position ( void ) const { return m_pos; }
const TileCoordsType& raw_coords ( void ) const;
const coords& position ( void ) const;
private:
void increment ( void );
@ -69,15 +57,9 @@ namespace dk {
ptrdiff_t distance_to ( const TileIterator& parOther );
bool equal ( const TileIterator& parOther ) const;
T& dereference ( void ) const;
size_t get_current_index ( void ) const { return implem::get_index_from_pos<D>(m_pos, m_subdivareasize) + m_subindex; }
coords m_pos;
coords m_from;
coords m_to;
coords m_subdivareasize;
TileCoordsType m_tile_range;;
qualif_vector_type* m_data;
CoordinateScalarType m_subindex;
CoordinateScalarType m_maxsubindex;
};
} //namespace dk

2
include/doorkeeper/implem/tilecoords.inl
View File

@ -111,7 +111,7 @@ namespace dk {
for (std::size_t d = 0; d < static_cast<std::size_t>(D); ++d) {
if (m_pos[d] > lower[d]) {
--m_pos[d];
return;
return *this;
}
else {
m_pos[d] = m_size[d];

132
include/doorkeeper/implem/tileiterator.inl
View File

@ -1,128 +1,28 @@
namespace dk {
namespace implem {
template <uint32_t D>
inline size_t get_index_from_pos (const Vector<D>& parPos, const Vector<D>& parSize) {
size_t index = 0;
for (size_t d = 0; d < D; ++d) {
size_t pos = static_cast<size_t>(parPos[D - 1 - d]);
for (size_t p = 0; p < D - 1 - d; ++p) {
pos *= static_cast<size_t>(parSize[p]);
}
index += pos;
}
return index;
}
#if defined(NDEBUG)
template <>
inline size_t get_index_from_pos<2> (const Vector<2>& parPos, const Vector<2>& parSize) {
return parPos.y() * parSize.x() + parPos.x();
}
#endif
template <uint32_t D>
inline Vector<D> buildPastEndCoordinate (const Vector<D>& parFrom, const Vector<D>& parTo) {
Vector<D> retval;
for (size_t d = 0; d < D - 1; ++d) {
retval[d] = parFrom[d];
}
retval[D - 1] = parTo[D - 1];
return retval;
}
template <typename T, uint32_t D, typename T1>
inline const Vector<D>& get_from_from_iterator (const TileIterator<T, D, T1>& parIterator) {
return parIterator.m_from;
}
} //namespace implem
template <typename T, uint32_t D, typename T1>
TileIterator<T, D, T1>::TileIterator() :
m_pos(CoordinateScalarType()),
m_from(CoordinateScalarType()),
m_to(CoordinateScalarType()),
m_subdivareasize(CoordinateScalarType()),
m_data(nullptr),
m_subindex(0),
m_maxsubindex(0)
{
}
template <typename T, uint32_t D, typename T1>
TileIterator<T, D, T1>::TileIterator (qualif_vector_type* parData, const coords& parFrom, const coords& parTo) :
m_pos(parFrom),
m_from(parFrom),
m_to(parTo),
m_subdivareasize(parTo - parFrom),
m_data(parData),
m_subindex(0),
m_maxsubindex(0)
TileIterator<T, D, T1>::TileIterator (qualif_vector_type* parData, const coords& parArea) :
m_tile_range(parArea),
m_data(parData)
{
DK_ASSERT(parData);
}
template <typename T, uint32_t D, typename T1>
TileIterator<T, D, T1>::TileIterator (qualif_vector_type* parData, const coords& parFrom, const coords& parTo, const coords& parAreaFrom, const coords& parAreaTo) :
m_pos(parFrom),
m_from(parFrom),
m_to(parTo),
m_subdivareasize(parAreaTo - parAreaFrom),
m_data(parData),
m_subindex(0),
m_maxsubindex(0)
{
DK_ASSERT(parData);
}
template <typename T, uint32_t D, typename T1>
TileIterator<T, D, T1>::TileIterator (qualif_vector_type* parData, const coords& parFrom, const coords& parTo, const coords& parAreaFrom, const coords& parAreaTo, const coords& parSubdiv) :
m_pos(parFrom),
m_from(parFrom),
m_to(parTo),
m_subdivareasize((parAreaTo - parAreaFrom) * parSubdiv),
m_data(parData),
m_subindex(0),
m_maxsubindex(implem::area(parSubdiv) - 1)
TileIterator<T, D, T1>::TileIterator (qualif_vector_type* parData, const coords& parStart, const coords& parArea) :
m_tile_range(parStart, parArea),
m_data(parData)
{
DK_ASSERT(parData);
}
template <typename T, uint32_t D, typename T1>
void TileIterator<T, D, T1>::increment() {
if (m_subindex < m_maxsubindex) {
++m_subindex;
return;
}
m_subindex = 0;
for (size_t d = 0; d < D - 1; ++d) {
++m_pos[d];
if (m_pos[d] >= m_to[d])
m_pos[d] = m_from[d];
else
return;
}
++m_pos[D - 1];
++m_tile_range;
}
template <typename T, uint32_t D, typename T1>
void TileIterator<T, D, T1>::decrement() {
if (m_maxsubindex > 0 and m_subindex == 0) {
--m_subindex;
}
m_subindex = m_maxsubindex;
for (size_t d = 0; d < D; ++d) {
if (m_pos[d] > m_from[d]) {
--m_pos[d];
return;
}
else {
m_pos[d] = m_to[d];
}
}
++m_pos[D - 1];
--m_tile_range;
}
template <typename T, uint32_t D, typename T1>
@ -132,19 +32,29 @@ namespace dk {
template <typename T, uint32_t D, typename T1>
ptrdiff_t TileIterator<T, D, T1>::distance_to (const TileIterator& parOther) {
return std::distance(this->get_current_index(), parOther.get_current_index());
return std::distance(to_index(m_tile_range), to_index(parOther.m_tile_range));
}
template <typename T, uint32_t D, typename T1>
bool TileIterator<T, D, T1>::equal (const TileIterator& parOther) const {
return m_data == parOther.m_data and m_pos == parOther.m_pos;
return m_data == parOther.m_data and m_tile_range == parOther.m_tile_range and m_tile_range == parOther.m_tile_range;
}
template <typename T, uint32_t D, typename T1>
T& TileIterator<T, D, T1>::dereference() const {
const auto index = this->get_current_index();
const auto index = to_index(m_tile_range);
DK_ASSERT(m_data);
DK_ASSERT(index < m_data->size());
return (*m_data)[index];
}
template <typename T, uint32_t D, typename T1>
auto TileIterator<T, D, T1>::raw_coords() const -> const TileCoordsType& {
return m_tile_range;
}
template <typename T, uint32_t D, typename T1>
auto TileIterator<T, D, T1>::position() const -> const coords& {
return m_tile_range.position();
}
} //namespace dk

1
test/unit/CMakeLists.txt
View File

@ -12,6 +12,7 @@ add_executable(${PROJECT_NAME}
"${CMAKE_CURRENT_SOURCE_DIR}/../gtest-1.7.0/src/gtest_main.cc"
tilecoords.cpp
vector.cpp
tileiterator.cpp
)
target_link_libraries(${PROJECT_NAME}

26
test/unit/tileiterator.cpp Normal file
View File

@ -0,0 +1,26 @@
#include <gtest/gtest.h>
#include "doorkeeper/components/tileiterator.hpp"
#include <vector>
#include <boost/iterator/counting_iterator.hpp>
#include <limits>
TEST(increment, tileiterator) {
typedef dk::TileIterator<int, 7> tileit7;
typedef dk::Vector<7> coords7;
using boost::counting_iterator;
std::vector<int> data(counting_iterator<int>(0), counting_iterator<int>(100000));
{
const coords7 max_coords(99, 999, 2, 2, 2, 2, 2);
tileit7 it(&data, max_coords);
for (std::size_t z = 0; z < data.size(); ++z) {
EXPECT_EQ(data[z], *it);
++it;
}
EXPECT_EQ(coords7(0, 0, 1, 0, 0, 0, 0), it.position());
}
}