From b812fe8fe22a44e4ab2ad6b8d92171896f4d8a90 Mon Sep 17 00:00:00 2001
From: Elias Pipping <elias.pipping@fu-berlin.de>
Date: Thu, 8 Sep 2011 17:45:36 +0200
Subject: [PATCH] SmallVector should be BlockVector<SmallVector>
---
src/bisection-example-new.cc | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/src/bisection-example-new.cc b/src/bisection-example-new.cc
index 1faa2e7d..3fa26ee1 100644
--- a/src/bisection-example-new.cc
+++ b/src/bisection-example-new.cc
@@ -70,16 +70,14 @@ class SampleFunctional {
A_.mv(x, tmp3);
double const rest_b = (b_ - tmp3) * descDir;
+ Dune::BlockVector<SmallVector> xx; // FIXME: we actually want x here
+ Dune::BlockVector<SmallVector> dd; // FIXME: we actually want descDir here
+
typedef MyNonlinearity<dimension, SampleFunction> MyNonlinearityType;
MyNonlinearityType phi;
-
- DirectionalConvexFunction <
- Nonlinearity<
- Dune::FieldVector<double,
- dimension>, // MyNonlinearityType::SmallVector,
- Dune::FieldMatrix<double, dimension,
- dimension> // MyNonlinearityType::SmallMatrix> >
- > rest(rest_A, rest_b, phi, x, descDir);
+ typedef DirectionalConvexFunction<MyNonlinearityType>
+ MyDirectionalConvexFunctionType;
+ MyDirectionalConvexFunctionType rest(rest_A, rest_b, phi, xx, dd);
if (descDir == SmallVector(0.0))
return SmallVector(0.0);
--
GitLab