From 48cbf04459dfa79b8752355a857bcb6b8d871bc8 Mon Sep 17 00:00:00 2001
From: Elias Pipping <elias.pipping@fu-berlin.de>
Date: Mon, 9 Jan 2012 18:19:40 +0100
Subject: [PATCH] Fix up test suite after change in SF::minimise()
---
src/test-gradient-method.cc | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
diff --git a/src/test-gradient-method.cc b/src/test-gradient-method.cc
index 1f384e8c..9f7d0e3a 100644
--- a/src/test-gradient-method.cc
+++ b/src/test-gradient-method.cc
@@ -2,20 +2,29 @@
#include "config.h"
#endif
+#include <cassert>
+
#include <dune/common/exceptions.hh>
#include <dune/common/shared_ptr.hh>
#include <dune/common/stdstreams.hh>
-#include <dune/tectonic/samplefunctional.hh>
+#include <dune/tnnmg/problem-classes/bisection.hh>
-#include <cassert>
+#include <dune/tectonic/samplefunctional.hh>
template <int dim>
double functionTester(Dune::SampleFunctional<dim> J,
typename Dune::SampleFunctional<dim>::SmallVector &start,
size_t runs) {
+ Bisection const bisection(
+ 0.0, // acceptError: Stop if the search interval has
+ // become smaller than this number
+ 1.0, // acceptFactor: ?
+ 1e-12, // requiredResidual: ?
+ true, // fastQuadratic
+ 0); // safety: acceptance factor for inexact minimization
std::cout << "Old value: J(...) = " << J(start) << std::endl;
- Dune::minimise(J, start, runs);
+ Dune::minimise(J, start, runs, bisection);
double const final = J(start);
std::cout << "Final value J(...) = " << final << std::endl;
return final;
--
GitLab