granie_ns updated

openproblems-bio · Aug 21, 2024 · 7a90f77 · 7a90f77
1 parent 5e30c29
commit 7a90f77
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 34 deletions.
diff --git a/src/api/comp_method_r.yaml b/src/api/comp_method_r.yaml
@@ -8,12 +8,12 @@ functionality:
       description: |
         A method for inferring GRN from expression data.
   arguments:
-    - name: --multiomics_rna
+    - name: --multiomics_rna_r
       type: file
       required: false
       direction: input
       default: resources_test/grn-benchmark/multiomics_rna.rds
-    - name: --multiomics_atac
+    - name: --multiomics_atac_r
       type: file
       required: false
       direction: input

diff --git a/src/methods/multi_omics/granie/script.R b/src/methods/multi_omics/granie/script.R
@@ -1,29 +1,3 @@
-
-## VIASH START
-# par <- list(
-#   file_rna = "resources_test/grn-benchmark/multiomics_r/rna.rds",
-#   file_atac = "resources_test/grn-benchmark/multiomics_r/atac.rds",
-#   preprocessing_clusteringMethod = 1, # Seurat::FindClusters: (1 = original Louvain algorithm, 2 = Louvain algorithm with multilevel refinement, 3 = SLM algorithm, 4 = Leiden algorithm)
-#   preprocessing_clusterResolution = 14, # Typically between 5 and 20
-#   preprocessing_RNA_nDimensions = 50, # Default 50
-#   genomeAssembly = "hg38",
-#   GRaNIE_corMethod = "spearman",
-#   GRaNIE_includeSexChr = TRUE,
-#   GRaNIE_promoterRange = 250000,
-#   GRaNIE_TF_peak_fdr_threshold = 0.2,
-#   GGRaNIE_peak_gene_fdr_threshold = 0.2,
-#   num_workers = 4,
-#   peak_gene = "output/granie/peak_gene.csv", # not yet implemented, should I?
-#   prediction= "output/granie/prediction.csv",
-#   useWeightingLinks = FALSE,
-#   forceRerun = FALSE
-# )
-
-# meta <- list(
-#   functionality_name = "my_method_r"
-# )
-## VIASH END
-
 set.seed(42)
 suppressPackageStartupMessages(library(Seurat))
 
@@ -40,12 +14,30 @@ suppressPackageStartupMessages(library(dplyr))
 suppressPackageStartupMessages(library(SummarizedExperiment))
 
 
-cat("Content of par list:")
-str(par)
-
-#qs::qsave(par, "/home/carnold/par.qs")
+## VIASH START
+par <- list(
+  multiomics_rna_r = "resources_test/grn-benchmark/multiomics_rna.rds",
+  multiomics_atac_r = "resources_test/grn-benchmark/multiomics_atac.rds",
+  preprocessing_clusteringMethod = 1, # Seurat::FindClusters: (1 = original Louvain algorithm, 2 = Louvain algorithm with multilevel refinement, 3 = SLM algorithm, 4 = Leiden algorithm)
+  preprocessing_clusterResolution = 14, # Typically between 5 and 20
+  preprocessing_RNA_nDimensions = 50, # Default 50
+  genomeAssembly = "hg38",
+  GRaNIE_corMethod = "spearman",
+  GRaNIE_includeSexChr = TRUE,
+  GRaNIE_promoterRange = 250000,
+  GRaNIE_TF_peak_fdr_threshold = 0.2,
+  GGRaNIE_peak_gene_fdr_threshold = 0.2,
+  num_workers = 4,
+  peak_gene = "output/granie/peak_gene.csv", # not yet implemented, should I?
+  prediction= "output/granie/prediction.csv",
+  useWeightingLinks = FALSE,
+  forceRerun = FALSE
+)
+## VIASH END
 
 
+cat("Content of par list:")
+str(par)
 
 #### STANDARD ASSIGNMENTS ###
 file_seurat = "seurat_granie.qs"
@@ -101,12 +93,12 @@ if (!file.exists(file_RNA)) {
 if (par$forceRerun | !file.exists(file_seurat)) {
 
  # Sparse matrix
- rna.m = readRDS(par$multiomics_rna)
+ rna.m = readRDS(par$multiomics_rna_r)
 
  seurat_object <- CreateSeuratObject(count = rna.m, project = "PBMC", min.cells = 1, min.features = 1, assay = "RNA")
 
  # RangedSummarizedExperiment
- atac = readRDS(par$multiomics_atac)
+ atac = readRDS(par$multiomics_atac_r)
 
  # Extract counts and metadata from the RangedSummarizedExperiment
   atac_counts <- assays(atac)$counts