From 390cba07b44479f71879fabdf7355c9928bb6267 Mon Sep 17 00:00:00 2001
From: Elias Pipping <elias.pipping@fu-berlin.de>
Date: Wed, 12 Oct 2011 16:09:37 +0200
Subject: [PATCH] Clean up
---
src/duneevaluate.cc | 6 +++---
src/duneminimise.cc | 12 ++++++------
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/duneevaluate.cc b/src/duneevaluate.cc
index fd6159ff..4af3f5ff 100644
--- a/src/duneevaluate.cc
+++ b/src/duneevaluate.cc
@@ -14,12 +14,11 @@
DEFUN_DLD(duneevaluate, args, nargout, "the help string") {
assert(args.length() == 1);
ColumnVector point(args(0).matrix_value());
- // FIXME: We're only working with dimension two for now
- assert(point.length() == 2);
int const dim = 2;
- typedef Dune::SampleFunctional<dim> SampleFunctional;
+ // {{{ The usual setup
+ typedef Dune::SampleFunctional<dim> SampleFunctional;
SampleFunctional::SmallMatrix A;
A[0][0] = 3;
A[0][1] = 1.5;
@@ -31,6 +30,7 @@ DEFUN_DLD(duneevaluate, args, nargout, "the help string") {
Dune::SampleFunction f;
SampleFunctional J(A, b, Dune::MyNonlinearity<dim>(f));
+ // }}}
SampleFunctional::SmallVector our_point;
Dune::octaveToDune<dim>(point, our_point);
diff --git a/src/duneminimise.cc b/src/duneminimise.cc
index e2ee4623..6e492fab 100644
--- a/src/duneminimise.cc
+++ b/src/duneminimise.cc
@@ -14,12 +14,11 @@
DEFUN_DLD(duneminimise, args, nargout, "the help string") {
assert(args.length() == 1);
ColumnVector current(args(0).matrix_value());
- // FIXME: We're only working with dimension two for now
- assert(current.length() == 2);
int const dim = 2;
- typedef Dune::SampleFunctional<dim> SampleFunctional;
+ // {{{ The usual setup
+ typedef Dune::SampleFunctional<dim> SampleFunctional;
SampleFunctional::SmallMatrix A;
A[0][0] = 3;
A[0][1] = 1.5;
@@ -31,6 +30,7 @@ DEFUN_DLD(duneminimise, args, nargout, "the help string") {
Dune::SampleFunction f;
SampleFunctional J(A, b, Dune::MyNonlinearity<dim>(f));
+ // }}}
SampleFunctional::SmallVector start;
Dune::octaveToDune<dim>(current, start);
@@ -39,8 +39,8 @@ DEFUN_DLD(duneminimise, args, nargout, "the help string") {
Dune::minimise(J, start, correction);
start += correction;
- ColumnVector foo(dim);
- Dune::duneToOctave<dim>(start, foo);
+ ColumnVector ret(dim);
+ Dune::duneToOctave<dim>(start, ret);
- return octave_value(foo);
+ return octave_value(ret);
}
--
GitLab