Skip to content

Commit d9669eb

Browse files
authored
Merge pull request #136 from RConsortium/copilot/purge-rds-usage
Completely remove RDS format usage per FDA feedback
2 parents 761762f + ae5ac03 commit d9669eb

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

71 files changed

+173
-82
lines changed

.github/workflows/lint.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,9 @@ jobs:
117117
}
118118
lints <- lint_dir(
119119
"pilot5-submission/pilot5-programs",
120-
linters_with_defaults(line_length_linter = line_length_linter(120L)),
120+
linters_with_defaults(line_length_linter = line_length_linter(120L),
121+
pipe_consistency_linter = NULL
122+
),
121123
exclusions = exclusions_list
122124
)
123125
saveRDS(lints, file = "lints.rds")

.lintr

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
linters: linters_with_defaults(
2-
line_length_linter(120)
2+
line_length_linter(120),
3+
pipe_consistency_linter = pipe_consistency_linter(pipe = "%>%")
34
)
45
exclusions: list(
5-
"pilot5-submission/pilot5-programs/pilot5-helper-fcns.r"
6+
"pilot5-submission/pilot5-programs/pilot5-helper-fcns.r",
7+
"adrg/llm-adrg-utils/util.R",
8+
"adrg/llm-adrg-utils/llm_prompts.R",
9+
"adrg/llm-adrg-utils/llm_pipeline.qmd",
10+
"adrg/llm-adrg-utils/llm_api.R"
611
)

adrg/_adrg.qmd

Lines changed: 9 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -270,9 +270,9 @@ As a temporary workaround, FDA requested that Conformance Summaries should be ge
270270

271271
The xpts were generated as follows:
272272

273-
* ADaM programs read in sdtm `.json` files
274-
* ADaM programs wrote out `.rds` files
275-
* A program converted these `.rds` files to `.json` and then to `.xpt`
273+
* ADaM programs read in sdtm `.json` files directly
274+
* ADaM programs wrote out `.json` files directly
275+
* A program converted these `.json` files to `.xpt`
276276
* `.xpt` files were validated by P21C
277277

278278
| Check ID | Diagnostic Message | Dataset | Count | Explanation |
@@ -285,11 +285,11 @@ The xpts were generated as follows:
285285

286286
The datasetson 1.0 `.json` files were generated as follows:
287287

288-
* ADaM programs read in sdtm `.json` files
288+
* ADaM programs read in sdtm `.json` files directly
289289
* `.json` files were created using datasetjson 1.1 standard
290-
* ADaM programs wrote out `.rds` files
291-
* A program converted these `.rds` files to `.json` and then to `.xpt`
290+
* ADaM programs wrote out `.json` files directly
292291
* `.json` files were created using datasetjson 1.1 standard
292+
* `.json` files were converted to `.xpt` files
293293
* `.xpt` files were converted to by P21C `.json` files using 1.0 standard
294294
* `.json` files were validated by P21C
295295

@@ -674,22 +674,7 @@ which will load all helper functions for datasets and displays into your global
674674
source(file.path(path$programs, "pilot5-helper-fcns.r"))
675675
```
676676

677-
4. Convert sdtm JSON files to rds files. The sdtm files are in json transport file format
678-
and need to be converted to rds files to run the ADaM programs.
679-
680-
Run the following code:
681-
682-
```r
683-
sdtm_files <- list.files(
684-
path = file.path(path$sdtm),
685-
pattern = "\\.json$",
686-
full.names = TRUE
687-
)
688-
689-
convert_json_to_rds(sdtm_files, output_dir = file.path(path$sdtm))
690-
```
691-
692-
5. Execute ADaM programs as seen in the order below:
677+
4. Execute ADaM programs as seen in the order below:
693678

694679
- `adsl.r`
695680
- `adadas.r`
@@ -698,13 +683,13 @@ convert_json_to_rds(sdtm_files, output_dir = file.path(path$sdtm))
698683
- `adtte.r`
699684

700685
You can use the following command to quickly execute each ADaM dataset. Just change
701-
the name of the dataset in the command. Rds files will be created for each ADaM in the `adamdata` folder and in your global environment.
686+
the name of the dataset in the command. Datasetjson files will be created for each ADaM in the `pilot5-datasetjson` output folder and the dataset will be loaded in your global environment.
702687

703688
```r
704689
source(file.path(path$programs, "adsl.r"))
705690
```
706691

707-
6. Execute Display programs as seen in the order below:
692+
5. Execute Display programs as seen in the order below:
708693

709694
- `tlf-demographic.r`
710695
- `tlf-efficacy.r`
-34.8 KB
Binary file not shown.
-56 KB
Binary file not shown.
-35.8 KB
Binary file not shown.
-56.7 KB
Binary file not shown.
-9.99 KB
Binary file not shown.
-9.87 KB
Binary file not shown.
-7.96 KB
Binary file not shown.

0 commit comments

Comments
 (0)