Commit ca862af9 authored by smorabit's avatar smorabit
Browse files

setdatexpr bugfix

parent f080d778
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
Package: hdWGCNA
Title: hdWGCNA
Version: 0.2.22
Version: 0.2.23
Authors@R: c(
    person("Sam", "Morabito", , "smorabit@uci.edu", role = c("aut", "cre"),
           comment = c(ORCID = "0000-0002-7768-4856")),
+7 −0
Original line number Diff line number Diff line
# hdWGCNA 0.2.23 (2023-09-10)
## Added
- None 

## Changes
- Fixed bug in SetDatExpr

# hdWGCNA 0.2.22 (2023-09-08)
## Added
- New tutorial for hdWGCNA with pseudobulk data, including some new functions like `ConstructPseudobulk`. 
+1 −17
Original line number Diff line number Diff line
@@ -182,7 +182,7 @@ SetDatExpr <- function(
  }  

  if(is.null(assay)){
      assay <- DefaultAssay(s_obj)
      assay <- DefaultAssay(seurat_obj)
      warning(paste0('assay not specified, trying to use assay ', assay))
  }

@@ -196,22 +196,6 @@ SetDatExpr <- function(
    stop('Invalid choice of slot. Valid choices are counts, data, or scale.data.')
  }

  # check that group.by is valid 
  if(!(group.by %in% names(seurat_obj@meta.data))){
    stop(paste0(group.by, ' not found in seurat_obj@meta.data.'))
  }
  if(!(class(seurat_obj@meta.data[,group.by]) %in% c('character', 'factor'))){
    stop('Selected group.by must be a character or a factor, but ', group.by, ' is a ', class(seurat_obj@meta.data[,group.by]), '.')
  }

    # check that multi.group.by is valid 
  if(!(multi.group.by %in% names(seurat_obj@meta.data))){
    stop(paste0(multi.group.by, ' not found in seurat_obj@meta.data.'))
  }
  if(!(class(seurat_obj@meta.data[,multi.group.by]) %in% c('character', 'factor'))){
    stop('Selected group.by must be a character or a factor, but ', group.by, ' is a ', class(seurat_obj@meta.data[,group.by]), '.')
  }

  # get parameters from seurat object
  params <- GetWGCNAParams(seurat_obj, wgcna_name)
  genes_use <- GetWGCNAGenes(seurat_obj, wgcna_name)
+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@
      </button>
      <span class="navbar-brand">
        <a class="navbar-link" href="https://smorabit.github.io/hdWGCNA/index.html">hdWGCNA</a>
        <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="">0.2.22</span>
        <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="">0.2.23</span>
      </span>
    </div>

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@
      </button>
      <span class="navbar-brand">
        <a class="navbar-link" href="index.html">hdWGCNA</a>
        <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="">0.2.22</span>
        <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="">0.2.23</span>
      </span>
    </div>

Loading