Add equality comparison for conditions

diff --git a/source/choicecondition.h b/source/choicecondition.h
index 9792f64c42f012963933b794ca09cba09acee6c7..5673d3f7a65ffe83129ef23273e78656af35a283 100644 (file)
--- a/source/choicecondition.h
+++ b/source/choicecondition.h
@@ -20,6 +20,7 @@ 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<const Condition *> &, const CompoundCondition &) const;
        virtual void add_lines(std::list<FilterStatement> &) const;
@@ -61,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
 {

diff --git a/source/condition.cpp b/source/condition.cpp
index 6d383eafb278bf6592b1bca5447e1506d56fb541..e9400c4c2721fe07ec4510db2ccb916d96119daa 100644 (file)
--- a/source/condition.cpp
+++ b/source/condition.cpp
@@ -16,6 +16,18 @@ void CompoundCondition::clone_to(CompoundCondition &other) const
                other.add((*i)->clone());
 }
 
+bool CompoundCondition::sub_equals(const CompoundCondition &other) const
+{
+       if(other.count()!=conditions.size())
+               return false;
+
+       for(unsigned i=0; i<conditions.size(); ++i)
+               if(!conditions[i]->equals(other.get(i)))
+                       return false;
+
+       return true;
+}
+
 void CompoundCondition::add(Condition *cond)
 {
        if(!cond)
@@ -171,6 +183,12 @@ AndCondition *AndCondition::clone() const
        return result;
 }
 
+bool AndCondition::equals(const Condition &other) const
+{
+       const AndCondition *other_and = dynamic_cast<const AndCondition *>(&other);
+       return (other_and ? sub_equals(*other_and) : false);
+}
+
 Condition *AndCondition::flatten(Condition *cond1, Condition *cond2) const
 {
        if(cond1->can_merge(*cond2, *this))
@@ -255,6 +273,12 @@ OrCondition *OrCondition::clone() const
        return result;
 }
 
+bool OrCondition::equals(const Condition &other) const
+{
+       const OrCondition *other_or = dynamic_cast<const OrCondition *>(&other);
+       return (other_or ? sub_equals(*other_or) : false);
+}
+
 Condition *OrCondition::flatten(Condition *cond1, Condition *cond2) const
 {
        if(cond1->can_merge(*cond2, *this))
@@ -321,6 +345,23 @@ LinkedColorsCondition *LinkedColorsCondition::clone() const
        return new LinkedColorsCondition(colors);
 }
 
+bool LinkedColorsCondition::equals(const Condition &other) const
+{
+       const LinkedColorsCondition *other_linked = dynamic_cast<const LinkedColorsCondition *>(&other);
+       if(!other_linked)
+               return false;
+
+       for(unsigned i=0; i<7; ++i)
+       {
+               if(colors.colors[i]!=other_linked->colors.colors[i])
+                       return false;
+               if(!colors.colors[i])
+                       break;
+       }
+
+       return true;
+}
+
 void LinkedColorsCondition::add_lines(list<FilterStatement> &st) const
 {
        FilterStatement::add_line(st, format("SocketGroup %s", colors.colors));

diff --git a/source/condition.h b/source/condition.h
index af8aa95faa282c364c515111eb93e33dad6c061e..9d945c78eec8ffa3c123fb4ea9e8fdb3e42ef978 100644 (file)
--- a/source/condition.h
+++ b/source/condition.h
@@ -18,6 +18,7 @@ public:
        virtual ~Condition() { }
 
        virtual Condition *clone() const = 0;
+       virtual bool equals(const Condition &) const = 0;
        virtual Condition *flatten() const { return clone(); }
        virtual bool can_merge(const Condition &, const CompoundCondition &) const { return false; }
        virtual Condition *merge(const std::vector<const Condition *> &, const CompoundCondition &) const { return 0; }
@@ -39,6 +40,7 @@ public:
 
 protected:
        void clone_to(CompoundCondition &) const;
+       bool sub_equals(const CompoundCondition &) const;
 
 public:
        void add(Condition *);
@@ -64,6 +66,7 @@ class AndCondition: public CompoundCondition
 {
 public:
        virtual AndCondition *clone() const;
+       virtual bool equals(const Condition &) const;
 protected:
        virtual Condition *flatten(Condition *, Condition *) const;
        virtual Condition *flatten(AndCondition *, Condition *) const;
@@ -81,6 +84,7 @@ class OrCondition: public CompoundCondition
 {
 public:
        virtual OrCondition *clone() const;
+       virtual bool equals(const Condition &) const;
 protected:
        virtual Condition *flatten(Condition *, Condition *) const;
        virtual Condition *flatten(AndCondition *, Condition *) const;
@@ -109,6 +113,7 @@ public:
        LinkedColorsCondition(const Colors &);
 
        virtual LinkedColorsCondition *clone() const;
+       virtual bool equals(const Condition &) const;
        virtual void add_lines(std::list<FilterStatement> &) const;
 };
 

diff --git a/source/rangecondition.h b/source/rangecondition.h
index a72fec2d1475db075baffbeb1ed46aa3979480e0..811a1aa48ffba85371d04249ef0ce0eef0f4cb36 100644 (file)
--- a/source/rangecondition.h
+++ b/source/rangecondition.h
@@ -20,6 +20,7 @@ public:
        RangeCondition(Type, Type);
 
        virtual RangeCondition<T> *clone() const;
+       virtual bool equals(const Condition &) const;
        virtual bool can_merge(const Condition &, const CompoundCondition &) const;
        virtual RangeCondition<T> *merge(const std::vector<const Condition *> &, const CompoundCondition &) const;
        virtual bool is_viable() const { return min<=max; }
@@ -133,6 +134,16 @@ RangeCondition<T> *RangeCondition<T>::clone() const
        return new RangeCondition<T>(min, max);
 }
 
+template<typename T>
+bool RangeCondition<T>::equals(const Condition &other) const
+{
+       const RangeCondition<T> *other_range = dynamic_cast<const RangeCondition<T> *>(&other);
+       if(!other_range)
+               return false;
+
+       return (min==other_range->min && max==other_range->max);
+}
+
 template<typename T>
 bool RangeCondition<T>::can_merge(const Condition &other, const CompoundCondition &parent) const
 {