Merge pull request #67 from MacoskoLab/update-object

Update object structure and functions for minor release
welch-lab · Jun 5, 2019 · 07a1649 · 07a1649
2 parents dd47724 + 8984dbe
commit 07a1649
Show file tree

Hide file tree

Showing 31 changed files with 392 additions and 94 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: liger
 Type: Package
 Title: Linked Inference of Genomic Experimental Relationships
-Version: 0.3.1
+Version: 0.4.0
 Date: 2018-04-09
 Author: Joshua Welch
 Maintainer: Joshua Welch <[email protected]>,

diff --git a/NAMESPACE b/NAMESPACE
@@ -4,6 +4,7 @@ import(doSNOW)
 import(snow)
 importFrom(Rcpp, evalCpp)
 importFrom(plyr, rbind.fill.matrix)
+importFrom(plyr, mapvalues)
 importFrom(Rtsne,Rtsne)
 importFrom(cowplot, plot_grid)
 importFrom(ggplot2, ggplot)
@@ -27,4 +28,6 @@ importFrom(riverplot, riverplot)
 importFrom(mclust, adjustedRandIndex)
 importFrom(RANN.L1, nn2)
 importFrom(dplyr, "%>%")
+importFrom(dplyr, group_by)
+importFrom(dplyr, summarize)
 exportPattern("^[[:alpha:]]+")
diff --git a/R/RcppExports.R b/R/RcppExports.R
@@ -13,7 +13,7 @@ rowVarsFast <- function(x, means) {
     .Call(`_liger_rowVarsFast`, x, means)
 }
 
-solve_nnls <- function(C, B) {
-    .Call(`_liger_solve_nnls`, C, B)
+solveNNLS <- function(C, B) {
+    .Call(`_liger_solveNNLS`, C, B)
 }