Merge pull request #52 from RasmussenLab/dev

Dev from rev1 to rev2
RasmussenLab · Dec 13, 2023 · 0b761d2 · 0b761d2
2 parents d9d6f1a + af85dd7
commit 0b761d2
Show file tree

Hide file tree

Showing 322 changed files with 6,866 additions and 36,297 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -65,7 +65,7 @@ jobs:
       run: | 
        cd project
        snakemake -p -c1 --configfile config/single_dev_dataset/example/config.yaml -n
-       snakemake -p -c2 -k --configfile config/single_dev_dataset/example/config.yaml
+       snakemake -p -c1 -k --configfile config/single_dev_dataset/example/config.yaml
     - name: Archive results
       uses: actions/upload-artifact@v3
       with:

diff --git a/README.md b/README.md
@@ -196,7 +196,7 @@ Packages either are based on this repository, or were referenced by NAGuideR (Ta
 From the brief description in the table the exact procedure is not always clear.
 
 | Method        | Package           | source       | status | name              |
-| ------------- | ----------------- | ------       | --- |------------------ | 
+| ------------- | ----------------- | ------       | ------ |------------------ | 
 | CF            | pimms             | pip          | | Collaborative Filtering |
 | DAE           | pimms             | pip          | | Denoising Autoencoder   |
 | VAE           | pimms             | pip          | | Variational Autoencoder |     
@@ -206,7 +206,7 @@ From the brief description in the table the exact procedure is not always clear.
 | COLMEDIAN     | e1071             | CRAN         | | replace NA with column median  |
 | ROWMEDIAN     | e1071             | CRAN         | | replace NA with row median     |
 | KNN_IMPUTE    | impute            | BIOCONDUCTOR | | k nearest neighbor imputation   |
-| SEQKNN        | SeqKnn            | tar file     | | Sequential k- nearest neighbor imputation <br> start with feature with least missing values and re-use imputed values for not yet imputed features
+| SEQKNN        | SeqKnn            | tar file     | | Sequential k- nearest neighbor imputation <br> starts with feature with least missing values and re-use imputed values for not yet imputed features
 | BPCA          | pcaMethods        | BIOCONDUCTOR | | Bayesian PCA missing value imputation
 | SVDMETHOD     | pcaMethods        | BIOCONDUCTOR | | replace NA initially with zero, use k most significant eigenvalues using Singular Value Decomposition for imputation until convergence
 | LLS           | pcaMethods        | BIOCONDUCTOR | | Local least squares imputation of a feature based on k most correlated features
@@ -222,26 +222,12 @@ From the brief description in the table the exact procedure is not always clear.
 | TRKNN         | -                 | script       | | truncation k-nearest neighbor imputation 
 | RF            | missForest        | CRAN         | | Random Forest imputation (one feature at a time)
 | PI            | -                 | -            | | Downshifted normal distribution (per sample)
+| GSIMP         | -                 | script       | | QRILC initialization and iterative Gibbs sampling with generalized linear models (glmnet)
+| MSIMPUTE      | msImpute          | BIOCONDUCTOR | | Missing at random algorithm using low rank approximation
+| MSIMPUTE_MNAR | msImpute          | BIOCONDUCTOR | | Missing not at random algorithm using low rank approximation
 | ~~grr~~       | DreamAI           | -            | Fails to install | Rigde regression 
 | ~~GMS~~       | GMSimpute         | tar file     | Fails on Windows | Lasso model
 
 
-
-## Workflows
-
-The workflows folder in the repository contains snakemake workflows used for rawfile data processing, 
-both for running MaxQuant over a large set of HeLa raw files 
-and ThermoRawFileParser on a list of raw files to extract their meta data. For details see:
-
->  Webel, Henry, Yasset Perez-Riverol, Annelaura Bach Nielson, and Simon Rasmussen. 2023. “Mass Spectrometry-Based Proteomics Data from Thousands of HeLa Control Samples.” Research Square. https://doi.org/10.21203/rs.3.rs-3083547/v1.
-
-### MaxQuant
-
-Process single raw files using MaxQuant. See [README](workflows/maxquant/README.md) for details.
-
-### Metadata
-
-Read metadata from single raw files using MaxQuant. See [README](workflows/metadata/README.md) for details.
-
 ## Build status
 [![Documentation Status](https://readthedocs.org/projects/pimms/badge/?version=latest)](https://pimms.readthedocs.io/en/latest/?badge=latest)
diff --git a/environment.yml b/environment.yml
@@ -47,8 +47,8 @@ dependencies:
   - jupyter-dash
   - papermill # execute ipynb's
   # R packages (listed in NAGuideR)
-  - r-base #=3.6
-  - r-devtools # is it needed for source installs on windows server? 
+  - r-base
+  - r-devtools # is it needed for source installs on windows server?
   - r-irkernel
   - r-reshape2
   - r-stringi # + rmarkdown hack for reshape2
@@ -66,6 +66,7 @@ dependencies:
   - r-rrcov
   - r-gmm
   - r-tmvtnorm
+  - r-igraph
   # - bioconductor-biocinstaller
   # - r-imputelcmd # bioconda
   # - bioconductor-impute
@@ -83,6 +84,5 @@ dependencies:
   # - jupyterlab_code_formatter
   # - jupyterlab-git
   - pip:
-    - -e .
-    - mrmr-selection
-
+      - -e .
+      - mrmr-selection