Skip to content

Commit 23ada40

Browse files
MegamindHenryMegamindHenry
committed
Merge branch '0.4.1'
2 parents 6872b5a + c1a31f5 commit 23ada40

40 files changed

+5526
-5220
lines changed

‎docs/src/index.md‎

Lines changed: 204 additions & 200 deletions
Large diffs are not rendered by default.

‎docs/src/man/cholesky.md‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ CurrentModule = JudiLing
55
# Cholesky
66

77
```@docs
8-
make_transform_fac
9-
make_transform_matrix
10-
make_transform_fac(::SparseMatrixCSC)
11-
make_transform_fac(::Matrix)
12-
make_transform_matrix(::Union{LinearAlgebra.Cholesky, SuiteSparse.CHOLMOD.Factor}, ::Union{SparseMatrixCSC, Matrix}, ::Union{SparseMatrixCSC, Matrix})
13-
make_transform_matrix(::SparseMatrixCSC, ::Matrix)
14-
make_transform_matrix(::Matrix, ::Union{SparseMatrixCSC, Matrix})
15-
make_transform_matrix(::SparseMatrixCSC, ::SparseMatrixCSC)
16-
format_matrix(::Union{SparseMatrixCSC, Matrix}, ::Symbol)
8+
make_transform_fac
9+
make_transform_matrix
10+
make_transform_fac(X::SparseMatrixCSC)
11+
make_transform_fac(X::Matrix)
12+
make_transform_matrix(fac::Union{LinearAlgebra.Cholesky, SuiteSparse.CHOLMOD.Factor}, X::Union{SparseMatrixCSC, Matrix}, Y::Union{SparseMatrixCSC, Matrix})
13+
make_transform_matrix(X::SparseMatrixCSC, Y::Matrix)
14+
make_transform_matrix(X::Matrix, Y::Union{SparseMatrixCSC, Matrix})
15+
make_transform_matrix(X::SparseMatrixCSC, Y::SparseMatrixCSC)
16+
format_matrix(M::Union{SparseMatrixCSC, Matrix}, output_format=:auto)
1717
```

‎docs/src/man/eval.md‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,18 @@ CurrentModule = JudiLing
55
# Find Paths
66

77
```@docs
8-
Comp_Acc_Struct
9-
accuracy_comprehension
10-
eval_SC
11-
eval_SC_loose
12-
eval_SC(Union{SparseMatrixCSC, Matrix}, Union{SparseMatrixCSC, Matrix})
13-
eval_SC(SChat,SC,data,target_col)
14-
eval_SC(SChat,SC,batch_size;verbose=false)
15-
eval_SC(SChat,SC,data,target_col,batch_size;verbose=false)
16-
eval_SC_loose(SChat,SC,k)
17-
eval_SC_loose(SChat,SC,k,data,target_col)
18-
eval_acc(::Array, ::Array)
19-
eval_acc_loose(::Array, ::Array)
20-
extract_gpi
21-
eval_manual
8+
Comp_Acc_Struct
9+
eval_SC
10+
eval_SC_loose
11+
accuracy_comprehension(S, Shat, data)
12+
eval_SC(SChat, SC)
13+
eval_SC(SChat, SC, data, target_col)
14+
eval_SC(SChat, SC, batch_size)
15+
eval_SC(SChat, SC, data, target_col, batch_size)
16+
eval_SC_loose(SChat, SC, k)
17+
eval_SC_loose(SChat, SC, k, data, target_col)
18+
eval_manual(res, data, i2f)
19+
eval_acc(res, gold_inds)
20+
eval_acc_loose(res, gold_inds)
21+
extract_gpi(gpi, threshold=0.1, tolerance=(-1000.0))
2222
```

‎docs/src/man/find_path.md‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ CurrentModule = JudiLing
55
# Find Paths
66

77
```@docs
8-
Result_Path_Info_Struct
9-
Gold_Path_Info_Struct
10-
learn_paths
11-
build_paths
12-
eval_can
13-
find_top_feature_indices
8+
Result_Path_Info_Struct
9+
Gold_Path_Info_Struct
10+
learn_paths(data_train, data_val, C_train, S_val, F_train, Chat_val, A, i2f, f2i)
11+
build_paths(data_val, C_train, S_val, F_train, Chat_val, A, i2f, C_train_ind)
12+
eval_can(candidates, S, F, i2f, max_can, if_pca, pca_eval_M)
13+
find_top_feature_indices(rC, C_train_ind)
1414
```

‎docs/src/man/make_adjacency_matrix.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ CurrentModule = JudiLing
55
# Make Adjacency Matrix
66

77
```@docs
8-
make_adjacency_matrix
9-
make_adjacency_matrix(::Dict)
10-
make_combined_adjacency_matrix(::DataFrame, ::DataFrame)
8+
make_adjacency_matrix
9+
make_adjacency_matrix(i2f)
10+
make_combined_adjacency_matrix(data_train, data_val)
1111
```

‎docs/src/man/make_cue_matrix.md‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,14 @@ CurrentModule = JudiLing
55
# Make Cue Matrix
66

77
```@docs
8-
Cue_Matrix_Struct
9-
make_cue_matrix
10-
make_combined_cue_matrix
11-
make_ngrams
12-
make_cue_matrix(::DataFrame)
13-
make_cue_matrix(::DataFrame,::Cue_Matrix_Struct)
14-
make_cue_matrix(::DataFrame,::DataFrame)
15-
make_combined_cue_matrix(::DataFrame,::DataFrame)
16-
make_ngrams(::Array,::Int64,::Bool,::Union{Nothing, String, Char},::Union{String, Char})
8+
Cue_Matrix_Struct
9+
make_cue_matrix
10+
make_combined_cue_matrix
11+
make_ngrams
12+
make_cue_matrix(data::DataFrame)
13+
make_cue_matrix(data::DataFrame, cue_obj::Cue_Matrix_Struct)
14+
make_cue_matrix(data_train::DataFrame, data_val::DataFrame)
15+
make_cue_matrix(data::DataFrame, pyndl_weights::Pyndl_Weight_Struct)
16+
make_combined_cue_matrix(data_train, data_val)
17+
make_ngrams(tokens, grams=3, keep_sep=false, sep_token=nothing, start_end_token="#")
1718
```

‎docs/src/man/make_semantic_matrix.md‎

Lines changed: 37 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -5,39 +5,41 @@ CurrentModule = JudiLing
55
# Make Semantic Matrix
66

77
```@docs
8-
PS_Matrix_Struct
9-
L_Matrix_Struct
10-
make_pS_matrix
11-
make_S_matrix
12-
make_L_matrix
13-
make_combined_S_matrix
14-
make_combined_L_matrix
15-
make_pS_matrix(::DataFrame)
16-
make_pS_matrix(::DataFrame, ::PS_Matrix_Struct)
17-
make_S_matrix(::DataFrame, ::Vector, ::Vector)
18-
make_S_matrix(::DataFrame, ::DataFrame, ::Vector, ::Vector)
19-
make_S_matrix(::DataFrame, ::Vector)
20-
make_S_matrix(::DataFrame, ::DataFrame, ::Vector)
21-
make_S_matrix(::DataFrame, ::Vector, ::Vector, ::L_Matrix_Struct)
22-
make_S_matrix(::DataFrame, ::DataFrame, ::Vector, ::L_Matrix_Struct)
23-
make_S_matrix(::DataFrame, ::DataFrame, ::Vector, ::Vector, ::L_Matrix_Struct)
24-
make_S_matrix(::DataFrame, ::Vector, ::L_Matrix_Struct)
25-
make_L_matrix(::DataFrame, ::Vector, ::Vector)
26-
make_L_matrix(::DataFrame, ::Vector)
27-
make_combined_S_matrix(::DataFrame, ::DataFrame, ::Vector, ::Vector, ::L_Matrix_Struct)
28-
make_combined_S_matrix(::DataFrame, ::DataFrame, ::Vector, ::Vector)
29-
make_combined_L_matrix(::DataFrame, ::DataFrame, ::Vector)
30-
make_combined_L_matrix(::DataFrame, ::DataFrame, ::Vector, ::Vector)
31-
L_Matrix_Struct(L, sd_base, sd_base_mean, sd_inflection, sd_inflection_mean, base_f, infl_f, base_f2i, infl_f2i, n_base_f, n_infl_f, ncol)
32-
L_Matrix_Struct(L, sd_base, sd_inflection, base_f, infl_f, base_f2i, infl_f2i, n_base_f, n_infl_f, ncol)
33-
process_features(data, feature_cols)
34-
comp_f_M!(L, sd, sd_mean, n_f, ncol, n_b)
35-
comp_f_M!(L, sd, n_f, ncol, n_b)
36-
merge_f2i(base_f2i, infl_f2i, n_base_f, n_infl_f)
37-
lexome_sum(L, features)
38-
make_St(L, n, data, base, inflections)
39-
make_St(L, n, data, base)
40-
add_St_noise!(St, sd_noise)
41-
normalize_St!(St, n_base, n_infl)
42-
normalize_St!(St, n_base)
8+
PS_Matrix_Struct
9+
L_Matrix_Struct
10+
make_pS_matrix
11+
make_S_matrix
12+
make_L_matrix
13+
make_combined_S_matrix
14+
make_combined_L_matrix
15+
make_pS_matrix(utterances)
16+
make_pS_matrix(utterances, utterances_train)
17+
make_S_matrix(data::DataFrame, base::Vector, inflections::Vector)
18+
make_S_matrix(data_train::DataFrame, data_val::DataFrame, base::Vector, inflections::Vector)
19+
make_S_matrix(data::DataFrame, base::Vector)
20+
make_S_matrix(data_train::DataFrame, data_val::DataFrame, base::Vector)
21+
make_S_matrix(data_train::DataFrame, data_val::DataFrame, pyndl_weights::Pyndl_Weight_Struct, n_features_columns::Vector)
22+
make_S_matrix(data_train::DataFrame, base::Vector, inflections::Vector, L::L_Matrix_Struct)
23+
make_S_matrix(data_train::DataFrame, data_val::Union{DataFrame, Nothing}, base::Vector, L::L_Matrix_Struct)
24+
make_S_matrix(data::DataFrame, base::Vector, L::L_Matrix_Struct)
25+
make_S_matrix(data_train::DataFrame, data_val::DataFrame, base::Vector, inflections::Vector, L::L_Matrix_Struct)
26+
make_L_matrix(data::DataFrame, base::Vector)
27+
make_combined_S_matrix(data_train::DataFrame, data_val::DataFrame, base::Vector, inflections::Vector, L::L_Matrix_Struct)
28+
make_combined_S_matrix(data_train::DataFrame, data_val::Union{DataFrame, Nothing}, base::Vector, L::L_Matrix_Struct)
29+
make_combined_S_matrix( data_train::DataFrame, data_val::DataFrame, base::Vector, inflections::Vector)
30+
make_combined_S_matrix(data_train::DataFrame, data_val::DataFrame, base::Vector)
31+
make_combined_L_matrix(data_train::DataFrame, data_val::DataFrame, base::Vector, inflections::Vector)
32+
make_combined_L_matrix(data_train::DataFrame, data_val::DataFrame, base::Vector)
33+
L_Matrix_Struct(L, sd_base, sd_base_mean, sd_inflection, sd_inflection_mean, base_f, infl_f, base_f2i, infl_f2i, n_base_f, n_infl_f, ncol)
34+
L_Matrix_Struct(L, sd_base, sd_inflection, base_f, infl_f, base_f2i, infl_f2i, n_base_f, n_infl_f, ncol)
35+
process_features(data, feature_cols)
36+
comp_f_M!(L, sd, sd_mean, n_f, ncol, n_b)
37+
comp_f_M!(L, sd, n_f, ncol, n_b)
38+
merge_f2i(base_f2i, infl_f2i, n_base_f, n_infl_f)
39+
lexome_sum(L, features)
40+
make_St(L, n, data, base, inflections)
41+
make_St(L, n, data, base)
42+
add_St_noise!(St, sd_noise)
43+
normalize_St!(St, n_base, n_infl)
44+
normalize_St!(St, n_base)
4345
```

‎docs/src/man/make_yt_matrix.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@ CurrentModule = JudiLing
55
# Make Yt Matrix
66

77
```@docs
8-
make_Yt_matrix
9-
make_Yt_matrix(::Int64, ::DataFrame, ::Dict)
8+
make_Yt_matrix
9+
make_Yt_matrix(t, data, f2i)
1010
```

‎docs/src/man/output.md‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,14 @@ CurrentModule = JudiLing
55
# Output
66

77
```@docs
8-
write2csv
9-
write2df
10-
save_L_matrix
11-
load_L_matrix
12-
write2csv(::Array{Array{Result_Path_Info_Struct,1},1}, ::DataFrame, ::Cue_Matrix_Struct, ::Cue_Matrix_Struct, ::String)
13-
write2csv(::Vector{Gold_Path_Info_Struct}, ::String)
14-
write2df(::Array{Array{Result_Path_Info_Struct,1},1}, ::DataFrame, ::Cue_Matrix_Struct, ::Cue_Matrix_Struct)
15-
write2df(::gpi::Vector{Gold_Path_Info_Struct})
16-
save_L_matrix(::L_Matrix_Struct,::String)
17-
load_L_matrix(::String)
18-
8+
write2csv
9+
write2df
10+
save_L_matrix
11+
load_L_matrix
12+
write2csv(res, data, cue_obj_train, cue_obj_val, filename)
13+
write2csv(gpi, filename)
14+
write2df(res, data, cue_obj_train, cue_obj_val)
15+
write2df(gpi)
16+
save_L_matrix(L, filename)
17+
load_L_matrix(filename)
1918
```

‎docs/src/man/pickle.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@ CurrentModule = JudiLing
55
# Utils
66

77
```@docs
8-
mypickle
9-
myunpickle
8+
mypickle
9+
myunpickle
1010
```

0 commit comments

Comments
 (0)