Skip to content

Commit b962ad2

Browse files
committed
Rel 2.0.2
1 parent 6c3813c commit b962ad2

14 files changed

Lines changed: 27 additions & 22 deletions

File tree

Project.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name = "DynamicHMCModels"
22
uuid = "6266e5bf-9887-5dfa-a522-2c46ecdcf14a"
33
authors = ["Rob J Goedman <goedman@icloud.com"]
4-
version = "2.0.1"
4+
version = "2.0.2"
55

66
[deps]
77
CSV = "336ed68f-0bac-5ca0-87d4-7b16caf5d00b"

scripts/04/m4.1d.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ cd(ProjDir)
99

1010
# Import the dataset.
1111

12-
data = DataFrame(CSV.read(joinpath("..", "..", "data", "Howell1.csv"), delim=';'));
12+
data = (CSV.File(joinpath("..", "..", "data", "Howell1.csv"),DataFrame; delim=';'));
1313

1414
# Use only adults and standardize
1515

scripts/04/m4.1d_mcmcchains.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ cd(ProjDir)
99

1010
# Import the dataset.
1111

12-
data = DataFrame(CSV.read(rel_path("..", "data", "Howell1.csv"), delim=';'));
12+
data = DataFrame!(CSV.File(rel_path("..", "data", "Howell1.csv"), delim=';'));
1313

1414
# Use only adults and standardize
1515

scripts/04/m4.2d.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ cd(ProjDir)
77

88
# Import the dataset.
99

10-
data = DataFrame(CSV.read(joinpath("..", "..", "data", "Howell1.csv"), delim=';'));
10+
data = DataFrame!(CSV.File(joinpath("..", "..", "data", "Howell1.csv"), delim=';'));
1111

1212
# Use only adults and standardize
1313

scripts/04/m4.5d.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ cd(ProjDir)
77

88
# Import the dataset.
99

10-
data = DataFrame(CSV.read(joinpath("..", "..", "data", "Howell1.csv"), delim=';'));
10+
data = DataFrame!(CSV.File(joinpath("..", "..", "data", "Howell1.csv"), delim=';'));
1111

1212
# Use only adults and standardize
1313

scripts/04/m4.5d1.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ cd(ProjDir)
77

88
# Import the dataset.
99

10-
data = DataFrame(CSV.read(joinpath("..", "..", "data", "Howell1.csv"), delim=';'));
10+
data = DataFrame!(CSV.File(joinpath("..", "..", "data", "Howell1.csv"), delim=';'));
1111

1212
# Use only adults and standardize
1313

scripts/05/m5.1d.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ cd(ProjDir)
99

1010
# ### snippet 5.1
1111

12-
df = DataFrame(CSV.read(joinpath("..", "..", "data", "WaffleDivorce.csv"), delim=';'))
12+
df = DataFrame!(CSV.File(joinpath("..", "..", "data", "WaffleDivorce.csv"), delim=';'))
1313
mean_ma = mean(df[:, :MedianAgeMarriage])
1414
df[!, :MedianAgeMarriage_s] = convert(Vector{Float64},
1515
(df[:, :MedianAgeMarriage]) .- mean_ma)/std(df[:, :MedianAgeMarriage]);

scripts/05/m5.3d.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ cd(ProjDir)
99

1010
# ### snippet 5.4
1111

12-
df = DataFrame(CSV.read(joinpath("..", "..", "data", "WaffleDivorce.csv"), delim=';'))
12+
df = DataFrame!(CSV.File(joinpath("..", "..", "data", "WaffleDivorce.csv"), delim=';'))
1313

1414
mean_ma = mean(df[:, :Marriage])
1515
df[!, :Marriage_s] = convert(Vector{Float64},

scripts/05/m5.6d.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ cd(ProjDir)
99

1010
# Read the milk data
1111

12-
df = DataFrame(CSV.read(joinpath("..", "..", "data", "milk.csv"), delim=';'))
12+
df = DataFrame!(CSV.File(joinpath("..", "..", "data", "milk.csv"), delim=';'))
1313
df = filter(row -> !(row[:neocortex_perc] == "NA"), df)
1414
#df[:, :kcal_per_g] = convert(Vector{Float64}, df[:, :kcal_per_g])
1515
df[!, :log_mass] = log.(convert(Vector{Float64}, df[:, :mass]))

scripts/08/m8.1d.jl

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,11 @@ cd(ProjDir)
77

88
# Read in data
99

10-
df = DataFrame(CSV.read(joinpath("..", "..", "data", "rugged.csv"), delim=';'))
10+
delim = ';'
11+
df = CSV.read(joinpath("..", "..", "data", "rugged.csv"), DataFrame; delim)
1112
df = filter(row -> !(ismissing(row[:rgdppc_2000])), df)
12-
df[!, :log_gdp] = log.(df[:, :rgdppc_2000])
13-
df[!, :cont_africa] = Array{Float64}(convert(Array{Int}, df[:, :cont_africa]))
13+
df.log_gdp = log.(df.rgdppc_2000)
14+
df.cont_africa = Array{Float64}(convert(Array{Int}, df.cont_africa))
1415

1516
Base.@kwdef mutable struct RuggedModel{Ty <: AbstractVector,
1617
Tx <: AbstractMatrix}

0 commit comments

Comments
 (0)