Skip to content

Commit

Permalink
Merge branch 'main' into compathelper/new_version/2023-05-02-00-55-24…
Browse files Browse the repository at this point in the history
…-534-02600619793
  • Loading branch information
eford authored Jul 12, 2024
2 parents 8f7a004 + 24ed76d commit bb1f9b6
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 67 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
fail-fast: false
matrix:
version:
- '1.6'
- '1.9.2'
os:
- ubuntu-latest
arch:
Expand Down
13 changes: 7 additions & 6 deletions Project.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name = "RvSpectML"
uuid = "1f61ac2c-3a1c-440a-925a-2707197041c8"
authors = ["Eric B. Ford, Christian Gilbertson, Joe Ninan, Michael L. Palumbo III, Alex Wise, and contributors"]
version = "0.2.7"
version = "0.2.8"

[deps]
CSV = "336ed68f-0bac-5ca0-87d4-7b16caf5d00b"
Expand Down Expand Up @@ -45,27 +45,28 @@ EchelleCCFs = "0.2"
EchelleInstruments = "0.2"
FITSIO = "0.16, 0.17"
FileIO = "1.4"
Interpolations = "0.12, 0.13, 0.14"
Interpolations = "0.12, 0.13, 0.14, 0.15"
JLD2 = "0.2, 0.3, 0.4"
KernelFunctions = "0.9.7, 0.10"
LsqFit = "0.11, 0.12, 0.13"
LsqFit = "0.11, 0.12, 0.13, 0.15"
MultivariateStats = "0.7, 0.8, 0.9, 0.10"
NaNMath = "0.3, 1"
Optim = "1"
PDMats = "0.10, 0.11"
Polynomials = "1, 1.1, 2, 3"
Polynomials = "1, 1.1, 2, 3, 4"
ProgressMeter = "1.4"
QuadGK = "2.4"
Query = "1"
RvSpectMLBase = "0.2"
Scalpels = "0.1"
SpecialFunctions = "1.0, 1.1, 2"
StaticArrays = "1"
Statistics = "1"
StatsBase = "0.33, 0.34"
Stheno = "0.6, 0.7, 0.8"
TemporalGPs = "0.3, 0.4, 0.5, 0.6"
TemporalGPs = "0.6 - 0.6.7"
ThreadedIterables = "0.2"
julia = "1.5, 1.6, 1.7, 1.8"
julia = "1.6"

[extras]
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
Expand Down
2 changes: 2 additions & 0 deletions docs/make.jl
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ makedocs(;
"Internals" => "internals.md",
"Index" => "longlist.md",
],
checkdocs=:none,
#checkdocs=:exports,
)

deploydocs(;
Expand Down
4 changes: 2 additions & 2 deletions docs/src/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ include("examples/calc_rvs_ccf_std.jl")
- [EchelleInstruments](https://rvspectml.github.io/EchelleInstruments.jl/stable/)
- [EchelleCCFs](https://rvspectml.github.io/EchelleCCFs.jl/stable)
- [Scalpels](https://rvspectml.github.io/Scalpels.jl/stable/)
- [RvSpectMLPlots](https://rvspectml.github.io/RvSpectMLPlots.jl/stable/)^[unreg]
- [RvSpectMLPlots](https://rvspectml.github.io/RvSpectMLPlots.jl/stable/)*


[^unreg]: This package is not yet registerd in Julia's general registry yet.
* = This package is not yet registerd in Julia's general registry yet.
56 changes: 0 additions & 56 deletions docs/src/internals.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,60 +11,4 @@ Depth = 3
```
## Functions

### General purpose
```@autodocs
Modules = [RvSpectML ]
Public = false
Order = [ :function ]
```

### Radial Velocity Related
```@autodocs
Modules = [RvSpectML.DCPCA, RvSpectML.LineFinder ] #, RvSpectML.PPCA ]
Public = false
Order = [ :function ]
```

### Interpolation
```@autodocs
Modules = [RvSpectML.LinearInterpolation, RvSpectML.SincInterpolation, RvSpectML.TemporalGPInterpolation ] # RvSpectML.GPInterpolation,
Public = false
Order = [ :function]
```

## Other
```@autodocs
Modules = [Pipeline ]
Public = false
Order = [:function]
```

## Types

### General purpose
```@autodocs
Modules = [RvSpectML ]
Public = false
Order = [:type ]
```

### Radial Velocity Related
```@autodocs
Modules = [ RvSpectML.DCPCA, RvSpectML.LineFinder ] #, RvSpectML.PPCA ]
Public = false
Order = [:type ]
```

### Interpolation
```@autodocs
Modules = [RvSpectML.LinearInterpolation, RvSpectML.SincInterpolation, RvSpectML.TemporalGPInterpolation ] # RvSpectML.GPInterpolation,
Public = false
Order = [:type ]
```

## Other
```@autodocs
Modules = [Pipeline ]
Public = false
Order = [:type]
```
6 changes: 4 additions & 2 deletions src/interp/gp_fast/low_level.jl
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ Optional Inputs:
function construct_gp_prior(; smooth_factor::Real = 1, σ²::Real = 0.5, l::Real = 5.8e-5)
σ² *= smooth_factor
l *= smooth_factor
k = σ² * transform(Matern52Kernel(), 1 / l)
#k = σ² * transform(Matern52Kernel(), 1 / l)
k = σ² * Matern52Kernel() ∘ ScaleTransform(1 / l)
f_naive = GP(k)
#f = to_sde(f_naive) # if develop issues with StaticArrays could revert to this
f = to_sde(f_naive, SArrayStorage(Float64))
Expand All @@ -29,7 +30,8 @@ function construct_gp_prior(; smooth_factor_σ²::Real = 1, smooth_factor_l::Rea
σ² *= smooth_factor_σ² * smooth_factor
l *= smooth_factor_l * smooth_factor
#k = σ² * transform(Matern52Kernel(), 1 / l)
k = σ² * with_lengthscale(Matern52Kernel(), 1 / l)
#k = σ² * with_lengthscale(Matern52Kernel(), 1 / l)
k = σ² * Matern52Kernel() ScaleTransform(1 / l)
f_naive = GP(k)
#f = to_sde(f_naive) # if develop issues with StaticArrays could revert to this
f = to_sde(f_naive, SArrayStorage(Float64))
Expand Down

0 comments on commit bb1f9b6

Please sign in to comment.