... | ... |
@@ -37,7 +37,6 @@ importFrom(IRanges,width) |
37 | 37 |
importFrom(S4Vectors,isConstant) |
38 | 38 |
importFrom(ShortRead,FastqSampler) |
39 | 39 |
importFrom(ShortRead,ShortReadQ) |
40 |
-importFrom(ShortRead,occurrenceFilter) |
|
41 | 40 |
importFrom(ShortRead,id) |
42 | 41 |
importFrom(ShortRead,nFilter) |
43 | 42 |
importFrom(ShortRead,sread) |
... | ... |
@@ -37,7 +37,7 @@ importFrom(IRanges,width) |
37 | 37 |
importFrom(S4Vectors,isConstant) |
38 | 38 |
importFrom(ShortRead,FastqSampler) |
39 | 39 |
importFrom(ShortRead,ShortReadQ) |
40 |
-importFrom(ShortRead, occurrenceFilter) |
|
40 |
+importFrom(ShortRead,occurrenceFilter) |
|
41 | 41 |
importFrom(ShortRead,id) |
42 | 42 |
importFrom(ShortRead,nFilter) |
43 | 43 |
importFrom(ShortRead,sread) |
fix ocurrenceFilter
... | ... |
@@ -37,6 +37,7 @@ importFrom(IRanges,width) |
37 | 37 |
importFrom(S4Vectors,isConstant) |
38 | 38 |
importFrom(ShortRead,FastqSampler) |
39 | 39 |
importFrom(ShortRead,ShortReadQ) |
40 |
+importFrom(ShortRead, occurrenceFilter) |
|
40 | 41 |
importFrom(ShortRead,id) |
41 | 42 |
importFrom(ShortRead,nFilter) |
42 | 43 |
importFrom(ShortRead,sread) |
... | ... |
@@ -1,15 +1,5 @@ |
1 |
-<<<<<<< HEAD |
|
2 | 1 |
# Generated by roxygen2: do not edit by hand |
3 | 2 |
|
4 |
-======= |
|
5 |
-<<<<<<< HEAD |
|
6 |
-# Generated by roxygen2: do not edit by hand |
|
7 |
- |
|
8 |
-======= |
|
9 |
- |
|
10 |
-useDynLib(FastqCleaner) |
|
11 |
->>>>>>> upstream/master |
|
12 |
->>>>>>> upstream/master |
|
13 | 3 |
export(adapter_filter) |
14 | 4 |
export(check_encoding) |
15 | 5 |
export(complex_filter) |
... | ... |
@@ -28,10 +18,6 @@ export(trim3q_filter) |
28 | 18 |
export(unique_filter) |
29 | 19 |
import(Rcpp) |
30 | 20 |
import(htmltools) |
31 |
-<<<<<<< HEAD |
|
32 |
-======= |
|
33 |
-<<<<<<< HEAD |
|
34 |
->>>>>>> upstream/master |
|
35 | 21 |
importFrom(Biostrings,BStringSet) |
36 | 22 |
importFrom(Biostrings,DNAString) |
37 | 23 |
importFrom(Biostrings,DNAStringSet) |
... | ... |
@@ -63,24 +49,3 @@ importFrom(shinyBS,bsModal) |
63 | 49 |
importFrom(shinyBS,bsPopover) |
64 | 50 |
importFrom(stats,quantile) |
65 | 51 |
useDynLib(FastqCleaner) |
66 |
-<<<<<<< HEAD |
|
67 |
-======= |
|
68 |
-======= |
|
69 |
-import(shiny, except=c(dataTableOutput, renderDataTable)) |
|
70 |
-importFrom(shinyBS, bsPopover, bsModal, bsAlert) |
|
71 |
-importFrom(DT, dataTableOutput) |
|
72 |
-importFrom(DT, renderDataTable) |
|
73 |
-importFrom(S4Vectors, isConstant) |
|
74 |
-importFrom(graphics, hist) |
|
75 |
-importFrom(methods, as, is) |
|
76 |
-importFrom(stats, quantile) |
|
77 |
-importFrom(ShortRead, FastqStreamer, yield, sread, id, ShortReadQ, writeFastq, |
|
78 |
- countLines, nFilter, qa, tables, FastqSampler, occurrenceFilter, |
|
79 |
- narrow) |
|
80 |
-importFrom(Biostrings, BStringSet, PhredQuality, DNAString, width, start, end, |
|
81 |
- dinucleotideFrequency, which.isMatchingStartingAt, as.matrix, |
|
82 |
- oligonucleotideFrequency, reverse, replaceLetterAt, trimLRPatterns, |
|
83 |
- reverseComplement,isMatchingStartingAt, isMatchingEndingAt, quality, |
|
84 |
- DNAStringSet, subseq) |
|
85 |
->>>>>>> upstream/master |
|
86 |
->>>>>>> upstream/master |
... | ... |
@@ -1,5 +1,5 @@ |
1 |
+# Generated by roxygen2: do not edit by hand |
|
1 | 2 |
|
2 |
-useDynLib(FastqCleaner) |
|
3 | 3 |
export(adapter_filter) |
4 | 4 |
export(check_encoding) |
5 | 5 |
export(complex_filter) |
... | ... |
@@ -18,19 +18,34 @@ export(trim3q_filter) |
18 | 18 |
export(unique_filter) |
19 | 19 |
import(Rcpp) |
20 | 20 |
import(htmltools) |
21 |
-import(shiny, except=c(dataTableOutput, renderDataTable)) |
|
22 |
-importFrom(shinyBS, bsPopover, bsModal, bsAlert) |
|
23 |
-importFrom(DT, dataTableOutput) |
|
24 |
-importFrom(DT, renderDataTable) |
|
25 |
-importFrom(S4Vectors, isConstant) |
|
26 |
-importFrom(graphics, hist) |
|
27 |
-importFrom(methods, as, is) |
|
28 |
-importFrom(stats, quantile) |
|
29 |
-importFrom(ShortRead, FastqStreamer, yield, sread, id, ShortReadQ, writeFastq, |
|
30 |
- countLines, nFilter, qa, tables, FastqSampler, occurrenceFilter, |
|
31 |
- narrow) |
|
32 |
-importFrom(Biostrings, BStringSet, PhredQuality, DNAString, width, start, end, |
|
33 |
- dinucleotideFrequency, which.isMatchingStartingAt, as.matrix, |
|
34 |
- oligonucleotideFrequency, reverse, replaceLetterAt, trimLRPatterns, |
|
35 |
- reverseComplement,isMatchingStartingAt, isMatchingEndingAt, quality, |
|
36 |
- DNAStringSet, subseq) |
|
21 |
+importFrom(Biostrings,BStringSet) |
|
22 |
+importFrom(Biostrings,DNAString) |
|
23 |
+importFrom(Biostrings,DNAStringSet) |
|
24 |
+importFrom(Biostrings,PhredQuality) |
|
25 |
+importFrom(Biostrings,dinucleotideFrequency) |
|
26 |
+importFrom(Biostrings,oligonucleotideFrequency) |
|
27 |
+importFrom(Biostrings,quality) |
|
28 |
+importFrom(Biostrings,replaceLetterAt) |
|
29 |
+importFrom(Biostrings,reverseComplement) |
|
30 |
+importFrom(Biostrings,trimLRPatterns) |
|
31 |
+importFrom(DT,dataTableOutput) |
|
32 |
+importFrom(DT,renderDataTable) |
|
33 |
+importFrom(IRanges,end) |
|
34 |
+importFrom(IRanges,narrow) |
|
35 |
+importFrom(IRanges,start) |
|
36 |
+importFrom(IRanges,width) |
|
37 |
+importFrom(S4Vectors,isConstant) |
|
38 |
+importFrom(ShortRead,FastqSampler) |
|
39 |
+importFrom(ShortRead,ShortReadQ) |
|
40 |
+importFrom(ShortRead,id) |
|
41 |
+importFrom(ShortRead,nFilter) |
|
42 |
+importFrom(ShortRead,sread) |
|
43 |
+importFrom(ShortRead,yield) |
|
44 |
+importFrom(graphics,hist) |
|
45 |
+importFrom(methods,as) |
|
46 |
+importFrom(methods,is) |
|
47 |
+importFrom(shinyBS,bsAlert) |
|
48 |
+importFrom(shinyBS,bsModal) |
|
49 |
+importFrom(shinyBS,bsPopover) |
|
50 |
+importFrom(stats,quantile) |
|
51 |
+useDynLib(FastqCleaner) |
1 | 1 |
new file mode 100644 |
... | ... |
@@ -0,0 +1,51 @@ |
1 |
+# Generated by roxygen2: do not edit by hand |
|
2 |
+ |
|
3 |
+export(adapter_filter) |
|
4 |
+export(check_encoding) |
|
5 |
+export(complex_filter) |
|
6 |
+export(fixed_filter) |
|
7 |
+export(inject_letter_random) |
|
8 |
+export(launch_fqc) |
|
9 |
+export(length_filter) |
|
10 |
+export(n_filter) |
|
11 |
+export(qmean_filter) |
|
12 |
+export(random_length) |
|
13 |
+export(random_qual) |
|
14 |
+export(random_seq) |
|
15 |
+export(seq_filter) |
|
16 |
+export(seq_names) |
|
17 |
+export(trim3q_filter) |
|
18 |
+export(unique_filter) |
|
19 |
+import(Rcpp) |
|
20 |
+import(htmltools) |
|
21 |
+importFrom(Biostrings,BStringSet) |
|
22 |
+importFrom(Biostrings,DNAString) |
|
23 |
+importFrom(Biostrings,DNAStringSet) |
|
24 |
+importFrom(Biostrings,PhredQuality) |
|
25 |
+importFrom(Biostrings,dinucleotideFrequency) |
|
26 |
+importFrom(Biostrings,oligonucleotideFrequency) |
|
27 |
+importFrom(Biostrings,quality) |
|
28 |
+importFrom(Biostrings,replaceLetterAt) |
|
29 |
+importFrom(Biostrings,reverseComplement) |
|
30 |
+importFrom(Biostrings,trimLRPatterns) |
|
31 |
+importFrom(DT,dataTableOutput) |
|
32 |
+importFrom(DT,renderDataTable) |
|
33 |
+importFrom(IRanges,end) |
|
34 |
+importFrom(IRanges,narrow) |
|
35 |
+importFrom(IRanges,start) |
|
36 |
+importFrom(IRanges,width) |
|
37 |
+importFrom(S4Vectors,isConstant) |
|
38 |
+importFrom(ShortRead,FastqSampler) |
|
39 |
+importFrom(ShortRead,ShortReadQ) |
|
40 |
+importFrom(ShortRead,id) |
|
41 |
+importFrom(ShortRead,nFilter) |
|
42 |
+importFrom(ShortRead,sread) |
|
43 |
+importFrom(ShortRead,yield) |
|
44 |
+importFrom(graphics,hist) |
|
45 |
+importFrom(methods,as) |
|
46 |
+importFrom(methods,is) |
|
47 |
+importFrom(shinyBS,bsAlert) |
|
48 |
+importFrom(shinyBS,bsModal) |
|
49 |
+importFrom(shinyBS,bsPopover) |
|
50 |
+importFrom(stats,quantile) |
|
51 |
+useDynLib(FastqCleaner) |
... | ... |
@@ -20,12 +20,12 @@ import(Rcpp) |
20 | 20 |
import(htmltools) |
21 | 21 |
import(shiny, except=c(dataTableOutput, renderDataTable)) |
22 | 22 |
importFrom(shinyBS, bsPopover, bsModal, bsAlert) |
23 |
-importFrom(DT,dataTableOutput) |
|
24 |
-importFrom(DT,renderDataTable) |
|
25 |
-importFrom(S4Vectors,isConstant) |
|
26 |
-importFrom(graphics,hist) |
|
27 |
-importFrom(methods,as) |
|
28 |
-importFrom(stats,quantile) |
|
23 |
+importFrom(DT, dataTableOutput) |
|
24 |
+importFrom(DT, renderDataTable) |
|
25 |
+importFrom(S4Vectors, isConstant) |
|
26 |
+importFrom(graphics, hist) |
|
27 |
+importFrom(methods, as, is) |
|
28 |
+importFrom(stats, quantile) |
|
29 | 29 |
importFrom(ShortRead, FastqStreamer, yield, sread, id, ShortReadQ, writeFastq, |
30 | 30 |
countLines, nFilter, qa, tables, FastqSampler, occurrenceFilter, |
31 | 31 |
narrow) |
1 | 1 |
new file mode 100644 |
... | ... |
@@ -0,0 +1,38 @@ |
1 |
+ |
|
2 |
+useDynLib(FastqCleaner) |
|
3 |
+export(adapter_filter) |
|
4 |
+export(check_encoding) |
|
5 |
+export(complex_filter) |
|
6 |
+export(cutLseq) |
|
7 |
+export(cutRseq) |
|
8 |
+export(fixed_filter) |
|
9 |
+export(inject_letter_random) |
|
10 |
+export(launch_fqc) |
|
11 |
+export(length_filter) |
|
12 |
+export(n_filter) |
|
13 |
+export(qmean_filter) |
|
14 |
+export(random_length) |
|
15 |
+export(random_qual) |
|
16 |
+export(random_seq) |
|
17 |
+export(seq_filter) |
|
18 |
+export(seq_names) |
|
19 |
+export(trim3q_filter) |
|
20 |
+export(unique_filter) |
|
21 |
+import(Rcpp) |
|
22 |
+import(htmltools) |
|
23 |
+import(shiny, except=c(dataTableOutput, renderDataTable)) |
|
24 |
+importFrom(shinyBS, bsPopover, bsModal, bsAlert) |
|
25 |
+importFrom(DT,dataTableOutput) |
|
26 |
+importFrom(DT,renderDataTable) |
|
27 |
+importFrom(S4Vectors,isConstant) |
|
28 |
+importFrom(graphics,hist) |
|
29 |
+importFrom(methods,as) |
|
30 |
+importFrom(stats,quantile) |
|
31 |
+importFrom(ShortRead, FastqStreamer, yield, sread, id, ShortReadQ, writeFastq, |
|
32 |
+ countLines, nFilter, qa, tables, FastqSampler, occurrenceFilter, |
|
33 |
+ narrow) |
|
34 |
+importFrom(Biostrings, BStringSet, PhredQuality, DNAString, width, start, end, |
|
35 |
+ dinucleotideFrequency, which.isMatchingStartingAt, as.matrix, |
|
36 |
+ oligonucleotideFrequency, reverse, replaceLetterAt, trimLRPatterns, |
|
37 |
+ reverseComplement,isMatchingStartingAt, isMatchingEndingAt, quality, |
|
38 |
+ DNAStringSet, subseq) |