flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-03-31 12:55:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

refs #330, relevant predicate-based container mutator methods now return the number of elements they modified.

Browse Source
This commit is contained in:
Klaus Basan
2014-10-02 15:58:54 +02:00
parent 4b50134d2a
commit 31646b91f6
2 changed files with 48 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/blackmisc/containerbase.h
View File

@@ -67,15 +67,18 @@ namespace BlackMisc
/*!
* \brief Remove elements for which a given predicate returns true.
* \pre The sequence must be initialized.
* \return The number of elements removed.
*/
template <class Predicate>
void removeIf(Predicate p)
int removeIf(Predicate p)
{
int count = 0;
for (auto it = derived().begin(); it != derived().end();)
{
if (p(*it)) { it = derived().erase(it); }
if (p(*it)) { it = derived().erase(it); count++; }
else { ++it; }
}
return count;
}
/*!
@@ -83,11 +86,12 @@ namespace BlackMisc
* \param k0 A pointer to a member function of T.
* \param v0 A value to compare against the value returned by k0.
* \param keysValues Zero or more additional pairs of { pointer to member function of T, value to compare it against }.
* \return The number of elements removed.
*/
template <class K0, class V0, class... KeysValues>
void removeIf(K0 k0, V0 v0, KeysValues... keysValues)
int removeIf(K0 k0, V0 v0, KeysValues... keysValues)
{
removeIf(BlackMisc::Predicates::MemberEqual(k0, v0, keysValues...));
return removeIf(BlackMisc::Predicates::MemberEqual(k0, v0, keysValues...));
}
public:

55
src/blackmisc/sequence.h
View File

@@ -337,11 +337,17 @@ namespace BlackMisc
/*!
* \brief Modify by applying a value map to each element for which a given predicate returns true.
* \return The number of elements modified.
*/
template <class Predicate>
void applyIf(Predicate p, const CIndexVariantMap &newValues)
int applyIf(Predicate p, const CPropertyIndexVariantMap &newValues, bool skipEqualValues = false)
{
std::for_each(begin(), end(), [ &, p ](T & value) { if (p(value)) { value.apply(newValues); } });
int count = 0;
for (auto &value : *this)
{
if (p(value) && ! value.apply(newValues, skipEqualValues).isEmpty()) { count++; }
}
return count;
}
/*!
@@ -349,45 +355,63 @@ namespace BlackMisc
* \param key1 A pointer to a member function of T.
* \param value1 Will be compared to the return value of key1.
* \param newValues Values from this map will be put into each matching element.
* \return The number of elements modified.
*/
template <class K1, class V1>
void applyIf(K1 key1, V1 value1, const CIndexVariantMap &newValues)
int applyIf(K1 key1, V1 value1, const CPropertyIndexVariantMap &newValues, bool skipEqualValues = false)
{
applyIf(BlackMisc::Predicates::MemberEqual(key1, value1), newValues);
return applyIf(BlackMisc::Predicates::MemberEqual(key1, value1), newValues, skipEqualValues);
}
/*!
* \brief Modify by applying a value map to each element matching a given value map.
* \return The number of elements modified.
*/
void applyIf(const CIndexVariantMap &pattern, const CIndexVariantMap &newValues)
int applyIf(const CPropertyIndexVariantMap &pattern, const CPropertyIndexVariantMap &newValues, bool skipEqualValues = false)
{
applyIf([ & ](const T & value) { return value == pattern; }, newValues);
return applyIf([ & ](const T &value) { return value == pattern; }, newValues, skipEqualValues);
}
/*!
* \brief Remove the given object, if it is contained.
* \brief Remove all elements equal to the given object, if it is contained.
* \pre The sequence must be initialized.
* \return The number of elements removed.
*/
void remove(const T &object)
int remove(const T &object)
{
erase(std::remove(begin(), end(), object), end());
const auto newEnd = std::remove(begin(), end(), object);
int count = std::distance(newEnd, end());
erase(newEnd, end());
return count;
}
/*!
* \brief Replace elements matching the given element with a replacement.
* \return The number of elements replaced.
*/
void replace(const T &original, const T &replacement)
int replace(const T &original, const T &replacement)
{
std::replace(begin(), end(), original, replacement);
int count = 0;
for (auto &element : *this)
{
if (element == original) { element = replacement; count++; }
}
return count;
}
/*!
* \brief Replace elements for which a given predicate returns true.
* \return The number of elements replaced.
*/
template <class Predicate>
void replaceIf(Predicate p, const T &replacement)
int replaceIf(Predicate p, const T &replacement)
{
std::replace_if(begin(), end(), p, replacement);
int count = 0;
for (auto &element : *this)
{
if (p(element)) { element = replacement; count++; }
}
return count;
}
/*!
@@ -395,11 +419,12 @@ namespace BlackMisc
* \param key1 A pointer to a member function of T.
* \param value1 Will be compared to the return value of key1.
* \param replacement All matching elements will be replaced by copies of this one.
* \return The number of elements replaced.
*/
template <class K1, class V1>
void replaceIf(K1 key1, V1 value1, const T &replacement)
int replaceIf(K1 key1, V1 value1, const T &replacement)
{
replaceIf(BlackMisc::Predicates::MemberEqual(key1, value1), replacement);
return replaceIf(BlackMisc::Predicates::MemberEqual(key1, value1), replacement);
}
/*!