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.

Sign up for GitHub

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

Jump to bottom

first take at expanding predictSolute #219

Merged
merged 16 commits into from
Aug 25, 2017
Merged

first take at expanding predictSolute #219

merged 16 commits into from
Aug 25, 2017

Commits on Aug 2, 2017

  1. add agg.by to predictSolute

    @wdwatkins
    wdwatkins committed Aug 2, 2017
    Configuration menu
    Copy the full SHA
    dd54448 View commit details
    Browse the repository at this point in the history

  2. more context, test was hanging/taking too long

    @wdwatkins
    wdwatkins committed Aug 2, 2017
    Configuration menu
    Copy the full SHA
    35a1ceb View commit details
    Browse the repository at this point in the history

Commits on Aug 11, 2017

  1. general structure of aggregating for non-rloadest models, might move … 

    …some to aggregateSolute
    @wdwatkins
    wdwatkins committed Aug 11, 2017
    Configuration menu
    Copy the full SHA
    0b4ca15 View commit details
    Browse the repository at this point in the history

Commits on Aug 16, 2017

  1. returning NAs for uncertainty from aggregateSolute, make internal

    @wdwatkins
    wdwatkins committed Aug 16, 2017
    Configuration menu
    Copy the full SHA
    3d935a7 View commit details
    Browse the repository at this point in the history

  2. loadReg2 tweaks

    @wdwatkins
    wdwatkins committed Aug 16, 2017
    Configuration menu
    Copy the full SHA
    6a2c8e2 View commit details
    Browse the repository at this point in the history

  3. add aggregate solute, agg.by argument to other predictSolute methods

    @wdwatkins
    wdwatkins committed Aug 16, 2017
    Configuration menu
    Copy the full SHA
    b6b86c8 View commit details
    Browse the repository at this point in the history

  4. no build vignettes

    @wdwatkins
    wdwatkins committed Aug 16, 2017
    Configuration menu
    Copy the full SHA
    a823800 View commit details
    Browse the repository at this point in the history

Commits on Aug 17, 2017

  1. nevermind

    @wdwatkins
    wdwatkins committed Aug 17, 2017
    Configuration menu
    Copy the full SHA
    73b7578 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of https://github.com/USGS-R/loadflex

    @wdwatkins
    wdwatkins committed Aug 17, 2017
    Configuration menu
    Copy the full SHA
    9e4e520 View commit details
    Browse the repository at this point in the history

  3. eliminate flux total in aggregateSolute

    @wdwatkins
    wdwatkins committed Aug 17, 2017
    Configuration menu
    Copy the full SHA
    4b17a92 View commit details
    Browse the repository at this point in the history

  4. clear out ci.agg code

    @wdwatkins
    wdwatkins committed Aug 17, 2017
    Configuration menu
    Copy the full SHA
    320c7e5 View commit details
    Browse the repository at this point in the history

  5. minor PR changes

    @wdwatkins
    wdwatkins committed Aug 17, 2017
    Configuration menu
    Copy the full SHA
    d67bc68 View commit details
    Browse the repository at this point in the history

Commits on Aug 18, 2017

  1. leave dates section as is, clarify comment

    @wdwatkins
    wdwatkins committed Aug 18, 2017
    Configuration menu
    Copy the full SHA
    cea2503 View commit details
    Browse the repository at this point in the history

Commits on Aug 25, 2017

  1. loadLm tests

    @wdwatkins
    wdwatkins committed Aug 25, 2017
    Configuration menu
    Copy the full SHA
    70bb643 View commit details
    Browse the repository at this point in the history

  2. need to send dates to aggregateSolute

    @wdwatkins
    wdwatkins committed Aug 25, 2017
    Configuration menu
    Copy the full SHA
    cdfe08a View commit details
    Browse the repository at this point in the history

  3. test agg.by in other predictSolutes

    @wdwatkins
    wdwatkins committed Aug 25, 2017
    Configuration menu
    Copy the full SHA
    c487d18 View commit details
    Browse the repository at this point in the history