diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt index 7ee6465..118fd5c 100644 --- a/docs/CMakeLists.txt +++ b/docs/CMakeLists.txt @@ -35,6 +35,7 @@ file(GLOB SPHINX_SOURCE_FILES CONFIGURE_DEPENDS "src/*.rst") # src/pyRawMasterFile.rst # ) + foreach(filename ${SPHINX_SOURCE_FILES}) get_filename_component(fname ${filename} NAME) message(STATUS "Copying ${filename} to ${SPHINX_BUILD}/src/${fname}") diff --git a/docs/src/index.rst b/docs/src/index.rst index a43ae4a..577c721 100644 --- a/docs/src/index.rst +++ b/docs/src/index.rst @@ -14,6 +14,7 @@ AARE Requirements + .. toctree:: :caption: Python API :maxdepth: 1 diff --git a/include/aare/NDArray.hpp b/include/aare/NDArray.hpp index c91ae14..346646c 100644 --- a/include/aare/NDArray.hpp +++ b/include/aare/NDArray.hpp @@ -21,6 +21,7 @@ TODO! Add expression templates for operators namespace aare { + template class NDArray : public ArrayExpr, Ndim> { std::array shape_; @@ -47,6 +48,7 @@ class NDArray : public ArrayExpr, Ndim> { std::multiplies<>())), data_(new T[size_]) {} + /** * @brief Construct a new NDArray object with a shape and value. * @@ -72,6 +74,7 @@ class NDArray : public ArrayExpr, Ndim> { : shape_(other.shape_), strides_(c_strides(shape_)), size_(other.size_), data_(other.data_) { other.reset(); // TODO! is this necessary? + } // Copy constructor diff --git a/src/NDArray.test.cpp b/src/NDArray.test.cpp index 34bd788..54099fd 100644 --- a/src/NDArray.test.cpp +++ b/src/NDArray.test.cpp @@ -203,6 +203,7 @@ TEST_CASE("Bitwise and on data") { REQUIRE(a(2) == 384); } + TEST_CASE("Elementwise operations on images") { std::array shape{5, 5}; double a_val = 3.0;