Skip to content

Commit

Permalink
Fix #88 move io classes to their own module
Browse files Browse the repository at this point in the history
  • Loading branch information
oruebel committed Sep 5, 2024
1 parent 1f3ad24 commit 99b5d4e
Show file tree
Hide file tree
Showing 27 changed files with 35 additions and 35 deletions.
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ include(cmake/variables.cmake)

add_library(
aqnwb_aqnwb
src/BaseIO.cpp
src/io/BaseIO.cpp
src/Channel.cpp
src/hdf5/HDF5IO.cpp
src/io/hdf5/HDF5IO.cpp
src/nwb/NWBFile.cpp
src/nwb/RecordingContainers.cpp
src/nwb/base/TimeSeries.cpp
Expand Down
4 changes: 2 additions & 2 deletions src/Utils.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
#include <boost/uuid/uuid_generators.hpp>
#include <boost/uuid/uuid_io.hpp>

#include "BaseIO.hpp"
#include "io/BaseIO.hpp"
#include "boost/date_time/c_local_time_adjustor.hpp"
#include "hdf5/HDF5IO.hpp"
#include "io/hdf5/HDF5IO.hpp"

namespace AQNWB
{
Expand Down
2 changes: 1 addition & 1 deletion src/BaseIO.cpp → src/io/BaseIO.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "BaseIO.hpp"
#include "io/BaseIO.hpp"

#include "Utils.hpp"

Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion src/hdf5/HDF5IO.cpp → src/io/hdf5/HDF5IO.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#include <memory>
#include <vector>

#include "hdf5/HDF5IO.hpp"
#include "io/hdf5/HDF5IO.hpp"

#include <H5Cpp.h>
#include <H5Fpublic.h>
Expand Down
2 changes: 1 addition & 1 deletion src/hdf5/HDF5IO.hpp → src/io/hdf5/HDF5IO.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

#include <H5Opublic.h>

#include "BaseIO.hpp"
#include "io/BaseIO.hpp"
#include "Types.hpp"

namespace H5
Expand Down
2 changes: 1 addition & 1 deletion src/nwb/NWBFile.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

#include "nwb/NWBFile.hpp"

#include "BaseIO.hpp"
#include "io/BaseIO.hpp"
#include "Channel.hpp"
#include "Utils.hpp"
#include "nwb/device/Device.hpp"
Expand Down
2 changes: 1 addition & 1 deletion src/nwb/NWBFile.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#include <string_view>
#include <vector>

#include "BaseIO.hpp"
#include "io/BaseIO.hpp"
#include "Types.hpp"
#include "nwb/RecordingContainers.hpp"
#include "nwb/base/TimeSeries.hpp"
Expand Down
2 changes: 1 addition & 1 deletion src/nwb/base/TimeSeries.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

#include <string>

#include "BaseIO.hpp"
#include "io/BaseIO.hpp"
#include "nwb/hdmf/base/Container.hpp"

namespace AQNWB::NWB
Expand Down
2 changes: 1 addition & 1 deletion src/nwb/device/Device.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

#include <string>

#include "BaseIO.hpp"
#include "io/BaseIO.hpp"
#include "nwb/hdmf/base/Container.hpp"

namespace AQNWB::NWB
Expand Down
2 changes: 1 addition & 1 deletion src/nwb/ecephys/ElectricalSeries.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

#include <string>

#include "BaseIO.hpp"
#include "io/BaseIO.hpp"
#include "Channel.hpp"
#include "nwb/base/TimeSeries.hpp"

Expand Down
2 changes: 1 addition & 1 deletion src/nwb/file/ElectrodeGroup.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

#include <string>

#include "BaseIO.hpp"
#include "io/BaseIO.hpp"
#include "nwb/device/Device.hpp"
#include "nwb/hdmf/base/Container.hpp"

Expand Down
2 changes: 1 addition & 1 deletion src/nwb/file/ElectrodeTable.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

#include <string>

#include "BaseIO.hpp"
#include "io/BaseIO.hpp"
#include "nwb/hdmf/table/DynamicTable.hpp"
#include "nwb/hdmf/table/ElementIdentifiers.hpp"
#include "nwb/hdmf/table/VectorData.hpp"
Expand Down
2 changes: 1 addition & 1 deletion src/nwb/hdmf/base/Container.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#include <memory>
#include <string>

#include "BaseIO.hpp"
#include "io/BaseIO.hpp"

namespace AQNWB::NWB
{
Expand Down
2 changes: 1 addition & 1 deletion src/nwb/hdmf/base/Data.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

#include <memory>

#include "BaseIO.hpp"
#include "io/BaseIO.hpp"

namespace AQNWB::NWB
{
Expand Down
2 changes: 1 addition & 1 deletion src/nwb/hdmf/table/DynamicTable.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

#include <string>

#include "BaseIO.hpp"
#include "io/BaseIO.hpp"
#include "nwb/hdmf/base/Container.hpp"
#include "nwb/hdmf/table/ElementIdentifiers.hpp"
#include "nwb/hdmf/table/VectorData.hpp"
Expand Down
4 changes: 2 additions & 2 deletions tests/examples/testWorkflowExamples.cpp
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@

#include <catch2/catch_test_macros.hpp>

#include "BaseIO.hpp"
#include "io/BaseIO.hpp"
#include "Channel.hpp"
#include "Types.hpp"
#include "Utils.hpp"
#include "hdf5/HDF5IO.hpp"
#include "io/hdf5/HDF5IO.hpp"
#include "nwb/NWBFile.hpp"
#include "nwb/RecordingContainers.hpp"
#include "nwb/file/ElectrodeTable.hpp"
Expand Down
2 changes: 1 addition & 1 deletion tests/examples/test_HDF5IO_examples.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

#include <catch2/catch_test_macros.hpp>

#include "hdf5/HDF5IO.hpp"
#include "io/hdf5/HDF5IO.hpp"
#include "nwb/NWBFile.hpp"
#include "nwb/file/ElectrodeTable.hpp"
#include "testUtils.hpp"
Expand Down
4 changes: 2 additions & 2 deletions tests/examples/test_ecephys_data_read.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
#include <catch2/catch_test_macros.hpp>
#include <catch2/matchers/catch_matchers_all.hpp>

#include "BaseIO.hpp"
#include "io/BaseIO.hpp"
#include "Channel.hpp"
#include "Types.hpp"
#include "Utils.hpp"
#include "hdf5/HDF5IO.hpp"
#include "io/hdf5/HDF5IO.hpp"
#include "nwb/NWBFile.hpp"
#include "nwb/RecordingContainers.hpp"
#include "nwb/device/Device.hpp"
Expand Down
2 changes: 1 addition & 1 deletion tests/examples/test_example.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// [example_all]
#include <catch2/catch_test_macros.hpp>

#include "hdf5/HDF5IO.hpp"
#include "io/hdf5/HDF5IO.hpp"
#include "testUtils.hpp"

TEST_CASE("SimpleExamples", "[hdf5io]")
Expand Down
2 changes: 1 addition & 1 deletion tests/testBase.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#include <catch2/catch_test_macros.hpp>
#include <catch2/matchers/catch_matchers_all.hpp>

#include "BaseIO.hpp"
#include "io/BaseIO.hpp"
#include "Types.hpp"
#include "Utils.hpp"
#include "nwb/base/TimeSeries.hpp"
Expand Down
4 changes: 2 additions & 2 deletions tests/testEcephys.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
#include <catch2/catch_test_macros.hpp>
#include <catch2/matchers/catch_matchers_all.hpp>

#include "BaseIO.hpp"
#include "io/BaseIO.hpp"
#include "Channel.hpp"
#include "Types.hpp"
#include "Utils.hpp"
#include "hdf5/HDF5IO.hpp"
#include "io/hdf5/HDF5IO.hpp"
#include "nwb/device/Device.hpp"
#include "nwb/ecephys/ElectricalSeries.hpp"
#include "nwb/file/ElectrodeGroup.hpp"
Expand Down
4 changes: 2 additions & 2 deletions tests/testFile.cpp
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#include <catch2/catch_test_macros.hpp>

#include "BaseIO.hpp"
#include "io/BaseIO.hpp"
#include "Channel.hpp"
#include "Types.hpp"
#include "hdf5/HDF5IO.hpp"
#include "io/hdf5/HDF5IO.hpp"
#include "nwb/file/ElectrodeTable.hpp"
#include "testUtils.hpp"

Expand Down
4 changes: 2 additions & 2 deletions tests/testHDF5IO.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@

#include <catch2/catch_test_macros.hpp>

#include "BaseIO.hpp"
#include "io/BaseIO.hpp"
#include "Channel.hpp"
#include "Types.hpp"
#include "hdf5/HDF5IO.hpp"
#include "io/hdf5/HDF5IO.hpp"
#include "nwb/NWBFile.hpp"
#include "nwb/file/ElectrodeTable.hpp"
#include "testUtils.hpp"
Expand Down
4 changes: 2 additions & 2 deletions tests/testNWBFile.cpp
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#include <catch2/catch_test_macros.hpp>

#include "BaseIO.hpp"
#include "io/BaseIO.hpp"
#include "Utils.hpp"
#include "hdf5/HDF5IO.hpp"
#include "io/hdf5/HDF5IO.hpp"
#include "nwb/NWBFile.hpp"
#include "nwb/RecordingContainers.hpp"
#include "nwb/base/TimeSeries.hpp"
Expand Down
4 changes: 2 additions & 2 deletions tests/testRecordingWorkflow.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
#include <catch2/catch_test_macros.hpp>
#include <catch2/matchers/catch_matchers_all.hpp>

#include "BaseIO.hpp"
#include "io/BaseIO.hpp"
#include "Channel.hpp"
#include "Types.hpp"
#include "Utils.hpp"
#include "hdf5/HDF5IO.hpp"
#include "io/hdf5/HDF5IO.hpp"
#include "nwb/NWBFile.hpp"
#include "nwb/RecordingContainers.hpp"
#include "nwb/file/ElectrodeTable.hpp"
Expand Down
2 changes: 1 addition & 1 deletion tests/testUtils.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

#include "Channel.hpp"
#include "Types.hpp"
#include "hdf5/HDF5IO.hpp"
#include "io/hdf5/HDF5IO.hpp"

using namespace AQNWB;
namespace fs = std::filesystem;
Expand Down

0 comments on commit 99b5d4e

Please sign in to comment.