temporary fix of statenames

vortexntnu · Oct 28, 2024 · 661b85f · 661b85f
1 parent b95a938
commit 661b85f
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/vortex-filtering/include/vortex_filtering/models/imm_model.hpp b/vortex-filtering/include/vortex_filtering/models/imm_model.hpp
@@ -47,7 +47,6 @@ template <vortex::concepts::DynamicModelWithDefinedSizes... DynModels> class Imm
   static constexpr bool MIN_DIM_x   = std::min(N_DIMS_x);
   static constexpr size_t N_MODELS = sizeof...(DynModels);
 
-  using StateName    = decltype(DynModels::StateT::STATE_NAMES);
   using StateNames   = std::tuple<std::array<StateName, DynModels::N_DIM_x>...>;
 
   static constexpr StateNames ALL_STATE_NAMES = {{DynModels::StateT::STATE_NAMES}...};

diff --git a/vortex-filtering/include/vortex_filtering/models/state.hpp b/vortex-filtering/include/vortex_filtering/models/state.hpp
@@ -21,7 +21,9 @@ struct StateMinMax {
 
 template <typename StateName>
   requires std::is_integral_v<StateName> || std::is_enum_v<StateName>
-using StateMap = std::map<StateName, StateMinMax>;
+using StateMapT = std::map<StateName, StateMinMax>;
+
+using StateMap = StateMapT<StateName>;
 
 template <typename StateName>
   requires std::is_integral_v<StateName> || std::is_enum_v<StateName>

diff --git a/vortex-filtering/include/vortex_filtering/types/type_aliases.hpp b/vortex-filtering/include/vortex_filtering/types/type_aliases.hpp
@@ -91,8 +91,6 @@
 namespace vortex {
 // Hover over the types in vscode to see the expanded types
 
-ONE_TYPE_STRUCT(n)
-
 ONE_TYPE_STRUCT(x)
 ONE_TYPE_STRUCT(z)
 ONE_TYPE_STRUCT(u)