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

Fix up test suite after change in SF::minimise()

parent 4c5cb9e1
Branches
No related tags found
No related merge requests found
...@@ -2,20 +2,29 @@ ...@@ -2,20 +2,29 @@
#include "config.h" #include "config.h"
#endif #endif
#include <cassert>
#include <dune/common/exceptions.hh> #include <dune/common/exceptions.hh>
#include <dune/common/shared_ptr.hh> #include <dune/common/shared_ptr.hh>
#include <dune/common/stdstreams.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> template <int dim>
double functionTester(Dune::SampleFunctional<dim> J, double functionTester(Dune::SampleFunctional<dim> J,
typename Dune::SampleFunctional<dim>::SmallVector &start, typename Dune::SampleFunctional<dim>::SmallVector &start,
size_t runs) { 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; 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); double const final = J(start);
std::cout << "Final value J(...) = " << final << std::endl; std::cout << "Final value J(...) = " << final << std::endl;
return final; return final;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment