Skip to content
Snippets Groups Projects
Commit 8de78cf3 authored by Elias Pipping's avatar Elias Pipping Committed by Elias Pipping
Browse files

Clean up after 5a7d8c41710b11a1ed3077b258637ba69860145a

Nuke obsoleted template parameter
parent 9580518c
No related branches found
No related tags found
No related merge requests found
...@@ -14,8 +14,7 @@ ...@@ -14,8 +14,7 @@
#include "nicefunction.hh" #include "nicefunction.hh"
namespace Dune { namespace Dune {
template <int dimension, class Function = TrivialFunction> template <int dimension> class SampleFunctional {
class SampleFunctional {
public: public:
typedef Dune::FieldVector<double, dimension> SmallVector; typedef Dune::FieldVector<double, dimension> SmallVector;
typedef Dune::FieldMatrix<double, dimension, dimension> SmallMatrix; typedef Dune::FieldMatrix<double, dimension, dimension> SmallMatrix;
......
...@@ -10,12 +10,11 @@ ...@@ -10,12 +10,11 @@
#include <cassert> #include <cassert>
template <int dim, class Function> template <int dim>
double functionTester( double functionTester(Dune::SampleFunctional<dim> J,
Dune::SampleFunctional<dim, Function> J, typename Dune::SampleFunctional<dim>::SmallVector &start,
typename Dune::SampleFunctional<dim, Function>::SmallVector &start, size_t runs) {
size_t runs) { typename Dune::SampleFunctional<dim>::SmallVector correction;
typename Dune::SampleFunctional<dim, Function>::SmallVector correction;
std::cout << "Old value: J(...) = " << J(start) << std::endl; std::cout << "Old value: J(...) = " << J(start) << std::endl;
for (size_t i = 1; i <= runs; ++i) { for (size_t i = 1; i <= runs; ++i) {
Dune::minimise(J, start, correction); Dune::minimise(J, start, correction);
...@@ -30,7 +29,7 @@ double functionTester( ...@@ -30,7 +29,7 @@ double functionTester(
void testSampleFunction() { void testSampleFunction() {
int const dim = 2; int const dim = 2;
typedef Dune::SampleFunctional<dim, Dune::SampleFunction> SampleFunctional; typedef Dune::SampleFunctional<dim> SampleFunctional;
SampleFunctional::SmallMatrix A; SampleFunctional::SmallMatrix A;
A[0][0] = 3; A[0][0] = 3;
...@@ -78,7 +77,7 @@ void testSampleFunction() { ...@@ -78,7 +77,7 @@ void testSampleFunction() {
void testSampleFunctionNonsmooth() { void testSampleFunctionNonsmooth() {
int const dim = 2; int const dim = 2;
typedef Dune::SampleFunctional<dim, Dune::SampleFunction> SampleFunctional; typedef Dune::SampleFunctional<dim> SampleFunctional;
SampleFunctional::SmallMatrix A; SampleFunctional::SmallMatrix A;
A[0][0] = 3; A[0][0] = 3;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment