Skip to content

Commit 14296f3

Browse files
committed
Merge remote-tracking branch 'origin/main' into feature/no-ref/add-sp-sim-results
2 parents 7975720 + 7c9c0db commit 14296f3

4 files changed

Lines changed: 78 additions & 71 deletions

File tree

results/_include/_baseline_descriptions.qmd

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -9,25 +9,26 @@ lines <- pmap_chr(baselines, function(method_name, method_summary, method_descri
99
references_doi <- pluck(rest, "references_doi", .default = NULL)
1010
references_bibtex <- pluck(rest, "references_bibtex", .default = NULL)
1111
12-
if ("paper_reference" %in% names(rest)) {
13-
ref <- split_cite_fun(rest$paper_reference)
14-
} else {
15-
bibs <- c()
16-
if (!is.null(references_doi) && !is.na(references_doi)) {
17-
bibs <- get_bibtex_from_doi(references_doi)
18-
}
19-
if (!is.null(references_bibtex) && !is.na(references_bibtex)) {
20-
bibs <- c(bibs, references_bibtex)
21-
}
22-
# Write new entries to library.bib
23-
write_library(bibs)
24-
# Get bibtex references
25-
if (!is.null(bibs)) {
26-
ref <- get_bibtex_entries(bibs)
12+
ref <-
13+
if ("paper_reference" %in% names(rest)) {
14+
split_cite_fun(rest$paper_reference)
2715
} else {
28-
ref <- ""
16+
bibs <- c()
17+
if (!is.null(references_doi) && !is.na(references_doi)) {
18+
bibs <- get_bibtex_from_doi(references_doi)
19+
}
20+
if (!is.null(references_bibtex) && !is.na(references_bibtex)) {
21+
bibs <- c(bibs, references_bibtex)
22+
}
23+
# Write new entries to library.bib
24+
write_library(bibs)
25+
# Get bibtex references
26+
if (!is.null(bibs)) {
27+
get_bibtex_entries(bibs)
28+
} else {
29+
""
30+
}
2931
}
30-
}
3132
3233
if (ref != "") ref <- paste0(" ", ref)
3334

results/_include/_dataset_descriptions.qmd

Lines changed: 21 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -8,32 +8,34 @@ lines <- pmap_chr(dataset_info, function(dataset_id, dataset_name, dataset_summa
88
date_created <- pluck(rest, "date_created", .default = NULL)
99
file_size <- pluck(rest, "file_size", .default = NULL)
1010
11-
if (grep("^[a-zA-Z0-9]+[0-9]{4}[a-z]+$",data_reference) && !grepl("^@",data_reference)) {
12-
ref <- split_cite_fun(data_reference)
13-
} else {
14-
bibs <- convert_to_bibtex(data_reference)
15-
# Write new entries to library.bib
16-
write_library(bibs)
17-
ref <- get_bibtex_entries(bibs)
18-
}
11+
ref <-
12+
if (grepl("^[a-zA-Z0-9]+[0-9]{4}[a-z]+$", data_reference) && !grepl("^@", data_reference)) {
13+
split_cite_fun(data_reference)
14+
} else {
15+
bibs <- convert_to_bibtex(data_reference)
16+
# Write new entries to library.bib
17+
write_library(bibs)
18+
get_bibtex_entries(bibs)
19+
}
1920
2021
if (ref != "") ref <- paste0(" ", ref)
2122
22-
dataset_link <- if (!is.null(source_dataset_id) && dir.exists(paste0("../../datasets/", source_dataset_id))) {
23-
glue::glue("../../datasets/{source_dataset_id}")
24-
} else if (dir.exists(paste0("../../datasets/", dataset_id))) {
25-
glue::glue("../../datasets/{dataset_id}")
26-
} else {
27-
NULL
28-
}
23+
dataset_link <-
24+
if (!is.null(source_dataset_id) && dir.exists(paste0("../../datasets/", source_dataset_id))) {
25+
glue::glue("../../datasets/{source_dataset_id}")
26+
} else if (dir.exists(paste0("../../datasets/", dataset_id))) {
27+
glue::glue("../../datasets/{dataset_id}")
28+
} else {
29+
NULL
30+
}
2931
3032
# Make file_size human readable
3133
if (!is.null(file_size)) {
3234
file_size_str <- format(
33-
structure(file_size, class = "object_size"),
34-
units = "auto",
35-
standard = "IEC",
36-
digits = 2
35+
structure(file_size, class = "object_size"),
36+
units = "auto",
37+
standard = "IEC",
38+
digits = 2
3739
)
3840
}
3941

results/_include/_method_descriptions.qmd

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -8,25 +8,27 @@ lines <- pmap_chr(method_info %>% filter(!is_baseline), function(method_name, me
88
code_version <- pluck(rest, "code_version", .default = NULL)
99
references_doi <- pluck(rest, "references_doi", .default = NULL)
1010
references_bibtex <- pluck(rest, "references_bibtex", .default = NULL)
11-
if ("paper_reference" %in% names(rest)) {
12-
ref <- split_cite_fun(rest$paper_reference)
13-
} else {
14-
bibs <- c()
15-
if (!is.null(references_doi) && !is.na(references_doi)) {
16-
bibs <- get_bibtex_from_doi(references_doi)
17-
}
18-
if (!is.null(references_bibtex) && !is.na(references_bibtex)) {
19-
bibs <- c(bibs, references_bibtex)
20-
}
21-
# Write new entries to library.bib
22-
write_library(bibs)
23-
# Get bibtex references
24-
if (!is.null(bibs)) {
25-
ref <- get_bibtex_entries(bibs)
11+
12+
ref <-
13+
if ("paper_reference" %in% names(rest)) {
14+
split_cite_fun(rest$paper_reference)
2615
} else {
27-
ref <- ""
16+
bibs <- c()
17+
if (!is.null(references_doi) && !is.na(references_doi)) {
18+
bibs <- get_bibtex_from_doi(references_doi)
19+
}
20+
if (!is.null(references_bibtex) && !is.na(references_bibtex)) {
21+
bibs <- c(bibs, references_bibtex)
22+
}
23+
# Write new entries to library.bib
24+
write_library(bibs)
25+
# Get bibtex references
26+
if (!is.null(bibs)) {
27+
get_bibtex_entries(bibs)
28+
} else {
29+
""
30+
}
2831
}
29-
}
3032
3133
if (ref != "") ref <- paste0(" ", ref)
3234

results/_include/_metric_descriptions.qmd

Lines changed: 20 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -6,26 +6,28 @@ lines <- pmap_chr(metric_info, function(metric_name, metric_summary, metric_desc
66
code_version <- pluck(rest, "code_version", .default = NULL)
77
references_doi <- pluck(rest, "references_doi", .default = NULL)
88
references_bibtex <- pluck(rest, "references_bibtex", .default = NULL)
9-
if ("paper_reference" %in% names(rest)) {
10-
ref <- split_cite_fun(rest$paper_reference)
11-
} else {
12-
bibs <- c()
13-
if (!is.null(references_doi) && !is.na(references_doi)) {
14-
bibs <- get_bibtex_from_doi(references_doi)
15-
}
16-
if (!is.null(references_bibtex) && !is.na(references_bibtex)) {
17-
bibs <- c(bibs, references_bibtex)
18-
}
19-
# Write new entries to library.bib
20-
write_library(bibs)
21-
22-
# Get bibtex references
23-
if (!is.null(bibs)) {
24-
ref <- get_bibtex_entries(bibs)
9+
10+
ref <-
11+
if ("paper_reference" %in% names(rest)) {
12+
split_cite_fun(rest$paper_reference)
2513
} else {
26-
ref <- ""
14+
bibs <- c()
15+
if (!is.null(references_doi) && !is.na(references_doi)) {
16+
bibs <- get_bibtex_from_doi(references_doi)
17+
}
18+
if (!is.null(references_bibtex) && !is.na(references_bibtex)) {
19+
bibs <- c(bibs, references_bibtex)
20+
}
21+
# Write new entries to library.bib
22+
write_library(bibs)
23+
24+
# Get bibtex references
25+
if (!is.null(bibs)) {
26+
get_bibtex_entries(bibs)
27+
} else {
28+
""
29+
}
2730
}
28-
}
2931
3032
if (ref != "") ref <- paste0(" ", ref)
3133

0 commit comments

Comments
 (0)