From 0f3c785427b4926577396f49d4c6bbcfde900555 Mon Sep 17 00:00:00 2001
From: Elias Pipping <elias.pipping@fu-berlin.de>
Date: Mon, 31 Oct 2011 14:05:41 +0100
Subject: [PATCH] Adjust octave code to new minimise() interface
---
src/duneminimise.cc | 8 +++-----
src/foo.m | 4 ++--
2 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/src/duneminimise.cc b/src/duneminimise.cc
index 23e14f46..01ed5051 100644
--- a/src/duneminimise.cc
+++ b/src/duneminimise.cc
@@ -38,11 +38,9 @@ Make a minimisation step of x -> 1/2<Ax,x> - <b,x> + H(|x|) using DUNE starting
Functional::SmallVector start;
Dune::octaveToDune<dim>(current, start);
- Functional::SmallVector correction;
- Dune::minimise(J, start, correction);
+ Dune::minimise(J, start);
- ColumnVector ret(dim);
- Dune::duneToOctave<dim>(correction, ret);
+ Dune::duneToOctave<dim>(start, current);
- return octave_value(ret);
+ return octave_value(current);
}
diff --git a/src/foo.m b/src/foo.m
index b7d12755..cf5f4d04 100644
--- a/src/foo.m
+++ b/src/foo.m
@@ -26,8 +26,8 @@ oldvec = [279; 0]; # Something random that takes a couple of iterations
olddiff = [ 0; 0];
for i = 1:10 # Something random
- newdiff = duneminimise(oldvec);
- newvec = oldvec + newdiff;
+ newvec = duneminimise(oldvec);
+ newdiff = newvec - oldvec;
line([oldvec(1) newvec(1)], ...
[oldvec(2) newvec(2)], ...
[duneevaluate(oldvec) duneevaluate(newvec)], ...
--
GitLab