Skip to content

Commit

Permalink
check fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
@jensmaurer
jensmaurer committed Nov 17, 2023
1 parent b116e2f commit 8026642
Showing 1 changed file with 42 additions and 41 deletions.
83 changes: 42 additions & 41 deletions source/numerics.tex
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11929,7 +11929,8 @@
\begin{itemdecl}
template<class MDS1, class MDS2>
requires(@\exposconcept{is-mdspan}@<MDS1> && @\exposconcept{is-mdspan}@<MDS2>)
constexpr bool @\exposid{compatible-static-extents}@(size_t r1, size_t r2) // \expos
constexpr
bool @\exposid{compatible-static-extents}@(size_t r1, size_t r2) // \expos
{
return MDS1::static_extent(r1) == dynamic_extent ||
MDS2::static_extent(r2) == dynamic_extent ||
Expand All @@ -11944,9 +11945,9 @@
template<@\exposconcept{in-vector}@ In1, @\exposconcept{in-vector}@ In2, @\exposconcept{in-vector}@ Out>
constexpr bool @\exposconcept{possibly-addable}@() // \expos
{
return @\exposconcept{compatible-static-extents}@<Out, In1>(0, 0) &&
@\exposconcept{compatible-static-extents}@<Out, In2>(0, 0) &&
@\exposconcept{compatible-static-extents}@<In1, In2>(0, 0);
return @\exposid{compatible-static-extents}@<Out, In1>(0, 0) &&
@\exposid{compatible-static-extents}@<Out, In2>(0, 0) &&
@\exposid{compatible-static-extents}@<In1, In2>(0, 0);
}
\end{itemdecl}

Expand All @@ -11955,14 +11956,14 @@

\begin{itemdecl}
template<@\exposconcept{in-matrix}@ In1, @\exposconcept{in-matrix}@ In2, @\exposconcept{in-matrix}@ Out>
constexpr bool @\exposconcept{possibly-addable}@() // \expos
constexpr bool @\exposid{possibly-addable}@() // \expos
{
return @\exposconcept{compatible-static-extents}@<Out, In1>(0, 0) &&
@\exposconcept{compatible-static-extents}@<Out, In1>(1, 1) &&
@\exposconcept{compatible-static-extents}@<Out, In2>(0, 0) &&
@\exposconcept{compatible-static-extents}@<Out, In2>(1, 1) &&
@\exposconcept{compatible-static-extents}@<In1, In2>(0, 0) &&
@\exposconcept{compatible-static-extents}@<In1, In2>(1, 1);
return @\exposid{compatible-static-extents}@<Out, In1>(0, 0) &&
@\exposid{compatible-static-extents}@<Out, In1>(1, 1) &&
@\exposid{compatible-static-extents}@<Out, In2>(0, 0) &&
@\exposid{compatible-static-extents}@<Out, In2>(1, 1) &&
@\exposid{compatible-static-extents}@<In1, In2>(0, 0) &&
@\exposid{compatible-static-extents}@<In1, In2>(1, 1);
}
\end{itemdecl}

Expand All @@ -11971,10 +11972,10 @@

\begin{itemdecl}
template<@\exposconcept{in-matrix}@ InMat, @\exposconcept{in-vector}@ InVec, @\exposconcept{in-vector}@ OutVec>
constexpr bool @\exposconcept{possibly-multipliable}@() // \expos
constexpr bool @\exposid{possibly-multipliable}@() // \expos
{
return @\exposconcept{compatible-static-extents}@<OutVec, InMat>(0, 0) &&
@\exposconcept{compatible-static-extents}@<InMat, InVec>(1, 0);
return @\exposid{compatible-static-extents}@<OutVec, InMat>(0, 0) &&
@\exposid{compatible-static-extents}@<InMat, InVec>(1, 0);
}
\end{itemdecl}

Expand All @@ -11983,10 +11984,10 @@

\begin{itemdecl}
template<@\exposconcept{in-vector}@ InVec, @\exposconcept{in-matrix}@ InMat, @\exposconcept{in-vector}@ OutVec>
constexpr bool @\exposconcept{possibly-multipliable}@() // \expos
constexpr bool @\exposid{possibly-multipliable}@() // \expos
{
return @\exposconcept{compatible-static-extents}@<OutVec, InMat>(0, 1) &&
@\exposconcept{compatible-static-extents}@<InMat, InVec>(0, 0);
return @\exposid{compatible-static-extents}@<OutVec, InMat>(0, 1) &&
@\exposid{compatible-static-extents}@<InMat, InVec>(0, 0);
}
\end{itemdecl}

Expand All @@ -11995,11 +11996,11 @@

\begin{itemdecl}
template<@\exposconcept{in-matrix}@ InMat1, @\exposconcept{in-matrix}@ InMat2, @\exposconcept{in-matrix}@ OutMat>
constexpr bool @\exposconcept{possibly-multipliable}@() // \expos
constexpr bool @\exposid{possibly-multipliable}@() // \expos
{
return @\exposconcept{compatible-static-extents}@<OutMat, InMat1>(0, 0) &&
@\exposconcept{compatible-static-extents}@<OutMat, InMat2>(1, 1) &&
@\exposconcept{compatible-static-extents}@<InMat1, InMat2>(1, 0);
return @\exposid{compatible-static-extents}@<OutMat, InMat1>(0, 0) &&
@\exposid{compatible-static-extents}@<OutMat, InMat2>(1, 1) &&
@\exposid{compatible-static-extents}@<InMat1, InMat2>(1, 0);
}
\end{itemdecl}

Expand All @@ -12015,7 +12016,7 @@
\end{note}

\begin{itemdecl}
constexpr bool @\exposconcept{addable}@( // \expos
constexpr bool @\exposid{addable}@( // \expos
const @\exposconcept{in-vector}@ auto& in1,
const @\exposconcept{in-vector}@ auto& in2,
const @\exposconcept{in-vector}@ auto& out)
Expand All @@ -12029,7 +12030,7 @@
\end{itemdescr}

\begin{itemdecl}
constexpr bool @\exposconcept{addable}@( // \expos
constexpr bool @\exposid{addable}@( // \expos
const @\exposconcept{in-matrix}@ auto& in1,
const @\exposconcept{in-matrix}@ auto& in2,
const @\exposconcept{in-matrix}@ auto& out)
Expand All @@ -12045,7 +12046,7 @@
\end{itemdescr}

\begin{itemdecl}
constexpr bool @\exposconcept{multipliable}@( // \expos
constexpr bool @\exposid{multipliable}@( // \expos
const @\exposconcept{in-matrix}@ auto& in_mat,
const @\exposconcept{in-vector}@ auto& in_vec,
const @\exposconcept{in-vector}@ auto& out_vec)
Expand All @@ -12059,7 +12060,7 @@
\end{itemdescr}

\begin{itemdecl}
constexpr bool @\exposconcept{multipliable}@( // \expos
constexpr bool @\exposid{multipliable}@( // \expos
const @\exposconcept{in-vector}@ auto& in_vec,
const @\exposconcept{in-matrix}@ auto& in_mat,
const @\exposconcept{in-vector}@ auto& out_vec)
Expand All @@ -12073,7 +12074,7 @@
\end{itemdescr}

\begin{itemdecl}
constexpr bool @\exposconcept{multipliable}@( // \expos
constexpr bool @\exposid{multipliable}@( // \expos
const @\exposconcept{in-matrix}@ auto& in_mat1,
const @\exposconcept{in-matrix}@ auto& in_mat2,
const @\exposconcept{in-matrix}@ auto& out_mat)
Expand Down Expand Up @@ -12149,12 +12150,12 @@
constexpr offset_policy::data_handle_type
offset(data_handle_type p, size_t i) const;

constexpr const ScalingFactor& scaling_factor() const noexcept { return @\exposconcept{scaling-factor}@; }
constexpr const NestedAccessor& nested_accessor() const noexcept { return @\exposconcept{nested-accessor}@; }
constexpr const ScalingFactor& scaling_factor() const noexcept { return @\exposid{scaling-factor}@; }
constexpr const NestedAccessor& nested_accessor() const noexcept { return @\exposid{nested-accessor}@; }

private:
ScalingFactor @\exposconcept{scaling-factor}@{}; // \expos
NestedAccessor @\exposconcept{nested-accessor}@{}; // \expos
ScalingFactor @\exposid{scaling-factor}@{}; // \expos
NestedAccessor @\exposid{nested-accessor}@{}; // \expos
};
\end{itemdecl}

Expand Down Expand Up @@ -12302,7 +12303,7 @@
template<class NestedAccessor>
class conjugated_accessor {
public:
using element_type = add_const_t<decltype(@\exposconcept{conj-if-needed}@(declval<NestedAccessor::element_type>()))>;
using element_type = add_const_t<decltype(@\exposid{conj-if-needed}@(declval<NestedAccessor::element_type>()))>;
using reference = remove_const_t<element_type>;
using data_handle_type = typename NestedAccessor::data_handle_type;
using offset_policy = conjugated_accessor<NestedAccessor::offset_policy>;
Expand Down Expand Up @@ -12480,7 +12481,7 @@
\begin{itemdecl}
template<class IndexType, size_t InputExtent0, size_t InputExtent1>
constexpr extents<IndexType, InputExtent1, InputExtent0>
@\exposconcept{transpose-extents}@(const extents<IndexType, InputExtent0, InputExtent1>& in); // \expos
@\exposid{transpose-extents}@(const extents<IndexType, InputExtent0, InputExtent1>& in); // \expos
\end{itemdecl}

\begin{itemdescr}
Expand All @@ -12492,8 +12493,8 @@

\begin{itemdecl}
template<class InputExtents>
using @\exposconcept{transpose-extents-t}@ =
decltype(@\exposconcept{transpose-extents}@(declval<InputExtents>())); // \expos
using @\exposid{transpose-extents-t}@ =
decltype(@\exposid{transpose-extents}@(declval<InputExtents>())); // \expos
\end{itemdecl}

\begin{itemdescr}
Expand All @@ -12515,9 +12516,9 @@
template<class Extents>
struct mapping {
private:
using @\exposconcept{nested-mapping-type}@ =
using @\exposid{nested-mapping-type}@ =
typename Layout::template mapping<
@\exposconcept{transpose-extents-t}@<Extents>>; // \expos
@\exposid{transpose-extents-t}@<Extents>>; // \expos

public:
using extents_type = Extents;
Expand All @@ -12526,7 +12527,7 @@
using rank_type = typename extents_type::rank_type;
using layout_type = layout_transpose;

constexpr explicit mapping(const @\exposconcept{nested-mapping-type}@&);
constexpr explicit mapping(const @\exposid{nested-mapping-type}@&);

constexpr const extents_type& extents() const noexcept
{ return @_extents\__@; }
Expand All @@ -12538,11 +12539,11 @@
constexpr index_type operator()(Index0 ind0, Index1 ind1) const
{ return @_nested-mapping\__@(ind1, ind0); }

constexpr const @\exposconcept{nested-mapping-type}@& nested_mapping() const noexcept
constexpr const @\exposid{nested-mapping-type}@& nested_mapping() const noexcept
{ return @_nested-mapping\__@; }

static constexpr bool is_always_unique() noexcept
{ return @\exposconcept{nested-mapping-type}@::is_always_unique(); }
{ return @\exposid{nested-mapping-type}@::is_always_unique(); }
static constexpr bool is_always_exhaustive() noexcept
{ return @_nested-mapping_type_@::is_always_exhaustive(); }
static constexpr bool is_always_strided() noexcept
Expand All @@ -12563,7 +12564,7 @@
};

private:
@\exposconcept{nested-mapping-type}@ @_nested-mapping\__@; // \expos
@\exposid{nested-mapping-type}@ @_nested-mapping\__@; // \expos
extents_type @_extents\__@; // \expos
};
\end{itemdecl}
Expand All @@ -12585,7 +12586,7 @@
\end{itemdescr}

\begin{itemdecl}
constexpr explicit mapping(const @\exposconcept{nested-mapping-type}@& map);
constexpr explicit mapping(const @\exposid{nested-mapping-type}@& map);
\end{itemdecl}

\begin{itemdescr}
Expand Down

0 comments on commit 8026642

Please sign in to comment.