Merge branch 'develop'

tdegeus · May 28, 2018 · 642d08e · 642d08e
2 parents cb744a3 + ebb2f1c
commit 642d08e
Show file tree

Hide file tree

Showing 194 changed files with 32,655 additions and 69,633 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -18,52 +18,125 @@ set(parse_version src/${PROJECT_NAME}/${PROJECT_NAME}.h)
 # header files
 set(headers
   src/${PROJECT_NAME}/cppmat.h
-  src/${PROJECT_NAME}/stl.h
-  src/${PROJECT_NAME}/stl.cpp
-  src/${PROJECT_NAME}/private.h
   src/${PROJECT_NAME}/private.cpp
-  src/${PROJECT_NAME}/regular_array.h
-  src/${PROJECT_NAME}/regular_array.cpp
-  src/${PROJECT_NAME}/regular_matrix.h
-  src/${PROJECT_NAME}/regular_matrix.cpp
-  src/${PROJECT_NAME}/regular_vector.h
-  src/${PROJECT_NAME}/regular_vector.cpp
-  src/${PROJECT_NAME}/periodic_array.h
-  src/${PROJECT_NAME}/periodic_array.cpp
-  src/${PROJECT_NAME}/periodic_matrix.h
-  src/${PROJECT_NAME}/periodic_matrix.cpp
-  src/${PROJECT_NAME}/periodic_vector.h
-  src/${PROJECT_NAME}/periodic_vector.cpp
-  src/${PROJECT_NAME}/tiny_matrix.h
-  src/${PROJECT_NAME}/tiny_matrix.cpp
-  src/${PROJECT_NAME}/tiny_vector.h
-  src/${PROJECT_NAME}/tiny_vector.cpp
-  src/${PROJECT_NAME}/tensor.h
-  src/${PROJECT_NAME}/tensor.cpp
-  src/${PROJECT_NAME}/tensor2.h
-  src/${PROJECT_NAME}/tensor2.cpp
-  src/${PROJECT_NAME}/tensor3.h
-  src/${PROJECT_NAME}/tensor3.cpp
-  src/${PROJECT_NAME}/view_tiny_matrix.h
-  src/${PROJECT_NAME}/view_tiny_matrix.cpp
-  src/${PROJECT_NAME}/view_tiny_vector.h
-  src/${PROJECT_NAME}/view_tiny_vector.cpp
-  src/${PROJECT_NAME}/view_tensor2.h
-  src/${PROJECT_NAME}/view_tensor2.cpp
-  src/${PROJECT_NAME}/view_tensor3.h
-  src/${PROJECT_NAME}/view_tensor3.cpp
+  src/${PROJECT_NAME}/private.h
+  src/${PROJECT_NAME}/stl.cpp
+  src/${PROJECT_NAME}/stl.h
+  src/${PROJECT_NAME}/fix_cartesian.cpp
+  src/${PROJECT_NAME}/fix_cartesian.h
+  src/${PROJECT_NAME}/fix_cartesian_2.cpp
+  src/${PROJECT_NAME}/fix_cartesian_3.cpp
+  src/${PROJECT_NAME}/fix_cartesian_tensor2.cpp
+  src/${PROJECT_NAME}/fix_cartesian_tensor2.h
+  src/${PROJECT_NAME}/fix_cartesian_tensor2d.cpp
+  src/${PROJECT_NAME}/fix_cartesian_tensor2d.h
+  src/${PROJECT_NAME}/fix_cartesian_tensor2s.cpp
+  src/${PROJECT_NAME}/fix_cartesian_tensor2s.h
+  src/${PROJECT_NAME}/fix_cartesian_tensor4.cpp
+  src/${PROJECT_NAME}/fix_cartesian_tensor4.h
+  src/${PROJECT_NAME}/fix_cartesian_vector.cpp
+  src/${PROJECT_NAME}/fix_cartesian_vector.h
+  src/${PROJECT_NAME}/fix_diagonal_matrix.cpp
+  src/${PROJECT_NAME}/fix_diagonal_matrix.h
+  src/${PROJECT_NAME}/fix_misc_matrix.cpp
+  src/${PROJECT_NAME}/fix_misc_matrix.h
+  src/${PROJECT_NAME}/fix_periodic_array.cpp
+  src/${PROJECT_NAME}/fix_periodic_array.h
+  src/${PROJECT_NAME}/fix_periodic_matrix.cpp
+  src/${PROJECT_NAME}/fix_periodic_matrix.h
+  src/${PROJECT_NAME}/fix_periodic_vector.cpp
+  src/${PROJECT_NAME}/fix_periodic_vector.h
+  src/${PROJECT_NAME}/fix_regular_array.cpp
+  src/${PROJECT_NAME}/fix_regular_array.h
+  src/${PROJECT_NAME}/fix_regular_matrix.cpp
+  src/${PROJECT_NAME}/fix_regular_matrix.h
+  src/${PROJECT_NAME}/fix_regular_vector.cpp
+  src/${PROJECT_NAME}/fix_regular_vector.h
+  src/${PROJECT_NAME}/fix_symmetric_matrix.cpp
+  src/${PROJECT_NAME}/fix_symmetric_matrix.h
+  src/${PROJECT_NAME}/map_cartesian_tensor2.cpp
+  src/${PROJECT_NAME}/map_cartesian_tensor2.h
+  src/${PROJECT_NAME}/map_cartesian_tensor2d.cpp
+  src/${PROJECT_NAME}/map_cartesian_tensor2d.h
+  src/${PROJECT_NAME}/map_cartesian_tensor2s.cpp
+  src/${PROJECT_NAME}/map_cartesian_tensor2s.h
+  src/${PROJECT_NAME}/map_cartesian_tensor4.cpp
+  src/${PROJECT_NAME}/map_cartesian_tensor4.h
+  src/${PROJECT_NAME}/map_cartesian_vector.cpp
+  src/${PROJECT_NAME}/map_cartesian_vector.h
+  src/${PROJECT_NAME}/map_diagonal_matrix.cpp
+  src/${PROJECT_NAME}/map_diagonal_matrix.h
+  src/${PROJECT_NAME}/map_periodic_array.cpp
+  src/${PROJECT_NAME}/map_periodic_array.h
+  src/${PROJECT_NAME}/map_periodic_matrix.cpp
+  src/${PROJECT_NAME}/map_periodic_matrix.h
+  src/${PROJECT_NAME}/map_periodic_vector.cpp
+  src/${PROJECT_NAME}/map_periodic_vector.h
+  src/${PROJECT_NAME}/map_regular_array.cpp
+  src/${PROJECT_NAME}/map_regular_array.h
+  src/${PROJECT_NAME}/map_regular_matrix.cpp
+  src/${PROJECT_NAME}/map_regular_matrix.h
+  src/${PROJECT_NAME}/map_regular_vector.cpp
+  src/${PROJECT_NAME}/map_regular_vector.h
+  src/${PROJECT_NAME}/map_symmetric_matrix.cpp
+  src/${PROJECT_NAME}/map_symmetric_matrix.h
+  src/${PROJECT_NAME}/var_cartesian.cpp
+  src/${PROJECT_NAME}/var_cartesian.h
+  src/${PROJECT_NAME}/var_cartesian_tensor2.cpp
+  src/${PROJECT_NAME}/var_cartesian_tensor2.h
+  src/${PROJECT_NAME}/var_cartesian_tensor2d.cpp
+  src/${PROJECT_NAME}/var_cartesian_tensor2d.h
+  src/${PROJECT_NAME}/var_cartesian_tensor2s.cpp
+  src/${PROJECT_NAME}/var_cartesian_tensor2s.h
+  src/${PROJECT_NAME}/var_cartesian_tensor4.cpp
+  src/${PROJECT_NAME}/var_cartesian_tensor4.h
+  src/${PROJECT_NAME}/var_cartesian_vector.cpp
+  src/${PROJECT_NAME}/var_cartesian_vector.h
+  src/${PROJECT_NAME}/var_diagonal_matrix.cpp
+  src/${PROJECT_NAME}/var_diagonal_matrix.h
+  src/${PROJECT_NAME}/var_misc_matrix.cpp
+  src/${PROJECT_NAME}/var_misc_matrix.h
+  src/${PROJECT_NAME}/var_periodic_array.cpp
+  src/${PROJECT_NAME}/var_periodic_array.h
+  src/${PROJECT_NAME}/var_periodic_matrix.cpp
+  src/${PROJECT_NAME}/var_periodic_matrix.h
+  src/${PROJECT_NAME}/var_periodic_vector.cpp
+  src/${PROJECT_NAME}/var_periodic_vector.h
+  src/${PROJECT_NAME}/var_regular_array.cpp
+  src/${PROJECT_NAME}/var_regular_array.h
+  src/${PROJECT_NAME}/var_regular_matrix.cpp
+  src/${PROJECT_NAME}/var_regular_matrix.h
+  src/${PROJECT_NAME}/var_regular_vector.cpp
+  src/${PROJECT_NAME}/var_regular_vector.h
+  src/${PROJECT_NAME}/var_symmetric_matrix.cpp
+  src/${PROJECT_NAME}/var_symmetric_matrix.h
   src/${PROJECT_NAME}/pybind11.h
-  src/${PROJECT_NAME}/pybind11_regular_array.h
-  src/${PROJECT_NAME}/pybind11_regular_matrix.h
-  src/${PROJECT_NAME}/pybind11_regular_vector.h
-  src/${PROJECT_NAME}/pybind11_periodic_array.h
-  src/${PROJECT_NAME}/pybind11_periodic_matrix.h
-  src/${PROJECT_NAME}/pybind11_periodic_vector.h
-  src/${PROJECT_NAME}/pybind11_tiny_matrix.h
-  src/${PROJECT_NAME}/pybind11_tiny_vector.h
-  src/${PROJECT_NAME}/pybind11_tensor.h
-  src/${PROJECT_NAME}/pybind11_tensor2.h
-  src/${PROJECT_NAME}/pybind11_tensor3.h
+  src/${PROJECT_NAME}/pybind11_fix_cartesian_tensor2.h
+  src/${PROJECT_NAME}/pybind11_fix_cartesian_tensor2d.h
+  src/${PROJECT_NAME}/pybind11_fix_cartesian_tensor2s.h
+  src/${PROJECT_NAME}/pybind11_fix_cartesian_tensor4.h
+  src/${PROJECT_NAME}/pybind11_fix_cartesian_vector.h
+  src/${PROJECT_NAME}/pybind11_fix_diagonal_matrix.h
+  src/${PROJECT_NAME}/pybind11_fix_periodic_array.h
+  src/${PROJECT_NAME}/pybind11_fix_periodic_matrix.h
+  src/${PROJECT_NAME}/pybind11_fix_periodic_vector.h
+  src/${PROJECT_NAME}/pybind11_fix_regular_array.h
+  src/${PROJECT_NAME}/pybind11_fix_regular_matrix.h
+  src/${PROJECT_NAME}/pybind11_fix_regular_vector.h
+  src/${PROJECT_NAME}/pybind11_fix_symmetric_matrix.h
+  src/${PROJECT_NAME}/pybind11_var_cartesian_tensor2.h
+  src/${PROJECT_NAME}/pybind11_var_cartesian_tensor2d.h
+  src/${PROJECT_NAME}/pybind11_var_cartesian_tensor2s.h
+  src/${PROJECT_NAME}/pybind11_var_cartesian_tensor4.h
+  src/${PROJECT_NAME}/pybind11_var_cartesian_vector.h
+  src/${PROJECT_NAME}/pybind11_var_diagonal_matrix.h
+  src/${PROJECT_NAME}/pybind11_var_periodic_array.h
+  src/${PROJECT_NAME}/pybind11_var_periodic_matrix.h
+  src/${PROJECT_NAME}/pybind11_var_periodic_vector.h
+  src/${PROJECT_NAME}/pybind11_var_regular_array.h
+  src/${PROJECT_NAME}/pybind11_var_regular_matrix.h
+  src/${PROJECT_NAME}/pybind11_var_regular_vector.h
+  src/${PROJECT_NAME}/pybind11_var_symmetric_matrix.h
 )
 
 # automatically parse the version number

diff --git a/develop/CMakeLists.txt b/develop/CMakeLists.txt
@@ -36,15 +36,32 @@ include_directories(${EIGEN3_INCLUDE_DIRS})
 # create executable
 add_executable(${PROJECT_NAME}
   main.cpp
-  regular_array.cpp
-  regular_matrix.cpp
-  regular_vector.cpp
-  periodic_array.cpp
-  periodic_matrix.cpp
-  periodic_vector.cpp
-  tiny_matrix.cpp
-  tiny_vector.cpp
-  tensor.cpp
-  tensor2.cpp
-  tensor3.cpp
+  var_regular_array.cpp
+  var_symmetric_matrix.cpp
+  var_diagonal_matrix.cpp
+  var_misc_matrix.cpp
+  var_cartesian_tensor4.cpp
+  var_cartesian_tensor2.cpp
+  var_cartesian_tensor2s.cpp
+  var_cartesian_tensor2d.cpp
+  var_cartesian_vector.cpp
+  fix_regular_array.cpp
+  fix_symmetric_matrix.cpp
+  fix_diagonal_matrix.cpp
+  fix_misc_matrix.cpp
+  fix_cartesian_tensor4.cpp
+  fix_cartesian_tensor2.cpp
+  fix_cartesian_tensor2s.cpp
+  fix_cartesian_tensor2d.cpp
+  fix_cartesian_vector.cpp
+  fix_cartesian_tensor4_2.cpp
+  fix_cartesian_tensor2_2.cpp
+  fix_cartesian_tensor2s_2.cpp
+  fix_cartesian_tensor2d_2.cpp
+  fix_cartesian_vector_2.cpp
+  fix_cartesian_tensor4_3.cpp
+  fix_cartesian_tensor2_3.cpp
+  fix_cartesian_tensor2s_3.cpp
+  fix_cartesian_tensor2d_3.cpp
+  fix_cartesian_vector_3.cpp
 )