Add interval filter IntervalFilterAndGroup

An and-group interval filter accepts all intervals which are accepted by all filters in its group.
It is done, if one of the filters in its group is done.

Relates to #468

Signed-off-by: Thomas Lauf <thomas.lauf@tngtech.com>

src/CMakeLists.txt

@@ -17,6 +17,7 @@ set (timew_SRCS AtomicFile.cpp AtomicFile.h
                 Interval.cpp   Interval.h
                 IntervalFactory.cpp IntervalFactory.h
                 IntervalFilter.cpp IntervalFilter.h
+                IntervalFilterAndGroup.cpp IntervalFilterAndGroup.h
                 IntervalFilterAllInRange.cpp IntervalFilterAllInRange.h
                 IntervalFilterAllWithIds.cpp IntervalFilterAllWithIds.h
                 IntervalFilterAllWithTags.cpp IntervalFilterAllWithTags.h

src/IntervalFilterAndGroup.cpp

@@ -0,0 +1,63 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+// Copyright 2021, Thomas Lauf, Paul Beckingham, Federico Hernandez.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included
+// in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+// SOFTWARE.
+//
+// https://www.opensource.org/licenses/mit-license.php
+//
+////////////////////////////////////////////////////////////////////////////////
+
+#include <IntervalFilterAndGroup.h>
+
+IntervalFilterAndGroup::IntervalFilterAndGroup (const std::vector <IntervalFilter *>& filters) : _filters (filters)
+{}
+
+bool IntervalFilterAndGroup::accepts (const Interval &interval)
+{
+  if (is_done ())
+  {
+    return false;
+  }
+
+  for (auto filter: _filters)
+  {
+    if (filter->accepts (interval))
+    {
+      continue;
+    }
+
+    if (filter->is_done ())
+    {
+      set_done (true);
+    }
+
+    return false;
+  }
+
+  return true;
+}
+
+void IntervalFilterAndGroup::reset ()
+{
+  for (auto filter: _filters)
+  {
+    filter->reset ();
+  }
+}

src/IntervalFilterAndGroup.h

@@ -0,0 +1,44 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+// Copyright 2021, Thomas Lauf, Paul Beckingham, Federico Hernandez.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included
+// in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+// SOFTWARE.
+//
+// https://www.opensource.org/licenses/mit-license.php
+//
+////////////////////////////////////////////////////////////////////////////////
+
+#ifndef INCLUDED_INTERVALFILTERANDGROUP
+#define INCLUDED_INTERVALFILTERANDGROUP
+
+#include <IntervalFilter.h>
+
+class IntervalFilterAndGroup : public IntervalFilter
+{
+public:
+  explicit IntervalFilterAndGroup (const std::vector <IntervalFilter *>& filters);
+
+  bool accepts (const Interval&) final;
+  void reset () override;
+
+private:
+  const std::vector<IntervalFilter*> _filters = {};
+};
+
+#endif //INCLUDED_INTERVALFILTERANDGROUP