From 916d4ad7c183873011ba2c756132d6170af0ea25 Mon Sep 17 00:00:00 2001 From: "Steven G. Johnson" Date: Sat, 4 Apr 2020 12:34:00 -0400 Subject: [PATCH 1/3] use Cubature_jll --- .travis.yml | 4 ++-- Project.toml | 8 +++----- appveyor.yml | 4 ++-- src/Cubature.jl | 13 ++----------- 4 files changed, 9 insertions(+), 20 deletions(-) diff --git a/.travis.yml b/.travis.yml index e35a15c..29bdb47 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,8 +4,8 @@ os: - linux - osx julia: - - 1.0 - - 1.1 + - 1.3 + - 1.4 - nightly notifications: email: false \ No newline at end of file diff --git a/Project.toml b/Project.toml index b354fa5..68b95a5 100644 --- a/Project.toml +++ b/Project.toml @@ -1,14 +1,12 @@ name = "Cubature" uuid = "667455a9-e2ce-5579-9412-b964f529a492" -version = "1.4.1" +version = "1.5.0" [deps] -BinaryProvider = "b99e7846-7c00-51b0-8f62-c81ae34c0232" -Libdl = "8f399da3-3557-5675-b5ff-fb832c97cbdb" +Cubature_jll = "7bc98958-0e37-5d67-a6ac-a3a19030071a" [compat] -BinaryProvider = "≥ 0.3.0" -julia = "≥ 1.0.0" +julia = "1.3" [extras] Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" diff --git a/appveyor.yml b/appveyor.yml index 32b0498..1c0ab36 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,7 +1,7 @@ environment: matrix: - - julia_version: 1 - - julia_version: 1.1 + - julia_version: 1.3 + - julia_version: 1.4 - julia_version: nightly platform: diff --git a/src/Cubature.jl b/src/Cubature.jl index bf1a8e7..b1fac22 100644 --- a/src/Cubature.jl +++ b/src/Cubature.jl @@ -10,20 +10,11 @@ integrals of scalar functions). """ module Cubature +using Cubature_jll + export hcubature, pcubature, hcubature_v, pcubature_v, hquadrature, pquadrature, hquadrature_v, pquadrature_v -# Load cubature libraries from our deps.jl -const depsjl_path = joinpath(dirname(@__FILE__), "..", "deps", "deps.jl") -if !isfile(depsjl_path) - error("Cubature not installed properly, run Pkg.build(\"Cubature\"), restart Julia, and try again") -end -include(depsjl_path) - -function __init__() - check_deps() -end - # constants from cubature.h const INDIVIDUAL = Int32(0) const PAIRED = Int32(1) From 737842e47d4594dbc5cb75aa8fee7b13bd2bad8a Mon Sep 17 00:00:00 2001 From: "Steven G. Johnson" Date: Sat, 4 Apr 2020 12:39:46 -0400 Subject: [PATCH 2/3] note HCubature --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index 90358d0..0c37103 100644 --- a/README.md +++ b/README.md @@ -10,6 +10,10 @@ support for vector-valued integrands and facilitation of parallel evaluation of integrands, based on the [Cubature Package](https://github.com/stevengj/cubature) by Steven G. Johnson. +See also the [HCubature package] for a pure-Julia implementation of +h-adaptive cubature using the same algorithm (which is therefore much +more flexible in the types that it can integrate). + ## h-adaptive versus p-adaptive integration Adaptive integration works by evaluating the integrand at more and From 7e6e0721597e73e14c5b9424861426b8e2137732 Mon Sep 17 00:00:00 2001 From: "Steven G. Johnson" Date: Sat, 4 Apr 2020 12:42:56 -0400 Subject: [PATCH 3/3] updated badge --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 0c37103..051c417 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ [![Build Status](https://travis-ci.org/stevengj/Cubature.jl.svg?branch=master)](https://travis-ci.org/stevengj/Cubature.jl) -[![Build status](https://ci.appveyor.com/api/projects/status/bu4lciej14ct2rb0?svg=true)](https://ci.appveyor.com/project/StevenGJohnson/cubature-jl) +[![Build status](https://ci.appveyor.com/api/projects/status/0gsydibwwx59ruu7?svg=true)](https://ci.appveyor.com/project/StevenGJohnson/cubature-jl-ux9xb) # The Cubature module for Julia