Skip to content

Commit

Permalink
Change capitalization
Browse files Browse the repository at this point in the history
  • Loading branch information
brenhinkeller committed Jul 9, 2024
1 parent ce7c4a1 commit 0680917
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 15 deletions.
6 changes: 3 additions & 3 deletions test/testCoupled.jl
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,8 @@ println("StratMetropolisDist with systematic uncertainties:")

## --- As above, but with hiata

nHiatuses = 2 # The number of hiatuses you have data for
hiatus = HiatusData(nHiatuses) # Struct to hold data
nhiatuses = 2 # The number of hiatuses you have data for
hiatus = HiatusData(nhiatuses) # Struct to hold data
hiatus.Height = [-7.0, 35.0 ]
hiatus.Height_sigma = [ 0.0, 0.0 ]
hiatus.Duration = [ 0.3, 0.3 ]
Expand All @@ -95,7 +95,7 @@ println("StratMetropolisDist with hiata:")
# Test that all age-depth models are in stratigraphic order
@test all([issorted(x, rev=true) for x in eachcol(agedist)])
@test all(!isnan, agedist)
@test size(hiatusdist) == (nHiatuses, config.nsteps)
@test size(hiatusdist) == (nhiatuses, config.nsteps)
@test mean(hiatusdist, dims=2) [0.064; 0.061;;] atol=0.3
@test size(lldist) == (config.nsteps,)
@test !isnan(mean(lldist))
Expand Down
12 changes: 6 additions & 6 deletions test/testRadiocarbon.jl
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,8 @@ config.sieve = round(Int,npoints_approx) # Record one out of every nsieve steps


# Data about hiatuses
nHiatuses = 2 # The number of hiatuses you have data for
hiatus = HiatusData(nHiatuses) # Struct to hold data
nhiatuses = 2 # The number of hiatuses you have data for
hiatus = HiatusData(nhiatuses) # Struct to hold data
hiatus.Height = [-371.5, -405.0 ]
hiatus.Height_sigma = [ 0.0, 0.0 ]
hiatus.Duration = [ 100.0, 123.0 ]
Expand All @@ -87,7 +87,7 @@ hiatus.Duration_sigma = [ 30.5, 20.0 ]
# Test that all age-depth models are in stratigraphic order
@test all([issorted(x, rev=true) for x in eachcol(agedist)])
@test all(!isnan, agedist)
@test size(hiatusdist) == (nHiatuses, config.nsteps)
@test size(hiatusdist) == (nhiatuses, config.nsteps)
@test mean(hiatusdist, dims=2) [108.4; 189.0;;] atol=20
@test -Inf < mean(lldist) < 0

Expand Down Expand Up @@ -143,8 +143,8 @@ config.sieve = round(Int,npoints_approx) # Record one out of every nsieve steps


# Data about hiatuses
nHiatuses = 2 # The number of hiatuses you have data for
hiatus = HiatusData(nHiatuses) # Struct to hold data
nhiatuses = 2 # The number of hiatuses you have data for
hiatus = HiatusData(nhiatuses) # Struct to hold data
hiatus.Height = [-371.5, -405.0 ]
hiatus.Height_sigma = [ 0.0, 0.0 ]
hiatus.Duration = [ 100.0, 123.0 ]
Expand All @@ -161,6 +161,6 @@ hiatus.Duration_sigma = [ 30.5, 20.0 ]
# Test that all age-depth models are in stratigraphic order
@test all([issorted(x, rev=true) for x in eachcol(agedist)])
@test all(!isnan, agedist)
@test size(hiatusdist) == (nHiatuses, config.nsteps)
@test size(hiatusdist) == (nhiatuses, config.nsteps)
@test mean(hiatusdist, dims=2) [110.5; 187.3;;] atol=20
@test -Inf < mean(lldist) < 0
6 changes: 3 additions & 3 deletions test/testStratOnly.jl
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ config.sieve = round(Int,npoints_approx) # Record one out of every nsieve steps
@test NamedTuple(mdl) isa NamedTuple

# Data about hiatuses
nHiatuses = 2 # The number of hiatuses you have data for
hiatus = HiatusData(nHiatuses) # Struct to hold data
nhiatuses = 2 # The number of hiatuses you have data for
hiatus = HiatusData(nhiatuses) # Struct to hold data
hiatus.Height = [-371.5, -405.0 ]
hiatus.Height_sigma = [ 0.0, 0.0 ]
hiatus.Duration = [ 10.0, 12.3 ]
Expand All @@ -57,6 +57,6 @@ hiatus.Duration_sigma = [ 3.1, 2.0 ]
# Test that all age-depth models are in stratigraphic order
@test all([issorted(x, rev=true) for x in eachcol(agedist)])
@test all(!isnan, agedist)
@test size(hiatusdist) == (nHiatuses, config.nsteps)
@test size(hiatusdist) == (nhiatuses, config.nsteps)
@test mean(hiatusdist, dims=2) [10.580012942504894; 18.96167245288326;;] atol=2
@test -Inf < mean(lldist) < 0
6 changes: 3 additions & 3 deletions test/testStratOnlyGeneral.jl
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ config.sieve = round(Int,npoints_approx) # Record one out of every nsieve steps
@test NamedTuple(mdl) isa NamedTuple

# Data about hiatuses
nHiatuses = 2 # The number of hiatuses you have data for
hiatus = HiatusData(nHiatuses) # Struct to hold data
nhiatuses = 2 # The number of hiatuses you have data for
hiatus = HiatusData(nhiatuses) # Struct to hold data
hiatus.Height = [ 150.0, 350.0 ]
hiatus.Height_sigma = [ 0.0, 0.0 ]
hiatus.Duration = [ 1.0, 2.3 ]
Expand All @@ -54,6 +54,6 @@ hiatus.Duration_sigma = [ 1.0, 0.5 ]
# Test that all age-depth models are in stratigraphic order
@test all([issorted(x, rev=true) for x in eachcol(agedist)])
@test all(!isnan, agedist)
@test size(hiatusdist) == (nHiatuses, config.nsteps)
@test size(hiatusdist) == (nhiatuses, config.nsteps)
@test mean(hiatusdist, dims=2) [0.9662452348821302; 1.9517040131111487;;] atol=2
@test -Inf < mean(lldist) < 0

0 comments on commit 0680917

Please sign in to comment.