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

Use make_shared

parent b3372dc1
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
src/test-gradient-method.cc
+ 22
− 34
View file @ 059b6602
...@@ -35,9 +35,8 @@ void testIdentity() { ...@@ -35,9 +35,8 @@ void testIdentity() {
b[0] = 1; b[0] = 1;
b[1] = 2; b[1] = 2;
Dune::shared_ptr<Dune::NiceFunction const> f(new Dune::LinearFunction(1)); auto f = Dune::make_shared<Dune::LinearFunction const>(1);
Dune::shared_ptr<Functional::NonlinearityType const> phi( auto phi = Dune::make_shared<Functional::NonlinearityType const>(f);
new Functional::NonlinearityType(f));
Functional J(A, b, phi); Functional J(A, b, phi);
Functional::SmallVector start = b; Functional::SmallVector start = b;
...@@ -72,9 +71,8 @@ void testSampleFunction() { ...@@ -72,9 +71,8 @@ void testSampleFunction() {
b[0] = 1; b[0] = 1;
b[1] = 2; b[1] = 2;
Dune::shared_ptr<Dune::NiceFunction const> f(new Dune::SampleFunction<2>()); auto f = Dune::make_shared<Dune::SampleFunction<2> const>();
Dune::shared_ptr<Functional::NonlinearityType const> phi( auto phi = Dune::make_shared<Functional::NonlinearityType const>(f);
new Functional::NonlinearityType(f));
Functional J(A, b, phi); Functional J(A, b, phi);
Functional::SmallVector start = b; Functional::SmallVector start = b;
...@@ -123,9 +121,8 @@ void testSampleFunctionNonsmooth() { ...@@ -123,9 +121,8 @@ void testSampleFunctionNonsmooth() {
b[0] = 1; b[0] = 1;
b[1] = 2; b[1] = 2;
Dune::shared_ptr<Dune::NiceFunction const> f(new Dune::SampleFunction<2>()); auto f = Dune::make_shared<Dune::SampleFunction<2> const>();
Dune::shared_ptr<Functional::NonlinearityType const> phi( auto phi = Dune::make_shared<Functional::NonlinearityType const>(f);
new Functional::NonlinearityType(f));
Functional J(A, b, phi); Functional J(A, b, phi);
Functional::SmallVector start; Functional::SmallVector start;
...@@ -187,9 +184,8 @@ void testTrivialFunction() { ...@@ -187,9 +184,8 @@ void testTrivialFunction() {
b[0] = 1; b[0] = 1;
b[1] = 2; b[1] = 2;
Dune::shared_ptr<Dune::NiceFunction const> f(new Dune::TrivialFunction()); auto f = Dune::make_shared<Dune::TrivialFunction const>();
Dune::shared_ptr<Functional::NonlinearityType const> phi( auto phi = Dune::make_shared<Functional::NonlinearityType const>(f);
new Functional::NonlinearityType(f));
Functional J(A, b, phi); Functional J(A, b, phi);
Functional::SmallVector start = b; Functional::SmallVector start = b;
...@@ -233,9 +229,8 @@ void testHorribleFunction() { ...@@ -233,9 +229,8 @@ void testHorribleFunction() {
b[0] = 1; b[0] = 1;
b[1] = 2; b[1] = 2;
Dune::shared_ptr<Dune::NiceFunction const> f(new Dune::HorribleFunction()); auto f = Dune::make_shared<Dune::HorribleFunction const>();
Dune::shared_ptr<Functional::NonlinearityType const> phi( auto phi = Dune::make_shared<Functional::NonlinearityType const>(f);
new Functional::NonlinearityType(f));
Functional J(A, b, phi); Functional J(A, b, phi);
Functional::SmallVector start = b; Functional::SmallVector start = b;
...@@ -270,10 +265,8 @@ void testHorribleFunctionLogarithmic() { ...@@ -270,10 +265,8 @@ void testHorribleFunctionLogarithmic() {
b[0] = 1; b[0] = 1;
b[1] = 2; b[1] = 2;
Dune::shared_ptr<Dune::NiceFunction const> f( auto f = Dune::make_shared<Dune::HorribleFunctionLogarithmic const>();
new Dune::HorribleFunctionLogarithmic()); auto phi = Dune::make_shared<Functional::NonlinearityType const>(f);
Dune::shared_ptr<Functional::NonlinearityType const> phi(
new Functional::NonlinearityType(f));
Functional J(A, b, phi); Functional J(A, b, phi);
Functional::SmallVector start = b; Functional::SmallVector start = b;
...@@ -312,9 +305,8 @@ void testSampleFunction3D() { ...@@ -312,9 +305,8 @@ void testSampleFunction3D() {
b[1] = 2; b[1] = 2;
b[2] = 3; b[2] = 3;
Dune::shared_ptr<Dune::NiceFunction const> f(new Dune::SampleFunction<2>()); auto f = Dune::make_shared<Dune::SampleFunction<2> const>();
Dune::shared_ptr<Functional::NonlinearityType const> phi( auto phi = Dune::make_shared<Functional::NonlinearityType const>(f);
new Functional::NonlinearityType(f));
Functional J(A, b, phi); Functional J(A, b, phi);
Functional::SmallVector start = b; Functional::SmallVector start = b;
...@@ -352,9 +344,8 @@ void testSampleFunction2() { ...@@ -352,9 +344,8 @@ void testSampleFunction2() {
b[0] = 1; b[0] = 1;
b[1] = 1; b[1] = 1;
Dune::shared_ptr<Dune::NiceFunction const> f(new Dune::SampleFunction<2>()); auto f = Dune::make_shared<Dune::SampleFunction<2> const>();
Dune::shared_ptr<Functional::NonlinearityType const> phi( auto phi = Dune::make_shared<Functional::NonlinearityType const>(f);
new Functional::NonlinearityType(f));
Functional J(A, b, phi); Functional J(A, b, phi);
Functional::SmallVector start = b; Functional::SmallVector start = b;
...@@ -388,9 +379,8 @@ void testSampleFunctionSteep1() { ...@@ -388,9 +379,8 @@ void testSampleFunctionSteep1() {
b[0] = 1; b[0] = 1;
b[1] = 2; b[1] = 2;
Dune::shared_ptr<Dune::NiceFunction const> f(new Dune::SampleFunction<2>()); auto f = Dune::make_shared<Dune::SampleFunction<2> const>();
Dune::shared_ptr<Functional::NonlinearityType const> phi( auto phi = Dune::make_shared<Functional::NonlinearityType const>(f);
new Functional::NonlinearityType(f));
Functional J(A, b, phi); Functional J(A, b, phi);
Functional::SmallVector start; Functional::SmallVector start;
...@@ -427,9 +417,8 @@ void testSampleFunctionSteep2() { ...@@ -427,9 +417,8 @@ void testSampleFunctionSteep2() {
b[0] = 1; b[0] = 1;
b[1] = 2.5; b[1] = 2.5;
Dune::shared_ptr<Dune::NiceFunction const> f(new Dune::SampleFunction<2>()); auto f = Dune::make_shared<Dune::SampleFunction<2> const>();
Dune::shared_ptr<Functional::NonlinearityType const> phi( auto phi = Dune::make_shared<Functional::NonlinearityType const>(f);
new Functional::NonlinearityType(f));
Functional J(A, b, phi); Functional J(A, b, phi);
Functional::SmallVector start; Functional::SmallVector start;
...@@ -466,9 +455,8 @@ void testSteepFunction() { ...@@ -466,9 +455,8 @@ void testSteepFunction() {
b[0] = 1; b[0] = 1;
b[1] = 2.5; b[1] = 2.5;
Dune::shared_ptr<Dune::NiceFunction const> f(new Dune::SampleFunction<100>()); auto f = Dune::make_shared<Dune::SampleFunction<100> const>();
Dune::shared_ptr<Functional::NonlinearityType const> phi( auto phi = Dune::make_shared<Functional::NonlinearityType const>(f);
new Functional::NonlinearityType(f));
Functional J(A, b, phi); Functional J(A, b, phi);
Functional::SmallVector start; Functional::SmallVector start;
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment