From 884ed5254a3f5200860ee54c182f8c5f19705676 Mon Sep 17 00:00:00 2001 From: Konrad1991 Date: Mon, 3 Jun 2024 15:50:13 +0200 Subject: [PATCH] switch to ConstantTypeTrait --- include/etr_bits/Allocation/Colon.hpp | 4 +-- include/etr_bits/Allocation/Vector.hpp | 48 +++++++++++++------------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/include/etr_bits/Allocation/Colon.hpp b/include/etr_bits/Allocation/Colon.hpp index 9303958..29827ad 100644 --- a/include/etr_bits/Allocation/Colon.hpp +++ b/include/etr_bits/Allocation/Colon.hpp @@ -251,7 +251,7 @@ inline auto colonInternalDerivs(AV &av, T start, T end) { if (start < end) { std::size_t length = convertSize(end - start + 1); av.varConstants[Idx].resize(convertSize(length)); - Vec, VariableTypeTrait> ret(av); + Vec, ConstantTypeTrait> ret(av); std::size_t counter = 0; while (start <= end) { av.varConstants[Idx][counter] = start; @@ -262,7 +262,7 @@ inline auto colonInternalDerivs(AV &av, T start, T end) { } std::size_t length = convertSize(start - end + 1); av.varConstants[Idx].resize(convertSize(length)); - Vec, VariableTypeTrait> ret(av); + Vec, ConstantTypeTrait> ret(av); std::size_t counter = 0; while (end <= start) { av.varConstants[Idx][counter] = start; diff --git a/include/etr_bits/Allocation/Vector.hpp b/include/etr_bits/Allocation/Vector.hpp index 4ba75c1..7e27d3b 100644 --- a/include/etr_bits/Allocation/Vector.hpp +++ b/include/etr_bits/Allocation/Vector.hpp @@ -104,21 +104,21 @@ inline auto vector_integer(AV &av, const T &inp) { using VecType = int; if constexpr (std::is_same_v) { av.varConstants[Idx].resize(convertSize(inp)); - Vec, VariableTypeTrait> ret(av); + Vec, ConstantTypeTrait> ret(av); return ret; } else if constexpr (std::is_floating_point_v) { av.varConstants[Idx].resize(convertSize(inp)); av.varConstants[Idx].resize(convertSize(inp)); - Vec, VariableTypeTrait> ret(av); + Vec, ConstantTypeTrait> ret(av); return ret; } else if constexpr (std::is_integral_v) { av.varConstants[Idx].resize(convertSize(inp)); - Vec, VariableTypeTrait> ret(av); + Vec, ConstantTypeTrait> ret(av); return ret; } else if constexpr (IsVecRorCalc || IsVec) { ass(inp.size() == 1, "invalid length argument"); av.varConstants[Idx].resize(convertSize(inp[0])); - Vec, VariableTypeTrait> ret(av); + Vec, ConstantTypeTrait> ret(av); return ret; } else { static_assert(sizeof(T) == 0, "Unsupported type in vector"); @@ -130,21 +130,21 @@ inline auto vector_integer(AV &av, T &inp) { using VecType = int; if constexpr (std::is_same_v) { av.varConstants[Idx].resize(convertSize(inp)); - Vec, VariableTypeTrait> ret(av); + Vec, ConstantTypeTrait> ret(av); return ret; } else if constexpr (std::is_floating_point_v) { av.varConstants[Idx].resize(convertSize(inp)); av.varConstants[Idx].resize(convertSize(inp)); - Vec, VariableTypeTrait> ret(av); + Vec, ConstantTypeTrait> ret(av); return ret; } else if constexpr (std::is_integral_v) { av.varConstants[Idx].resize(convertSize(inp)); - Vec, VariableTypeTrait> ret(av); + Vec, ConstantTypeTrait> ret(av); return ret; } else if constexpr (IsVecRorCalc || IsVec) { ass(inp.size() == 1, "invalid length argument"); av.varConstants[Idx].resize(convertSize(inp[0])); - Vec, VariableTypeTrait> ret(av); + Vec, ConstantTypeTrait> ret(av); return ret; } else { static_assert(sizeof(T) == 0, "Unsupported type in vector"); @@ -156,21 +156,21 @@ inline auto vector_logical(AV &av, const T &inp) { using VecType = bool; if constexpr (std::is_same_v) { av.varConstants[Idx].resize(convertSize(inp)); - Vec, VariableTypeTrait> ret(av); + Vec, ConstantTypeTrait> ret(av); return ret; } else if constexpr (std::is_floating_point_v) { av.varConstants[Idx].resize(convertSize(inp)); av.varConstants[Idx].resize(convertSize(inp)); - Vec, VariableTypeTrait> ret(av); + Vec, ConstantTypeTrait> ret(av); return ret; } else if constexpr (std::is_integral_v) { av.varConstants[Idx].resize(convertSize(inp)); - Vec, VariableTypeTrait> ret(av); + Vec, ConstantTypeTrait> ret(av); return ret; } else if constexpr (IsVecRorCalc || IsVec) { ass(inp.size() == 1, "invalid length argument"); av.varConstants[Idx].resize(convertSize(inp[0])); - Vec, VariableTypeTrait> ret(av); + Vec, ConstantTypeTrait> ret(av); return ret; } else { static_assert(sizeof(T) == 0, "Unsupported type in vector"); @@ -182,21 +182,21 @@ inline auto vector_logical(AV &av, T &inp) { using VecType = bool; if constexpr (std::is_same_v) { av.varConstants[Idx].resize(convertSize(inp)); - Vec, VariableTypeTrait> ret(av); + Vec, ConstantTypeTrait> ret(av); return ret; } else if constexpr (std::is_floating_point_v) { av.varConstants[Idx].resize(convertSize(inp)); av.varConstants[Idx].resize(convertSize(inp)); - Vec, VariableTypeTrait> ret(av); + Vec, ConstantTypeTrait> ret(av); return ret; } else if constexpr (std::is_integral_v) { av.varConstants[Idx].resize(convertSize(inp)); - Vec, VariableTypeTrait> ret(av); + Vec, ConstantTypeTrait> ret(av); return ret; } else if constexpr (IsVecRorCalc || IsVec) { ass(inp.size() == 1, "invalid length argument"); av.varConstants[Idx].resize(convertSize(inp[0])); - Vec, VariableTypeTrait> ret(av); + Vec, ConstantTypeTrait> ret(av); return ret; } else { static_assert(sizeof(T) == 0, "Unsupported type in vector"); @@ -208,21 +208,21 @@ inline auto vector_numeric(AV &av, const T &inp) { using VecType = BaseType; if constexpr (std::is_same_v) { av.varConstants[Idx].resize(convertSize(inp)); - Vec, VariableTypeTrait> ret(av); + Vec, ConstantTypeTrait> ret(av); return ret; } else if constexpr (std::is_floating_point_v) { av.varConstants[Idx].resize(convertSize(inp)); av.varConstants[Idx].resize(convertSize(inp)); - Vec, VariableTypeTrait> ret(av); + Vec, ConstantTypeTrait> ret(av); return ret; } else if constexpr (std::is_integral_v) { av.varConstants[Idx].resize(convertSize(inp)); - Vec, VariableTypeTrait> ret(av); + Vec, ConstantTypeTrait> ret(av); return ret; } else if constexpr (IsVecRorCalc || IsVec) { ass(inp.size() == 1, "invalid length argument"); av.varConstants[Idx].resize(convertSize(inp[0])); - Vec, VariableTypeTrait> ret(av); + Vec, ConstantTypeTrait> ret(av); return ret; } else { static_assert(sizeof(T) == 0, "Unsupported type in vector"); @@ -234,21 +234,21 @@ inline auto vector_numeric(AV &av, T &inp) { using VecType = BaseType; if constexpr (std::is_same_v) { av.varConstants[Idx].resize(convertSize(inp)); - Vec, VariableTypeTrait> ret(av); + Vec, ConstantTypeTrait> ret(av); return ret; } else if constexpr (std::is_floating_point_v) { av.varConstants[Idx].resize(convertSize(inp)); av.varConstants[Idx].resize(convertSize(inp)); - Vec, VariableTypeTrait> ret(av); + Vec, ConstantTypeTrait> ret(av); return ret; } else if constexpr (std::is_integral_v) { av.varConstants[Idx].resize(convertSize(inp)); - Vec, VariableTypeTrait> ret(av); + Vec, ConstantTypeTrait> ret(av); return ret; } else if constexpr (IsVecRorCalc || IsVec) { ass(inp.size() == 1, "invalid length argument"); av.varConstants[Idx].resize(convertSize(inp[0])); - Vec, VariableTypeTrait> ret(av); + Vec, ConstantTypeTrait> ret(av); return ret; } else { static_assert(sizeof(T) == 0, "Unsupported type in vector");