Commit 53c8a126 authored by laurence's avatar laurence
Browse files

ENH: Pair: Add extra comparison operators. Make member functions non-member

parent 25804eaa
......@@ -108,12 +108,6 @@ public:
return this->operator[](1);
}
//- Return reverse pair
inline Pair<Type> reversePair() const
{
return Pair<Type>(second(), first());
}
//- Return other
inline const Type& other(const Type& a) const
{
......@@ -147,11 +141,11 @@ public:
// - -1: same pair, but reversed order
static inline int compare(const Pair<Type>& a, const Pair<Type>& b)
{
if (a[0] == b[0] && a[1] == b[1])
if (a == b)
{
return 1;
}
else if (a[0] == b[1] && a[1] == b[0])
else if (a == reverse(b))
{
return -1;
}
......@@ -160,33 +154,64 @@ public:
return 0;
}
}
};
// Friend Operators
template<class Type>
Pair<Type> reverse(const Pair<Type>& p)
{
return Pair<Type>(p.second(), p.first());
}
friend bool operator==(const Pair<Type>& a, const Pair<Type>& b)
{
return (a.first() == b.first() && a.second() == b.second());
}
friend bool operator!=(const Pair<Type>& a, const Pair<Type>& b)
{
return !(a == b);
}
template<class Type>
bool operator==(const Pair<Type>& a, const Pair<Type>& b)
{
return (a.first() == b.first() && a.second() == b.second());
}
friend bool operator<(const Pair<Type>& a, const Pair<Type>& b)
{
return
(
a.first() < b.first()
||
(
!(b.first() < a.first())
&& a.second() < b.second()
)
);
}
};
template<class Type>
bool operator!=(const Pair<Type>& a, const Pair<Type>& b)
{
return !(a == b);
}
template<class Type>
bool operator<(const Pair<Type>& a, const Pair<Type>& b)
{
return
(
a.first() < b.first()
||
(
!(b.first() < a.first())
&& a.second() < b.second()
)
);
}
template<class Type>
bool operator<=(const Pair<Type>& a, const Pair<Type>& b)
{
return !(b < a);
}
template<class Type>
bool operator>(const Pair<Type>& a, const Pair<Type>& b)
{
return (b < a);
}
template<class Type>
bool operator>=(const Pair<Type>& a, const Pair<Type>& b)
{
return !(a < b);
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
......
......@@ -450,7 +450,7 @@ Foam::Map<Foam::labelPair> Foam::meshRefinement::getZoneBafflePatches
labelPair patches = zPatches;
if (fZone.flipMap()[i])
{
patches = patches.reversePair();
patches = reverse(patches);
}
if (!bafflePatch.insert(faceI, patches))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment