From 60f2ebe7415cd811bbdfb52b16a38d6e2823ee28 Mon Sep 17 00:00:00 2001 From: Alexander Schmidt Date: Wed, 27 Aug 2014 00:55:30 +0200 Subject: [PATCH] Set build type to release and fixed ncomp in complex demo. --- CMakeLists.txt | 2 ++ cubaint.cpp | 12 ++++++------ demo.cpp | 2 +- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a1caa11..b93aed8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,8 @@ 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) diff --git a/cubaint.cpp b/cubaint.cpp index 939da69..9c9fef3 100644 --- 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 diff --git a/demo.cpp b/demo.cpp index 93914bf..f876bf7 100644 --- 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), - {{0,1}}, 2, + {{0,1}}, 1, nregions, neval, fail, &integral_c, &error_c, &prob_c, 0); -- 2.39.5