Set build type to release and fixed ncomp in complex demo.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a1caa119e997e5f1d7cfd46591620afccfcc84c4..b93aed88f280f5021838478f32d7620e9c4986fa 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,8 @@
 cmake_minimum_required (VERSION 3.0)
 project (CUBAINT)
 
 cmake_minimum_required (VERSION 3.0)
 project (CUBAINT)
 

+set (CMAKE_BUILD_TYPE Release)
+

 set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
 
 add_library (cubaint cubaint.cpp)
 set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
 
 add_library (cubaint cubaint.cpp)

diff --git a/cubaint.cpp b/cubaint.cpp
index 939da69a933d8846b4038ff570bd46d19162bffa..9c9fef3af04da39b00b37bac79681d7de48bc691 100644 (file)
--- a/cubaint.cpp
+++ b/cubaint.cpp
@@ -15,9 +15,9 @@ int cubaint::integrate (integrand_t integrand, const intmethod& IntMethod,
 {
   assert (verbosity < 4);
 
 {
   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, 
 }
 
 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);
 
 {
   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>
 }
 
 template <typename integrandtype, typename compreal>

diff --git a/demo.cpp b/demo.cpp
index 93914bfbc3b1b85867e6d2416f4b395e419c4f28..f876bf7120830000c29c42adafcba45a77e1dbd9 100644 (file)
--- a/demo.cpp
+++ b/demo.cpp
@@ -96,7 +96,7 @@ int main ()
   std::cout << "int_0^1 dx (e-x^2+i0): " << std::endl;
   for (int itype=0; itype<4; itype++) {
     cubaint::integrate (&test_integrand_c, cubaint::intmethod(itype),
   std::cout << "int_0^1 dx (e-x^2+i0): " << std::endl;
   for (int itype=0; itype<4; itype++) {
     cubaint::integrate (&test_integrand_c, cubaint::intmethod(itype),

-                       {{0,1}}, 2,
+                       {{0,1}}, 1,

                        nregions,
                        neval, fail, &integral_c, 
                        &error_c, &prob_c, 0);
                        nregions,
                        neval, fail, &integral_c, 
                        &error_c, &prob_c, 0);