Move headers to namespace Dune

src/mynonlinearity.cc

@@ -13,7 +13,8 @@
 
 #include "properscalarincreasingconvexfunction.hh"
 
-template <int dimension, class OuterFunction = TrivialFunction>
+namespace Dune {
+template <int dimension, class OuterFunction = Dune::TrivialFunction>
 class MyNonlinearity {
 public:
   typedef Dune::FieldVector<double, dimension> SmallVector;
@@ -52,3 +53,4 @@ class MyNonlinearity {
 private:
   OuterFunction func_;
 };
+}

src/properscalarincreasingconvexfunction.hh

@@ -3,6 +3,7 @@
 #ifndef PROPER_SCALAR_INCREASING_CONVEX_FUNCTION_HH
 #define PROPER_SCALAR_INCREASING_CONVEX_FUNCTION_HH
 
+namespace Dune {
 class ProperScalarIncreasingConvexFunction {
 public:
   virtual double operator()(const double s) const = 0;
@@ -27,5 +28,5 @@ class TrivialFunction : public ProperScalarIncreasingConvexFunction {
 
   double rightDifferential(const double) const { return 0; }
 };
-
+}
 #endif

src/samplefunctional.hh

@@ -11,6 +11,8 @@
 #include "mynonlinearity.cc"
 #include "properscalarincreasingconvexfunction.hh"
 
+namespace Dune {
+
 template <int dimension, class Function = TrivialFunction>
 class SampleFunctional {
 public:
@@ -139,5 +141,5 @@ void minimise(const Functional J, const typename Functional::SmallVector x,
   corr = descDir;
   corr *= stepsize;
 }
-
+}
 #endif

src/test-gradient-method.cc

@@ -10,12 +10,13 @@
 
 template <int dim, class Function>
 void functionTester(
-    SampleFunctional<dim, Function> J,
-    typename SampleFunctional<dim, Function>::SmallVector &start, size_t runs) {
-  typename SampleFunctional<dim, Function>::SmallVector correction;
+    Dune::SampleFunctional<dim, Function> J,
+    typename Dune::SampleFunctional<dim, Function>::SmallVector &start,
+    size_t runs) {
+  typename Dune::SampleFunctional<dim, Function>::SmallVector correction;
   std::cout << "Old value: J(...) = " << J(start) << std::endl;
   for (size_t i = 1; i <= runs; ++i) {
-    minimise(J, start, correction);
+    Dune::minimise(J, start, correction);
     start += correction;
     if (i != runs)
       std::cout << "New value: J(...) = " << J(start) << std::endl;
@@ -25,7 +26,7 @@ void functionTester(
 
 void testSampleFunction() {
   int const dim = 2;
-  typedef SampleFunctional<dim, SampleFunction> SampleFunctional;
+  typedef Dune::SampleFunctional<dim, Dune::SampleFunction> SampleFunctional;
 
   SampleFunctional::SmallMatrix A;
   A[0][0] = 3;
@@ -46,7 +47,7 @@ void testSampleFunction() {
 
 void testTrivialFunction() {
   int const dim = 2;
-  typedef SampleFunctional<dim> SampleFunctional;
+  typedef Dune::SampleFunctional<dim> SampleFunctional;
 
   SampleFunctional::SmallMatrix A;
   A[0][0] = 3;