From cd5698108261869bddba4a73f807b7544730ea1b Mon Sep 17 00:00:00 2001
From: Elias Pipping <elias.pipping@fu-berlin.de>
Date: Mon, 14 Nov 2011 12:28:52 +0100
Subject: [PATCH] Adjust to interface changes in LocalNonlinearity
---
src/test-gradient-method.cc | 23 ++++++++++++-----------
1 file changed, 12 insertions(+), 11 deletions(-)
diff --git a/src/test-gradient-method.cc b/src/test-gradient-method.cc
index 8936b415..cb2abe9e 100644
--- a/src/test-gradient-method.cc
+++ b/src/test-gradient-method.cc
@@ -35,7 +35,7 @@ void testIdentity() {
b[0] = 1;
b[1] = 2;
- Dune::LinearFunction f(1);
+ Dune::shared_ptr<Dune::NiceFunction> f(new Dune::LinearFunction(1));
Functional J(A, b, Dune::LocalNonlinearity<dim>(f));
Functional::SmallVector start = b;
@@ -70,7 +70,7 @@ void testSampleFunction() {
b[0] = 1;
b[1] = 2;
- Dune::SampleFunction<2> f;
+ Dune::shared_ptr<Dune::NiceFunction> f(new Dune::SampleFunction<2>());
Functional J(A, b, Dune::LocalNonlinearity<dim>(f));
Functional::SmallVector start = b;
@@ -119,7 +119,7 @@ void testSampleFunctionNonsmooth() {
b[0] = 1;
b[1] = 2;
- Dune::SampleFunction<2> f;
+ Dune::shared_ptr<Dune::NiceFunction> f(new Dune::SampleFunction<2>());
Functional J(A, b, Dune::LocalNonlinearity<dim>(f));
Functional::SmallVector start;
@@ -181,7 +181,7 @@ void testTrivialFunction() {
b[0] = 1;
b[1] = 2;
- Dune::TrivialFunction f;
+ Dune::shared_ptr<Dune::NiceFunction> f(new Dune::TrivialFunction());
Functional J(A, b, Dune::LocalNonlinearity<dim>(f));
Functional::SmallVector start = b;
@@ -225,7 +225,7 @@ void testHorribleFunction() {
b[0] = 1;
b[1] = 2;
- Dune::HorribleFunction f;
+ Dune::shared_ptr<Dune::NiceFunction> f(new Dune::HorribleFunction());
Functional J(A, b, Dune::LocalNonlinearity<dim>(f));
Functional::SmallVector start = b;
@@ -260,7 +260,8 @@ void testHorribleFunctionLogarithmic() {
b[0] = 1;
b[1] = 2;
- Dune::HorribleFunctionLogarithmic f;
+ Dune::shared_ptr<Dune::NiceFunction> f(
+ new Dune::HorribleFunctionLogarithmic());
Functional J(A, b, Dune::LocalNonlinearity<dim>(f));
Functional::SmallVector start = b;
@@ -299,7 +300,7 @@ void testSampleFunction3D() {
b[1] = 2;
b[2] = 3;
- Dune::SampleFunction<2> f;
+ Dune::shared_ptr<Dune::NiceFunction> f(new Dune::SampleFunction<2>());
Functional J(A, b, Dune::LocalNonlinearity<dim>(f));
Functional::SmallVector start = b;
@@ -337,7 +338,7 @@ void testSampleFunction2() {
b[0] = 1;
b[1] = 1;
- Dune::SampleFunction<2> f;
+ Dune::shared_ptr<Dune::NiceFunction> f(new Dune::SampleFunction<2>());
Functional J(A, b, Dune::LocalNonlinearity<dim>(f));
Functional::SmallVector start = b;
@@ -371,7 +372,7 @@ void testSampleFunctionSteep1() {
b[0] = 1;
b[1] = 2;
- Dune::SampleFunction<2> f;
+ Dune::shared_ptr<Dune::NiceFunction> f(new Dune::SampleFunction<2>());
Functional J(A, b, Dune::LocalNonlinearity<dim>(f));
Functional::SmallVector start;
@@ -408,7 +409,7 @@ void testSampleFunctionSteep2() {
b[0] = 1;
b[1] = 2.5;
- Dune::SampleFunction<2> f;
+ Dune::shared_ptr<Dune::NiceFunction> f(new Dune::SampleFunction<2>());
Functional J(A, b, Dune::LocalNonlinearity<dim>(f));
Functional::SmallVector start;
@@ -445,7 +446,7 @@ void testSteepFunction() {
b[0] = 1;
b[1] = 2.5;
- Dune::SampleFunction<100> f;
+ Dune::shared_ptr<Dune::NiceFunction> f(new Dune::SampleFunction<100>());
Functional J(A, b, Dune::LocalNonlinearity<dim>(f));
Functional::SmallVector start;
--
GitLab