Skip to content

Commit

Permalink
Changed include dir name
Browse files Browse the repository at this point in the history
  • Loading branch information
hosseinmoein committed Oct 5, 2023
1 parent fba8ada commit dac3d45
Show file tree
Hide file tree
Showing 17 changed files with 61 additions and 63 deletions.
20 changes: 10 additions & 10 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -55,16 +55,16 @@ add_definitions(-D DMS_INCLUDE_SOURCE) # Need this for some of the .tcc files to
add_library(${LIBRARY_TARGET_NAME} INTERFACE)
# List of header files.
set(${LIBRARY_TARGET_NAME}_HDR
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include/Complex.h>
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include/DenseMatrixBase.h>
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include/DenseMatrixBase.tcc>
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include/MathOperators.h>
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include/Matrix.h>
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include/Matrix.tcc>
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include/MatrixBase.h>
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include/MatrixBase.tcc>
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include/SymmMatrixBase.h>
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include/SymmMatrixBase.tcc>
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include/Tiger/Complex.h>
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include/Tiger/DenseMatrixBase.h>
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include/Tiger/DenseMatrixBase.tcc>
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include/Tiger/MathOperators.h>
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include/Tiger/Matrix.h>
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include/Tiger/Matrix.tcc>
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include/Tiger/MatrixBase.h>
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include/Tiger/MatrixBase.tcc>
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include/Tiger/SymmMatrixBase.h>
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include/Tiger/SymmMatrixBase.tcc>
)

target_include_directories(${LIBRARY_TARGET_NAME} INTERFACE "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>"
Expand Down
2 changes: 1 addition & 1 deletion LICENSE.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ notice, this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
* Neither the name of Hossein Moein and/or the Matrix nor the
* Neither the name of Hossein Moein and/or the Tiger nor the
names of its contributors may be used to endorse or promote products
derived from this software without specific prior written permission.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ modification, are permitted provided that the following conditions are met:
* Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
* Neither the name of Hossein Moein and/or the Matrix nor the
* Neither the name of Hossein Moein and/or the Tiger nor the
names of its contributors may be used to endorse or promote products
derived from this software without specific prior written permission.
Expand Down
2 changes: 1 addition & 1 deletion include/Complex.h → include/Tiger/Complex.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ modification, are permitted provided that the following conditions are met:
* Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
* Neither the name of Hossein Moein and/or the Matrix nor the
* Neither the name of Hossein Moein and/or the Tiger nor the
names of its contributors may be used to endorse or promote products
derived from this software without specific prior written permission.
Expand Down
10 changes: 5 additions & 5 deletions include/DenseMatrixBase.h → include/Tiger/DenseMatrixBase.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ modification, are permitted provided that the following conditions are met:
* Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
* Neither the name of Hossein Moein and/or the Matrix nor the
* Neither the name of Hossein Moein and/or the Tiger nor the
names of its contributors may be used to endorse or promote products
derived from this software without specific prior written permission.
Expand All @@ -31,10 +31,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

#include <iostream>

#include <VectorRange.h>
#include <StepVectorRange.h>
#include <Tiger/VectorRange.h>
#include <Tiger/StepVectorRange.h>

#include <MatrixBase.h>
#include <Tiger/MatrixBase.h>

// ----------------------------------------------------------------------------

Expand Down Expand Up @@ -420,7 +420,7 @@ class DenseMatrixBase : public DenseMatrixStorage<T> {
// ----------------------------------------------------------------------------

# ifdef DMS_INCLUDE_SOURCE
# include <DenseMatrixBase.tcc>
# include <Tiger/DenseMatrixBase.tcc>
# endif // DMS_INCLUDE_SOURCE

// ----------------------------------------------------------------------------
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ modification, are permitted provided that the following conditions are met:
* Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
* Neither the name of Hossein Moein and/or the Matrix nor the
* Neither the name of Hossein Moein and/or the Tiger nor the
names of its contributors may be used to endorse or promote products
derived from this software without specific prior written permission.
Expand All @@ -27,7 +27,7 @@ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/

#include <DenseMatrixBase.h>
#include <Tiger/DenseMatrixBase.h>

// ----------------------------------------------------------------------------

Expand Down
4 changes: 2 additions & 2 deletions include/MathOperators.h → include/Tiger/MathOperators.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ modification, are permitted provided that the following conditions are met:
* Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
* Neither the name of Hossein Moein and/or the Matrix nor the
* Neither the name of Hossein Moein and/or the Tiger nor the
names of its contributors may be used to endorse or promote products
derived from this software without specific prior written permission.
Expand All @@ -33,7 +33,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <stdexcept>
#include <iterator>

#include <Matrix.h>
#include <Tiger/Matrix.h>

// ----------------------------------------------------------------------------

Expand Down
8 changes: 4 additions & 4 deletions include/Matrix.h → include/Tiger/Matrix.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ modification, are permitted provided that the following conditions are met:
* Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
* Neither the name of Hossein Moein and/or the Matrix nor the
* Neither the name of Hossein Moein and/or the Tiger nor the
names of its contributors may be used to endorse or promote products
derived from this software without specific prior written permission.
Expand All @@ -31,8 +31,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

#include <future>

#include <DenseMatrixBase.h>
#include <SymmMatrixBase.h>
#include <Tiger/DenseMatrixBase.h>
#include <Tiger/SymmMatrixBase.h>

// ----------------------------------------------------------------------------

Expand Down Expand Up @@ -601,7 +601,7 @@ typedef Matrix<SymmMatrixBase, long double> SLDMatrix;
// ----------------------------------------------------------------------------

# ifdef DMS_INCLUDE_SOURCE
# include <Matrix.tcc>
# include <Tiger/Matrix.tcc>
# endif // DMS_INCLUDE_SOURCE

// ----------------------------------------------------------------------------
Expand Down
6 changes: 3 additions & 3 deletions include/Matrix.tcc → include/Tiger/Matrix.tcc
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ modification, are permitted provided that the following conditions are met:
* Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
* Neither the name of Hossein Moein and/or the Matrix nor the
* Neither the name of Hossein Moein and/or the Tiger nor the
names of its contributors may be used to endorse or promote products
derived from this software without specific prior written permission.
Expand All @@ -30,8 +30,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <math.h>
#include <algorithm> // std::max and min

#include <MathOperators.h>
#include <Matrix.h>
#include <Tiger/MathOperators.h>
#include <Tiger/Matrix.h>

// ----------------------------------------------------------------------------

Expand Down
4 changes: 2 additions & 2 deletions include/MatrixBase.h → include/Tiger/MatrixBase.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ modification, are permitted provided that the following conditions are met:
* Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
* Neither the name of Hossein Moein and/or the Matrix nor the
* Neither the name of Hossein Moein and/or the Tiger nor the
names of its contributors may be used to endorse or promote products
derived from this software without specific prior written permission.
Expand Down Expand Up @@ -127,7 +127,7 @@ class DenseMatrixStorage : public MatrixBase<T> {
// ----------------------------------------------------------------------------

# ifdef DMS_INCLUDE_SOURCE
# include <MatrixBase.tcc>
# include <Tiger/MatrixBase.tcc>
# endif // DMS_INCLUDE_SOURCE

// ----------------------------------------------------------------------------
Expand Down
5 changes: 3 additions & 2 deletions include/MatrixBase.tcc → include/Tiger/MatrixBase.tcc
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ modification, are permitted provided that the following conditions are met:
* Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
* Neither the name of Hossein Moein and/or the Matrix nor the
* Neither the name of Hossein Moein and/or the Tiger nor the
names of its contributors may be used to endorse or promote products
derived from this software without specific prior written permission.
Expand All @@ -27,7 +27,8 @@ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/

#include <MatrixBase.h>
#include <Tiger/MatrixBase.h>

#include <iomanip>
#include <stdexcept>
#include <fstream>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ modification, are permitted provided that the following conditions are met:
* Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
* Neither the name of Hossein Moein and/or the Matrix nor the
* Neither the name of Hossein Moein and/or the Tiger nor the
names of its contributors may be used to endorse or promote products
derived from this software without specific prior written permission.
Expand Down
10 changes: 5 additions & 5 deletions include/SymmMatrixBase.h → include/Tiger/SymmMatrixBase.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ modification, are permitted provided that the following conditions are met:
* Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
* Neither the name of Hossein Moein and/or the Matrix nor the
* Neither the name of Hossein Moein and/or the Tiger nor the
names of its contributors may be used to endorse or promote products
derived from this software without specific prior written permission.
Expand All @@ -31,10 +31,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

#include <iostream>

#include <VectorRange.h>
#include <StepVectorRange.h>
#include <Tiger/VectorRange.h>
#include <Tiger/StepVectorRange.h>

#include <MatrixBase.h>
#include <Tiger/MatrixBase.h>

// ----------------------------------------------------------------------------

Expand Down Expand Up @@ -384,7 +384,7 @@ class SymmMatrixBase : public DenseMatrixStorage<T> {
// ----------------------------------------------------------------------------

# ifdef DMS_INCLUDE_SOURCE
# include <SymmMatrixBase.tcc>
# include <Tiger/SymmMatrixBase.tcc>
# endif // DMS_INCLUDE_SOURCE

// ----------------------------------------------------------------------------
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ modification, are permitted provided that the following conditions are met:
* Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
* Neither the name of Hossein Moein and/or the Matrix nor the
* Neither the name of Hossein Moein and/or the Tiger nor the
names of its contributors may be used to endorse or promote products
derived from this software without specific prior written permission.
Expand All @@ -27,7 +27,7 @@ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/

#include <SymmMatrixBase.h>
#include <Tiger/SymmMatrixBase.h>

// ----------------------------------------------------------------------------

Expand Down
2 changes: 1 addition & 1 deletion include/VectorRange.h → include/Tiger/VectorRange.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ modification, are permitted provided that the following conditions are met:
* Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
* Neither the name of Hossein Moein and/or the Matrix nor the
* Neither the name of Hossein Moein and/or the Tiger nor the
names of its contributors may be used to endorse or promote products
derived from this software without specific prior written permission.
Expand Down
26 changes: 13 additions & 13 deletions src/CommonMakefile.mk
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,18 @@ PROJECT_INCLUDE_DIR = ../../include
# -----------------------------------------------------------------------------

SRCS =
HEADERS = $(LOCAL_INCLUDE_DIR)/MathOperators.h \
$(LOCAL_INCLUDE_DIR)/SymmMatrixBase.h \
$(LOCAL_INCLUDE_DIR)/SymmMatrixBase.tcc \
$(LOCAL_INCLUDE_DIR)/MatrixBase.h \
$(LOCAL_INCLUDE_DIR)/MatrixBase.tcc \
$(LOCAL_INCLUDE_DIR)/DenseMatrixBase.h \
$(LOCAL_INCLUDE_DIR)/DenseMatrixBase.tcc \
$(LOCAL_INCLUDE_DIR)/Matrix.h \
$(LOCAL_INCLUDE_DIR)/Matrix.tcc \
$(LOCAL_INCLUDE_DIR)/VectorRange.h \
$(LOCAL_INCLUDE_DIR)/StepVectorRange.h \
$(LOCAL_INCLUDE_DIR)/BaseMathOperators.h
HEADERS = $(LOCAL_INCLUDE_DIR)/Tiger/MathOperators.h \
$(LOCAL_INCLUDE_DIR)/Tiger/SymmMatrixBase.h \
$(LOCAL_INCLUDE_DIR)/Tiger/SymmMatrixBase.tcc \
$(LOCAL_INCLUDE_DIR)/Tiger/MatrixBase.h \
$(LOCAL_INCLUDE_DIR)/Tiger/MatrixBase.tcc \
$(LOCAL_INCLUDE_DIR)/Tiger/DenseMatrixBase.h \
$(LOCAL_INCLUDE_DIR)/Tiger/DenseMatrixBase.tcc \
$(LOCAL_INCLUDE_DIR)/Tiger/Matrix.h \
$(LOCAL_INCLUDE_DIR)/Tiger/Matrix.tcc \
$(LOCAL_INCLUDE_DIR)/Tiger/VectorRange.h \
$(LOCAL_INCLUDE_DIR)/Tiger/StepVectorRange.h \
$(LOCAL_INCLUDE_DIR)/Tiger/BaseMathOperators.h

LIB_NAME =
TARGET_LIB =
Expand Down Expand Up @@ -68,7 +68,7 @@ PRE_BUILD:
mkdir -p $(LOCAL_BIN_DIR)
mkdir -p $(LOCAL_OBJ_DIR)
mkdir -p $(PROJECT_LIB_DIR)
mkdir -p $(PROJECT_INCLUDE_DIR)
mkdir -p $(PROJECT_INCLUDE_DIR)/Tiger

MATRIX_TESTER_OBJ = $(LOCAL_OBJ_DIR)/matrix_tester.o
$(LOCAL_BIN_DIR)/matrix_tester: $(MATRIX_TESTER_OBJ)
Expand Down
13 changes: 5 additions & 8 deletions src/matrix_tester.cc
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ modification, are permitted provided that the following conditions are met:
* Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
* Neither the name of Hossein Moein and/or the Matrix nor the
* Neither the name of Hossein Moein and/or the Tiger nor the
names of its contributors may be used to endorse or promote products
derived from this software without specific prior written permission.
Expand All @@ -30,13 +30,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <iostream>
#include <time.h>

#include <BaseMathOperators.h>
#include <MathOperators.h>

// #include <Eigen/Dense>

#include <Complex.h>
#include <Matrix.h>
#include <Tiger/BaseMathOperators.h>
#include <Tiger/MathOperators.h>
#include <Tiger/Complex.h>
#include <Tiger/Matrix.h>

using namespace hmma;

Expand Down

0 comments on commit dac3d45

Please sign in to comment.