Skip to content

Refactor ModelPropertyContainer::m_vValues from vector to unordered_map #1302

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Biendeo wants to merge 1 commit into from
Closed

Refactor ModelPropertyContainer::m_vValues from vector to unordered_map #1302

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 19 additions & 24 deletions src/devkit/data/ModelPropertyContainer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,15 @@ namespace data {

std::wstring ModelPropertyContainer::s_sEmpty;

int ModelPropertyContainer::CompareModelPropertyKey(const ModelPropertyContainer::ModelPropertyValue& left, int nKey) noexcept
{
return left.nKey < nKey;
}

const int* ModelPropertyContainer::FindValue(int nKey) const
{
std::lock_guard<std::mutex> pLock(m_mtxData);

const auto iter = std::lower_bound(m_vValues.begin(), m_vValues.end(), nKey, CompareModelPropertyKey);
if (iter == m_vValues.end() || iter->nKey != nKey)
const auto iter = m_vValues.find(nKey);
if (iter == m_vValues.end())
return nullptr;

return &iter->nValue;
return &iter->second;
}

void ModelPropertyContainer::SetValue(const BoolModelProperty& pProperty, bool bValue)
Expand All @@ -27,23 +22,23 @@ void ModelPropertyContainer::SetValue(const BoolModelProperty& pProperty, bool b
{
std::lock_guard<std::mutex> pLock(m_mtxData);

auto iter = std::lower_bound(m_vValues.begin(), m_vValues.end(), pProperty.GetKey(), CompareModelPropertyKey);
if (iter == m_vValues.end() || iter->nKey != pProperty.GetKey())
auto iter = m_vValues.find(pProperty.GetKey());
if (iter == m_vValues.end())
{
if (bValue == pProperty.GetDefaultValue())
return;

m_vValues.emplace(iter, pProperty.GetKey(), nValue);
m_vValues.emplace(pProperty.GetKey(), nValue);
}
else
{
if (nValue == iter->nValue)
if (nValue == iter->second)
return;

if (bValue == pProperty.GetDefaultValue())
m_vValues.erase(iter);
else
iter->nValue = nValue;
iter->second = nValue;
}

#ifdef _DEBUG
Expand Down Expand Up @@ -112,8 +107,8 @@ void ModelPropertyContainer::SetValue(const StringModelProperty& pProperty, cons
{
std::lock_guard<std::mutex> pLock(m_mtxData);

auto iter = std::lower_bound(m_vValues.begin(), m_vValues.end(), pProperty.GetKey(), CompareModelPropertyKey);
if (iter == m_vValues.end() || iter->nKey != pProperty.GetKey())
auto iter = m_vValues.find(pProperty.GetKey());
if (iter == m_vValues.end())
{
// no entry for property. if setting to default, do nothing
if (sValue == pProperty.GetDefaultValue())
Expand All @@ -132,27 +127,27 @@ void ModelPropertyContainer::SetValue(const StringModelProperty& pProperty, cons
nValue = LoadIntoEmptyStringSlot(sValue);
}

m_vValues.emplace(iter, pProperty.GetKey(), nValue);
m_vValues.emplace(pProperty.GetKey(), nValue);
pOldValue = &pProperty.GetDefaultValue();
}
else
{
pOldValue = &sOldValue;
gsl::not_null<std::wstring*> sString = gsl::make_not_null(&sOldValue);

if (iter->nValue == -1)
if (iter->second == -1)
{
// negative nValue is empty string. if new value is also empty, do nothing
if (sValue.empty())
return;

iter->nValue = LoadIntoEmptyStringSlot(sValue);
iter->second = LoadIntoEmptyStringSlot(sValue);
}
else
{
// find the current value. if the new value is the same, do nothing
ModelPropertyStrings* pStrings = m_pStrings.get();
int nIndex = iter->nValue;
int nIndex = iter->second;
while (nIndex >= ModelPropertyStrings::ChunkCount && pStrings)
{
pStrings = pStrings->pNext.get();
Expand Down Expand Up @@ -201,25 +196,25 @@ void ModelPropertyContainer::SetValue(const IntModelProperty& pProperty, int nVa
{
std::lock_guard<std::mutex> pLock(m_mtxData);

auto iter = std::lower_bound(m_vValues.begin(), m_vValues.end(), pProperty.GetKey(), CompareModelPropertyKey);
if (iter == m_vValues.end() || iter->nKey != pProperty.GetKey())
auto iter = m_vValues.find(pProperty.GetKey());
if (iter == m_vValues.end())
{
nOldValue = pProperty.GetDefaultValue();
if (nValue == nOldValue)
return;

m_vValues.emplace(iter, pProperty.GetKey(), nValue);
m_vValues.emplace(pProperty.GetKey(), nValue);
}
else
{
nOldValue = iter->nValue;
nOldValue = iter->second;
if (nValue == nOldValue)
return;

if (nValue == pProperty.GetDefaultValue())
m_vValues.erase(iter);
else
iter->nValue = nValue;
iter->second = nValue;
}

#ifdef _DEBUG
Expand Down
14 changes: 2 additions & 12 deletions src/devkit/data/ModelPropertyContainer.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
#include "data/ModelProperty.hh"

#include <mutex>
#include <map>

namespace ra {
namespace data {
Expand Down Expand Up @@ -105,17 +106,7 @@ public:
virtual void OnValueChanged(const IntModelProperty::ChangeArgs& args) noexcept(false);

private:
typedef struct ModelPropertyValue
{
ModelPropertyValue(int nKey, int nValue) noexcept
: nKey(nKey), nValue(nValue)
{
}

int nKey;
int nValue;
} ModelPropertyValue;
std::vector<ModelPropertyValue> m_vValues;
std::unordered_map<int, int> m_vValues;

typedef struct ModelPropertyStrings
{
Expand All @@ -135,7 +126,6 @@ private:

static std::wstring s_sEmpty;

static int CompareModelPropertyKey(const ModelPropertyValue& left, int nKey) noexcept;
const int* FindValue(int nKey) const;
const std::wstring& GetString(int nIndex) const noexcept;
int LoadIntoEmptyStringSlot(const std::wstring& sValue);
Expand Down