From 5f96fd2878753342c059b7c60edac71d28e1aeca Mon Sep 17 00:00:00 2001 From: Thomas Lauf Date: Mon, 1 Nov 2021 17:08:50 +0100 Subject: [PATCH] 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 --- src/CMakeLists.txt | 1 + src/IntervalFilterAndGroup.cpp | 63 ++++++++++++++++++++++++++++++++++ src/IntervalFilterAndGroup.h | 44 ++++++++++++++++++++++++ 3 files changed, 108 insertions(+) create mode 100644 src/IntervalFilterAndGroup.cpp create mode 100644 src/IntervalFilterAndGroup.h diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index ee65a17f..8b4b317e 100644 --- a/src/CMakeLists.txt +++ b/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 diff --git a/src/IntervalFilterAndGroup.cpp b/src/IntervalFilterAndGroup.cpp new file mode 100644 index 00000000..05922bd7 --- /dev/null +++ b/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::IntervalFilterAndGroup (const std::vector & 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 (); + } +} diff --git a/src/IntervalFilterAndGroup.h b/src/IntervalFilterAndGroup.h new file mode 100644 index 00000000..19c6fb7a --- /dev/null +++ b/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 + +class IntervalFilterAndGroup : public IntervalFilter +{ +public: + explicit IntervalFilterAndGroup (const std::vector & filters); + + bool accepts (const Interval&) final; + void reset () override; + +private: + const std::vector _filters = {}; +}; + +#endif //INCLUDED_INTERVALFILTERANDGROUP