From 884ef870684894fc08e235920e9ce7189dbbd077 Mon Sep 17 00:00:00 2001
From: Jonathan Youett <youett@math.fu-berlin.de>
Date: Tue, 23 Feb 2016 15:21:05 +0100
Subject: [PATCH] Remove unused and rarely used typedefs
---
dune/solvers/test/mmgtest.cc | 6 +-----
dune/solvers/test/quadraticipoptsolvertest.cc | 5 +----
2 files changed, 2 insertions(+), 9 deletions(-)
diff --git a/dune/solvers/test/mmgtest.cc b/dune/solvers/test/mmgtest.cc
index b941ef3f..453775ff 100644
--- a/dune/solvers/test/mmgtest.cc
+++ b/dune/solvers/test/mmgtest.cc
@@ -30,10 +30,6 @@
template<class GridType, class MatrixType, class VectorType, class BitVector>
void solveObstacleProblemByMMGSolver(const GridType& grid, const MatrixType& mat, VectorType& x, const VectorType& rhs, const BitVector& ignore, int maxIterations=100, double tolerance=1.0e-10)
{
- typedef VectorType Vector;
- typedef MatrixType Matrix;
- typedef EnergyNorm<Matrix, Vector> Norm;
-
// create double obstacle constraints
const int blockSize = VectorType::block_type::dimension;
@@ -68,7 +64,7 @@ void solveObstacleProblemByMMGSolver(const GridType& grid, const MatrixType& mat
Dune::BitSetVector<blockSize> hasObstacle(x.size(),true);
mmgStep.hasObstacle_ = &hasObstacle;
- std::vector<BoxConstraint<typename Vector::field_type,blockSize> > boxConstraints(rhs.size());
+ std::vector<BoxConstraint<typename VectorType::field_type,blockSize> > boxConstraints(rhs.size());
for (int i = 0; i < boxConstraints.size(); ++i)
{
for (int j = 0; j < blockSize; ++j)
diff --git a/dune/solvers/test/quadraticipoptsolvertest.cc b/dune/solvers/test/quadraticipoptsolvertest.cc
index aae1e193..2516373f 100644
--- a/dune/solvers/test/quadraticipoptsolvertest.cc
+++ b/dune/solvers/test/quadraticipoptsolvertest.cc
@@ -28,15 +28,12 @@
template<class GridType, class MatrixType, class VectorType, class BitVector>
void solveObstacleProblemByQuadraticIPOptSolver(const GridType& grid, const MatrixType& mat, VectorType& x, const VectorType& rhs, const BitVector& ignore, int maxIterations=100, double tolerance=1.0e-10)
{
- typedef VectorType Vector;
- typedef MatrixType Matrix;
- typedef EnergyNorm<Matrix, Vector> Norm;
typedef QuadraticIPOptSolver<MatrixType,VectorType> Solver;
const int blockSize = VectorType::block_type::dimension;
// create double obstacle constraints
- std::vector<BoxConstraint<typename Vector::field_type,blockSize> > boxConstraints(rhs.size());
+ std::vector<BoxConstraint<typename VectorType::field_type,blockSize> > boxConstraints(rhs.size());
for (int i = 0; i < boxConstraints.size(); ++i)
{
for (int j = 0; j < blockSize; ++j)
--
GitLab