X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fchoicecondition.h;h=5673d3f7a65ffe83129ef23273e78656af35a283;hb=HEAD;hp=424dca6a8fce12be193e6a9fb02f8048db309a7a;hpb=8b9d1f472e7bfbb1e097bb6d8bcad026e9636822;p=poefilter.git

diff --git a/source/choicecondition.h b/source/choicecondition.h
index 424dca6..5673d3f 100644
--- a/source/choicecondition.h
+++ b/source/choicecondition.h
@@ -1,6 +1,7 @@
 #ifndef CHOICECONDITION_H_
 #define CHOICECONDITION_H_
 
+#include <msp/core/algorithm.h>
 #include "condition.h"
 #include "filter.h"
 
@@ -19,8 +20,9 @@ public:
 	ChoiceCondition(const std::vector<Type> &);
 
 	virtual ChoiceCondition<T> *clone() const;
+	virtual bool equals(const Condition &) const;
 	virtual bool can_merge(const Condition &, const CompoundCondition &) const;
-	virtual ChoiceCondition<T> *merge(const std::vector<Condition *> &, const CompoundCondition &) const;
+	virtual ChoiceCondition<T> *merge(const std::vector<const Condition *> &, const CompoundCondition &) const;
 	virtual void add_lines(std::list<FilterStatement> &) const;
 };
 
@@ -60,6 +62,20 @@ ChoiceCondition<T> *ChoiceCondition<T>::clone() const
 	return new ChoiceCondition<T>(values);
 }
 
+template<typename T>
+bool ChoiceCondition<T>::equals(const Condition &other) const
+{
+	const ChoiceCondition<T> *other_choice = dynamic_cast<const ChoiceCondition<T> *>(&other);
+	if(!other_choice || values.size()!=other_choice->values.size())
+		return false;
+
+	for(unsigned i=0; i<values.size(); ++i)
+		if(values[i]!=other_choice->values[i])
+			return false;
+
+	return true;
+}
+
 template<typename T>
 bool ChoiceCondition<T>::can_merge(const Condition &other, const CompoundCondition &parent) const
 {
@@ -67,18 +83,17 @@ bool ChoiceCondition<T>::can_merge(const Condition &other, const CompoundConditi
 }
 
 template<typename T>
-ChoiceCondition<T> *ChoiceCondition<T>::merge(const std::vector<Condition *> &conditions, const CompoundCondition &parent) const
+ChoiceCondition<T> *ChoiceCondition<T>::merge(const std::vector<const Condition *> &conditions, const CompoundCondition &parent) const
 {
 	if(dynamic_cast<const OrCondition *>(&parent) && !conditions.empty())
 	{
-		ChoiceCondition<T> *result = 0;
-		for(std::vector<Condition *>::const_iterator i=conditions.begin(); ++i!=conditions.end(); )
+		ChoiceCondition<T> *result = new ChoiceCondition<T>(std::vector<Type>());
+		for(std::vector<const Condition *>::const_iterator i=conditions.begin(); i!=conditions.end(); ++i)
 		{
-			const std::vector<Type> &v = static_cast<ChoiceCondition<T> *>(*i)->values;
-			if(!result)
-				result = new ChoiceCondition<T>(v);
-			else
-				result->values.insert(result->values.end(), v.begin(), v.end());
+			const std::vector<Type> &v = static_cast<const ChoiceCondition<T> *>(*i)->values;
+			for(typename std::vector<Type>::const_iterator j=v.begin(); j!=v.end(); ++j)
+				if(Msp::find(result->values, *j)==result->values.end())
+					result->values.push_back(*j);
 		}
 		return result;
 	}