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 @@
#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;
......
......@@ -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;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment