From f4fd52b5162bb65781904b16e73127da9f32f425 Mon Sep 17 00:00:00 2001 From: Regina Kleinhappel Date: Tue, 31 May 2016 22:11:04 +0200 Subject: [PATCH] Adapted to new cuba interface --- cubaint.cpp | 11 ++++++----- cubaint.hpp | 3 ++- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/cubaint.cpp b/cubaint.cpp index 9c9fef3..cca1faa 100644 --- a/cubaint.cpp +++ b/cubaint.cpp @@ -53,8 +53,9 @@ int cubaint::_integrate (integrandtype integrand, const intmethod& IntMethod, Options.epsrel, Options.epsabs, Options.flags | verbosity, Options.seed, Options.mineval, Options.maxeval, - Options.Suave.nnew, Options.Suave.flatness, - Options.statefile, + Options.Suave.nnew, Options.Suave.nmin, + Options.Suave.flatness, + Options.statefile, Options.spin, &nregions, &neval, &fail, reinterpret_cast(integral), reinterpret_cast(error), @@ -74,7 +75,7 @@ int cubaint::_integrate (integrandtype integrand, const intmethod& IntMethod, Options.Divonne.ngiven, Options.Divonne.ldxgiven, Options.Divonne.xgiven, Options.Divonne.nextra, Options.Divonne.peakfinder, - Options.statefile, + Options.statefile, Options.spin, &nregions, &neval, &fail, reinterpret_cast(integral), reinterpret_cast(error), @@ -88,7 +89,7 @@ int cubaint::_integrate (integrandtype integrand, const intmethod& IntMethod, Options.flags | verbosity, Options.seed, Options.mineval, Options.maxeval, Options.Vegas.nstart, Options.Vegas.nincrease, Options.Vegas.nbatch, - Options.Vegas.gridno, Options.statefile, + Options.Vegas.gridno, Options.statefile, Options.spin, &neval, &fail, reinterpret_cast(integral), reinterpret_cast(error), @@ -101,7 +102,7 @@ int cubaint::_integrate (integrandtype integrand, const intmethod& IntMethod, Options.epsrel, Options.epsabs, Options.flags, Options.mineval, Options.maxeval, Options.Cuhre.key, - Options.statefile, + Options.statefile, Options.spin, &nregions, &neval, &fail, reinterpret_cast(integral), reinterpret_cast(error), diff --git a/cubaint.hpp b/cubaint.hpp index 103ea86..3e99648 100644 --- a/cubaint.hpp +++ b/cubaint.hpp @@ -41,8 +41,9 @@ namespace cubaint struct suave { int nnew; double flatness; + int nmin; suave() : - nnew(1000), flatness(25.) + nnew(1000), flatness(25.), nmin(2) {}; }; -- 2.39.5