From: Regina Kleinhappel <regina@treefish.org>
Date: Tue, 31 May 2016 20:11:04 +0000 (+0200)
Subject: Adapted to new cuba interface
X-Git-Url: http://git.treefish.org/~alex/cubaint.git/commitdiff_plain/HEAD?ds=sidebyside

Adapted to new cuba interface
---

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<double*>(integral), 
 	   reinterpret_cast<double*>(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<double*>(integral), 
 	     reinterpret_cast<double*>(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<double*>(integral), 
 	   reinterpret_cast<double*>(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<double*>(integral), 
 	   reinterpret_cast<double*>(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)
       {};
     };