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

Clean up

parent f0cd6b82
Branches
No related tags found
No related merge requests found
......@@ -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);
......
......@@ -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);
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment