From 8de78cf34a225df4d013765873c49887171c0dea Mon Sep 17 00:00:00 2001
From: Elias Pipping <elias.pipping@fu-berlin.de>
Date: Mon, 19 Sep 2011 19:13:26 +0200
Subject: [PATCH] Clean up after 5a7d8c41710b11a1ed3077b258637ba69860145a
Nuke obsoleted template parameter
---
src/samplefunctional.hh | 3 +--
src/test-gradient-method.cc | 15 +++++++--------
2 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/src/samplefunctional.hh b/src/samplefunctional.hh
index 65c0d9f7..9403f9ea 100644
--- a/src/samplefunctional.hh
+++ b/src/samplefunctional.hh
@@ -14,8 +14,7 @@
#include "nicefunction.hh"
namespace Dune {
-template <int dimension, class Function = TrivialFunction>
-class SampleFunctional {
+template <int dimension> class SampleFunctional {
public:
typedef Dune::FieldVector<double, dimension> SmallVector;
typedef Dune::FieldMatrix<double, dimension, dimension> SmallMatrix;
diff --git a/src/test-gradient-method.cc b/src/test-gradient-method.cc
index d0aaa699..3536f55c 100644
--- a/src/test-gradient-method.cc
+++ b/src/test-gradient-method.cc
@@ -10,12 +10,11 @@
#include <cassert>
-template <int dim, class Function>
-double functionTester(
- Dune::SampleFunctional<dim, Function> J,
- typename Dune::SampleFunctional<dim, Function>::SmallVector &start,
- size_t runs) {
- typename Dune::SampleFunctional<dim, Function>::SmallVector correction;
+template <int dim>
+double functionTester(Dune::SampleFunctional<dim> J,
+ typename Dune::SampleFunctional<dim>::SmallVector &start,
+ size_t runs) {
+ typename Dune::SampleFunctional<dim>::SmallVector correction;
std::cout << "Old value: J(...) = " << J(start) << std::endl;
for (size_t i = 1; i <= runs; ++i) {
Dune::minimise(J, start, correction);
@@ -30,7 +29,7 @@ double functionTester(
void testSampleFunction() {
int const dim = 2;
- typedef Dune::SampleFunctional<dim, Dune::SampleFunction> SampleFunctional;
+ typedef Dune::SampleFunctional<dim> SampleFunctional;
SampleFunctional::SmallMatrix A;
A[0][0] = 3;
@@ -78,7 +77,7 @@ void testSampleFunction() {
void testSampleFunctionNonsmooth() {
int const dim = 2;
- typedef Dune::SampleFunctional<dim, Dune::SampleFunction> SampleFunctional;
+ typedef Dune::SampleFunctional<dim> SampleFunctional;
SampleFunctional::SmallMatrix A;
A[0][0] = 3;
--
GitLab