X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Falgorithm.h;h=43bbaeeb2c00ace3199beae6b1af8052cd0bfb51;hb=HEAD;hp=b79114e9d7a8de906b7be40e4c684e1a9758280a;hpb=6bb431a4fdd6b6437c25890a89627d206a9e52ac;p=libs%2Fcore.git

diff --git a/source/core/algorithm.h b/source/core/algorithm.h
index b79114e..43bbaee 100644
--- a/source/core/algorithm.h
+++ b/source/core/algorithm.h
@@ -2,6 +2,7 @@
 #define MSP_CORE_ALGORITHM_H_
 
 #include <algorithm>
+#include <functional>
 
 namespace Msp {
 
@@ -29,6 +30,20 @@ inline typename Container::const_iterator find_if(const Container &cont, Predica
 	return std::find_if(cont.begin(), cont.end(), pred);
 }
 
+template<typename T>
+struct ValueMatch
+{
+	const T &value;
+
+	bool operator()(const T &v) { return v==value; }
+};
+
+template<typename Container, typename T>
+inline bool any_equals(Container &cont, const T &value)
+{
+	return std::any_of(cont.begin(), cont.end(), ValueMatch<T>{value});
+}
+
 template<typename Container, typename T>
 inline typename Container::iterator lower_bound(Container &cont, const T &value)
 {
@@ -107,32 +122,32 @@ struct MemberMatch
 	const T &value;
 	T C::*mem_ptr;
 
-	MemberMatch(const T &v, T C::*p): value(v), mem_ptr(p) { }
-
 	bool operator()(const C &obj) { return obj.*mem_ptr==value; }
 };
 
 template<typename Container, typename T>
 inline typename Container::iterator find_member(Container &cont, const T &value, T Container::value_type::*mp)
 {
-	return find_if(cont, MemberMatch<typename Container::value_type, T>(value, mp));
+	return find_if(cont, MemberMatch<typename Container::value_type, T>{ value, mp });
 }
 
 template<typename Container, typename T>
 inline typename Container::const_iterator find_member(const Container &cont, const T &value, T Container::value_type::*mp)
 {
-	return find_if(cont, MemberMatch<typename Container::value_type, T>(value, mp));
+	return find_if(cont, MemberMatch<typename Container::value_type, T>{ value, mp });
 }
 
-template<typename C, typename T>
+template<typename C, typename T, typename P=std::less<T>>
 struct MemberCompare
 {
 	T C::*mem_ptr;
+	P pred;
 
 	MemberCompare(T C::*p): mem_ptr(p) { }
 
-	bool operator()(const C &obj, const T &v) { return obj.*mem_ptr<v; }
-	bool operator()(const C &obj1, const C &obj2) { return obj1.*mem_ptr<obj2.*mem_ptr; }
+	bool operator()(const C &obj, const T &v) { return pred(obj.*mem_ptr, v); }
+	bool operator()(const T &v, const C &obj) { return pred(v, obj.*mem_ptr); }
+	bool operator()(const C &obj1, const C &obj2) { return pred(obj1.*mem_ptr, obj2.*mem_ptr); }
 };
 
 template<typename Container, typename T>
@@ -171,6 +186,12 @@ inline void stable_sort_member(Container &cont, T Container::value_type::*mp)
 	stable_sort(cont, MemberCompare<typename Container::value_type, T>(mp));
 }
 
+template<typename Container, typename Predicate>
+inline void transform(Container &cont, Predicate pred)
+{
+	transform(cont.begin(), cont.end(), cont.begin(), pred);
+}
+
 } // namespace Msp
 
 #endif