PIVector2D - add funcs, optimize, tests, fixes, doxygen (#194)
Reviewed-on: #194 Co-authored-by: andrey.bychkov <andrey@signalmodelling.ru> Co-committed-by: andrey.bychkov <andrey@signalmodelling.ru>
This commit was merged in pull request #194.
This commit is contained in:
@@ -835,8 +835,8 @@ public:
|
||||
//! piCout << v.contains({1,4}); // true
|
||||
//! piCout << v.contains({1,5}); // false
|
||||
//! \endcode
|
||||
//! \~\sa \a every(), \a any(), \a entries(), \a forEach()
|
||||
inline bool contains(const PIVector<T> & v, ssize_t start = 0) const {
|
||||
//! \~\sa \a every(), \a any(), \a entries(), \a forEach(), \a contains()
|
||||
inline bool containsAll(const PIVector<T> & v, ssize_t start = 0) const {
|
||||
if (start < 0) {
|
||||
start = piv_size + start;
|
||||
if (start < 0) start = 0;
|
||||
@@ -854,6 +854,24 @@ public:
|
||||
return true;
|
||||
}
|
||||
|
||||
//! \~english Tests if any element of `v` exists in the array.
|
||||
//! \~russian Проверяет наличие хотя бы одного из элементов `v` в массиве.
|
||||
//! \~\sa \a containsAll(), \a contains()
|
||||
inline bool containsAny(const PIVector<T> & v, ssize_t start = 0) const {
|
||||
if (start < 0) {
|
||||
start = piv_size + start;
|
||||
if (start < 0) start = 0;
|
||||
}
|
||||
for (const T & e: v) {
|
||||
for (size_t i = start; i < piv_size; ++i) {
|
||||
if (e == piv_data[i]) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
//! \~english Count elements equal `e` in the array.
|
||||
//! \~russian Подсчитывает количество элементов, совпадающих с элементом `e` в массиве.
|
||||
//! \~\details
|
||||
@@ -1303,14 +1321,16 @@ public:
|
||||
//! piCout << v; // {1, 3, 7, 5}
|
||||
//! \endcode
|
||||
//! \~\sa \a append(), \a prepend(), \a remove()
|
||||
inline PIVector<T> & insert(size_t index, const T & e = T()) {
|
||||
alloc(piv_size + 1);
|
||||
if (index < piv_size - 1) {
|
||||
const size_t os = piv_size - index - 1;
|
||||
memmove(reinterpret_cast<void *>(piv_data + index + 1), reinterpret_cast<const void *>(piv_data + index), os * sizeof(T));
|
||||
inline PIVector<T> & insert(size_t index, const T & e = T(), size_t count = 1) {
|
||||
alloc(piv_size + count);
|
||||
if (index < piv_size - count) {
|
||||
const size_t os = piv_size - index - count;
|
||||
memmove(reinterpret_cast<void *>(piv_data + index + count), reinterpret_cast<const void *>(piv_data + index), os * sizeof(T));
|
||||
}
|
||||
PIINTROSPECTION_CONTAINER_USED(T, count)
|
||||
for (size_t i = 0; i < count; ++i) {
|
||||
elementNew(piv_data + index + i, e);
|
||||
}
|
||||
PIINTROSPECTION_CONTAINER_USED(T, 1)
|
||||
elementNew(piv_data + index, e);
|
||||
return *this;
|
||||
}
|
||||
|
||||
@@ -1349,8 +1369,8 @@ public:
|
||||
alloc(piv_size + v.piv_size);
|
||||
if (os > 0) {
|
||||
memmove(reinterpret_cast<void *>(piv_data + index + v.piv_size),
|
||||
reinterpret_cast<const void *>(piv_data + index),
|
||||
os * sizeof(T));
|
||||
reinterpret_cast<const void *>(piv_data + index),
|
||||
os * sizeof(T));
|
||||
}
|
||||
newT(piv_data + index, v.piv_data, v.piv_size);
|
||||
return *this;
|
||||
@@ -1372,8 +1392,8 @@ public:
|
||||
alloc(piv_size + init_list.size());
|
||||
if (os > 0) {
|
||||
memmove(reinterpret_cast<void *>(piv_data + index + init_list.size()),
|
||||
reinterpret_cast<const void *>(piv_data + index),
|
||||
os * sizeof(T));
|
||||
reinterpret_cast<const void *>(piv_data + index),
|
||||
os * sizeof(T));
|
||||
}
|
||||
newT(piv_data + index, init_list.begin(), init_list.size());
|
||||
return *this;
|
||||
|
||||
Reference in New Issue
Block a user