Adding tests for parse_slices

Author: jholloc

libtokamap/TODO.md

@@ -10,7 +10,7 @@
 - [ ] Make mapping directory nesting configurable
 - [x] ~~Remove SignalType logic~~
 - [ ] Add C++20 template constraints
-- [ ] Replace std::string{} with string_literals
+- [x] ~~Replace std::string{} with string_literals~~
 - [ ] Fix logging
-- [ ] Add tests for parse_slices
+- [x] ~~Add tests for parse_slices~~
 - [x] ~~Replace gsl::span with std::span~~

libtokamap/src/map_types/data_source_mapping.cpp

@@ -24,7 +24,7 @@ libtokamap::TypedDataArray libtokamap::DataSourceMapping::map(const MapArguments
         }
     }
     TypedDataArray array = m_data_source->get(args, arguments, m_ram_cache.get());
-    subset::update_array(array, m_slice, m_scale, m_offset);
+    update_array(array, m_slice, m_scale, m_offset);
     return array;
 }
 

libtokamap/src/utils/subset.cpp

@@ -51,27 +51,13 @@ template <typename T> libtokamap::SubsetInfo parse_slice(const T& slice, size_t
     throw std::runtime_error{"invalid subset: " + slice.to_string()};
 }
 
-std::vector<libtokamap::SubsetInfo> parse_slices(const std::string& slice, const std::vector<size_t>& shape)
-{
-    size_t dim_idx = 0;
-    std::vector<libtokamap::SubsetInfo> subsets;
-    for (const auto& token : ctre::search_all<token_re>(slice)) {
-        if (dim_idx == shape.size()) {
-            throw std::runtime_error{"to many slices provided"};
-        }
-        subsets.push_back(parse_slice(token.get<1>(), shape[dim_idx]));
-        ++dim_idx;
-    }
-    return subsets;
-}
-
 void apply_subset(libtokamap::TypedDataArray& input, const std::optional<std::string>& slice)
 {
     if (!slice) {
         return;
     }
 
-    std::vector<libtokamap::SubsetInfo> subset_info = parse_slices(slice.value(), input.shape());
+    std::vector<libtokamap::SubsetInfo> subset_info = libtokamap::parse_slices(slice.value(), input.shape());
     using libtokamap::DataType;
     switch (libtokamap::type_index_map(input.type_index())) {
         case DataType::Short:
@@ -154,8 +140,22 @@ void apply_scale_offset(libtokamap::TypedDataArray& input, std::optional<float>
 
 } // namespace
 
-void libtokamap::subset::update_array(libtokamap::TypedDataArray& input, const std::optional<std::string>& slice,
-                                      std::optional<float> scale_factor, std::optional<float> offset)
+std::vector<libtokamap::SubsetInfo> libtokamap::parse_slices(const std::string& slice, const std::vector<size_t>& shape)
+{
+    size_t dim_idx = 0;
+    std::vector<libtokamap::SubsetInfo> subsets;
+    for (const auto& token : ctre::search_all<token_re>(slice)) {
+        if (dim_idx == shape.size()) {
+            throw std::runtime_error{"to many slices provided"};
+        }
+        subsets.push_back(parse_slice(token.get<1>(), shape[dim_idx]));
+        ++dim_idx;
+    }
+    return subsets;
+}
+
+void libtokamap::update_array(libtokamap::TypedDataArray& input, const std::optional<std::string>& slice,
+                              std::optional<float> scale_factor, std::optional<float> offset)
 {
     apply_subset(input, slice);
     apply_scale_offset(input, scale_factor, offset);

libtokamap/src/utils/subset.hpp

@@ -1,7 +1,6 @@
 #pragma once
 
 #include <chrono>
-#include <cmath>
 #include <cstdint>
 #include <cstdlib>
 #include <ctime>
@@ -11,12 +10,15 @@
 #include <optional>
 #include <string>
 #include <string_view>
+#include <vector>
 
 #include "map_types/map_arguments.hpp"
 
-namespace libtokamap::subset
+namespace libtokamap
 {
 
+std::vector<libtokamap::SubsetInfo> parse_slices(const std::string& slice, const std::vector<size_t>& shape);
+
 void update_array(TypedDataArray& input, const std::optional<std::string>& slice, std::optional<float> scale_factor,
                   std::optional<float> offset);
 
@@ -62,4 +64,4 @@ inline int log(LogLevel log_level, std::string_view log_msg)
     return 0;
 }
 
-} // namespace libtokamap::subset
+} // namespace libtokamap

libtokamap/test/CMakeLists.txt

@@ -13,12 +13,10 @@ set( CMAKE_CXX_EXTENSIONS OFF )
 set( TEST_SOURCES
     src/data_source_mapping_test.cpp
     src/indices_test.cpp
-    src/json_plugin_test.cpp
-    src/main_test.cpp
+    src/parse_slices_test.cpp
     src/syntax_parser_test.cpp
-    src/value_mapping_test.cpp
-    src/subset_test.cpp
     src/typed_data_array_test.cpp
+    src/value_mapping_test.cpp
 )
 
 include( FetchContent )