Merge pull request #97 from davidbrochart/rename

Rename xdisk_io_handler to xio_disk_handler

Author: JohanMabille

CMakeLists.txt

@@ -53,7 +53,7 @@ message(STATUS "Found xtensor: ${xtensor_INCLUDE_DIRS}/xtensor")
 set(XTENSOR_IO_HEADERS
   ${XTENSOR_IO_INCLUDE_DIR}/xtensor-io/xaudio.hpp
   ${XTENSOR_IO_INCLUDE_DIR}/xtensor-io/xchunk_store_manager.hpp
-  ${XTENSOR_IO_INCLUDE_DIR}/xtensor-io/xdisk_io_handler.hpp
+  ${XTENSOR_IO_INCLUDE_DIR}/xtensor-io/xio_disk_handler.hpp
   ${XTENSOR_IO_INCLUDE_DIR}/xtensor-io/xfile_array.hpp
   ${XTENSOR_IO_INCLUDE_DIR}/xtensor-io/xgdal.hpp
   ${XTENSOR_IO_INCLUDE_DIR}/xtensor-io/xhighfive.hpp

include/xtensor-io/xdisk_io_handler.hpp renamed to include/xtensor-io/xio_disk_handler.hpp

@@ -1,13 +1,13 @@
-#ifndef XTENSOR_IO_DISK_IO_HANDLER_HPP
-#define XTENSOR_IO_DISK_IO_HANDLER_HPP
+#ifndef XTENSOR_IO_DISK_HANDLER_HPP
+#define XTENSOR_IO_DISK_HANDLER_HPP
 
 #include <xtensor/xarray.hpp>
 #include <xtensor/xexpression.hpp>
 
 namespace xt
 {
     template <class C>
-    class xdisk_io_handler
+    class xio_disk_handler
     {
     public:
 
@@ -26,7 +26,7 @@ namespace xt
 
     template <class C>
     template <class E>
-    inline void xdisk_io_handler<C>::write(const xexpression<E>& expression, const std::string& path) const
+    inline void xio_disk_handler<C>::write(const xexpression<E>& expression, const std::string& path) const
     {
         std::ofstream out_file(path, std::ofstream::binary);
         if (out_file.is_open())
@@ -41,7 +41,7 @@ namespace xt
 
     template <class C>
     template <class ET>
-    inline void xdisk_io_handler<C>::read(ET& array, const std::string& path, bool throw_on_fail) const
+    inline void xio_disk_handler<C>::read(ET& array, const std::string& path, bool throw_on_fail) const
     {
         std::ifstream in_file(path, std::ifstream::binary);
         if (in_file.is_open())
@@ -63,7 +63,7 @@ namespace xt
     }
 
     template <class C>
-    inline void xdisk_io_handler<C>::configure_format(const C& format_config)
+    inline void xio_disk_handler<C>::configure_format(const C& format_config)
     {
         m_format_config = format_config;
     }

test/test_xchunk_store_manager.cpp

@@ -14,7 +14,7 @@
 //#include "xtensor-io/xchunked_array.hpp"
 //#include "xtensor-io/xchunk_store_manager.hpp"
 //#include "xtensor-io/xfile_array.hpp"
-//#include "xtensor-io/xdisk_io_handler.hpp"
+//#include "xtensor-io/xio_disk_handler.hpp"
 
 namespace xt
 {
@@ -118,7 +118,7 @@ namespace xt
         std::vector<size_t> chunk_shape = {2, 2};
         std::string chunk_dir = "files";
         std::size_t pool_size = 2;
-        xchunked_array<xchunk_store_manager<xfile_array<double, xdisk_io_handler<xcsv_config>>>> a1(shape, chunk_shape, chunk_dir, pool_size);
+        xchunked_array<xchunk_store_manager<xfile_array<double, xio_disk_handler<xcsv_config>>>> a1(shape, chunk_shape, chunk_dir, pool_size);
         std::vector<size_t> idx = {1, 2};
         double v1 = 3.4;
         double v2 = 5.6;
@@ -156,7 +156,7 @@ namespace xt
     TEST(xfile_array, indexed_access)
     {
         std::vector<size_t> shape = {2, 2, 2};
-        xfile_array<double, xdisk_io_handler<xcsv_config>> a;
+        xfile_array<double, xio_disk_handler<xcsv_config>> a;
         a.ignore_empty_path(true);
         a.resize(shape);
         double val = 3.;
@@ -169,15 +169,15 @@ namespace xt
     TEST(xfile_array, assign_expression)
     {
         double v1 = 3.;
-        auto a1 = xfile_array<double, xdisk_io_handler<xcsv_config>>(broadcast(v1, {2, 2}), "a1");
+        auto a1 = xfile_array<double, xio_disk_handler<xcsv_config>>(broadcast(v1, {2, 2}), "a1");
         a1.ignore_empty_path(true);
         for (const auto& v: a1)
         {
             EXPECT_EQ(v, v1);
         }
 
         double v2 = 2. * v1;
-        auto a2 = xfile_array<double, xdisk_io_handler<xcsv_config>>(a1 + a1, "a2");
+        auto a2 = xfile_array<double, xio_disk_handler<xcsv_config>>(a1 + a1, "a2");
         a2.ignore_empty_path(true);
         for (const auto& v: a2)
         {