From f45c8216385cea757c2c6df7ee9bac7000e4cb46 Mon Sep 17 00:00:00 2001 From: Elias Pipping <elias.pipping@fu-berlin.de> Date: Tue, 1 Nov 2011 16:49:37 +0100 Subject: [PATCH] Fix up after 580dac202759a2e7af9ee6906c17bc44be24e94e --- src/duneevaluate.cc | 4 ++-- src/duneminimise.cc | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/duneevaluate.cc b/src/duneevaluate.cc index dd28b626..0fee6e52 100644 --- a/src/duneevaluate.cc +++ b/src/duneevaluate.cc @@ -27,8 +27,8 @@ Evaluate x -> 1/2<Ax,x> - <b,x> + H(|x|) at each point y that is a column vector Functional::SmallVector b; Dune::octaveToDune<dim>(args(1).vector_value(), b); - Dune::SteepFunctionNonsmooth f_steep; - Dune::SampleFunction f_sample; + Dune::SampleFunction<100> f_steep; + Dune::SampleFunction<2> f_sample; charNDArray bar = args(2).char_array_value(); Dune::NiceFunction *foo; diff --git a/src/duneminimise.cc b/src/duneminimise.cc index fb66823b..4238fa2b 100644 --- a/src/duneminimise.cc +++ b/src/duneminimise.cc @@ -27,8 +27,8 @@ Make a minimisation step of x -> 1/2<Ax,x> - <b,x> + H(|x|) using DUNE starting Functional::SmallVector b; Dune::octaveToDune<dim>(args(1).vector_value(), b); - Dune::SteepFunctionNonsmooth f_steep; - Dune::SampleFunction f_sample; + Dune::SampleFunction<100> f_steep; + Dune::SampleFunction<2> f_sample; charNDArray bar = args(2).char_array_value(); Dune::NiceFunction *foo; -- GitLab