Refactor logical and reductions to improve coverage

Author: tpadioleau

include/ddc/detail/kokkos.hpp

@@ -175,7 +175,7 @@ KOKKOS_FUNCTION auto build_mdspan(
         Kokkos::View<DataType, Properties...> const view,
         std::index_sequence<Is...>)
 {
-    KOKKOS_ASSERT((is_kokkos_layout_compatible(view)))
+    KOKKOS_ASSERT(is_kokkos_layout_compatible(view))
     DDC_IF_NVCC_THEN_PUSH_AND_SUPPRESS(implicit_return_from_non_void_function)
     using element_type = kokkos_to_mdspan_element_t<DataType>;
     using extents_type = Kokkos::dextents<std::size_t, Kokkos::View<DataType, Properties...>::rank>;

include/ddc/discrete_domain.hpp

@@ -217,12 +217,17 @@ class DiscreteDomain
                 sizeof...(DDims) == (0 + ... + DElems::size()),
                 "Invalid number of dimensions");
         static_assert((is_discrete_element_v<DElems> && ...), "Expected DiscreteElements");
-        return (((DiscreteElement<DDims>(take<DDims>(delems...))
-                  >= DiscreteElement<DDims>(m_element_begin))
-                 && ...)
-                && ((DiscreteElement<DDims>(take<DDims>(delems...))
-                     < DiscreteElement<DDims>(m_element_end))
-                    && ...));
+        // GCOVR_EXCL_BR_START
+        auto const test1
+                = ((DiscreteElement<DDims>(take<DDims>(delems...))
+                    >= DiscreteElement<DDims>(m_element_begin))
+                   && ...);
+        auto const test2
+                = ((DiscreteElement<DDims>(take<DDims>(delems...))
+                    < DiscreteElement<DDims>(m_element_end))
+                   && ...);
+        // GCOVR_EXCL_BR_STOP
+        return test1 && test2;
     }
 
     template <class... DElems>

include/ddc/sparse_discrete_domain.hpp

@@ -279,12 +279,14 @@ class SparseDiscreteDomain
                 sizeof...(DDims) == (0 + ... + DElems::size()),
                 "Invalid number of dimensions");
         static_assert((is_discrete_element_v<DElems> && ...), "Expected DiscreteElements");
+        // GCOVR_EXCL_BR_START
         return (detail::binary_search(
                         get<DDims>(m_views).data(),
                         get<DDims>(m_views).data() + get<DDims>(m_views).size(),
                         uid<DDims>(take<DDims>(delems...)),
                         std::less {})
                 && ...);
+        // GCOVR_EXCL_BR_STOP
     }
 
     template <class... DElems>

include/ddc/strided_discrete_domain.hpp

@@ -220,6 +220,7 @@ class StridedDiscreteDomain
                 sizeof...(DDims) == (0 + ... + DElems::size()),
                 "Invalid number of dimensions");
         static_assert((is_discrete_element_v<DElems> && ...), "Expected DiscreteElements");
+        // GCOVR_EXCL_BR_START
         auto const test1
                 = ((DiscreteElement<DDims>(take<DDims>(delems...))
                     >= DiscreteElement<DDims>(m_element_begin))
@@ -235,6 +236,7 @@ class StridedDiscreteDomain
                      % DiscreteVector<DDims>(m_strides))
                     == 0)
                    && ...);
+        // GCOVR_EXCL_BR_STOP
         return test1 && test2 && test3;
     }