pkgd

rspatial · Apr 9, 2021 · 0e48beb · 0e48beb
1 parent df41528
commit 0e48beb
Show file tree

Hide file tree

Showing 16 changed files with 58 additions and 9 deletions.
diff --git a/.Rbuildignore b/.Rbuildignore
@@ -5,4 +5,5 @@ TODO
 ^revdep/
 ^.*\.Rproj$
 ^\.Rproj\.user$
-.travis.yml
+.travis.yml
+^\.github$
diff --git a/.github/.gitignore b/.github/.gitignore
@@ -0,0 +1 @@
+*.html
diff --git a/.github/workflows/pkgdown.yaml b/.github/workflows/pkgdown.yaml
@@ -0,0 +1,49 @@
+on:
+  push:
+    branches:
+      - main
+      - master
+
+name: pkgdown
+
+jobs:
+  pkgdown:
+    runs-on: macOS-latest
+    env:
+      GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
+    steps:
+      - uses: actions/checkout@v2
+
+      - uses: r-lib/actions/setup-r@v1
+
+      - uses: r-lib/actions/setup-pandoc@v1
+
+      - name: Query dependencies
+        run: |
+          install.packages('remotes')
+          saveRDS(remotes::dev_package_deps(dependencies = TRUE), ".github/depends.Rds", version = 2)
+          writeLines(sprintf("R-%i.%i", getRversion()$major, getRversion()$minor), ".github/R-version")
+        shell: Rscript {0}
+
+      - name: Restore R package cache
+        uses: actions/cache@v2
+        with:
+          path: ${{ env.R_LIBS_USER }}
+          key: ${{ runner.os }}-${{ hashFiles('.github/R-version') }}-1-${{ hashFiles('.github/depends.Rds') }}
+          restore-keys: ${{ runner.os }}-${{ hashFiles('.github/R-version') }}-1-
+
+      - name: Install dependencies
+        run: |
+          remotes::install_deps(dependencies = TRUE)
+          install.packages("pkgdown", type = "binary")
+          install.packages(c("pls", "randomForest", "party"), type = "binary")
+        shell: Rscript {0}
+
+      - name: Install package
+        run: R CMD INSTALL .
+
+      - name: Deploy package
+        run: |
+          git config --local user.email "[email protected]"
+          git config --local user.name "GitHub Actions"
+          Rscript -e 'pkgdown::deploy_to_branch(new_process = FALSE)'
diff --git a/R/AAgeneric_functions.R b/R/AAgeneric_functions.R
@@ -3,6 +3,9 @@ if (!isGeneric("rectify")) {setGeneric("rectify", function(x, ...) standardGener
 if (!isGeneric("whiches.max")) {setGeneric("whiches.max", function(x, ...)standardGeneric("whiches.max"))}	
 if (!isGeneric("whicheses.min")) {setGeneric("whiches.min", function(x, ...)standardGeneric("whiches.min"))}	
 
+
+if (!isGeneric("weighted.mean")) {setGeneric("weighted.mean", function(x, w, ...) standardGeneric("weighted.mean"))}	
+
 if (!isGeneric("%in%")) { setGeneric("%in%", function(x, table) standardGeneric("%in%"))}
 
 if (!isGeneric("adjacent")) {setGeneric("adjacent", function(x, ...) standardGeneric("adjacent"))}

diff --git a/R/weighted.mean.R b/R/weighted.mean.R
@@ -3,11 +3,6 @@
 # Version 1.0
 # Licence GPL v3
 
-
-if (!isGeneric("weighted.mean")) {
-	setGeneric("weighted.mean", function(x, w, ...)
-		standardGeneric("weighted.mean"))
-}	
 
 
 setMethod('weighted.mean', signature(x='RasterStackBrick', w='vector'), 

diff --git a/docs/pkgdown.yml b/docs/pkgdown.yml
@@ -2,5 +2,5 @@ pandoc: 2.2.3.2
 pkgdown: 1.6.1
 pkgdown_sha: ~
 articles: {}
-last_built: 2021-04-07T04:34Z
+last_built: 2021-04-08T06:52Z
 
diff --git a/docs/reference/boundaries-1.png b/docs/reference/boundaries-1.png
diff --git a/docs/reference/boundaries-2.png b/docs/reference/boundaries-2.png
diff --git a/docs/reference/boundaries-3.png b/docs/reference/boundaries-3.png
diff --git a/docs/reference/corLocal-1.png b/docs/reference/corLocal-1.png
diff --git a/docs/reference/distanceFromPoints-1.png b/docs/reference/distanceFromPoints-1.png
diff --git a/docs/reference/gridDistance-1.png b/docs/reference/gridDistance-1.png
diff --git a/docs/reference/programming.html b/docs/reference/programming.html
diff --git a/docs/reference/rasterToContour-1.png b/docs/reference/rasterToContour-1.png
diff --git a/docs/reference/scalebar-1.png b/docs/reference/scalebar-1.png
diff --git a/docs/reference/text-1.png b/docs/reference/text-1.png