Adapted to new cuba interface

[cubaint.git] / cubaint.cpp

diff --git a/cubaint.cpp b/cubaint.cpp
index 939da69a933d8846b4038ff570bd46d19162bffa..cca1faa01417355923b53c9cd1a1441ac7910e52 100644 (file)
--- a/cubaint.cpp
+++ b/cubaint.cpp
@@ -15,9 +15,9 @@ int cubaint::integrate (integrand_t integrand, const intmethod& IntMethod,
 {
   assert (verbosity < 4);
 
-  _integrate( integrand, IntMethod, Limits, ncomp, 
-             nregions, neval, fail, integral,
-             error, prob, verbosity, userdata, Options );
+  return _integrate( integrand, IntMethod, Limits, ncomp, 
+                    nregions, neval, fail, integral,
+                    error, prob, verbosity, userdata, Options );
 }
 
 int cubaint::integrate (integrand_tc integrand, const intmethod& IntMethod, 
@@ -30,9 +30,9 @@ int cubaint::integrate (integrand_tc integrand, const intmethod& IntMethod,
 {
   assert (verbosity < 4);
 
-  _integrate( integrand, IntMethod, Limits, 2*ncomp, 
-             nregions, neval, fail, integral,
-             error, prob, verbosity, userdata, Options );
+  return _integrate( integrand, IntMethod, Limits, 2*ncomp, 
+                    nregions, neval, fail, integral,
+                    error, prob, verbosity, userdata, Options );
 }
 
 template <typename integrandtype, typename compreal>
@@ -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),