Mercurial > repos > mheinzl > fsd

changeset 48:e51fe3083b16 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
planemo upload for repository https://github.com/monikaheinzl/duplexanalysis_galaxy/tree/master/tools/fsd commit 9bae9043a53f1e07b502acd1082450adcb6d9e31-dirty
author mheinzl
date Wed, 16 Oct 2019 10:06:13 -0400
parents 1ed4a127c41a
children 6d0281f8d0dc
files fsd.py test-data/fsd_output1.pdf test-data/fsd_output1.tab test-data/fsd_output2.pdf test-data/fsd_output2.tab
diffstat 5 files changed, 21 insertions(+), 22 deletions(-) [+]
line wrap: on
line diff
--- a/fsd.py	Wed Aug 28 17:36:28 2019 -0400
+++ b/fsd.py	Wed Oct 16 10:06:13 2019 -0400
@@ -735,8 +735,7 @@
                     sep, sep, sep, sep, sep, sep, sep, sep, sep))
             output_file.write("{}{}{}{}{:.3f}{}{:.3f}{}{}{}{:.3f}{}{}{}{:.3f}{}{}{}{}\n\n".format(
                 name_file, sep, singl, sep, float(singl) / len(data), sep, float(singl) / sum(data_o), sep,
-                last, sep, float(last) / len(data), sep, sum(data_o[data_o > 20]), sep,
-                                                        float(sum(data_o[data_o > 20])) / sum(data_o), sep, len(data),
+                last, sep, float(last) / len(data), sep, sum(data_o[data_o > 20]), sep, float(sum(data_o[data_o > 20])) / sum(data_o), sep, len(data),
                 sep, sum(data_o)))
 
             # information for FS >= 1
@@ -751,14 +750,14 @@
             output_file.write("SSCS ab{}{}{}{}{}{:.3f}{}{:.3f}{}{:.3f}{}{:.3f}\n".format(
                 sep, len(dataAB), sep, sum(dataAB_o), sep,
                 float(len(dataAB)) / (len(dataAB) + len(dataBA) + len(duplTags)),
-                sep, float(sum(dataAB_o)) / (sum(dataAB_o) + sum(dataBA_o) + sum(duplTags_o)), sep,
-                float(len(dataAB)) / (len(ab) + len(ba)), sep, float(sum(dataAB_o)) / (sum(ab_o) + sum(ba_o))))
+                sep, float(len(dataAB)) / (len(ab) + len(ba)), sep, float(sum(dataAB_o)) / (sum(dataAB_o) + sum(dataBA_o) + sum(duplTags_o)),
+                sep, float(sum(dataAB_o)) / (sum(ab_o) + sum(ba_o))))
             output_file.write("SSCS ba{}{}{}{}{}{:.3f}{}{:.3f}{}{:.3f}{}{:.3f}\n".format(
                 sep, len(dataBA), sep, sum(dataBA_o), sep,
-                float(len(dataBA)) / (len(dataBA) + len(dataBA) + len(duplTags)),
-                sep, float(sum(dataBA_o)) / (sum(dataBA_o) + sum(dataBA_o) + sum(duplTags_o)), sep,
-                float(len(dataBA)) / (len(ba) + len(ba)),
-                sep, float(sum(dataBA_o)) / (sum(ba_o) + sum(ba_o))))
+                float(len(dataBA)) / (len(dataAB) + len(dataBA) + len(duplTags)),
+                sep, float(len(dataBA)) / (len(ab) + len(ba)), sep, 
+                float(sum(dataBA_o)) / (sum(dataAB_o) + sum(dataBA_o) + sum(duplTags_o)),
+                sep, float(sum(dataBA_o)) / (sum(ab_o) + sum(ba_o))))
             output_file.write(
                 "DCS (total){}{} ({}){}{} ({}){}{:.3f}{}{:.3f} ({:.3f}){}{:.3f}{}{:.3f} ({:.3f})\n".format(
                     sep, len(duplTags), len(duplTags_double), sep, sum(duplTags_o), sum(duplTags_double_o), sep,
Binary file test-data/fsd_output1.pdf has changed
--- a/test-data/fsd_output1.tab	Wed Aug 28 17:36:28 2019 -0400
+++ b/test-data/fsd_output1.tab	Wed Oct 16 10:06:13 2019 -0400
@@ -67,8 +67,8 @@
 
 FS >= 1	nr. of tags	nr. of PE reads	rel. freq of tags		rel. freq of PE reads:
 			unique:	total	unique	total:
-SSCS ab	47	123	0.431	0.339	0.420	0.325
-SSCS ba	59	222	0.488	0.481	0.476	0.468
+SSCS ab	47	123	0.431	0.420	0.339	0.325
+SSCS ba	59	222	0.541	0.527	0.612	0.587
 DCS (total)	3 (6)	18 (33)	0.028	0.027 (0.054)	0.050	0.048 (0.087)
 total nr. of tags	109	363	109	112	363	378
 
@@ -146,8 +146,8 @@
 
 FS >= 1	nr. of tags	nr. of PE reads	rel. freq of tags		rel. freq of PE reads:
 			unique:	total	unique	total:
-SSCS ab	47	123	0.431	0.339	0.420	0.325
-SSCS ba	59	222	0.488	0.481	0.476	0.468
+SSCS ab	47	123	0.431	0.420	0.339	0.325
+SSCS ba	59	222	0.541	0.527	0.612	0.587
 DCS (total)	3 (6)	18 (33)	0.028	0.027 (0.054)	0.050	0.048 (0.087)
 total nr. of tags	109	363	109	112	363	378
 
@@ -225,8 +225,8 @@
 
 FS >= 1	nr. of tags	nr. of PE reads	rel. freq of tags		rel. freq of PE reads:
 			unique:	total	unique	total:
-SSCS ab	47	123	0.431	0.339	0.420	0.325
-SSCS ba	59	222	0.488	0.481	0.476	0.468
+SSCS ab	47	123	0.431	0.420	0.339	0.325
+SSCS ba	59	222	0.541	0.527	0.612	0.587
 DCS (total)	3 (6)	18 (33)	0.028	0.027 (0.054)	0.050	0.048 (0.087)
 total nr. of tags	109	363	109	112	363	378
 
@@ -304,8 +304,8 @@
 
 FS >= 1	nr. of tags	nr. of PE reads	rel. freq of tags		rel. freq of PE reads:
 			unique:	total	unique	total:
-SSCS ab	47	123	0.431	0.339	0.420	0.325
-SSCS ba	59	222	0.488	0.481	0.476	0.468
+SSCS ab	47	123	0.431	0.420	0.339	0.325
+SSCS ba	59	222	0.541	0.527	0.612	0.587
 DCS (total)	3 (6)	18 (33)	0.028	0.027 (0.054)	0.050	0.048 (0.087)
 total nr. of tags	109	363	109	112	363	378
 
Binary file test-data/fsd_output2.pdf has changed
--- a/test-data/fsd_output2.tab	Wed Aug 28 17:36:28 2019 -0400
+++ b/test-data/fsd_output2.tab	Wed Oct 16 10:06:13 2019 -0400
@@ -67,8 +67,8 @@
 
 FS >= 1	nr. of tags	nr. of PE reads	rel. freq of tags		rel. freq of PE reads:
 			unique:	total	unique	total:
-SSCS ab	47	123	0.431	0.339	0.420	0.325
-SSCS ba	59	222	0.488	0.481	0.476	0.468
+SSCS ab	47	123	0.431	0.420	0.339	0.325
+SSCS ba	59	222	0.541	0.527	0.612	0.587
 DCS (total)	3 (6)	18 (33)	0.028	0.027 (0.054)	0.050	0.048 (0.087)
 total nr. of tags	109	363	109	112	363	378
 
@@ -146,8 +146,8 @@
 
 FS >= 1	nr. of tags	nr. of PE reads	rel. freq of tags		rel. freq of PE reads:
 			unique:	total	unique	total:
-SSCS ab	47	123	0.431	0.339	0.420	0.325
-SSCS ba	59	222	0.488	0.481	0.476	0.468
+SSCS ab	47	123	0.431	0.420	0.339	0.325
+SSCS ba	59	222	0.541	0.527	0.612	0.587
 DCS (total)	3 (6)	18 (33)	0.028	0.027 (0.054)	0.050	0.048 (0.087)
 total nr. of tags	109	363	109	112	363	378
 
@@ -225,8 +225,8 @@
 
 FS >= 1	nr. of tags	nr. of PE reads	rel. freq of tags		rel. freq of PE reads:
 			unique:	total	unique	total:
-SSCS ab	47	123	0.431	0.339	0.420	0.325
-SSCS ba	59	222	0.488	0.481	0.476	0.468
+SSCS ab	47	123	0.431	0.420	0.339	0.325
+SSCS ba	59	222	0.541	0.527	0.612	0.587
 DCS (total)	3 (6)	18 (33)	0.028	0.027 (0.054)	0.050	0.048 (0.087)
 total nr. of tags	109	363	109	112	363	378