Merge branch 'release/3.0' of github.com:satijalab/seurat into releas…

…e/3.0
zhanghao-njmu · Feb 22, 2019 · 2c67111 · 2c67111
2 parents bd5ddfd + 456da39
commit 2c67111
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/R/clustering.R b/R/clustering.R
@@ -207,7 +207,7 @@ FindClusters.Seurat <- function(
 FindNeighbors.default <- function(
   object,
   distance.matrix = FALSE,
-  k.param = 10,
+  k.param = 20,
   compute.SNN = TRUE,
   prune.SNN = 1/15,
   nn.eps = 0,
@@ -286,7 +286,7 @@ FindNeighbors.default <- function(
 FindNeighbors.Assay <- function(
   object,
   features = NULL,
-  k.param = 10,
+  k.param = 20,
   compute.SNN = TRUE,
   prune.SNN = 1/15,
   nn.eps = 0,
@@ -314,7 +314,7 @@ FindNeighbors.Assay <- function(
 #'
 FindNeighbors.dist <- function(
   object,
-  k.param = 10,
+  k.param = 20,
   compute.SNN = TRUE,
   prune.SNN = 1/15,
   nn.eps = 0,
@@ -355,7 +355,7 @@ FindNeighbors.Seurat <- function(
   dims = 1:10,
   assay = NULL,
   features = NULL,
-  k.param = 30,
+  k.param = 20,
   compute.SNN = TRUE,
   prune.SNN = 1/15,
   nn.eps = 0,

diff --git a/appveyor.yml b/appveyor.yml
@@ -17,6 +17,7 @@ environment:
   global:
     R_ARCH: x64
     USE_RTOOLS: true
+    BIOC_USE_DEVEL: "FALSE"
     _R_CHECK_FORCE_SUGGESTS_: false
     PYTHON: "C:\\Python36-x64"
     RETICULATE_PYTHON: "C:\\Python36-x64"

diff --git a/man/FindNeighbors.Rd b/man/FindNeighbors.Rd