Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Edited wrappers for R scripts #81

Open
wants to merge 27 commits into
base: master
Choose a base branch
from

Conversation

PerlaTroncosoRey
Copy link
Contributor

@PerlaTroncosoRey PerlaTroncosoRey commented Apr 10, 2017

  • Renamed two wrappers (as they now call R scripts instead of MultiPEN standalone application):

    • from: MultiPEN-enrichment-GO.xml, to: Rscript-enrichment-GO.xml
    • from: MultiPEN-enrichment-KEGG.xml, to: Rscript-enrichment-KEGG.xml)
  • Added one more wrapper: Rscript-STRINGdb-network.xml.

  • Added R scripts:

    • enrichmentGO.R
    • enrichmentKEGG.R
    • compileNetworkStringDB.R
  • Edited MultiPEN-feature-selectiom.xml to include string with optional parameters for log2 transform, z-scores, decision threshold, max number of iterations.

…ow calls the r script directly (instead of calling r script from MultiPEN)
…ow calls the r script directly (instead of calling r script from MultiPEN)
…s, description of inputs and how to run Rscript
…al parameters for log2 transform, z-scores, decision threshold, max number of iterations
…al parameters for log2 transform, z-scores, decision threshold, max number of iterations; optional string is also added at the end of all output file name
mv MultiPEN-Rankings_lambda${lambda}_${optionalParameters}.txt Rankings.txt &&
mv MultiPEN-vts_lambda${lambda}_${optionalParameters}.txt vts.txt &&
mv MultiPEN-Rankings_lambda${lambda}_genes-higher-in-cases_${optionalParameters}.txt Rankings-higherInCases.txt &&
mv MultiPEN-Rankings_lambda${lambda}_genes-higher-in-control_${optionalParameters}.txt Rankings-higherInControl.txt
Copy link
Member

@nsoranzo nsoranzo May 5, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add single quotes around all the MultiPEN-....txt filenames (again because ${optionalParameters} is a text param).

tools/MultiPEN/Rscript-STRINGdb-network.xml Outdated Show resolved Hide resolved
tools/MultiPEN/Rscript-STRINGdb-network.xml Outdated Show resolved Hide resolved
tools/MultiPEN/Rscript-enrichment-GO.xml Outdated Show resolved Hide resolved
tools/MultiPEN/Rscript-enrichment-GO.xml Outdated Show resolved Hide resolved
tools/MultiPEN/Rscript-enrichment-GO.xml Outdated Show resolved Hide resolved
tools/MultiPEN/Rscript-enrichment-GO.xml Outdated Show resolved Hide resolved
tools/MultiPEN/Rscript-enrichment-KEGG.xml Outdated Show resolved Hide resolved
<tool id="enrich kegg" name="enrich kegg" version="0.0.3">
<description> over-representation and GSE analysis with KEGG</description>
<requirements>
<requirement type="package" version="3.3.1">r</requirement>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove r requirement.

<requirements>
<requirement type="package" version="3.3.1">r</requirement>
<requirement type="package" version="3.0.5">bioconductor-clusterProfiler</requirement>
<requirement type="package" version="1.10">r-BBmisc</requirement>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As above, only version 1.9 is available in Bioconda, need to update the recipe there or decrease the version here.

tools/MultiPEN/Rscript-enrichment-KEGG.xml Outdated Show resolved Hide resolved
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants