Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

use Cubature_jll #49

Merged
merged 3 commits into from
Apr 4, 2020
Merged

use Cubature_jll #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
916d4ad
use Cubature_jll
stevengj Apr 4, 2020
737842e
note HCubature
stevengj Apr 4, 2020
7e6e072
updated badge
stevengj Apr 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ os:
- linux
- osx
julia:
- 1.0
- 1.1
- 1.3
- 1.4
- nightly
notifications:
email: false
8 changes: 3 additions & 5 deletions Project.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
6 changes: 5 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions appveyor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
13 changes: 2 additions & 11 deletions src/Cubature.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down