From bfee943429fb2a029c96f9cef52a4de490164487 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Klinkovsk=C3=BD?= <klinkjak@fjfi.cvut.cz>
Date: Fri, 4 May 2018 15:14:17 +0200
Subject: [PATCH] Moved multimaps from Experimental to Containers
---
src/TNL/Containers/CMakeLists.txt | 21 ++++++++++---------
.../Multimaps/CMakeLists.txt | 2 +-
.../Multimaps/EllpackIndexMultimap.h | 4 ++--
.../Multimaps/EllpackIndexMultimapValues.h | 2 +-
.../EllpackIndexMultimapValues_impl.h | 0
.../Multimaps/EllpackIndexMultimap_impl.h | 2 +-
.../Multimaps/MultimapPermutationApplier.h | 0
.../Multimaps/StaticEllpackIndexMultimap.h | 4 ++--
.../StaticEllpackIndexMultimapValues.h | 2 +-
.../StaticEllpackIndexMultimapValues_impl.h | 0
.../StaticEllpackIndexMultimap_impl.h | 2 +-
src/TNL/Experimental/CMakeLists.txt | 1 -
.../MeshDetails/IndexPermutationApplier.h | 2 +-
.../MeshDetails/traits/MeshSubentityTraits.h | 2 +-
.../traits/MeshSuperentityTraits.h | 2 +-
15 files changed, 23 insertions(+), 23 deletions(-)
rename src/TNL/{Experimental => Containers}/Multimaps/CMakeLists.txt (93%)
rename src/TNL/{Experimental => Containers}/Multimaps/EllpackIndexMultimap.h (96%)
rename src/TNL/{Experimental => Containers}/Multimaps/EllpackIndexMultimapValues.h (98%)
rename src/TNL/{Experimental => Containers}/Multimaps/EllpackIndexMultimapValues_impl.h (100%)
rename src/TNL/{Experimental => Containers}/Multimaps/EllpackIndexMultimap_impl.h (99%)
rename src/TNL/{Experimental => Containers}/Multimaps/MultimapPermutationApplier.h (100%)
rename src/TNL/{Experimental => Containers}/Multimaps/StaticEllpackIndexMultimap.h (95%)
rename src/TNL/{Experimental => Containers}/Multimaps/StaticEllpackIndexMultimapValues.h (97%)
rename src/TNL/{Experimental => Containers}/Multimaps/StaticEllpackIndexMultimapValues_impl.h (100%)
rename src/TNL/{Experimental => Containers}/Multimaps/StaticEllpackIndexMultimap_impl.h (99%)
diff --git a/src/TNL/Containers/CMakeLists.txt b/src/TNL/Containers/CMakeLists.txt
index 5e5422f128..83991f2456 100644
--- a/src/TNL/Containers/CMakeLists.txt
+++ b/src/TNL/Containers/CMakeLists.txt
@@ -1,4 +1,5 @@
ADD_SUBDIRECTORY( Algorithms )
+ADD_SUBDIRECTORY( Multimaps )
set( headers Array.h
Array_impl.h
@@ -15,10 +16,10 @@ set( headers Array.h
MultiArray1D_impl.h
MultiArray2D_impl.h
MultiArray3D_impl.h
- MultiArray4D_impl.h
+ MultiArray4D_impl.h
SharedArray.h
SharedArray_impl.h
- StaticArray.h
+ StaticArray.h
StaticArray_impl.h
StaticArray1D_impl.h
StaticArray2D_impl.h
@@ -32,23 +33,23 @@ set( headers Array.h
MultiVector4D_impl.h
SharedVector.h
SharedVector_impl.h
- StaticVector.h
+ StaticVector.h
StaticVector_impl.h
StaticVector1D_impl.h
StaticVector2D_impl.h
StaticVector3D_impl.h )
SET( CURRENT_DIR ${CMAKE_SOURCE_DIR}/src/TNL/Containers )
-set( common_SOURCES
+set( common_SOURCES
${CURRENT_DIR}/SharedArray_impl.cpp
${CURRENT_DIR}/MultiArray_impl.cpp
${CURRENT_DIR}/Array_impl.cpp
- ${CURRENT_DIR}/StaticArray_impl.cpp
+ ${CURRENT_DIR}/StaticArray_impl.cpp
${CURRENT_DIR}/MultiVector_impl.cpp
${CURRENT_DIR}/SharedVector_impl.cpp
${CURRENT_DIR}/Vector_impl.cpp
${CURRENT_DIR}/StaticVector_impl.cpp
-)
+)
IF( BUILD_CUDA )
set( tnl_containers_CUDA__SOURCES
@@ -58,12 +59,12 @@ IF( BUILD_CUDA )
${CURRENT_DIR}/MultiArray_impl.cu
${CURRENT_DIR}/StaticArray_impl.cu
${CURRENT_DIR}/Vector_impl.cu
- ${CURRENT_DIR}/StaticVector_impl.cu
+ ${CURRENT_DIR}/StaticVector_impl.cu
PARENT_SCOPE )
-ENDIF()
+ENDIF()
-set( tnl_containers_SOURCES
+set( tnl_containers_SOURCES
${common_SOURCES}
PARENT_SCOPE )
-
+
INSTALL( FILES ${headers} DESTINATION ${TNL_TARGET_INCLUDE_DIRECTORY}/Containers )
diff --git a/src/TNL/Experimental/Multimaps/CMakeLists.txt b/src/TNL/Containers/Multimaps/CMakeLists.txt
similarity index 93%
rename from src/TNL/Experimental/Multimaps/CMakeLists.txt
rename to src/TNL/Containers/Multimaps/CMakeLists.txt
index c9fcff297f..921c735f7b 100644
--- a/src/TNL/Experimental/Multimaps/CMakeLists.txt
+++ b/src/TNL/Containers/Multimaps/CMakeLists.txt
@@ -8,4 +8,4 @@ SET( headers EllpackIndexMultimap.h
StaticEllpackIndexMultimapValues_impl.h
MultimapPermutationApplier.h )
-INSTALL( FILES ${headers} DESTINATION ${TNL_TARGET_INCLUDE_DIRECTORY}/Experimental/Multimaps )
+INSTALL( FILES ${headers} DESTINATION ${TNL_TARGET_INCLUDE_DIRECTORY}/Containers/Multimaps )
diff --git a/src/TNL/Experimental/Multimaps/EllpackIndexMultimap.h b/src/TNL/Containers/Multimaps/EllpackIndexMultimap.h
similarity index 96%
rename from src/TNL/Experimental/Multimaps/EllpackIndexMultimap.h
rename to src/TNL/Containers/Multimaps/EllpackIndexMultimap.h
index a1ff4f3c5a..3cc3b36596 100644
--- a/src/TNL/Experimental/Multimaps/EllpackIndexMultimap.h
+++ b/src/TNL/Containers/Multimaps/EllpackIndexMultimap.h
@@ -11,7 +11,7 @@
#pragma once
#include <TNL/Containers/Vector.h>
-#include <TNL/Experimental/Multimaps/EllpackIndexMultimapValues.h>
+#include <TNL/Containers/Multimaps/EllpackIndexMultimapValues.h>
namespace TNL {
@@ -107,5 +107,5 @@ std::ostream& operator << ( std::ostream& str, const EllpackIndexMultimap< Index
} // namespace TNL
-#include <TNL/Experimental/Multimaps/EllpackIndexMultimap_impl.h>
+#include <TNL/Containers/Multimaps/EllpackIndexMultimap_impl.h>
diff --git a/src/TNL/Experimental/Multimaps/EllpackIndexMultimapValues.h b/src/TNL/Containers/Multimaps/EllpackIndexMultimapValues.h
similarity index 98%
rename from src/TNL/Experimental/Multimaps/EllpackIndexMultimapValues.h
rename to src/TNL/Containers/Multimaps/EllpackIndexMultimapValues.h
index ae1552f811..87364c5f79 100644
--- a/src/TNL/Experimental/Multimaps/EllpackIndexMultimapValues.h
+++ b/src/TNL/Containers/Multimaps/EllpackIndexMultimapValues.h
@@ -114,5 +114,5 @@ std::ostream& operator << ( std::ostream& str, const EllpackIndexMultimapValues<
} // namespace TNL
-#include <TNL/Experimental/Multimaps/EllpackIndexMultimapValues_impl.h>
+#include <TNL/Containers/Multimaps/EllpackIndexMultimapValues_impl.h>
diff --git a/src/TNL/Experimental/Multimaps/EllpackIndexMultimapValues_impl.h b/src/TNL/Containers/Multimaps/EllpackIndexMultimapValues_impl.h
similarity index 100%
rename from src/TNL/Experimental/Multimaps/EllpackIndexMultimapValues_impl.h
rename to src/TNL/Containers/Multimaps/EllpackIndexMultimapValues_impl.h
diff --git a/src/TNL/Experimental/Multimaps/EllpackIndexMultimap_impl.h b/src/TNL/Containers/Multimaps/EllpackIndexMultimap_impl.h
similarity index 99%
rename from src/TNL/Experimental/Multimaps/EllpackIndexMultimap_impl.h
rename to src/TNL/Containers/Multimaps/EllpackIndexMultimap_impl.h
index f73274c6bf..5c10152a7d 100644
--- a/src/TNL/Experimental/Multimaps/EllpackIndexMultimap_impl.h
+++ b/src/TNL/Containers/Multimaps/EllpackIndexMultimap_impl.h
@@ -10,7 +10,7 @@
#pragma once
-#include <TNL/Experimental/Multimaps/EllpackIndexMultimap.h>
+#include <TNL/Containers/Multimaps/EllpackIndexMultimap.h>
namespace TNL {
diff --git a/src/TNL/Experimental/Multimaps/MultimapPermutationApplier.h b/src/TNL/Containers/Multimaps/MultimapPermutationApplier.h
similarity index 100%
rename from src/TNL/Experimental/Multimaps/MultimapPermutationApplier.h
rename to src/TNL/Containers/Multimaps/MultimapPermutationApplier.h
diff --git a/src/TNL/Experimental/Multimaps/StaticEllpackIndexMultimap.h b/src/TNL/Containers/Multimaps/StaticEllpackIndexMultimap.h
similarity index 95%
rename from src/TNL/Experimental/Multimaps/StaticEllpackIndexMultimap.h
rename to src/TNL/Containers/Multimaps/StaticEllpackIndexMultimap.h
index 2b9c8785b3..85f0133698 100644
--- a/src/TNL/Experimental/Multimaps/StaticEllpackIndexMultimap.h
+++ b/src/TNL/Containers/Multimaps/StaticEllpackIndexMultimap.h
@@ -11,7 +11,7 @@
#pragma once
#include <TNL/Containers/Vector.h>
-#include <TNL/Experimental/Multimaps/StaticEllpackIndexMultimapValues.h>
+#include <TNL/Containers/Multimaps/StaticEllpackIndexMultimapValues.h>
namespace TNL {
@@ -104,5 +104,5 @@ std::ostream& operator << ( std::ostream& str, const StaticEllpackIndexMultimap<
} // namespace TNL
-#include <TNL/Experimental/Multimaps/StaticEllpackIndexMultimap_impl.h>
+#include <TNL/Containers/Multimaps/StaticEllpackIndexMultimap_impl.h>
diff --git a/src/TNL/Experimental/Multimaps/StaticEllpackIndexMultimapValues.h b/src/TNL/Containers/Multimaps/StaticEllpackIndexMultimapValues.h
similarity index 97%
rename from src/TNL/Experimental/Multimaps/StaticEllpackIndexMultimapValues.h
rename to src/TNL/Containers/Multimaps/StaticEllpackIndexMultimapValues.h
index 9a478ff1b6..5b69861c18 100644
--- a/src/TNL/Experimental/Multimaps/StaticEllpackIndexMultimapValues.h
+++ b/src/TNL/Containers/Multimaps/StaticEllpackIndexMultimapValues.h
@@ -101,5 +101,5 @@ std::ostream& operator << ( std::ostream& str, const StaticEllpackIndexMultimapV
} // namespace TNL
-#include <TNL/Experimental/Multimaps/StaticEllpackIndexMultimapValues_impl.h>
+#include <TNL/Containers/Multimaps/StaticEllpackIndexMultimapValues_impl.h>
diff --git a/src/TNL/Experimental/Multimaps/StaticEllpackIndexMultimapValues_impl.h b/src/TNL/Containers/Multimaps/StaticEllpackIndexMultimapValues_impl.h
similarity index 100%
rename from src/TNL/Experimental/Multimaps/StaticEllpackIndexMultimapValues_impl.h
rename to src/TNL/Containers/Multimaps/StaticEllpackIndexMultimapValues_impl.h
diff --git a/src/TNL/Experimental/Multimaps/StaticEllpackIndexMultimap_impl.h b/src/TNL/Containers/Multimaps/StaticEllpackIndexMultimap_impl.h
similarity index 99%
rename from src/TNL/Experimental/Multimaps/StaticEllpackIndexMultimap_impl.h
rename to src/TNL/Containers/Multimaps/StaticEllpackIndexMultimap_impl.h
index 4782ed9c2a..a0c61fa08b 100644
--- a/src/TNL/Experimental/Multimaps/StaticEllpackIndexMultimap_impl.h
+++ b/src/TNL/Containers/Multimaps/StaticEllpackIndexMultimap_impl.h
@@ -10,7 +10,7 @@
#pragma once
-#include <TNL/Experimental/Multimaps/StaticEllpackIndexMultimap.h>
+#include <TNL/Containers/Multimaps/StaticEllpackIndexMultimap.h>
namespace TNL {
diff --git a/src/TNL/Experimental/CMakeLists.txt b/src/TNL/Experimental/CMakeLists.txt
index 47fc9efa44..fea80728f2 100644
--- a/src/TNL/Experimental/CMakeLists.txt
+++ b/src/TNL/Experimental/CMakeLists.txt
@@ -1,3 +1,2 @@
ADD_SUBDIRECTORY( Arithmetics )
-ADD_SUBDIRECTORY( Multimaps )
ADD_SUBDIRECTORY( Hamilton-Jacobi )
diff --git a/src/TNL/Meshes/MeshDetails/IndexPermutationApplier.h b/src/TNL/Meshes/MeshDetails/IndexPermutationApplier.h
index f2f2c925e2..2bf9a007c6 100644
--- a/src/TNL/Meshes/MeshDetails/IndexPermutationApplier.h
+++ b/src/TNL/Meshes/MeshDetails/IndexPermutationApplier.h
@@ -12,7 +12,7 @@
#include <TNL/Meshes/DimensionTag.h>
#include <TNL/Meshes/Mesh.h>
-#include <TNL/Experimental/Multimaps/MultimapPermutationApplier.h>
+#include <TNL/Containers/Multimaps/MultimapPermutationApplier.h>
namespace TNL {
namespace Meshes {
diff --git a/src/TNL/Meshes/MeshDetails/traits/MeshSubentityTraits.h b/src/TNL/Meshes/MeshDetails/traits/MeshSubentityTraits.h
index 70ed6ffcad..6f44e834e4 100644
--- a/src/TNL/Meshes/MeshDetails/traits/MeshSubentityTraits.h
+++ b/src/TNL/Meshes/MeshDetails/traits/MeshSubentityTraits.h
@@ -20,7 +20,7 @@
#include <TNL/Meshes/MeshEntity.h>
#include <TNL/Meshes/MeshDetails/traits/MeshEntityTraits.h>
#include <TNL/Meshes/Topologies/SubentityVertexMap.h>
-#include <TNL/Experimental/Multimaps/StaticEllpackIndexMultimap.h>
+#include <TNL/Containers/Multimaps/StaticEllpackIndexMultimap.h>
namespace TNL {
namespace Meshes {
diff --git a/src/TNL/Meshes/MeshDetails/traits/MeshSuperentityTraits.h b/src/TNL/Meshes/MeshDetails/traits/MeshSuperentityTraits.h
index 0b5d3e831f..efee12537b 100644
--- a/src/TNL/Meshes/MeshDetails/traits/MeshSuperentityTraits.h
+++ b/src/TNL/Meshes/MeshDetails/traits/MeshSuperentityTraits.h
@@ -18,7 +18,7 @@
#include <TNL/Meshes/MeshEntity.h>
#include <TNL/Meshes/MeshDetails/traits/MeshEntityTraits.h>
-#include <TNL/Experimental/Multimaps/EllpackIndexMultimap.h>
+#include <TNL/Containers/Multimaps/EllpackIndexMultimap.h>
namespace TNL {
namespace Meshes {
--
GitLab