update names and includes

dune/gdt/local/dof-vector.hh

@@ -10,7 +10,7 @@
 
 #include <dune/stuff/la/container/vector-interface.hh>
 
-#include <dune/gdt/mapper/interface.hh>
+#include <dune/gdt/spaces/mapper/interfaces.hh>
 
 namespace Dune {
 namespace GDT {

dune/gdt/playground/mapper/productdgpdelab.hh

@@ -11,8 +11,8 @@
 #include <dune/stuff/common/debug.hh>
 #include <dune/stuff/common/type_utils.hh>
 
-#include <dune/gdt/mapper/interface.hh>
-#include <dune/gdt/mapper/pdelab.hh>
+#include <dune/gdt/spaces/mapper/interfaces.hh>
+#include <dune/gdt/spaces/mapper/dune-pdelab-wrapper.hh>
 
 namespace Dune {
 namespace GDT {

dune/gdt/playground/spaces/cg/fem-localfunctions.hh

@@ -28,7 +28,7 @@
 
 #include <dune/stuff/common/type_utils.hh>
 
-#include <dune/gdt/mapper/fem.hh>
+#include <dune/gdt/spaces/mapper/dune-fem-wrapper.hh>
 #include <dune/gdt/spaces/basefunctionset/dune-fem-localfunctions-wrapper.hh>
 #include <dune/gdt/spaces/cg/interface.hh>
 

dune/gdt/playground/spaces/dg/fem-localfunctions.hh

@@ -25,7 +25,7 @@
 #include <dune/stuff/common/color.hh>
 #include <dune/stuff/common/type_utils.hh>
 
-#include <dune/gdt/mapper/fem.hh>
+#include <dune/gdt/spaces/mapper/dune-fem-wrapper.hh>
 #include <dune/gdt/spaces/basefunctionset/dune-fem-localfunctions-wrapper.hh>
 #include <dune/gdt/spaces/constraints.hh>
 #include <dune/gdt/spaces/interface.hh>

dune/gdt/spaces/fv/default.hh

@@ -9,7 +9,7 @@
 #include <dune/stuff/common/type_utils.hh>
 
 #include <dune/gdt/spaces/basefunctionset/fv.hh>
-#include <dune/gdt/mapper/default/fv.hh>
+#include <dune/gdt/spaces/mapper/fv.hh>
 #include <dune/gdt/spaces/parallel.hh>
 
 #include "interface.hh"

dune/gdt/spaces/interface.hh

@@ -25,7 +25,7 @@
 #include <dune/stuff/grid/layers.hh>
 #include <dune/stuff/la/container/pattern.hh>
 
-#include <dune/gdt/mapper/interface.hh>
+#include <dune/gdt/spaces/mapper/interfaces.hh>
 
 #include "constraints.hh"
 

dune/gdt/spaces/mapper/dune-fem-wrapper.hh

@@ -3,8 +3,8 @@
 // Copyright holders: Felix Schindler
 // License: BSD 2-Clause License (http://opensource.org/licenses/BSD-2-Clause)
 
-#ifndef DUNE_GDT_MAPPER_FEM_HH
-#define DUNE_GDT_MAPPER_FEM_HH
+#ifndef DUNE_GDT_SPACES_MAPPER_DUNE_FEM_WRAPPER_HH
+#define DUNE_GDT_SPACES_MAPPER_DUNE_FEM_WRAPPER_HH
 
 #include <dune/common/dynvector.hh>
 #include <dune/common/typetraits.hh>
@@ -15,7 +15,7 @@
 
 #include <dune/stuff/common/type_utils.hh>
 
-#include "interface.hh"
+#include "interfaces.hh"
 
 namespace Dune {
 namespace GDT {
@@ -241,4 +241,4 @@ class FemDofWrapper
 } // namespace GDT
 } // namespace Dune
 
-#endif // DUNE_GDT_MAPPER_FEM_HH
+#endif // DUNE_GDT_SPACES_MAPPER_DUNE_FEM_WRAPPER_HH

dune/gdt/spaces/mapper/dune-pdelab-wrapper.hh

@@ -3,8 +3,8 @@
 // Copyright holders: Felix Schindler
 // License: BSD 2-Clause License (http://opensource.org/licenses/BSD-2-Clause)
 
-#ifndef DUNE_GDT_MAPPER_PDELAB_HH
-#define DUNE_GDT_MAPPER_PDELAB_HH
+#ifndef DUNE_GDT_SPACES_MAPPER_DUNE_PDELAB_WRAPPER_HH
+#define DUNE_GDT_SPACES_MAPPER_DUNE_PDELAB_WRAPPER_HH
 
 #include <unordered_map>
 
@@ -19,8 +19,8 @@
 #include <dune/stuff/common/type_utils.hh>
 #include <dune/stuff/common/tuple.hh>
 
-#include "interface.hh"
-#include <dune/gdt/mapper/default/product.hh>
+#include "interfaces.hh"
+#include "product.hh"
 
 namespace Dune {
 namespace GDT {
@@ -236,4 +236,4 @@ class DiscontinuousPdelabWrapper
 } // namespace GDT
 } // namespace Dune
 
-#endif // DUNE_GDT_MAPPER_PDELAB_HH
+#endif // DUNE_GDT_SPACES_MAPPER_DUNE_PDELAB_WRAPPER_HH

dune/gdt/spaces/mapper/fv.hh

@@ -3,8 +3,8 @@
 // Copyright holders: Felix Schindler
 // License: BSD 2-Clause License (http://opensource.org/licenses/BSD-2-Clause)
 
-#ifndef DUNE_GDT_MAPPER_DEFAULT_FV_HH
-#define DUNE_GDT_MAPPER_DEFAULT_FV_HH
+#ifndef DUNE_GDT_SPACES_MAPPER_FV_HH
+#define DUNE_GDT_SPACES_MAPPER_FV_HH
 
 #include <type_traits>
 
@@ -13,7 +13,7 @@
 #include <dune/stuff/common/debug.hh>
 #include <dune/stuff/common/type_utils.hh>
 
-#include "../../mapper/interface.hh"
+#include "interfaces.hh"
 
 namespace Dune {
 namespace GDT {
@@ -273,4 +273,4 @@ private:
 } // namespace GDT
 } // namespace Dune
 
-#endif // DUNE_GDT_MAPPER_DEFAULT_FV_HH
+#endif // DUNE_GDT_SPACES_MAPPER_FV_HH

dune/gdt/spaces/mapper/interfaces.hh

@@ -3,8 +3,8 @@
 // Copyright holders: Felix Schindler
 // License: BSD 2-Clause License (http://opensource.org/licenses/BSD-2-Clause)
 
-#ifndef DUNE_GDT_MAPPER_INTERFACE_HH
-#define DUNE_GDT_MAPPER_INTERFACE_HH
+#ifndef DUNE_GDT_SPACES_MAPPER_INTERFACES_HH
+#define DUNE_GDT_SPACES_MAPPER_INTERFACES_HH
 
 #include <dune/common/dynvector.hh>
 
@@ -132,4 +132,4 @@ public:
 } // namespace Dune
 
 
-#endif // DUNE_GDT_MAPPER_INTERFACE_HH
+#endif // DUNE_GDT_SPACES_MAPPER_INTERFACES_HH

dune/gdt/spaces/mapper/product.hh

@@ -3,8 +3,8 @@
 // Copyright holders: Felix Schindler
 // License: BSD 2-Clause License (http://opensource.org/licenses/BSD-2-Clause)
 
-#ifndef DUNE_GDT_MAPPER_DEFAULT_PRODUCT_HH
-#define DUNE_GDT_MAPPER_DEFAULT_PRODUCT_HH
+#ifndef DUNE_GDT_SPACES_MAPPER_PRODUCT_HH
+#define DUNE_GDT_SPACES_MAPPER_PRODUCT_HH
 
 #include <dune/common/dynvector.hh>
 
@@ -13,7 +13,7 @@
 
 #include <dune/gdt/spaces/basefunctionset/product.hh>
 
-#include "../../mapper/interface.hh"
+#include "interfaces.hh"
 
 namespace Dune {
 namespace GDT {
@@ -286,4 +286,4 @@ private:
 } // namespace GDT
 } // namespace Dune
 
-#endif // DUNE_GDT_MAPPER_DEFAULT_PRODUCT_HH
+#endif // DUNE_GDT_SPACES_MAPPER_PRODUCT_HH

dune/gdt/spaces/product.hh

@@ -13,7 +13,7 @@
 #include <dune/stuff/common/tuple.hh>
 
 #include <dune/gdt/spaces/basefunctionset/product.hh>
-#include <dune/gdt/mapper/default/product.hh>
+#include <dune/gdt/spaces/mapper/product.hh>
 #include <dune/gdt/spaces/cg.hh>
 #include <dune/gdt/spaces/parallel.hh>
 

dune/gdt/spaces/rt/pdelab.hh

@@ -25,7 +25,7 @@
 #include <dune/stuff/common/type_utils.hh>
 
 #include <dune/gdt/spaces/basefunctionset/dune-pdelab-wrapper.hh>
-#include <dune/gdt/mapper/pdelab.hh>
+#include <dune/gdt/spaces/mapper/dune-pdelab-wrapper.hh>
 #include <dune/gdt/spaces/parallel.hh>
 
 #include "interface.hh"

dune/gdt/test/spaces/base.hh

@@ -18,7 +18,7 @@
 #include <dune/stuff/test/gtest/gtest.h>
 
 #include <dune/gdt/spaces/interface.hh>
-#include <dune/gdt/mapper/interface.hh>
+#include <dune/gdt/spaces/mapper/interfaces.hh>
 #include <dune/gdt/spaces/basefunctionset/interface.hh>
 
 #include <dune/gdt/test/grids.hh>

dune/gdt/test/spaces/cg.hh

@@ -17,7 +17,7 @@
 
 #include <dune/gdt/spaces/cg/fem.hh>
 #include <dune/gdt/spaces/cg/pdelab.hh>
-#include <dune/gdt/mapper/interface.hh>
+#include <dune/gdt/spaces/mapper/interfaces.hh>
 #include <dune/gdt/spaces/basefunctionset/interface.hh>
 
 #include "base.hh"