Skip to content

Commit eeb01ea

Browse files
atsyplenkovatsyplenkov
authored
Merge pull request #19 from atsyplenkov/dev
new features
2 parents ff466b2 + a64de74 commit eeb01ea

64 files changed

Lines changed: 4890 additions & 3144 deletions

Some content is hidden

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

‎.Rbuildignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,5 @@
1818
^codemeta\.json$
1919
^CODE_OF_CONDUCT\.md$
2020
^src/.*\.o$
21+
^dev\.R$
22+
^paper$

‎.github/CONTRIBUTING.md‎

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,15 @@ Please note that the tidyhydro project is released with a [Contributor Code of C
5050
### GOF
5151
-[ ] KGE''
5252

53-
-[ ] KGE Score
53+
-[ ] KGE Score [@knobenTechnicalNoteInherent2019]
54+
55+
-[ ] Weighted KGE [@mizukamiChoiceCalibrationMetrics2019]
56+
57+
-[ ] MSDR - mean squared deviation ratio [@oliverTutorialGuideGeostatistics2014]
58+
59+
-[x] RMSE
60+
61+
-[ ] NRMSE - normalized root mean squared error
5462

5563
### Regression
5664
-[ ] PPCC - maximizes the probability plot correlation coefficient [@helselStatisticalMethodsWater2002, p.253]
@@ -61,4 +69,13 @@ Please note that the tidyhydro project is released with a [Contributor Code of C
6169

6270
-[ ] MSPE - model standard percentage error log and nonlog [@rasmussenGuidelinesProceduresComputing2009, p. 13]
6371

64-
-[ ] RMSE
72+
### Stats
73+
-[ ] MAD
74+
75+
-[x] Geometric Mean (GM)
76+
77+
-[x] Coefficient of Variation (Cv)
78+
79+
-[ ] Coefficient of Skewness (g or Cs)
80+
81+
-[ ] Others measures of descriptive stats mentioned in Helsel et al. (2020)

‎.github/workflows/check-no-suggests.yaml‎

Lines changed: 58 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -1,59 +1,59 @@
1-
# Workflow derived from https://github.com/r-lib/actions/tree/v2/examples
2-
# Need help debugging build failures? Start at https://github.com/r-lib/actions#where-to-find-help
3-
#
4-
# NOTE: This workflow only directly installs "hard" dependencies, i.e. Depends,
5-
# Imports, and LinkingTo dependencies. Notably, Suggests dependencies are never
6-
# installed, with the exception of testthat, knitr, and rmarkdown. The cache is
7-
# never used to avoid accidentally restoring a cache containing a suggested
8-
# dependency.
9-
on:
10-
push:
11-
branches: master
12-
pull_request:
13-
14-
name: check-no-suggests.yaml
15-
16-
permissions: read-all
17-
18-
jobs:
19-
check-no-suggests:
20-
runs-on: ${{ matrix.config.os }}
21-
22-
name: ${{ matrix.config.os }} (${{ matrix.config.r }})
23-
24-
strategy:
25-
fail-fast: false
26-
matrix:
27-
config:
28-
- {os: ubuntu-latest, r: 'release'}
29-
30-
env:
31-
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
32-
R_KEEP_PKG_SOURCE: yes
33-
34-
steps:
35-
- uses: actions/checkout@v4
36-
37-
- uses: r-lib/actions/setup-pandoc@v2
38-
39-
- uses: r-lib/actions/setup-r@v2
40-
with:
41-
r-version: ${{ matrix.config.r }}
42-
http-user-agent: ${{ matrix.config.http-user-agent }}
43-
use-public-rspm: true
44-
45-
- uses: r-lib/actions/setup-r-dependencies@v2
46-
with:
47-
dependencies: '"hard"'
48-
cache: false
49-
extra-packages: |
50-
any::rcmdcheck
51-
any::testthat
52-
any::knitr
53-
any::rmarkdown
54-
needs: check
55-
56-
- uses: r-lib/actions/check-r-package@v2
57-
with:
58-
upload-snapshots: true
1+
# Workflow derived from https://github.com/r-lib/actions/tree/v2/examples
2+
# Need help debugging build failures? Start at https://github.com/r-lib/actions#where-to-find-help
3+
#
4+
# NOTE: This workflow only directly installs "hard" dependencies, i.e. Depends,
5+
# Imports, and LinkingTo dependencies. Notably, Suggests dependencies are never
6+
# installed, with the exception of testthat, knitr, and rmarkdown. The cache is
7+
# never used to avoid accidentally restoring a cache containing a suggested
8+
# dependency.
9+
on:
10+
push:
11+
branches: master
12+
pull_request:
13+
14+
name: check-no-suggests.yaml
15+
16+
permissions: read-all
17+
18+
jobs:
19+
check-no-suggests:
20+
runs-on: ${{ matrix.config.os }}
21+
22+
name: ${{ matrix.config.os }} (${{ matrix.config.r }})
23+
24+
strategy:
25+
fail-fast: false
26+
matrix:
27+
config:
28+
- {os: ubuntu-latest, r: 'release'}
29+
30+
env:
31+
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
32+
R_KEEP_PKG_SOURCE: yes
33+
34+
steps:
35+
- uses: actions/checkout@v4
36+
37+
- uses: r-lib/actions/setup-pandoc@v2
38+
39+
- uses: r-lib/actions/setup-r@v2
40+
with:
41+
r-version: ${{ matrix.config.r }}
42+
http-user-agent: ${{ matrix.config.http-user-agent }}
43+
use-public-rspm: true
44+
45+
- uses: r-lib/actions/setup-r-dependencies@v2
46+
with:
47+
dependencies: '"hard"'
48+
cache: false
49+
extra-packages: |
50+
any::rcmdcheck
51+
any::testthat
52+
any::knitr
53+
any::rmarkdown
54+
needs: check
55+
56+
- uses: r-lib/actions/check-r-package@v2
57+
with:
58+
upload-snapshots: true
5959
build_args: 'c("--no-manual","--compact-vignettes=gs+qpdf")'

‎.github/workflows/check-r-pkg.yaml‎

Lines changed: 50 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,50 @@
1-
# Workflow derived from https://github.com/r-lib/actions/tree/v2/examples
2-
# Need help debugging build failures? Start at https://github.com/r-lib/actions#where-to-find-help
3-
on:
4-
push:
5-
branches: master
6-
pull_request:
7-
branches: master
8-
9-
name: R-CMD-check
10-
11-
jobs:
12-
R-CMD-check:
13-
runs-on: ${{ matrix.config.os }}
14-
15-
name: ${{ matrix.config.os }} (${{ matrix.config.r }})
16-
17-
strategy:
18-
fail-fast: false
19-
matrix:
20-
config:
21-
- {os: macos-latest, r: 'release'}
22-
- {os: windows-latest, r: 'release'}
23-
- {os: ubuntu-latest, r: 'devel', http-user-agent: 'release'}
24-
- {os: ubuntu-latest, r: 'release'}
25-
- {os: ubuntu-latest, r: 'oldrel-1'}
26-
27-
env:
28-
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
29-
R_KEEP_PKG_SOURCE: yes
30-
31-
steps:
32-
- uses: actions/checkout@v4
33-
34-
- uses: r-lib/actions/setup-pandoc@v2
35-
36-
- uses: r-lib/actions/setup-r@v2
37-
with:
38-
r-version: ${{ matrix.config.r }}
39-
http-user-agent: ${{ matrix.config.http-user-agent }}
40-
use-public-rspm: true
41-
42-
- uses: r-lib/actions/setup-r-dependencies@v2
43-
with:
44-
extra-packages: any::rcmdcheck
45-
needs: check
46-
47-
- uses: r-lib/actions/check-r-package@v2
48-
with:
49-
upload-snapshots: true
50-
build_args: 'c("--no-manual","--compact-vignettes=gs+qpdf")'
1+
# Workflow derived from https://github.com/r-lib/actions/tree/v2/examples
2+
# Need help debugging build failures? Start at https://github.com/r-lib/actions#where-to-find-help
3+
on:
4+
push:
5+
branches: master
6+
pull_request:
7+
branches: master
8+
9+
name: R-CMD-check
10+
11+
jobs:
12+
R-CMD-check:
13+
runs-on: ${{ matrix.config.os }}
14+
15+
name: ${{ matrix.config.os }} (${{ matrix.config.r }})
16+
17+
strategy:
18+
fail-fast: false
19+
matrix:
20+
config:
21+
- {os: macos-latest, r: 'release'}
22+
- {os: windows-latest, r: 'release'}
23+
- {os: ubuntu-latest, r: 'devel', http-user-agent: 'release'}
24+
- {os: ubuntu-latest, r: 'release'}
25+
- {os: ubuntu-latest, r: 'oldrel-1'}
26+
27+
env:
28+
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
29+
R_KEEP_PKG_SOURCE: yes
30+
31+
steps:
32+
- uses: actions/checkout@v4
33+
34+
- uses: r-lib/actions/setup-pandoc@v2
35+
36+
- uses: r-lib/actions/setup-r@v2
37+
with:
38+
r-version: ${{ matrix.config.r }}
39+
http-user-agent: ${{ matrix.config.http-user-agent }}
40+
use-public-rspm: true
41+
42+
- uses: r-lib/actions/setup-r-dependencies@v2
43+
with:
44+
extra-packages: any::rcmdcheck
45+
needs: check
46+
47+
- uses: r-lib/actions/check-r-package@v2
48+
with:
49+
upload-snapshots: true
50+
build_args: 'c("--no-manual","--compact-vignettes=gs+qpdf")'

‎.github/workflows/pkgdown.yaml‎

Lines changed: 49 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,49 @@
1-
# Workflow derived from https://github.com/r-lib/actions/tree/v2/examples
2-
# Need help debugging build failures? Start at https://github.com/r-lib/actions#where-to-find-help
3-
on:
4-
push:
5-
branches: master
6-
pull_request:
7-
release:
8-
types: [published]
9-
workflow_dispatch:
10-
11-
name: pkgdown.yaml
12-
13-
permissions: read-all
14-
15-
jobs:
16-
pkgdown:
17-
runs-on: ubuntu-latest
18-
# Only restrict concurrency for non-PR jobs
19-
concurrency:
20-
group: pkgdown-${{ github.event_name != 'pull_request' || github.run_id }}
21-
env:
22-
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
23-
permissions:
24-
contents: write
25-
steps:
26-
- uses: actions/checkout@v4
27-
28-
- uses: r-lib/actions/setup-pandoc@v2
29-
30-
- uses: r-lib/actions/setup-r@v2
31-
with:
32-
use-public-rspm: true
33-
34-
- uses: r-lib/actions/setup-r-dependencies@v2
35-
with:
36-
extra-packages: any::pkgdown, local::.
37-
needs: website
38-
39-
- name: Build site
40-
run: pkgdown::build_site_github_pages(new_process = FALSE, install = FALSE)
41-
shell: Rscript {0}
42-
43-
- name: Deploy to GitHub pages 🚀
44-
if: github.event_name != 'pull_request'
45-
uses: JamesIves/github-pages-deploy-action@v4.5.0
46-
with:
47-
clean: false
48-
branch: gh-pages
49-
folder: docs
1+
# Workflow derived from https://github.com/r-lib/actions/tree/v2/examples
2+
# Need help debugging build failures? Start at https://github.com/r-lib/actions#where-to-find-help
3+
on:
4+
push:
5+
branches: master
6+
pull_request:
7+
release:
8+
types: [published]
9+
workflow_dispatch:
10+
11+
name: pkgdown.yaml
12+
13+
permissions: read-all
14+
15+
jobs:
16+
pkgdown:
17+
runs-on: ubuntu-latest
18+
# Only restrict concurrency for non-PR jobs
19+
concurrency:
20+
group: pkgdown-${{ github.event_name != 'pull_request' || github.run_id }}
21+
env:
22+
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
23+
permissions:
24+
contents: write
25+
steps:
26+
- uses: actions/checkout@v4
27+
28+
- uses: r-lib/actions/setup-pandoc@v2
29+
30+
- uses: r-lib/actions/setup-r@v2
31+
with:
32+
use-public-rspm: true
33+
34+
- uses: r-lib/actions/setup-r-dependencies@v2
35+
with:
36+
extra-packages: any::pkgdown, local::.
37+
needs: website
38+
39+
- name: Build site
40+
run: pkgdown::build_site_github_pages(new_process = FALSE, install = FALSE)
41+
shell: Rscript {0}
42+
43+
- name: Deploy to GitHub pages 🚀
44+
if: github.event_name != 'pull_request'
45+
uses: JamesIves/github-pages-deploy-action@v4.5.0
46+
with:
47+
clean: false
48+
branch: gh-pages
49+
folder: docs

0 commit comments

Comments
 (0)