move boxconstraint.hh, genericvectortools.hh, and numproc.hh from the root directory to 'common'

[[Imported from SVN: r3662]]

dune/solvers/Makefile.am

@@ -2,6 +2,6 @@
 SUBDIRS = common iterationsteps norms solvers transferoperators
 
 dune_solversdir = $(includedir)/dune/dune-solvers
-dune_solvers_HEADERS = boxconstraint.hh numproc.hh computeenergy.hh genericvectortools.hh
+dune_solvers_HEADERS = computeenergy.hh
 
 include $(top_srcdir)/am/global-rules

dune/solvers/common/Makefile.am

 SUBDIRS =
 
 commondir = $(includedir)/dune/dune-solvers/common
-common_HEADERS = canignore.hh \
+common_HEADERS = boxconstraint.hh \
+                 genericvectortools.hh \
+                 canignore.hh \
+                 numproc.hh \
                  permutationmanager.hh \
                  preconditioner.hh \
                  staticmatrixtools.hh

dune/solvers/common/preconditioner.hh

 #ifndef PRECONDITIONER_HH
 #define PRECONDITIONER_HH
 
-#include <dune/solvers/numproc.hh>
+#include <dune/solvers/common/numproc.hh>
 
 /** \brief Abstract base class for preconditioners
  */

dune/solvers/iterationsteps/iterationstep.hh

@@ -6,7 +6,7 @@
 
 #include <dune/common/bitsetvector.hh>
 #include <dune/solvers/common/canignore.hh>
-#include <dune/solvers/numproc.hh>
+#include <dune/solvers/common/numproc.hh>
 
     //! Base class for iteration steps being called by an iterative solver
 template<class VectorType, class BitVectorType = Dune::BitSetVector<VectorType::block_type::dimension> >

dune/solvers/iterationsteps/mmgstep.hh

@@ -5,7 +5,7 @@
 #include <dune/solvers/iterationsteps/projectedblockgsstep.hh>
 #include <dune/solvers/transferoperators/multigridtransfer.hh>
 
-#include <dune/solvers/boxconstraint.hh>
+#include <dune/solvers/common/boxconstraint.hh>
 #include <dune/solvers/transferoperators/obstaclerestrictor.hh>
 
 /** \brief The general monotone multigrid solver

dune/solvers/iterationsteps/multigridstep.cc

@@ -2,7 +2,7 @@
 
 #include <dune/solvers/transferoperators/multigridtransfer.hh>
 #include <dune/solvers/solvers/loopsolver.hh>
-#include <dune/solvers/genericvectortools.hh>
+#include <dune/solvers/common/genericvectortools.hh>
 #include "blockgsstep.hh"
 
 #ifdef HAVE_IPOPT

dune/solvers/iterationsteps/projectedblockgsstep.hh

@@ -4,7 +4,7 @@
 #include <vector>
 
 #include "blockgsstep.hh"
-#include <dune/solvers/boxconstraint.hh>
+#include <dune/solvers/common/boxconstraint.hh>
 
 template<class OperatorType, class DiscFuncType>
 class ProjectedBlockGSStep : public BlockGSStep<OperatorType, DiscFuncType>

dune/solvers/iterationsteps/projectedlinegsstep.hh

@@ -5,7 +5,7 @@
 
 #include <dune/istl/btdmatrix.hh>
 
-#include <dune/solvers/boxconstraint.hh>
+#include <dune/solvers/common/boxconstraint.hh>
 #include <dune/solvers/iterationsteps/linegsstep.hh>
 
 template<class MatrixType,

dune/solvers/iterationsteps/trustregiongsstep.hh

@@ -7,7 +7,7 @@
 */
 
 #include "projectedblockgsstep.hh"
-#include <dune/solvers/boxconstraint.hh>
+#include <dune/solvers/common/boxconstraint.hh>
 
     /** \brief A Gauss-Seidel iterator which does not assume that the functional
         is convex, but which expects a bounded admissible set.

dune/solvers/solvers/iterativesolver.cc

@@ -4,7 +4,7 @@
 #include <iomanip>
 #include <fstream>
 
-#include <dune/solvers/genericvectortools.hh>
+#include <dune/solvers/common/genericvectortools.hh>
 
 template <class VectorType, class BitVectorType>
 void IterativeSolver<VectorType, BitVectorType>::check() const

dune/solvers/solvers/quadraticipopt.hh

@@ -15,7 +15,7 @@
 #include <dune/istl/bcrsmatrix.hh>
 #include <dune/istl/bvector.hh>
 
-#include <dune/solvers/boxconstraint.hh>
+#include <dune/solvers/common/boxconstraint.hh>
 #include <dune/solvers/common/canignore.hh>
 #include <dune/solvers/solvers/iterativesolver.hh>
 

dune/solvers/solvers/solver.hh

 #ifndef DUNE_SOLVER_HH
 #define DUNE_SOLVER_HH
 
-#include <dune/solvers/numproc.hh>
+#include <dune/solvers/common/numproc.hh>
 
     /** \brief The base class for all sorts of solver algorithms */
     class Solver : public NumProc

dune/solvers/transferoperators/mandelobsrestrictor.hh

@@ -4,7 +4,7 @@
 #include <dune/common/bitsetvector.hh>
 #include <dune/solvers/transferoperators/obstaclerestrictor.hh>
 #include <dune/solvers/transferoperators/multigridtransfer.hh>
-#include <dune/solvers/boxconstraint.hh>
+#include <dune/solvers/common/boxconstraint.hh>
 
 template <class DiscFuncType>
 class MandelObstacleRestrictor : public ObstacleRestrictor<DiscFuncType>

dune/solvers/transferoperators/obstaclerestrictor.hh

@@ -4,7 +4,7 @@
 #include <vector>
 
 #include <dune/solvers/transferoperators/multigridtransfer.hh>
-#include <dune/solvers/boxconstraint.hh>
+#include <dune/solvers/common/boxconstraint.hh>
 
 /** \brief Abstract base class for all obstacle restriction operators
  * \todo Do we need the template parameter?