[DEV] set back the Vector

This commit is contained in:
Edouard DUPIN 2017-06-22 00:56:22 +02:00
parent 90fff0caff
commit 8dcc6851b6
4 changed files with 750 additions and 0 deletions

79
etk/List.hpp Normal file
View File

@ -0,0 +1,79 @@
/**
* @author Edouard DUPIN
* @copyright 2011, Edouard DUPIN, all right reserved
* @license MPL-2 (see license file)
*/
#pragma once
#include <etk/types.hpp>
#include <etk/debug.hpp>
namespace etk {
/**
* @brief List class ...
*
* @param[in] T The type of objects to store.
*
* m_first
* | o-----------------------o
* *-------->| Element |<-----------------------------------+
* |-----------------------| |
* | m_previous | o-----------------------o |
* | m_next |--+--->| Element | |
* | m_data | | |-----------------------| |
* o-----------------------o | | m_previous |----+
* | | m_next |
* m_last ---------------------------------+ | m_data |
* o-----------------------o
*
*/
template<class ETK_LIST_TYPE> class List {
private:
class Element {
List<ETK_LIST_TYPE>::Element* m_previous;
List<ETK_LIST_TYPE>::Element* m_next;
ETK_LIST_TYPE m_data;
};
List<ETK_LIST_TYPE>::Element* m_first;
List<ETK_LIST_TYPE>::Element* m_last;
public:
const ETK_LIST_TYPE& front() const;
ETK_LIST_TYPE& front();
const ETK_LIST_TYPE& back() const;
ETK_LIST_TYPE& back();
List<ETK_LIST_TYPE>::Iterator begin();
List<ETK_LIST_TYPE>::Iterator end();
List<ETK_LIST_TYPE>::ReverseIterator rbegin();
List<ETK_LIST_TYPE>::ReverseIterator rend();
bool empty() const;
size_t size() const;
void clear();
void insert(List<ETK_LIST_TYPE>::Iterator _itPrevious, ETK_LIST_TYPE _element);
List<ETK_LIST_TYPE>::Iterator erase(List<ETK_LIST_TYPE>::Iterator _itRemove);
void pushBack(ETK_LIST_TYPE _element);
void pop_back();
void push_front(ETK_LIST_TYPE _element);
void pop_front();
void resize(size_t _size);
void swap(List<ETK_LIST_TYPE>& _other);
void merge(List<ETK_LIST_TYPE>& _other);
void reverse()
bool operator== (const List<ETK_LIST_TYPE>& _other);
bool operator!= (const List<ETK_LIST_TYPE>& _other);
bool operator< (const List<ETK_LIST_TYPE>& _other);
bool operator<= (const List<ETK_LIST_TYPE>& _other);
bool operator> (const List<ETK_LIST_TYPE>& _other);
bool operator>= (const List<ETK_LIST_TYPE>& _other);
};
}

0
etk/Map.hpp Normal file
View File

0
etk/MultiMap.hpp Normal file
View File

671
etk/Vector.hpp Normal file
View File

@ -0,0 +1,671 @@
/**
* @author Edouard DUPIN
* @copyright 2011, Edouard DUPIN, all right reserved
* @license MPL-2 (see license file)
*/
#pragma once
#include <etk/types.hpp>
#include <etk/debug.hpp>
namespace etk {
/**
* @brief Vector class ...
*
* @tparam[in] ETK_VECTOR_TYPE class type of the current element.
*
* m_data
* <------------ m_dataSize ------------>
* ----------------------------------------
* | 0 |
* |--------------------------------------|
* | 1 |
* |--------------------------------------|
* | 2 |
* |--------------------------------------|
* m_size | 3 |
* |--------------------------------------|
* | x |
* |--------------------------------------|
* | x |
* |--------------------------------------|
* | x |
* |--------------------------------------|
* | x |
* |--------------------------------------|
* | x |
* |--------------------------------------|
* | x |
* |--------------------------------------|
* m_allocated | x |
* ----------------------------------------
*/
template<class ETK_VECTOR_TYPE> class Vector {
public:
class Iterator {
private:
size_t m_current; //!< curent Id on the vector
Vector<ETK_VECTOR_TYPE>* m_vector; //!< Pointer on the curent element of the vectorBin
public:
/**
* @brief Basic itarator constructor with no link with an etkVector
*/
Iterator():
m_current(0),
m_vector(nullptr) {
// nothing to do ...
}
/**
* @brief Recopy constructor on a specific etkVector.
* @param[in] _obj The Iterator that might be copy
*/
Iterator(const Iterator & _obj):
m_current(_obj.m_current),
m_vector(_obj.m_vector) {
// nothing to do ...
}
/**
* @brief Asignation operator.
* @param[in] _otherIterator The Iterator that might be copy
* @return reference on the curent Iterator
*/
Iterator& operator=(const Iterator & _otherIterator) {
m_current = _otherIterator.m_current;
m_vector = _otherIterator.m_vector;
return *this;
}
/**
* @brief Basic destructor
*/
~Iterator() {
m_current = 0;
m_vector = nullptr;
}
/**
* @brief basic boolean cast
* @return true if the element is present in the etkVector size
*/
operator bool () {
return (m_current < m_vector->size());
}
/**
* @brief Incremental operator
* @return Reference on the current iterator incremented
*/
Iterator& operator++ () {
if ( m_vector != nullptr
&& m_current < m_vector->size() )
{
m_current++;
}
return *this;
}
/**
* @brief Decremental operator
* @return Reference on the current iterator decremented
*/
Iterator& operator-- () {
if ( m_vector != nullptr
&& m_current > 0) {
m_current--;
}
return *this;
}
/**
* @brief Incremental operator
* @return Reference on a new iterator and increment the other one
*/
Iterator operator++ (int32_t) {
Iterator it(*this);
++(*this);
return it;
}
/**
* @brief Decremental operator
* @return Reference on a new iterator and decrement the other one
*/
Iterator operator-- (int32_t) {
Iterator it(*this);
--(*this);
return it;
}
/**
* @brief Get reference on the current Element
* @return the reference on the current Element
*/
ETK_VECTOR_TYPE & operator-> () const {
TK_CHECK_INOUT(m_current < m_vector->size());
return &m_vector->get(m_current);
}
/**
* @brief Get reference on the current Element
* @return the reference on the current Element
*/
ETK_VECTOR_TYPE & operator* () const {
TK_CHECK_INOUT(m_current < m_vector->size());
return m_vector->get(m_current);
}
private:
Iterator(Vector<ETK_VECTOR_TYPE> * _obj, int32_t _pos):
m_current(_pos),
m_vector(_obj) {
// nothing to do ...
}
friend class Vector;
};
private:
ETK_VECTOR_TYPE* m_data; //!< pointer on the curetn table of Data
size_t m_size; //!< nb Element in the buffer
size_t m_allocated; //!< Current allocated size
public:
/**
* @brief Create an empty vector
* @param[in] _count Minimum request size of the Buffer
*/
Vector(int32_t _count = 0):
m_data(nullptr),
m_size(0),
m_allocated(0) {
changeAllocation(_count);
}
/**
* @brief Re-copy constructor (copy all needed data)
* @param[in] _obj Vector that might be copy
*/
Vector(const etk::Vector<ETK_VECTOR_TYPE>& _obj) {
m_allocated = _obj.m_allocated;
m_size = _obj.m_size;
m_data = nullptr;
//TK_DEBUG("USE Specific vector allocator ... Evb.m_size=" << Evb.m_size << " Evb.m_increment=" << Evb.m_increment);
// allocate all same data
m_data = new ETK_VECTOR_TYPE[m_allocated];
if (m_data == nullptr) {
TK_CRITICAL("Vector : Error in data allocation ... might nor work corectly anymore");
return;
}
// Copy all data ...
for(size_t iii=0; iii<m_allocated; iii++) {
// copy operator ...
m_data[iii] = _obj.m_data[iii];
}
}
/**
* @brief Destructor of the current Class
*/
~Vector() {
if (m_data != nullptr) {
delete[] m_data;
m_data = nullptr;
}
m_allocated = 0;
m_size = 0;
}
/**
* @brief Swap the data of 2 Vectors
* @param[in] _obj second vector to swap data.
*/
void swap(etk::Vector<ETK_VECTOR_TYPE>& _obj) {
// avoid Swap of itself
if(this != &_obj) {
ETK_VECTOR_TYPE* tmpData = m_data;
size_t tmpAllocated = m_allocated;
size_t tmpSize = m_size;
m_data = _obj.m_data;
m_allocated = _obj.m_allocated;
m_size = _obj.m_size;
_obj.m_data = tmpData;
_obj.m_allocated = tmpAllocated;
_obj.m_size = tmpSize;
}
}
/**
* @brief Re-copy operator
* @param[in] _obj Vector that might be copy
* @return reference on the curent re-copy vector
*/
Vector& operator=(const etk::Vector<ETK_VECTOR_TYPE> & _obj) {
//TK_DEBUG("USE RECOPY vector ... Evb.m_size=" << Evb.m_size << " Evb.m_increment=" << Evb.m_increment);
if (this != &_obj) {
if (m_data != nullptr) {
delete[] m_data;
m_data = nullptr;
}
// Set the new value
m_allocated = _obj.m_allocated;
m_size = _obj.m_size;
// allocate all same data
m_data = new ETK_VECTOR_TYPE[m_allocated];
if (m_data == nullptr) {
TK_CRITICAL("Vector : Error in data allocation ... might nor work corectly anymore");
return *this;
}
for(size_t iii=0; iii<m_allocated; iii++) {
// copy operator ...
m_data[iii] = _obj.m_data[iii];
}
}
// Return the current pointer
return *this;
}
/**
* @brief Add at the Last position of the Vector
* @param[in] _obj Element to add at the end of vector
*/
Vector& operator+= (const etk::Vector<ETK_VECTOR_TYPE>& _obj) {
size_t nbElememt = _obj.size();
size_t idx = m_size;
resize(m_size+nbElememt);
if (m_size<=idx) {
TK_CRITICAL("allocation error");
return *this;
}
for(size_t iii=0; iii<nbElememt; iii++) {
// copy operator ...
m_data[idx+iii] = _obj.m_data[iii];
}
// Return the curent pointer
return *this;
}
/**
* @brief Get the number of element in the vector
* @return The number requested
*/
size_t size() const {
return m_size;
}
/**
* @brief Resize the vector with a basic element
* @param[in] _newSize New size of the vector
*/
void resize(size_t _newSize, const ETK_VECTOR_TYPE& _basicElement) {
size_t idx = m_size;
resize(_newSize);
if (m_size != _newSize) {
TK_CRITICAL("error to resize vector");
return;
}
if (_newSize > idx) {
// initialize data ...
for(size_t iii=idx; iii<_newSize; iii++) {
m_data[iii] = _basicElement;
}
}
}
/**
* @brief Get the Allocated size in the vector
* @return The size of allocation
*/
size_t allocatedSize() const {
return m_allocated;
}
/**
* @brief Get a current element in the vector
* @param[in] _pos Desired position read
* @return Reference on the Element
*/
ETK_VECTOR_TYPE& get(size_t _pos) {
// NOTE :Do not change log level, this generate error only in debug mode
#if DEBUG_LEVEL > 2
if(_pos>m_size){
TK_CRITICAL("[CRITICAL] Access to an unexistant data in vector : " << _pos << "/ " << m_size);
}
#endif
return m_data[_pos];
}
/**
* @brief Get an copy Element an a special position
* @param[in] _pos Position in the vector that might be get [0..Size()]
* @return An reference on the copy of selected element
*/
ETK_VECTOR_TYPE& operator[] (size_t _pos) {
return get(_pos);
}
/**
* @brief Get an Element an a special position
* @param[in] _pos Position in the vector that might be get [0..Size()]
* @return An reference on the selected element
*/
const ETK_VECTOR_TYPE& operator[] (size_t _pos) const {
// NOTE :Do not change log level, this generate error only in debug mode
#if DEBUG_LEVEL > 2
if(_pos>m_size){
TK_CRITICAL("[CRITICAL] Access to an unexistant data in vector : " << _pos << "/ " << m_size);
}
#endif
return m_data[_pos];
}
/**
* @brief Add at the First position of the Vector
* @param[in] _item Element to add at the end of vector
*/
void pushFront(const ETK_VECTOR_TYPE& _item) {
insert(0, &_item, 1);
}
/**
* @brief Add at the Last position of the Vector
* @param[in] _item Pointer on a list of Element to add at the start of vector
* @param[in] _nbElement Number of element to add.
*/
void pushFront(const ETK_VECTOR_TYPE * _item, size_t _nbElement) {
insert(0, _item, _nbElement);
}
/**
* @brief Add at the Last position of the Vector
* @param[in] _item Element to add at the end of vector
*/
void pushBack(const ETK_VECTOR_TYPE& _item) {
size_t idx = m_size;
resize(m_size+1);
if (idx < m_size) {
m_data[idx] = _item;
} else {
TK_ERROR("Resize does not work corectly ... not added item");
}
}
/**
* @brief Add at the Last position of the Vector
* @param[in] _item Pointer on a list of Element to add at the end of vector
* @param[in] _nbElement Number of element to add.
*/
void pushBack(const ETK_VECTOR_TYPE * _item, size_t _nbElement) {
if (_item == nullptr) {
return;
}
size_t idx = m_size;
resize(m_size+_nbElement);
if (idx > m_size) {
TK_ERROR("Resize does not work corectly ... not added item");
return;
}
for (size_t iii=0; iii<_nbElement; iii++) {
m_data[idx+iii] = _item[iii];
}
}
/**
* @brief Remove the last element of the vector
*/
void popBack() {
if(m_size>0) {
resize(m_size-1);
}
}
/**
* @brief Remove all alement in the current vector
*/
void clear() {
if(m_size>0) {
resize(0);
}
}
/**
* @brief Insert N element in the Vector.
* @param[in] _pos Position to add the elements.
* @param[in] _item Pointer on a table of the elements to add.
* @param[in] _nbElement Number of element to add in the Vector
*/
void insert(size_t _pos, const ETK_VECTOR_TYPE * _item, size_t _nbElement) {
if (_pos>m_size) {
TK_WARNING(" can not insert Element at this position : " << _pos << " > " << m_size << " add it at the end ... ");
pushBack(_item, _nbElement);
return;
}
size_t idx = m_size;
// Request resize of the current buffer
resize(m_size+_nbElement);
if (idx>=m_size) {
TK_ERROR("Resize does not work corectly ... not added item");
return;
}
// move curent data (after the position)
size_t sizeToMove = (idx - _pos);
if ( 0 < sizeToMove) {
for (size_t iii=1; iii<=sizeToMove; iii++) {
m_data[m_size-iii] = m_data[idx-iii];
}
}
// affectation of all input element
for (size_t iii=0; iii<_nbElement; iii++) {
m_data[_pos+iii] = _item[iii];
}
}
/**
* @brief Insert one element in the Vector at a specific position
* @param[in] _pos Position to add the elements.
* @param[in] _item Element to add.
*/
void insert(size_t _pos, const ETK_VECTOR_TYPE& _item) {
insert(_pos, &_item, 1);
}
/**
* @brief Remove N element
* @param[in] _pos Position to remove the data
* @param[in] _nbElement number of element to remove
*/
void eraseLen(size_t _pos, size_t _nbElement) {
if (_pos>m_size) {
TK_ERROR(" can not Erase Len Element at this position : " << _pos << " > " << m_size);
return;
}
if (_pos+_nbElement>m_size) {
_nbElement = m_size - _pos;
}
size_t idx = m_size;
// move curent data
size_t sizeToMove = (idx - (_pos+_nbElement));
if ( 0 < sizeToMove) {
for (size_t iii=0; iii<sizeToMove; iii++) {
m_data[_pos+iii] = m_data[_pos+_nbElement+iii];
}
}
// Request resize of the current buffer
resize(m_size-_nbElement);
}
/**
* @brief Remove one element
* @param[in] _pos Position to remove the data
*/
inline void erase(size_t _pos) {
eraseLen(_pos, 1);
}
/**
* @brief Remove one element
* @param[in] _pos Position to remove the data
*/
inline void remove(size_t _pos) {
eraseLen(_pos, 1);
}
/**
* @brief Remove N elements
* @param[in] _pos Position to remove the data
* @param[in] _posEnd Last position number
*/
void erase(size_t _pos, size_t _posEnd) {
if (_pos>m_size) {
TK_ERROR(" can not Erase Element at this position : " << _pos << " > " << m_size);
return;
}
if (_posEnd>m_size) {
_posEnd = m_size;
}
size_t nbElement = m_size - _pos;
size_t tmpSize = m_size;
// move curent data
size_t sizeToMove = (tmpSize - (_pos+nbElement));
if ( 0 < sizeToMove) {
for (size_t iii=0; iii<sizeToMove; iii++) {
m_data[_pos+iii] = m_data[_pos+nbElement+iii];
}
}
// Request resize of the current buffer
resize(m_size-nbElement);
}
/**
* @brief extract data between two point :
* @param[in] _posStart start position to extract data
* @param[in] _posEnd End position to extract data
* @return the extracted vector
*/
Vector<ETK_VECTOR_TYPE> extract(size_t _posStart = 0, size_t _posEnd=0x7FFFFFFF) const {
Vector<ETK_VECTOR_TYPE> out;
if (_posStart >= size() ) {
return out;
}
if (_posEnd >= size() ) {
_posEnd = size();
}
out.pushBack(&m_data[_posStart], _posEnd-_posStart);
return out;
}
/**
* @brief Get the pointer on the sata
* @return the type pointer on data
*/
ETK_VECTOR_TYPE* dataPointer() {
return &m_data[0];
}
/**
* @brief Get an iterator an an specific position
* @param[in] _pos Requested position of the iterator in the vector
* @return The Iterator
*/
Iterator position(size_t _pos) {
return iterator(this, _pos);
}
/**
* @brief Get an Iterator on the start position of the Vector
* @return The Iterator
*/
Iterator begin() {
return position(0);
}
/**
* @brief Get an Iterator on the end position of the Vector
* @return The Iterator
*/
Iterator end() {
return position( size()-1 );
}
private:
/**
* @brief Change the current size of the vector
* @param[in] _newSize New requested size of element in the vector
*/
void resize(size_t _newSize) {
// Reallocate memory
if (_newSize > m_allocated) {
changeAllocation(_newSize);
}
m_size = _newSize;
}
/**
* @brief Change the current allocation to the corect one (depend on the current size)
* @param[in] _newSize Minimum number of element needed
*/
void changeAllocation(size_t _newSize) {
// set the minimal size to 1
if(_newSize == 0) {
_newSize = 1;
}
size_t requestSize = m_allocated;
// set the size with the corect chose type :
if (_newSize == requestSize) {
return;
} else if (_newSize < requestSize) {
// we did not remove data ???
} else {
while(_newSize > requestSize) {
if (0 == requestSize) {
requestSize = 1;
} else {
requestSize = requestSize * 2;
}
}
}
// No reallocation needed :
if (requestSize <= m_allocated) {
return;
}
//TK_INFO("Change vector allocation : " << m_allocated << "==>" << requestSize);
// check if something is allocated :
if (m_data == nullptr) {
// no data allocated ==> request an allocation (might be the first)
m_data = new ETK_VECTOR_TYPE[requestSize];
if (m_data == nullptr) {
TK_CRITICAL("Vector : Error in data allocation request allocation:" << requestSize << "*" << (int32_t)(sizeof(ETK_VECTOR_TYPE)) << "bytes" );
m_allocated = 0;
return;
}
} else {
// allocate a new pool of data:
ETK_VECTOR_TYPE* m_dataTmp = new ETK_VECTOR_TYPE[requestSize];
if (m_dataTmp == nullptr) {
TK_CRITICAL("Vector : Error in data allocation request allocation:" << requestSize << "*" << (int32_t)(sizeof(ETK_VECTOR_TYPE)) << "bytes" );
m_allocated = 0;
return;
}
// copy data in the new pool
size_t nbElements = etk_min(requestSize, m_allocated);
for(size_t iii=0; iii<nbElements; iii++) {
m_dataTmp[iii] = std::move(m_data[iii]);
}
// switch pointer:
ETK_VECTOR_TYPE* m_dataTmp2 = m_data;
m_data = m_dataTmp;
// remove old pool
if (m_dataTmp2 != nullptr) {
delete[] m_dataTmp2;
}
}
// set the new allocation size
m_allocated = requestSize;
}
public :
/*****************************************************
* == operator
*****************************************************/
bool operator== (const Vector<ETK_VECTOR_TYPE>& _obj) const {
// check if it was the same pointer
if( this == &_obj ) {
return true;
}
// fiist step : check the size ...
if (m_size != _obj.m_size) {
return false;
}
if( m_data == nullptr
|| _obj.m_data == nullptr) {
return false;
}
for (size_t iii=0; iii<m_size; iii++) {
if (m_data[iii]!=_obj.m_data[iii]) {
return false;
}
}
return true;
}
/*****************************************************
* != operator
*****************************************************/
bool operator!= (const Vector<ETK_VECTOR_TYPE>& _obj) const {
// check if it was the same pointer
if( this == &_obj ) {
return false;
}
// fiist step : check the size ...
if (m_size!=_obj.m_size) {
return true;
}
if( m_data == nullptr
|| _obj.m_data == nullptr) {
return false;
}
for (size_t iii=0; iii<m_size; iii++) {
if (m_data[iii]!=_obj.m_data[iii]) {
return true;
}
}
return false;
}
};
}