Skip to content

Commit

Permalink
ArrayBase
Browse files Browse the repository at this point in the history
  • Loading branch information
@morzhovets
morzhovets committed Dec 28, 2024
1 parent c4e6cc8 commit 0b3b163
Show file tree
Hide file tree
Showing 4 changed files with 129 additions and 141 deletions.
47 changes: 14 additions & 33 deletions include/momo/Array.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
#pragma once

#include "ArrayUtility.h"
#include "KeyUtility.h"

namespace momo
{
Expand Down Expand Up @@ -190,6 +189,7 @@ template<conceptObject TItem,
typename TItemTraits = ArrayItemTraits<TItem, TMemManager>,
typename TSettings = ArraySettings<>>
class Array
: public internal::ArrayBase<TItem, TMemManager, TItemTraits, TSettings>
{
public:
typedef TItem Item;
Expand All @@ -200,6 +200,8 @@ class Array
static const size_t internalCapacity = Settings::internalCapacity;

private:
typedef internal::ArrayBase<Item, MemManager, ItemTraits, Settings> BaseArray;

class Data : private MemManager
{
private:
Expand Down Expand Up @@ -818,21 +820,16 @@ class Array
pvInsert(index, FastMovableFunctor<ItemCreator>(std::forward<ItemCreator>(itemCreator)));
}

template<typename... ItemArgs>
//requires requires { typename ItemTraits::template Creator<ItemArgs...>; }
void InsertVar(size_t index, ItemArgs&&... itemArgs)
{
InsertCrt(index, typename ItemTraits::template Creator<ItemArgs...>(GetMemManager(),
std::forward<ItemArgs>(itemArgs)...));
}
//template<typename... ItemArgs>
//void InsertVar(size_t index, ItemArgs&&... itemArgs)

void Insert(size_t index, Item&& item)
{
size_t initCount = GetCount();
size_t grow = (initCount + 1 > GetCapacity());
size_t itemIndex = pvIndexOf(std::as_const(item));
if (grow || (index <= itemIndex && itemIndex < initCount))
InsertVar(index, std::move(item));
BaseArray::InsertVar(index, std::move(item));
else
ArrayShifter::InsertNogrow(*this, index, std::move(item));
}
Expand Down Expand Up @@ -892,33 +889,17 @@ class Array
pvRemoveBack(count);
}

void Remove(size_t index, size_t count = 1)
{
ArrayShifter::Remove(*this, index, count);
}
//void Remove(size_t index, size_t count = 1)

template<internal::conceptObjectPredicate<Item> ItemFilter>
size_t Remove(ItemFilter itemFilter)
{
return ArrayShifter::Remove(*this, FastCopyableFunctor<ItemFilter>(itemFilter));
}
//template<internal::conceptObjectPredicate<Item> ItemFilter>
//size_t Remove(ItemFilter itemFilter)

template<typename ItemArg,
internal::conceptEqualFunc<Item, ItemArg> EqualFunc = std::equal_to<>>
bool Contains(const ItemArg& itemArg, EqualFunc equalFunc = EqualFunc()) const
{
FastCopyableFunctor<EqualFunc> fastEqualFunc(equalFunc);
auto itemPred = [&itemArg, fastEqualFunc] (const Item& item)
{ return fastEqualFunc(item, itemArg); };
return std::any_of(GetBegin(), GetEnd(), FastCopyableFunctor(itemPred));
}
//template<typename ItemArg,
// internal::conceptEqualFunc<Item, ItemArg> EqualFunc = std::equal_to<>>
//bool Contains(const ItemArg& itemArg, EqualFunc equalFunc = EqualFunc()) const

template<internal::conceptEqualFunc<Item> EqualFunc = std::equal_to<Item>>
bool IsEqual(const Array& array, EqualFunc equalFunc = EqualFunc()) const
{
return std::equal(GetBegin(), GetEnd(), array.GetBegin(), array.GetEnd(),
FastCopyableFunctor<EqualFunc>(equalFunc));
}
//template<internal::conceptEqualFunc<Item> EqualFunc = std::equal_to<Item>>
//bool IsEqual(const Array& array, EqualFunc equalFunc = EqualFunc()) const

private:
explicit Array(Data&& data) noexcept
Expand Down
113 changes: 83 additions & 30 deletions include/momo/ArrayUtility.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@

#include "ObjectManager.h"
#include "IteratorUtility.h"
#include "KeyUtility.h"

namespace momo
{
Expand Down Expand Up @@ -156,6 +157,88 @@ namespace internal
MemManager* mMemManager;
};

template<typename TItem, typename TMemManager, typename TItemTraits, typename TSettings>
class ArrayBase
{
public:
typedef TItem Item;
typedef TMemManager MemManager;
typedef TItemTraits ItemTraits;
typedef TSettings Settings;

public:
template<conceptMutableThisArg ArrayArg, typename... ItemArgs>
//requires requires { typename ItemTraits::template Creator<ItemArgs...>; }
void InsertVar(this ArrayArg&& array, size_t index, ItemArgs&&... itemArgs)
{
array.InsertCrt(index, typename ItemTraits::template Creator<ItemArgs...>(
array.GetMemManager(), std::forward<ItemArgs>(itemArgs)...));
}

template<conceptMutableThisArg ArrayArg>
void Insert(this ArrayArg&& array, size_t index, Item&& item)
{
array.InsertVar(index, std::move(item));
}

template<conceptMutableThisArg ArrayArg>
void Insert(this ArrayArg&& array, size_t index, const Item& item)
{
array.InsertVar(index, item);
}

template<conceptMutableThisArg ArrayArg>
void Remove(this ArrayArg&& array, size_t index, size_t count = 1)
{
size_t initCount = array.GetCount();
MOMO_CHECK(index + count <= initCount);
MemManager& memManager = array.GetMemManager();
for (size_t i = index + count; i < initCount; ++i)
ItemTraits::Assign(memManager, std::move(array[i]), array[i - count]);
array.RemoveBack(count);
}

template<conceptMutableThisArg ArrayArg, conceptObjectPredicate<Item> ItemFilter>
size_t Remove(this ArrayArg&& array, ItemFilter itemFilter)
{
size_t initCount = array.GetCount();
size_t newCount = 0;
while (newCount < initCount && !itemFilter(std::as_const(array[newCount])))
++newCount;
MemManager& memManager = array.GetMemManager();
for (size_t i = newCount + 1; i < initCount; ++i)
{
if (itemFilter(std::as_const(array[i])))
continue;
ItemTraits::Assign(memManager, std::move(array[i]), array[newCount]);
++newCount;
}
size_t remCount = initCount - newCount;
array.RemoveBack(remCount);
return remCount;
}

template<typename Array, typename ItemArg,
conceptEqualFunc<Item, ItemArg> EqualFunc = std::equal_to<>>
bool Contains(this const Array& array, const ItemArg& itemArg,
EqualFunc equalFunc = EqualFunc())
{
FastCopyableFunctor<EqualFunc> fastEqualFunc(equalFunc);
auto itemPred = [&itemArg, fastEqualFunc] (const Item& item)
{ return fastEqualFunc(item, itemArg); };
return std::any_of(array.GetBegin(), array.GetEnd(), FastCopyableFunctor(itemPred));
}

template<typename Array,
conceptEqualFunc<Item> EqualFunc = std::equal_to<Item>>
bool IsEqual(this const Array& array1, const std::type_identity_t<Array>& array2,
EqualFunc equalFunc = EqualFunc())
{
return std::equal(array1.GetBegin(), array1.GetEnd(), array2.GetBegin(), array2.GetEnd(),
FastCopyableFunctor<EqualFunc>(equalFunc));
}
};

template<typename TArray>
class ArrayShifter
{
Expand Down Expand Up @@ -244,36 +327,6 @@ namespace internal
{
InsertNogrow(array, index, std::make_move_iterator(std::addressof(item)), 1);
}

static void Remove(Array& array, size_t index, size_t count)
{
size_t initCount = array.GetCount();
MOMO_CHECK(index + count <= initCount);
MemManager& memManager = array.GetMemManager();
for (size_t i = index + count; i < initCount; ++i)
ItemTraits::Assign(memManager, std::move(array[i]), array[i - count]);
array.RemoveBack(count);
}

template<conceptObjectPredicate<Item> ItemFilter>
static size_t Remove(Array& array, FastCopyableFunctor<ItemFilter> itemFilter)
{
size_t initCount = array.GetCount();
size_t newCount = 0;
while (newCount < initCount && !itemFilter(std::as_const(array[newCount])))
++newCount;
MemManager& memManager = array.GetMemManager();
for (size_t i = newCount + 1; i < initCount; ++i)
{
if (itemFilter(std::as_const(array[i])))
continue;
ItemTraits::Assign(memManager, std::move(array[i]), array[newCount]);
++newCount;
}
size_t remCount = initCount - newCount;
array.RemoveBack(remCount);
return remCount;
}
};

template<typename TContainer>
Expand Down
55 changes: 16 additions & 39 deletions include/momo/MergeArray.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@ template<conceptObject TItem,
typename TItemTraits = MergeArrayItemTraits<TItem, TMemManager>,
typename TSettings = MergeArraySettings<>>
class MergeArray
: public internal::ArrayBase<TItem, TMemManager, TItemTraits, TSettings>
{
public:
typedef TItem Item;
Expand All @@ -106,6 +107,8 @@ class MergeArray
typedef typename Iterator::ConstIterator ConstIterator;

private:
typedef internal::ArrayBase<Item, MemManager, ItemTraits, Settings> BaseArray;

typedef internal::MemManagerProxy<MemManager> MemManagerProxy;

typedef internal::NestedArraySettings<typename Settings::SegmentsSettings> SegmentsSettings;
Expand Down Expand Up @@ -519,23 +522,13 @@ class MergeArray
pvInsert(index, FastMovableFunctor<ItemCreator>(std::forward<ItemCreator>(itemCreator)));
}

template<typename... ItemArgs>
//requires requires { typename ItemTraits::template Creator<ItemArgs...>; }
void InsertVar(size_t index, ItemArgs&&... itemArgs)
{
InsertCrt(index, typename ItemTraits::template Creator<ItemArgs...>(GetMemManager(),
std::forward<ItemArgs>(itemArgs)...));
}
//template<typename... ItemArgs>
//void InsertVar(size_t index, ItemArgs&&... itemArgs)

void Insert(size_t index, Item&& item)
{
InsertVar(index, std::move(item));
}
using BaseArray::Insert;

void Insert(size_t index, const Item& item)
{
InsertVar(index, item);
}
//void Insert(size_t index, Item&& item)
//void Insert(size_t index, const Item& item)

void Insert(size_t index, size_t count, const Item& item)
{
Expand Down Expand Up @@ -572,16 +565,10 @@ class MergeArray
pvRemoveBack(count);
}

void Remove(size_t index, size_t count = 1)
{
ArrayShifter::Remove(*this, index, count);
}
//void Remove(size_t index, size_t count = 1)

template<internal::conceptObjectPredicate<Item> ItemFilter>
size_t Remove(ItemFilter itemFilter)
{
return ArrayShifter::Remove(*this, FastCopyableFunctor<ItemFilter>(itemFilter));
}
//template<internal::conceptObjectPredicate<Item> ItemFilter>
//size_t Remove(ItemFilter itemFilter)

size_t GetSegmentCount() const noexcept
{
Expand All @@ -599,22 +586,12 @@ class MergeArray
return pvGetSegmentItems(segIndex);
}

template<typename ItemArg,
internal::conceptEqualFunc<Item, ItemArg> EqualFunc = std::equal_to<>>
bool Contains(const ItemArg& itemArg, EqualFunc equalFunc = EqualFunc()) const
{
FastCopyableFunctor<EqualFunc> fastEqualFunc(equalFunc);
auto itemPred = [&itemArg, fastEqualFunc] (const Item& item)
{ return fastEqualFunc(item, itemArg); };
return std::any_of(GetBegin(), GetEnd(), FastCopyableFunctor(itemPred));
}
//template<typename ItemArg,
// internal::conceptEqualFunc<Item, ItemArg> EqualFunc = std::equal_to<>>
//bool Contains(const ItemArg& itemArg, EqualFunc equalFunc = EqualFunc()) const

template<internal::conceptEqualFunc<Item> EqualFunc = std::equal_to<Item>>
bool IsEqual(const MergeArray& array, EqualFunc equalFunc = EqualFunc()) const
{
return std::equal(GetBegin(), GetEnd(), array.GetBegin(), array.GetEnd(),
FastCopyableFunctor<EqualFunc>(equalFunc));
}
//template<internal::conceptEqualFunc<Item> EqualFunc = std::equal_to<Item>>
//bool IsEqual(const MergeArray& array, EqualFunc equalFunc = EqualFunc()) const

private:
static size_t pvGetSegmentItemCount(size_t segIndex) noexcept
Expand Down
Loading

0 comments on commit 0b3b163

Please sign in to comment.