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

SHIPP tool integration #413

Open
wants to merge 69 commits into
base: master
Choose a base branch
from
Open

SHIPP tool integration #413

wants to merge 69 commits into from

Commits on Oct 17, 2023

  1. Configuration menu
    Copy the full SHA
    2637919 View commit details
    Browse the repository at this point in the history

Commits on Nov 1, 2023

  1. initial commit

    rtesra committed Nov 1, 2023
    Configuration menu
    Copy the full SHA
    34a1730 View commit details
    Browse the repository at this point in the history

Commits on Nov 3, 2023

  1. Configuration menu
    Copy the full SHA
    877056c View commit details
    Browse the repository at this point in the history

Commits on Nov 6, 2023

  1. Add WIP

    r-ash committed Nov 6, 2023
    Configuration menu
    Copy the full SHA
    b1607a7 View commit details
    Browse the repository at this point in the history
  2. Add WIP impl

    r-ash committed Nov 6, 2023
    Configuration menu
    Copy the full SHA
    f68acc0 View commit details
    Browse the repository at this point in the history

Commits on Nov 14, 2023

  1. fix incidence calculations

    rtesra committed Nov 14, 2023
    Configuration menu
    Copy the full SHA
    0769c86 View commit details
    Browse the repository at this point in the history

Commits on Nov 15, 2023

  1. Configuration menu
    Copy the full SHA
    d824b88 View commit details
    Browse the repository at this point in the history

Commits on Nov 17, 2023

  1. Configuration menu
    Copy the full SHA
    24be9e3 View commit details
    Browse the repository at this point in the history

Commits on Dec 6, 2023

  1. Configuration menu
    Copy the full SHA
    c634f8b View commit details
    Browse the repository at this point in the history

Commits on Dec 7, 2023

  1. Use new format of workbook

    r-ash committed Dec 7, 2023
    Configuration menu
    Copy the full SHA
    d9ae04e View commit details
    Browse the repository at this point in the history

Commits on Dec 8, 2023

  1. Configuration menu
    Copy the full SHA
    4f79a95 View commit details
    Browse the repository at this point in the history

Commits on Dec 11, 2023

  1. Configuration menu
    Copy the full SHA
    1437926 View commit details
    Browse the repository at this point in the history

Commits on Dec 12, 2023

  1. Update test-downloads.R

    rtesra committed Dec 12, 2023
    Configuration menu
    Copy the full SHA
    b3d5ef7 View commit details
    Browse the repository at this point in the history
  2. update test data and fix bugs

    rtesra committed Dec 12, 2023
    Configuration menu
    Copy the full SHA
    34d1de2 View commit details
    Browse the repository at this point in the history

Commits on Dec 13, 2023

  1. Configuration menu
    Copy the full SHA
    0d48f75 View commit details
    Browse the repository at this point in the history
  2. Update agyw integration code

    -Adds comments & sources
    -Corrects minor issues w/translation of code
    -Updates KP calculations based on updated data
    -Corrects age distribution of MSM to reflect age at sexual debut by country
    krisher1 committed Dec 13, 2023
    Configuration menu
    Copy the full SHA
    d18a72c View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    5cb895c View commit details
    Browse the repository at this point in the history
  4. Wire up data with AGYW template

    r-ash committed Dec 13, 2023
    Configuration menu
    Copy the full SHA
    97cb487 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    f897636 View commit details
    Browse the repository at this point in the history

Commits on Dec 14, 2023

  1. Suppress single warning

    r-ash committed Dec 14, 2023
    Configuration menu
    Copy the full SHA
    1030010 View commit details
    Browse the repository at this point in the history

Commits on Dec 19, 2023

  1. Configuration menu
    Copy the full SHA
    0ed3ac9 View commit details
    Browse the repository at this point in the history
  2. Merge branch 'agyw-tool-integration' of https://github.com/mrc-ide/naomi

     into agyw-tool-integration
    rtesra committed Dec 19, 2023
    Configuration menu
    Copy the full SHA
    df0e2e9 View commit details
    Browse the repository at this point in the history

Commits on Dec 20, 2023

  1. Configuration menu
    Copy the full SHA
    c87824d View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    03b8ecd View commit details
    Browse the repository at this point in the history

Commits on Dec 22, 2023

  1. Configuration menu
    Copy the full SHA
    6484369 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    ee61e50 View commit details
    Browse the repository at this point in the history
  3. remove tetsing files :(

    rtesra committed Dec 22, 2023
    Configuration menu
    Copy the full SHA
    4544245 View commit details
    Browse the repository at this point in the history
  4. Update NEWS.md

    rtesra committed Dec 22, 2023
    Configuration menu
    Copy the full SHA
    3a48a40 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    4f1358c View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    b8721ea View commit details
    Browse the repository at this point in the history
  7. Fix up test, regen docs

    r-ash committed Dec 22, 2023
    Configuration menu
    Copy the full SHA
    dd18af0 View commit details
    Browse the repository at this point in the history
  8. Set min naomi.resources version

    r-ash committed Dec 22, 2023
    Configuration menu
    Copy the full SHA
    5b68931 View commit details
    Browse the repository at this point in the history

Commits on Jan 11, 2024

  1. Configuration menu
    Copy the full SHA
    3e83bfe View commit details
    Browse the repository at this point in the history

Commits on Jan 12, 2024

  1. Update R/agyw-integration.R

    Co-authored-by: Rob <[email protected]>
    rtesra and r-ash authored Jan 12, 2024
    Configuration menu
    Copy the full SHA
    1dffc41 View commit details
    Browse the repository at this point in the history
  2. fix up documentation

    rtesra committed Jan 12, 2024
    Configuration menu
    Copy the full SHA
    873a7b1 View commit details
    Browse the repository at this point in the history
  3. Merge branch 'agyw-tool-integration' of https://github.com/mrc-ide/naomi

     into agyw-tool-integration
    rtesra committed Jan 12, 2024
    Configuration menu
    Copy the full SHA
    46f4feb View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    d4fc44f View commit details
    Browse the repository at this point in the history

Commits on Jan 15, 2024

  1. Configuration menu
    Copy the full SHA
    8ff8064 View commit details
    Browse the repository at this point in the history

Commits on Jan 16, 2024

  1. Configuration menu
    Copy the full SHA
    669ec99 View commit details
    Browse the repository at this point in the history
  2. Regen docs

    r-ash committed Jan 16, 2024
    Configuration menu
    Copy the full SHA
    bd34f08 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    ba7d6a2 View commit details
    Browse the repository at this point in the history

Commits on Jan 17, 2024

  1. Remove unused helper function

    r-ash committed Jan 17, 2024
    Configuration menu
    Copy the full SHA
    eaa0d05 View commit details
    Browse the repository at this point in the history

Commits on Jan 22, 2024

  1. add agyw vignette

    rtesra committed Jan 22, 2024
    Configuration menu
    Copy the full SHA
    d7aee39 View commit details
    Browse the repository at this point in the history
  2. Squashed commit of the following:

    commit 551ada7
    Author: Katie Risher <[email protected]>
    Date:   Fri Jan 19 16:53:00 2024 -0500
    
        Additional edits to the agyw integration functions
    
        -New infections instead of incidence for the Naomi outputs tab
        -Naming the countries to match the tool
        -some edits so the area names are formatted more nicely
        -max RR for FSW capped at 35 - if over 35 leads to impossible incidence estimates in some districts
    
    commit 666c504
    Author: Katie Risher <[email protected]>
    Date:   Sun Dec 17 22:08:52 2023 -0500
    
        Add outputs argument to agyw_calculate_prevalence_male
    
        Add outputs argument to agyw_calculate_prevalence_male
    
    commit 0d35296
    Author: Katie Risher <[email protected]>
    Date:   Thu Dec 14 23:05:36 2023 -0500
    
        Remove rr_sexnonreg
    
        Remove rr_sexnonreg from female output
    rtesra committed Jan 22, 2024
    Configuration menu
    Copy the full SHA
    31162e8 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    04e7e40 View commit details
    Browse the repository at this point in the history

Commits on Jan 23, 2024

  1. add DOI for Hines 2020 paper

    rtesra committed Jan 23, 2024
    Configuration menu
    Copy the full SHA
    e923fce View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    611c9fd View commit details
    Browse the repository at this point in the history

Commits on Jan 24, 2024

  1. Configuration menu
    Copy the full SHA
    f84c756 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    a4c6fe0 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    a10bfcd View commit details
    Browse the repository at this point in the history

Commits on Jan 25, 2024

  1. Configuration menu
    Copy the full SHA
    dff5bf0 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    95da62c View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    69359ff View commit details
    Browse the repository at this point in the history
  4. Update agyw-integration.R

    add placeholder for incidence adjustment code
    rtesra committed Jan 25, 2024
    Configuration menu
    Copy the full SHA
    7c8d87a View commit details
    Browse the repository at this point in the history

Commits on Jan 31, 2024

  1. Add KP adjustment for new infections

    Added KP adjustment to incidence estimates to match Spectrum KP new infection estimates for women & men - results in updated estimates of incidence for other behavioural groups as well
    krisher1 committed Jan 31, 2024
    Configuration menu
    Copy the full SHA
    e2b0088 View commit details
    Browse the repository at this point in the history

Commits on Feb 5, 2024

  1. Configuration menu
    Copy the full SHA
    9160a40 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #430 from krisher1/pse-tool-update-incidence

    Add KP adjustment for new infections
    rtesra authored Feb 5, 2024
    Configuration menu
    Copy the full SHA
    318d350 View commit details
    Browse the repository at this point in the history
  3. rename agyw -> shipp

    rtesra committed Feb 5, 2024
    Configuration menu
    Copy the full SHA
    3063d17 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    7b2ea08 View commit details
    Browse the repository at this point in the history

Commits on Feb 19, 2024

  1. Update SHIPP vignette + some code fixes

    - Align SHIPP vignette with the methods used
    - Minor code fixes for adjusting KP new infections to either KP workbook or Goals estimates under the assumption that a consensus KP new infection estimate is never missing
    krisher1 committed Feb 19, 2024
    Configuration menu
    Copy the full SHA
    e35a4a0 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    3b6db4d View commit details
    Browse the repository at this point in the history
  3. Sum infections_pwid not pwid

    krisher1 committed Feb 19, 2024
    Configuration menu
    Copy the full SHA
    7b6f99e View commit details
    Browse the repository at this point in the history
  4. Merge branch 'pse-tool-update-incidence' of https://github.com/mrc-id…

    …e/naomi into pse-tool-update-incidence
    krisher1 committed Feb 19, 2024
    Configuration menu
    Copy the full SHA
    7ad6134 View commit details
    Browse the repository at this point in the history

Commits on Feb 21, 2024

  1. Configuration menu
    Copy the full SHA
    aeb9ad6 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    2b649ce View commit details
    Browse the repository at this point in the history

Commits on Feb 22, 2024

  1. Bump version number

    r-ash committed Feb 22, 2024
    Configuration menu
    Copy the full SHA
    2dc75ef View commit details
    Browse the repository at this point in the history

Commits on Feb 26, 2024

  1. edge case for 0 pse

    rtesra committed Feb 26, 2024
    Configuration menu
    Copy the full SHA
    d37d5be View commit details
    Browse the repository at this point in the history
  2. Merge branch 'agyw-tool-integration' of https://github.com/mrc-ide/naomi

     into agyw-tool-integration
    rtesra committed Feb 26, 2024
    Configuration menu
    Copy the full SHA
    99f9349 View commit details
    Browse the repository at this point in the history

Commits on Feb 27, 2024

  1. Configuration menu
    Copy the full SHA
    8aaa93b View commit details
    Browse the repository at this point in the history