Skip to content

Commit 8d3162a

Browse files
committed
update CSV to 0.8
1 parent d3a90e6 commit 8d3162a

15 files changed

+46
-46
lines changed

Manifest.toml

Lines changed: 13 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ uuid = "6e4b80f9-dd63-53aa-95a3-0cdb28fa8baf"
1616
version = "0.5.0"
1717

1818
[[CSV]]
19-
deps = ["CategoricalArrays", "DataFrames", "Dates", "Mmap", "Parsers", "PooledArrays", "SentinelArrays", "Tables", "Unicode"]
20-
git-tree-sha1 = "b1f60ea404dc40a76e7f539672ce651079a5a190"
19+
deps = ["Dates", "Mmap", "Parsers", "PooledArrays", "SentinelArrays", "Tables", "Unicode"]
20+
git-tree-sha1 = "1f79803452adf73e2d3fc84785adb7aaca14db36"
2121
uuid = "336ed68f-0bac-5ca0-87d4-7b16caf5d00b"
22-
version = "0.7.10"
22+
version = "0.8.3"
2323

2424
[[CategoricalArrays]]
2525
deps = ["DataAPI", "Future", "JSON", "Missings", "Printf", "Statistics", "StructTypes", "Unicode"]
@@ -87,9 +87,9 @@ uuid = "8ba89e20-285c-5b6f-9357-94700520ee1b"
8787

8888
[[Distributions]]
8989
deps = ["FillArrays", "LinearAlgebra", "PDMats", "Printf", "QuadGK", "Random", "SparseArrays", "SpecialFunctions", "Statistics", "StatsBase", "StatsFuns"]
90-
git-tree-sha1 = "5a9a742ae30f13d6172c7ea245988d932134e25b"
90+
git-tree-sha1 = "0fc424e725eaec6ea3e9fa8df773bee18a1ab503"
9191
uuid = "31c24e10-a181-5473-b8eb-7969acd0382f"
92-
version = "0.24.13"
92+
version = "0.24.14"
9393

9494
[[DocStringExtensions]]
9595
deps = ["LibGit2", "Markdown", "Pkg", "Test"]
@@ -111,9 +111,9 @@ version = "0.2.0"
111111

112112
[[FillArrays]]
113113
deps = ["LinearAlgebra", "Random", "SparseArrays"]
114-
git-tree-sha1 = "e384d3cff80ac79c7a541a817192841836e46331"
114+
git-tree-sha1 = "4705cc4e212c3c978c60b1b18118ec49b4d731fd"
115115
uuid = "1a297f60-69ca-5386-bcde-b61e274b549b"
116-
version = "0.11.2"
116+
version = "0.11.5"
117117

118118
[[Future]]
119119
deps = ["Random"]
@@ -197,9 +197,9 @@ uuid = "efe28fd5-8261-553b-a9e1-b2916fc3738e"
197197
version = "0.5.3+4"
198198

199199
[[OrderedCollections]]
200-
git-tree-sha1 = "d45739abcfc03b51f6a42712894a593f74c80a23"
200+
git-tree-sha1 = "4fa2ba51070ec13fcc7517db714445b4ab986bdf"
201201
uuid = "bac558e1-5e72-5ebc-8fee-abe8a469f55d"
202-
version = "1.3.3"
202+
version = "1.4.0"
203203

204204
[[PDMats]]
205205
deps = ["LinearAlgebra", "SparseArrays", "SuiteSparse", "Test"]
@@ -302,25 +302,19 @@ uuid = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
302302

303303
[[SpecialFunctions]]
304304
deps = ["ChainRulesCore", "OpenSpecFun_jll"]
305-
git-tree-sha1 = "75394dbe2bd346beeed750fb02baa6445487b862"
305+
git-tree-sha1 = "5919936c0e92cff40e57d0ddf0ceb667d42e5902"
306306
uuid = "276daf66-3868-5448-9aa4-cd146d93841b"
307-
version = "1.2.1"
308-
309-
[[StaticArrays]]
310-
deps = ["LinearAlgebra", "Random", "Statistics"]
311-
git-tree-sha1 = "da4cf579416c81994afd6322365d00916c79b8ae"
312-
uuid = "90137ffa-7385-5640-81b9-e52037218182"
313-
version = "0.12.5"
307+
version = "1.3.0"
314308

315309
[[Statistics]]
316310
deps = ["LinearAlgebra", "SparseArrays"]
317311
uuid = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
318312

319313
[[StatsBase]]
320314
deps = ["DataAPI", "DataStructures", "LinearAlgebra", "Missings", "Printf", "Random", "SortingAlgorithms", "SparseArrays", "Statistics"]
321-
git-tree-sha1 = "7bab7d4eb46b225b35179632852b595a3162cb61"
315+
git-tree-sha1 = "400aa43f7de43aeccc5b2e39a76a79d262202b76"
322316
uuid = "2913bbd2-ae8a-5f71-8c99-4fb6c76f3a91"
323-
version = "0.33.2"
317+
version = "0.33.3"
324318

325319
[[StatsFuns]]
326320
deps = ["Rmath", "SpecialFunctions"]

docs/src/index.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ We first download and read the csv file into Julia:
5151
```julia
5252
download("https://osf.io/2ejfu/download", "latin.csv")
5353

54-
latin = CSV.DataFrame!(CSV.File(joinpath(@__DIR__, "latin.csv")));
54+
latin = DataFrame(CSV.File(joinpath(@__DIR__, "latin.csv")));
5555
```
5656

5757
and we can inspect the latin dataframe:
@@ -347,8 +347,8 @@ The model also provides functionality for cross-validation. Here, you can downlo
347347
download("https://osf.io/2ejfu/download", "latin_train.csv")
348348
download("https://osf.io/bm7y6/download", "latin_val.csv")
349349
350-
latin_train = CSV.DataFrame!(CSV.File(joinpath(@__DIR__, "latin_train.csv")))
351-
latin_val = CSV.DataFrame!(CSV.File(joinpath(@__DIR__, "latin_val.csv")))
350+
latin_train = DataFrame(CSV.File(joinpath(@__DIR__, "latin_train.csv")))
351+
latin_val = DataFrame(CSV.File(joinpath(@__DIR__, "latin_val.csv")))
352352
```
353353

354354
Then, we make the C and S matrices passing both training and validation datasets to the `make_cue_matrix` function.

examples/estonian.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ using CSV # read csv files into dataframes
33

44
# load estonian file
55
estonian_train =
6-
CSV.DataFrame!(CSV.File(joinpath(@__DIR__, "data", "estonian_train.csv")))
6+
DataFrame(CSV.File(joinpath(@__DIR__, "data", "estonian_train.csv")))
77
estonian_val =
8-
CSV.DataFrame!(CSV.File(joinpath(@__DIR__, "data", "estonian_val.csv")))
8+
DataFrame(CSV.File(joinpath(@__DIR__, "data", "estonian_val.csv")))
99

1010
# create C matrixes for training and validation datasets
1111
cue_obj_train = JudiLing.make_cue_matrix(

examples/latin.jl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ mkpath(joinpath(@__DIR__, "data"))
55
download("https://osf.io/2ejfu/download", "latin.csv")
66
mv("latin.csv", joinpath(@__DIR__, "data", "latin.csv"), force = true)
77
# load latin file
8-
latin = CSV.DataFrame!(CSV.File(joinpath(@__DIR__, "data", "latin.csv")))
8+
latin = DataFrame(CSV.File(joinpath(@__DIR__, "data", "latin.csv")))
99
display(latin)
1010

1111
# create C matrixes for training datasets
@@ -171,9 +171,9 @@ mv(
171171
mv("latin_val.csv", joinpath(@__DIR__, "data", "latin_val.csv"), force = true)
172172
# cross-validation
173173
latin_train =
174-
CSV.DataFrame!(CSV.File(joinpath(@__DIR__, "data", "latin_train.csv")))
174+
DataFrame(CSV.File(joinpath(@__DIR__, "data", "latin_train.csv")))
175175
latin_val =
176-
CSV.DataFrame!(CSV.File(joinpath(@__DIR__, "data", "latin_val.csv")))
176+
DataFrame(CSV.File(joinpath(@__DIR__, "data", "latin_val.csv")))
177177

178178
# create C matrices for both training and validation datasets
179179
cue_obj_train, cue_obj_val = JudiLing.make_cue_matrix(

src/make_yt_matrix.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ for the corresponding n-gram predicted for timestep t for each of the observatio
2222
2323
# Examples
2424
```julia
25-
latin = CSV.DataFrame!(CSV.File(joinpath("data", "latin_mini.csv")))
25+
latin = DataFrame(CSV.File(joinpath("data", "latin_mini.csv")))
2626
JudiLing.make_Yt_matrix(2, latin)
2727
```
2828
...

src/output.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -424,7 +424,7 @@ L_load = JudiLing.load_L_matrix(joinpath(@__DIR__, "L.csv"))
424424
"""
425425
function load_L_matrix(filename; header = false)
426426

427-
L_df = CSV.DataFrame!(CSV.File(filename, header = header))
427+
L_df = DataFrame(CSV.File(filename, header = header))
428428
i2f = L_df[:, 1]
429429
f2i = Dict(v => i for (i, v) in enumerate(i2f))
430430
ncol = size(L_df, 2) - 1

src/preprocess.jl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Leave p out cross-validation.
2424
"""
2525
function lpo_cv_split(p, data_path; random_seed = 314)
2626
# read csv
27-
data = CSV.DataFrame!(CSV.File(data_path))
27+
data = DataFrame(CSV.File(data_path))
2828

2929
# shuffle data
3030
rng = MersenneTwister(random_seed)
@@ -60,7 +60,7 @@ function train_val_split(
6060
)
6161

6262
# read csv
63-
utterances = CSV.DataFrame!(CSV.File(data_path))
63+
utterances = DataFrame(CSV.File(data_path))
6464

6565
# shuffle data
6666
rng = MersenneTwister(random_seed)
@@ -160,7 +160,7 @@ function train_val_split(
160160
)
161161

162162
# read csv
163-
utterances = CSV.DataFrame!(CSV.File(data_path))
163+
utterances = DataFrame(CSV.File(data_path))
164164
num_utterances = size(utterances, 1)
165165

166166
# shuffle data
@@ -385,7 +385,7 @@ function preprocess_ndl(
385385
)
386386

387387
# read csv
388-
data = CSV.DataFrame!(CSV.File(data_path))
388+
data = DataFrame(CSV.File(data_path))
389389

390390
io = GZip.open(joinpath(save_path), "w")
391391

src/test_combo.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -193,11 +193,11 @@ function test_combo(
193193

194194
# load data
195195
verbose && println("Loading CSV...")
196-
data_train = CSV.DataFrame!(CSV.File(joinpath(
196+
data_train = DataFrame(CSV.File(joinpath(
197197
output_dir_path,
198198
"$(data_prefix)_train.csv",
199199
)))
200-
data_val = CSV.DataFrame!(CSV.File(joinpath(
200+
data_val = DataFrame(CSV.File(joinpath(
201201
output_dir_path,
202202
"$(data_prefix)_val.csv",
203203
)))

test/cholesky_tests.jl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ using JudiLing
22
using CSV
33
using Test
44
using SparseArrays
5+
using DataFrames
56

67
@testset "cholesky transformation matrix" begin
78
try
@@ -35,7 +36,7 @@ end
3536
@testset "cholesky transformation matrix for latin" begin
3637
try
3738
latin_train =
38-
CSV.DataFrame!(CSV.File(joinpath("data", "latin_mini.csv")))
39+
DataFrame(CSV.File(joinpath("data", "latin_mini.csv")))
3940
cue_obj_train = JudiLing.make_cue_matrix(
4041
latin_train,
4142
grams = 3,

test/find_path_tests.jl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
using JudiLing
22
using CSV
33
using Test
4+
using DataFrames
45

56
@testset "path finding for latin" begin
67
try
78
latin_train =
8-
CSV.DataFrame!(CSV.File(joinpath("data", "latin_mini.csv")))
9+
DataFrame(CSV.File(joinpath("data", "latin_mini.csv")))
910
cue_obj_train = JudiLing.make_cue_matrix(
1011
latin_train,
1112
grams = 3,

0 commit comments

Comments
 (0)