Pull changes from 'devel' into 'master' #329
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* Added BLOBFISH * Removed singleton genes in BLOBFISH output * Added export statement to method for plotting networks * Added the ability to highlight the 2-hop subnetwork * Modified null distribution to include entire prior * Moved the significance testing to the beginning and added FDR adjustment * Moved calculation of p-values to a separate function * Updated tests for BLOBFISH * Added color-coding functionality to the plots * Delete tests/testthat/test-blobfish.R Deleted the test file as requested to see if we are able to build. * Fixed devtools::check() warnings and notes * First commit * man/cobra.Rd * Added tests back * Fixed warnings in build * Removed local import * Added description of BLOBFISH to the README
* Added missing references from BLOBFISH and YARN * Added data for YARN vignettes to YAML reference * Added documentation generated during pkgdown build * Changed VignetteIndexEntry fields to match titles in YAML file to address mismatch warnings * Removed PNG files * Added the PNG files back * Added PNG files back in
…atory networks (eg from panda)
- fixed typo in domonster error message
Merge branch 'master' of https://github.com/laurenhsu1/netZooR # Conflicts: # R/MONSTER.R # man/domonster.Rd
Add monster wrapper function that takes as input 2 premade networks
Update authors
This merge will pull in the following changes: 1. Updates to MONSTER that allow for seamless integration with inputs such as PANDA 2. Updates to author list 3. Additional, older commits that were never pulled in and are creating inconsistencies between the branches
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## master #329 +/- ##
==========================================
- Coverage 40.36% 40.07% -0.30%
==========================================
Files 25 25
Lines 3384 3409 +25
==========================================
Hits 1366 1366
- Misses 2018 2043 +25
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. |
|
Incorporates changes to MONSTER and to author list. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This merge will pull in the following changes: