Skip to content

Commit 1d884e3

Browse files
odunbarodunbar
authored
Merge pull request #12 from climate-machine/ck/FixName
Sorry, I thought I had already reviewed this last week @charleskawczynski
2 parents 49828b2 + 67feaaf commit 1d884e3

File tree

19 files changed

+173
-124
lines changed

19 files changed

+173
-124
lines changed

‎Project.toml‎

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,21 @@
1-
name = "Solus"
2-
uuid = "16b9c28e-565c-11e9-13a9-53e2645fa95d"
3-
authors = ["Simon Byrne <simonbyrne@gmail.com>"]
1+
name = "CalibrateEmulateSample"
2+
uuid = "95e48a1f-0bec-4818-9538-3db4340308e3"
3+
authors = ["Charles Kawczynski <kawczynski.charles@gmail.com>"]
44
version = "0.1.0"
55

66
[deps]
77
ArgParse = "c7e460c6-2fb9-53a9-8c5b-16f535851c63"
88
ConfParser = "88353bc9-fd38-507d-a820-d3b43837d6b9"
9+
DifferentialEquations = "0c46a032-eb83-5123-abaf-570d42b7fbaa"
910
Distributions = "31c24e10-a181-5473-b8eb-7969acd0382f"
1011
DocStringExtensions = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae"
1112
EllipsisNotation = "da5c29d0-fa7d-589e-88eb-ea29b0a81949"
1213
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
14+
NPZ = "15e1cf62-19b3-5cfa-8e77-841668bca605"
1315
Parameters = "d96e819e-fc66-5662-9728-84c9c7592b0a"
1416
PyCall = "438e738f-606a-5dbb-bf0a-cddfbfd45ab0"
17+
PyPlot = "d330b81b-6aea-500a-939a-2ce795aea3ee"
1518
ScikitLearn = "3646fa90-6ef7-5e7e-9f22-8aca16db6324"
1619
Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
1720
StatsBase = "2913bbd2-ae8a-5f71-8c99-4fb6c76f3a91"
18-
19-
[extras]
20-
DifferentialEquations = "0c46a032-eb83-5123-abaf-570d42b7fbaa"
21-
NPZ = "15e1cf62-19b3-5cfa-8e77-841668bca605"
22-
Parameters = "d96e819e-fc66-5662-9728-84c9c7592b0a"
2321
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
24-
25-
[targets]
26-
test = ["DifferentialEquations", "NPZ", "Parameters", "Test"]

‎README.md‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
1-
# Solus.jl
1+
# CalibrateEmulateSample.jl
22

3-
[![Travis Build Status](https://travis-ci.org/climate-machine/Solus.jl.svg?branch=master)](https://travis-ci.org/climate-machine/Solus.jl)
4-
[![Appveyor Build Status](https://ci.appveyor.com/api/projects/status/uslnruyhehva7bbv/branch/master?svg=true)](https://ci.appveyor.com/project/climate-machine/solus-jl/branch/master)
3+
| **Build Status** |
4+
|:------------------------------------------------------------------------------|
5+
| [![appveyor][appveyor-img]][appveyor-url] [![travis][travis-img]][travis-url] |
6+
7+
[travis-img]: https://travis-ci.org/climate-machine/CalibrateEmulateSample.jl.svg?branch=master
8+
[travis-url]: https://travis-ci.org/climate-machine/CalibrateEmulateSample.jl
9+
10+
[appveyor-img]: https://ci.appveyor.com/api/projects/status/uslnruyhehva7bbv/branch/master?svg=true
11+
[appveyor-url]: https://ci.appveyor.com/project/climate-machine/CalibrateEmulateSample.jl/branch/master
512

‎docs/Project.toml‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
[deps]
2+
ArgParse = "c7e460c6-2fb9-53a9-8c5b-16f535851c63"
3+
ConfParser = "88353bc9-fd38-507d-a820-d3b43837d6b9"
4+
DifferentialEquations = "0c46a032-eb83-5123-abaf-570d42b7fbaa"
5+
Distributions = "31c24e10-a181-5473-b8eb-7969acd0382f"
6+
DocStringExtensions = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae"
7+
Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4"
8+
EllipsisNotation = "da5c29d0-fa7d-589e-88eb-ea29b0a81949"
9+
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
10+
NPZ = "15e1cf62-19b3-5cfa-8e77-841668bca605"
11+
Parameters = "d96e819e-fc66-5662-9728-84c9c7592b0a"
12+
PyCall = "438e738f-606a-5dbb-bf0a-cddfbfd45ab0"
13+
PyPlot = "d330b81b-6aea-500a-939a-2ce795aea3ee"
14+
ScikitLearn = "3646fa90-6ef7-5e7e-9f22-8aca16db6324"
15+
Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
16+
StatsBase = "2913bbd2-ae8a-5f71-8c99-4fb6c76f3a91"
17+
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"

‎docs/make.jl‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
using CalibrateEmulateSample, Documenter
2+
3+
makedocs(
4+
sitename = "CalibrateEmulateSample.jl",
5+
doctest = false,
6+
strict = false,
7+
format = Documenter.HTML(
8+
prettyurls = get(ENV, "CI", nothing) == "true",
9+
mathengine = MathJax(Dict(
10+
:TeX => Dict(
11+
:equationNumbers => Dict(:autoNumber => "AMS"),
12+
:Macros => Dict()
13+
)
14+
))
15+
),
16+
clean = false,
17+
modules = [Documenter, CalibrateEmulateSample],
18+
pages = Any[
19+
"Home" => "index.md",
20+
],
21+
)
22+
23+
deploydocs(
24+
repo = "github.com/climate-machine/CalibrateEmulateSample.jl.git",
25+
target = "build",
26+
)

‎docs/src/index.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# CalibrateEmulateSample.jl
2+
3+
Calibrate, Emulate, Sample

‎examples/GPR/main.jl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ import NPZ
44
import PyPlot
55
const plt = PyPlot
66

7-
include("../../src/GPR.jl")
7+
include(joinpath("..","..","src","GPR.jl"))
88

9-
const gpr_data = NPZ.npzread("../../test/GPR/data/data_points.npy")
9+
const gpr_data = NPZ.npzread(joinpath("..","..","test","GPR","data","data_points.npy"))
1010

1111
################################################################################
1212
# main section #################################################################

‎examples/Manifest.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -538,7 +538,7 @@ git-tree-sha1 = "012661b70364840fcd380912d878d96f7bf95ff3"
538538
uuid = "b85f4697-e234-5449-a836-ec8e2f98b302"
539539
version = "1.0.10"
540540

541-
[[Solus]]
541+
[[CalibrateEmulateSample]]
542542
deps = ["Distributions", "DocStringExtensions", "LinearAlgebra", "Statistics", "Test"]
543543
path = ".."
544544
uuid = "16b9c28e-565c-11e9-13a9-53e2645fa95d"

‎examples/Project.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
66
Parameters = "d96e819e-fc66-5662-9728-84c9c7592b0a"
77
Plots = "91a5bcdd-55d7-5caf-9e0b-520d859cae80"
88
PyPlot = "d330b81b-6aea-500a-939a-2ce795aea3ee"
9-
Solus = "16b9c28e-565c-11e9-13a9-53e2645fa95d"
9+
CalibrateEmulateSample = "16b9c28e-565c-11e9-13a9-53e2645fa95d"

‎src/Solus.jl‎ renamed to ‎src/CalibrateEmulateSample.jl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
module Solus
1+
module CalibrateEmulateSample
22

33
using Distributions, Statistics, LinearAlgebra, DocStringExtensions
44

55
include("spaces.jl")
66
include("problems.jl")
7-
include("neki.jl")
7+
include("eks.jl")
88
include("GPR.jl")
99

1010
end # module

‎src/GPR.jl‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
1-
module GPR
21
"""
3-
For the time being, please use `include("src/GPR.jl")` and not `using Solus.GPR`
2+
GPR
3+
4+
For the time being, please use `include(joinpath("src","GPR.jl"))` and not `using CalibrateEmulateSample.GPR`
45
since there are precompile issues with the backend (scikit-learn)
56
"""
7+
module GPR
68

79
using Parameters # lets you have defaults for fields
810

0 commit comments

Comments
 (0)