Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Repository restructuring -- combining with PrestoGP_Pesticides #14

Closed
sigmafelix opened this issue Nov 2, 2023 · 1 comment
Closed

Comments

@sigmafelix
Copy link
Collaborator

This repository is structured for a R package. I think the existing PrestoGP_Pesticide repository needs to be integrated into a part of this repository for both the ease of maintenance and the integration of an effective demonstration of the functions of PrestoGP. After a discussion with Kyle, we suggest taking this directory structure:

PrestoGP

  • Standard R package components: included in the package build and submission to CRAN
    • ./R: R functions
    • ./data: a small subset of pesticide analysis data (e.g., data in NC), possibly in addition to the current US_ST_NO2_Data in PrestoGP package.
    • ./man: *.Rd files, generated from roxygen2
    • ./src: C++ source codes and Makevars.
    • ./tests: testthat tests, which are executable for GitHub Action test-coverage workflow
    • ./vignettes: demonstration R markdown files for PrestoGP model classes (SpatialModel, SpatioTemporalModel, MultivariateVecchiaModel, etc.) using files in ./data
  • For manuscript/paper
    • ./Pesticide_Analysis: analysis codes for pesticide modeling
      • ./Pesticide_Analysis/code: similar to code folder in PrestoGP_Pesticides repository; R, rmd, qmd files are organized as follows
        • ./Pesticide_Analysis/code/00_Load_Packages
        • ./Pesticide_Analysis/code/01_Create_Dataset
        • ./Pesticide_Analysis/code/02_Geographic_Covariates
        • ./Pesticide_Analysis/code/03_Model_Fitting_and_Prediction
      • ./Pesticide_Analysis/input: shareable input data. Potentially pointing to the external websites and repository
      • ./Pesticide_Analysis/output: thematic/cleaned covariates and outcomes for model fitting and prediction

TODO

  • Insang: make a new branch for implementing the directory structure
sciome-bot pushed a commit that referenced this issue Dec 1, 2023
Merge in STAT/prestogp from master to to-git

Squashed commit of the following:

commit 17f5284
Merge: ea78ffa 895100d
Author: Eric Bair <eric.bair@sciome.com>
Date:   Fri Dec 1 10:49:09 2023 -0500

    Pull request #12: Testing

    Merge in STAT/prestogp from testing to master

    * commit '895100db78d89c5082ddfcf1411dad69bdf1b6c5':
      Fixed another sparseNN bug and updated tests
      Fixed a bug in SparseNN
      Added more likelihood and maxmin ordering tests

commit 895100d
Merge: 7f3ca3c fb060ff
Author: Eric Bair <eric.bair@sciome.com>
Date:   Wed Nov 29 17:02:10 2023 -0500

    Merge branch 'to-git' of http://192.168.167.103:7990/bitbucket/scm/stat/prestogp into testing

    Conflicts:
    	DESCRIPTION
    	man/prestogp_fit-PrestoGPModel-method.Rd
    	tests/testthat/test-Log_Likelihood.R

    Fixed merge conflicts.

commit 7f3ca3c
Author: Eric Bair <eric.bair@sciome.com>
Date:   Wed Nov 29 16:43:40 2023 -0500

    Fixed another sparseNN bug and updated tests

commit 1ca9586
Author: Eric Bair <eric.bair@sciome.com>
Date:   Tue Nov 28 18:40:36 2023 -0500

    Fixed a bug in SparseNN

commit 80a9818
Author: Eric Bair <eric.bair@sciome.com>
Date:   Tue Nov 21 17:49:19 2023 -0500

    Added more likelihood and maxmin ordering tests

commit ea78ffa
Merge: 286ba5d 53e2b0d
Author: sciome-bot <software.tools@sciome.com>
Date:   Mon Nov 20 12:41:08 2023 -0500

    Merge branch 'main-sciome' of sciome-bot-git:Spatiotemporal-Exposures-and-Toxicology/PrestoGP

commit 53e2b0d
Author: {SET}group <127860447+Spatiotemporal-Exposures-and-Toxicology@users.noreply.github.com>
Date:   Fri Nov 17 20:54:40 2023 -0500

    Update README.md with lifecycle badge

commit 2d2e84b
Merge: f9d0185 b7c0809
Author: {SET}group <127860447+Spatiotemporal-Exposures-and-Toxicology@users.noreply.github.com>
Date:   Thu Nov 16 22:13:58 2023 -0500

    Merge pull request #15 from Spatiotemporal-Exposures-and-Toxicology/SET-actions

    partial linting (PrestoGP_Model.R) done thus far

commit b7c0809
Merge: 5705bb4 f9d0185
Author: Messier <messierkp@almbp02184136.local>
Date:   Thu Nov 16 18:43:42 2023 -0500

    fixing conflicts

commit 5705bb4
Merge: d602b8f 391e477
Author: Messier <messierkp@almbp02184136.niehs.nih.gov>
Date:   Thu Nov 16 16:54:00 2023 -0500

    Merge branch 'main' into SET-actions

commit d602b8f
Merge: 60e5fd3 4c1bf2a
Author: Messier <messierkp@almbp02184136.niehs.nih.gov>
Date:   Thu Nov 16 16:51:21 2023 -0500

    Merge branch 'SET-actions' of https://github.com/Spatiotemporal-Exposures-and-Toxicology/PrestoGP into SET-actions

commit 60e5fd3
Author: Messier <messierkp@almbp02184136.niehs.nih.gov>
Date:   Thu Nov 16 16:51:08 2023 -0500

    linting PrestoGP_Model.R

commit 4c1bf2a
Author: {SET}group <127860447+Spatiotemporal-Exposures-and-Toxicology@users.noreply.github.com>
Date:   Thu Nov 16 16:50:31 2023 -0500

    Update lint.yaml 3-linters as NULL

commit f9d0185
Merge: 391e477 e7fd7ea
Author: ericbair-sciome <149633517+ericbair-sciome@users.noreply.github.com>
Date:   Wed Nov 15 15:17:56 2023 -0500

    Merge pull request #36 from Spatiotemporal-Exposures-and-Toxicology/main-sciome

    Latest Sciome update: likelihood bug fix and additional testing

commit e7fd7ea
Merge: fb060ff 84fd72f
Author: sciome-bot <software.tools@sciome.com>
Date:   Tue Nov 14 13:16:41 2023 -0500

    Merge branch 'main-sciome' of github-sciome:Spatiotemporal-Exposures-and-Toxicology/PrestoGP into to-git

commit 286ba5d
Merge: f52ebbb 84fd72f
Author: sciome-bot <software.tools@sciome.com>
Date:   Tue Nov 14 13:11:48 2023 -0500

    Merge branch 'main-sciome' of sciome-bot-git:Spatiotemporal-Exposures-and-Toxicology/PrestoGP

commit 84fd72f
Author: sciome-bot <software.tools@sciome.com>
Date:   Tue Nov 14 13:10:52 2023 -0500

    Pull request #9: Testing

    * commit '2dd74a21380be960918b6067abec8ec163721853':
      Added a simulation file for testing
      Fixed likelihood function and added additional tests
      Fixed likelihood function and added additional test

commit f52ebbb
Merge: 4e0e1ec 2dd74a2
Author: Eric Bair <eric.bair@sciome.com>
Date:   Tue Nov 14 13:10:51 2023 -0500

    Pull request #9: Testing

    * commit '2dd74a21380be960918b6067abec8ec163721853':
      Added a simulation file for testing
      Fixed likelihood function and added additional tests
      Fixed likelihood function and added additional test

commit 79011bd
Merge: b613143 9094abe
Author: sciome-bot <software.tools@sciome.com>
Date:   Tue Nov 14 13:09:25 2023 -0500

    Merge branch 'main-sciome' of sciome-bot-git:Spatiotemporal-Exposures-and-Toxicology/PrestoGP into main-sciome

commit b613143
Merge: 615e30a 391e477
Author: sciome-bot <software.tools@sciome.com>
Date:   Tue Nov 14 13:06:44 2023 -0500

    Merge branch 'main' of sciome-bot-git:Spatiotemporal-Exposures-and-Toxicology/PrestoGP into main-sciome

... and 20 more commits
sciome-bot pushed a commit that referenced this issue Dec 28, 2023
…ode for R and C++

Merge in STAT/prestogp from master to to-git

Squashed commit of the following:

commit 710520c
Merge: d2a2e3a 11771e4
Author: Shail Choksi <shail.choksi@sciome.com>
Date:   Thu Dec 28 14:09:40 2023 -0500

    Pull request #18: Added missing imports and ran auto-formatter in vscode for R and C++

    Merge in STAT/prestogp from build-workflow to master

    * commit '11771e4ccbd6311aa35334c5ab4b7e4299a8db56':
      Added missing imports
      Ran auto-formatter/linter for R and C++ in vscode. Added some missing imports

commit 11771e4
Author: sciome-bot <software.tools@sciome.com>
Date:   Thu Dec 28 14:07:28 2023 -0500

    Added missing imports

commit 73aed75
Merge: 7c0bbfe d2a2e3a
Author: sciome-bot <software.tools@sciome.com>
Date:   Thu Dec 28 13:58:37 2023 -0500

    Merge branch 'master' of ssh://sciome-bot/stat/prestogp into build-workflow

commit d2a2e3a
Merge: bea8382 85517e7
Author: sciome-bot <software.tools@sciome.com>
Date:   Thu Dec 28 13:57:14 2023 -0500

    Merge branch 'master' of ssh://sciome-bot/stat/prestogp

commit bea8382
Merge: 17f5284 1e4361d
Author: sciome-bot <software.tools@sciome.com>
Date:   Thu Dec 28 13:55:26 2023 -0500

    Merge branch 'main-sciome' of sciome-bot-git:Spatiotemporal-Exposures-and-Toxicology/PrestoGP

commit 7c0bbfe
Author: sciome-bot <software.tools@sciome.com>
Date:   Thu Dec 28 13:52:27 2023 -0500

    Ran auto-formatter/linter for R and C++ in vscode. Added some missing imports

commit 85517e7
Merge: 17f5284 2c9c2ed
Author: Shail Choksi <shail.choksi@sciome.com>
Date:   Thu Dec 28 13:12:00 2023 -0500

    Pull request #16: Add UBSAN/ASAN sanitizers

    Merge in STAT/prestogp from build-workflow to master

    * commit '2c9c2ede3d40e6e5af24b38a6acfc2dfb2994975':
      Add USAN/ASAN pipeline
      Pull request #14: Additional Testing
      Additional Testing
      Add UBSAN/ASAN sanitizers

commit 2c9c2ed
Merge: 6af43f4 56cdbf2
Author: sciome-bot <software.tools@sciome.com>
Date:   Thu Dec 28 13:11:14 2023 -0500

    Merge branch 'to-git' of ssh://sciome-bot/stat/prestogp into build-workflow

commit 6af43f4
Merge: e530819 17f5284
Author: sciome-bot <software.tools@sciome.com>
Date:   Thu Dec 28 13:07:50 2023 -0500

    Merge branch 'master' of ssh://sciome-bot/stat/prestogp into build-workflow

commit e530819
Author: sciome-bot <software.tools@sciome.com>
Date:   Thu Dec 28 13:06:21 2023 -0500

    Add USAN/ASAN pipeline

commit 17f5284
Merge: ea78ffa 895100d
Author: Eric Bair <eric.bair@sciome.com>
Date:   Fri Dec 1 10:49:09 2023 -0500

    Pull request #12: Testing

    Merge in STAT/prestogp from testing to master

    * commit '895100db78d89c5082ddfcf1411dad69bdf1b6c5':
      Fixed another sparseNN bug and updated tests
      Fixed a bug in SparseNN
      Added more likelihood and maxmin ordering tests

commit 895100d
Merge: 7f3ca3c fb060ff
Author: Eric Bair <eric.bair@sciome.com>
Date:   Wed Nov 29 17:02:10 2023 -0500

    Merge branch 'to-git' of http://192.168.167.103:7990/bitbucket/scm/stat/prestogp into testing

    Conflicts:
    	DESCRIPTION
    	man/prestogp_fit-PrestoGPModel-method.Rd
    	tests/testthat/test-Log_Likelihood.R

    Fixed merge conflicts.

commit 7f3ca3c
Author: Eric Bair <eric.bair@sciome.com>
Date:   Wed Nov 29 16:43:40 2023 -0500

    Fixed another sparseNN bug and updated tests

commit 1ca9586
Author: Eric Bair <eric.bair@sciome.com>
Date:   Tue Nov 28 18:40:36 2023 -0500

    Fixed a bug in SparseNN

commit 80a9818
Author: Eric Bair <eric.bair@sciome.com>
Date:   Tue Nov 21 17:49:19 2023 -0500

    Added more likelihood and maxmin ordering tests

commit 4822fbc
Author: sciome-bot <software.tools@sciome.com>
Date:   Mon Nov 20 15:01:37 2023 -0500

    Add UBSAN/ASAN sanitizers

commit ea78ffa
Merge: 286ba5d 53e2b0d
Author: sciome-bot <software.tools@sciome.com>
Date:   Mon Nov 20 12:41:08 2023 -0500

    Merge branch 'main-sciome' of sciome-bot-git:Spatiotemporal-Exposures-and-Toxicology/PrestoGP

commit 286ba5d
Merge: f52ebbb 84fd72f
Author: sciome-bot <software.tools@sciome.com>
Date:   Tue Nov 14 13:11:48 2023 -0500

    Merge branch 'main-sciome' of sciome-bot-git:Spatiotemporal-Exposures-and-Toxicology/PrestoGP

commit f52ebbb
Merge: 4e0e1ec 2dd74a2
Author: Eric Bair <eric.bair@sciome.com>
Date:   Tue Nov 14 13:10:51 2023 -0500

    Pull request #9: Testing

    * commit '2dd74a21380be960918b6067abec8ec163721853':
      Added a simulation file for testing
      Fixed likelihood function and added additional tests
      Fixed likelihood function and added additional test

commit 2dd74a2
Author: Eric Bair <eric.bair@sciome.com>
Date:   Mon Nov 13 19:17:43 2023 -0500

    Added a simulation file for testing

... and 3 more commits
sciome-bot pushed a commit that referenced this issue Dec 28, 2023
Squashed commit of the following:

commit d7794fd
Merge: 03c3589 2e94403
Author: sciome-bot <software.tools@sciome.com>
Date:   Thu Dec 28 15:10:33 2023 -0500

    Merge branch 'master' of ssh://sciome-bot/stat/prestogp

commit 03c3589
Merge: d2a2e3a 961880a
Author: sciome-bot <software.tools@sciome.com>
Date:   Thu Dec 28 15:08:24 2023 -0500

    Merge branch 'to-git' of ssh://sciome-bot/stat/prestogp

commit 2e94403
Merge: 710520c 8dac095
Author: Shail Choksi <shail.choksi@sciome.com>
Date:   Thu Dec 28 15:07:40 2023 -0500

    Pull request #20: R CMD check fixes

    Merge in STAT/prestogp from build-workflow to master

    * commit '8dac09511058405d630121ca13c589781c932bf4':
      R CMD check fixes
      Add new files to Collate section in DESCRIPTION file

commit 8dac095
Author: sciome-bot <software.tools@sciome.com>
Date:   Thu Dec 28 15:06:38 2023 -0500

    R CMD check fixes

commit f037a0b
Author: sciome-bot <software.tools@sciome.com>
Date:   Thu Dec 28 14:22:52 2023 -0500

    Add new files to Collate section in DESCRIPTION file

commit 710520c
Merge: d2a2e3a 11771e4
Author: Shail Choksi <shail.choksi@sciome.com>
Date:   Thu Dec 28 14:09:40 2023 -0500

    Pull request #18: Added missing imports and ran auto-formatter in vscode for R and C++

    Merge in STAT/prestogp from build-workflow to master

    * commit '11771e4ccbd6311aa35334c5ab4b7e4299a8db56':
      Added missing imports
      Ran auto-formatter/linter for R and C++ in vscode. Added some missing imports

commit 11771e4
Author: sciome-bot <software.tools@sciome.com>
Date:   Thu Dec 28 14:07:28 2023 -0500

    Added missing imports

commit 73aed75
Merge: 7c0bbfe d2a2e3a
Author: sciome-bot <software.tools@sciome.com>
Date:   Thu Dec 28 13:58:37 2023 -0500

    Merge branch 'master' of ssh://sciome-bot/stat/prestogp into build-workflow

commit d2a2e3a
Merge: bea8382 85517e7
Author: sciome-bot <software.tools@sciome.com>
Date:   Thu Dec 28 13:57:14 2023 -0500

    Merge branch 'master' of ssh://sciome-bot/stat/prestogp

commit bea8382
Merge: 17f5284 1e4361d
Author: sciome-bot <software.tools@sciome.com>
Date:   Thu Dec 28 13:55:26 2023 -0500

    Merge branch 'main-sciome' of sciome-bot-git:Spatiotemporal-Exposures-and-Toxicology/PrestoGP

commit 7c0bbfe
Author: sciome-bot <software.tools@sciome.com>
Date:   Thu Dec 28 13:52:27 2023 -0500

    Ran auto-formatter/linter for R and C++ in vscode. Added some missing imports

commit 85517e7
Merge: 17f5284 2c9c2ed
Author: Shail Choksi <shail.choksi@sciome.com>
Date:   Thu Dec 28 13:12:00 2023 -0500

    Pull request #16: Add UBSAN/ASAN sanitizers

    Merge in STAT/prestogp from build-workflow to master

    * commit '2c9c2ede3d40e6e5af24b38a6acfc2dfb2994975':
      Add USAN/ASAN pipeline
      Pull request #14: Additional Testing
      Additional Testing
      Add UBSAN/ASAN sanitizers

commit 2c9c2ed
Merge: 6af43f4 56cdbf2
Author: sciome-bot <software.tools@sciome.com>
Date:   Thu Dec 28 13:11:14 2023 -0500

    Merge branch 'to-git' of ssh://sciome-bot/stat/prestogp into build-workflow

commit 6af43f4
Merge: e530819 17f5284
Author: sciome-bot <software.tools@sciome.com>
Date:   Thu Dec 28 13:07:50 2023 -0500

    Merge branch 'master' of ssh://sciome-bot/stat/prestogp into build-workflow

commit e530819
Author: sciome-bot <software.tools@sciome.com>
Date:   Thu Dec 28 13:06:21 2023 -0500

    Add USAN/ASAN pipeline

commit 17f5284
Merge: ea78ffa 895100d
Author: Eric Bair <eric.bair@sciome.com>
Date:   Fri Dec 1 10:49:09 2023 -0500

    Pull request #12: Testing

    Merge in STAT/prestogp from testing to master

    * commit '895100db78d89c5082ddfcf1411dad69bdf1b6c5':
      Fixed another sparseNN bug and updated tests
      Fixed a bug in SparseNN
      Added more likelihood and maxmin ordering tests

commit 895100d
Merge: 7f3ca3c fb060ff
Author: Eric Bair <eric.bair@sciome.com>
Date:   Wed Nov 29 17:02:10 2023 -0500

    Merge branch 'to-git' of http://192.168.167.103:7990/bitbucket/scm/stat/prestogp into testing

    Conflicts:
    	DESCRIPTION
    	man/prestogp_fit-PrestoGPModel-method.Rd
    	tests/testthat/test-Log_Likelihood.R

    Fixed merge conflicts.

commit 7f3ca3c
Author: Eric Bair <eric.bair@sciome.com>
Date:   Wed Nov 29 16:43:40 2023 -0500

    Fixed another sparseNN bug and updated tests

commit 1ca9586
Author: Eric Bair <eric.bair@sciome.com>
Date:   Tue Nov 28 18:40:36 2023 -0500

    Fixed a bug in SparseNN

commit 80a9818
Author: Eric Bair <eric.bair@sciome.com>
Date:   Tue Nov 21 17:49:19 2023 -0500

    Added more likelihood and maxmin ordering tests

... and 8 more commits
sciome-bot pushed a commit that referenced this issue Dec 29, 2023
Merge in STAT/prestogp from build-workflow to master

* commit '2c9c2ede3d40e6e5af24b38a6acfc2dfb2994975':
  Add USAN/ASAN pipeline
  Pull request #14: Additional Testing
  Additional Testing
  Add UBSAN/ASAN sanitizers
@kyle-messier
Copy link
Collaborator

new targets pipeline

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

2 participants