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

v2.0.2: Clean-up #96

Merged
merged 37 commits into from
Nov 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
0bdeebb
Create scripts directory with helper scripts
marinak-ebi Jun 24, 2024
71ae4ba
Correct a typo
marinak-ebi Jun 24, 2024
d617746
Merge pull request #81 from mpi2/scripts
marinak-ebi Jul 16, 2024
29f7bca
Add script run_pipeline.sh that execute stats and annotation pipeline
marinak-ebi Jul 9, 2024
60a9c9a
Fix errors
marinak-ebi Jul 19, 2024
d6e552b
Add messages
marinak-ebi Jul 19, 2024
e05a90d
Update README.md with new running instructions
marinak-ebi Jul 19, 2024
ad6d424
Merge pull request #85 from mpi2/running-script
marinak-ebi Jul 23, 2024
e1bae65
Replace miniparquet with arrow
marinak-ebi Jul 8, 2024
403a03e
Install dependencies set to TRUE
marinak-ebi Jul 8, 2024
b61ccca
Reorder packages
marinak-ebi Jul 8, 2024
8dc6a2f
Add dependency update parameter
marinak-ebi Jul 8, 2024
ac43852
Add documentation to recreate environment
marinak-ebi Jul 8, 2024
6567d05
Convert the dependencies argument to logical type
marinak-ebi Jul 8, 2024
6f2936a
Add third parameter to the UpdatePackagesFromGithub in the running sc…
marinak-ebi Jul 19, 2024
daf11c1
Add rwebhdfs library to the description
marinak-ebi Jul 19, 2024
8816b55
Add installation rwebhdfs in UpdatePackagesFromGithub.R
marinak-ebi Jul 23, 2024
f8c3231
Merge pull request #82 from mpi2/new-env
ficolo Jul 26, 2024
e01595e
Update LICENSE copyright data
marinak-ebi Jul 25, 2024
d7a7bc2
Merge pull request #86 from mpi2/license
marinak-ebi Jul 26, 2024
4ada026
Remove gross morphology commented code
marinak-ebi Apr 10, 2024
d812a37
Remove IMPC_statspipelinePostProcess function that is not in use
marinak-ebi Apr 16, 2024
e7ca9f8
Remove splitIndexFileIntoPiecesForPvalueExtraction function that is n…
marinak-ebi Apr 16, 2024
46c31dd
Remove editfile function that is not in use
marinak-ebi Apr 16, 2024
5ab7afc
Remove ClearReportsAfterCreation function that is not in use
marinak-ebi Apr 16, 2024
449990e
Remove HadoopReTransfer function that is not in use
marinak-ebi Apr 16, 2024
54eeab3
Remove HadoopReTransferSCP function that is not in use
marinak-ebi Apr 16, 2024
422ba49
Clean up README.md from functions that are not in use
marinak-ebi Apr 16, 2024
8a90642
Remove ExtractPVals.R
marinak-ebi Apr 24, 2024
b2a0fac
Remove ExtractPValsPhenStat.R
marinak-ebi Apr 24, 2024
585b92a
Remove unnessasary step from README.md
marinak-ebi Jul 25, 2024
c894556
Merge pull request #87 from mpi2/clean-up
marinak-ebi Aug 9, 2024
7b99b21
Remove EquationMap.conf
marinak-ebi Jul 29, 2024
ec90eb2
Remove getEquation function
marinak-ebi Jul 29, 2024
9521d23
Refactor mainAgeing function
marinak-ebi Jul 29, 2024
03f4fda
Remove updateEquationMap function
marinak-ebi Jul 29, 2024
314f57b
Merge pull request #89 from mpi2/remove-equation
marinak-ebi Oct 8, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
786 changes: 0 additions & 786 deletions Extract details from StatPackets/ExtractPVals.R

This file was deleted.

689 changes: 0 additions & 689 deletions Extract details from StatPackets/ExtractPValsPhenStat.R

This file was deleted.

2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@
same "printed page" as the copyright notice for easier
identification within third-party archives.

Copyright [yyyy] [name of copyright owner]
Copyright [2023-2027] Wellcome Trust Sanger Institute and the EMBL-European Bioinformatics Institute.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ Description: The required package for IMPC ageing pipeline.
License: LGPL (>= 2)
Encoding: UTF-8
LazyData: true
Imports: RJSONIO, methods, SmoothWin, stringi, base64enc, jsonlite, pingr, foreach, nlme, MASS, base, abind, OpenStats, rlist, DBI, RSQLite, gtools, plyr, robustbase, rlang, RPostgreSQL, data.table, miniparquet, Tmisc
Imports: RJSONIO, methods, SmoothWin, stringi, base64enc, jsonlite, pingr, foreach, nlme, MASS, base, abind, OpenStats, rlist, DBI, RSQLite, gtools, plyr, robustbase, rlang, RPostgreSQL, data.table, arrow, Tmisc, rwebhdfs
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,6 @@ mainAgeing = function(file = NULL ,
# Config files
message0('Loading configuration ...')
methodmap = readConf('MethodMap.conf')
equationmap = readConf('EquationMap.conf')
CategoryMap = readConf('CategoryMap.conf')
MergeCategoryParameters = read.csv(file = file.path(local(), 'MergeParameterList.txt'))
initial = readConf('Initialize.conf')
Expand Down Expand Up @@ -672,31 +671,6 @@ mainAgeing = function(file = NULL ,
)
###
n3.5.2[, depVar] = MergLev$x
################## Only for Gross Morphology group
# n3.5.2_summary = SummaryStatisticsOriginal(x = n3.5.2,
# depVar = depVar,
# label = 'GEL data summary statistics')
# write(
# paste(
# c(
# procedure,
# parameter,
# center,
# strain,
# zyg,
# meta,
# colony,
# FlatteningTheSummary(n3.5.2_summary, 'GEL data summary statistics')
# ),
# sep = '\t',
# collapse = '\t'
# ),
# file = 'summaryStats.tsv',
# append = TRUE,
# ncolumns = 10 ^ 4
# )
# return(NULL)
##################################
n3.5.2 = droplevels0(n3.5.2[!is.na(n3.5.2[, depVar]), ])
n3.5.2OnlyKO = subset(n3.5.2,
n3.5.2$biological_sample_group %in% 'experimental')
Expand Down Expand Up @@ -827,8 +801,7 @@ mainAgeing = function(file = NULL ,
data = a@datasetPL
) <= .2 &&
EnoughWeightForTheSexGenInteraction(a@datasetPL) ,
getEquation(var = parameter,
equationMap = equationmap),
'withWeight',
'withoutWeight'
)
} else{
Expand Down
Loading