diff --git a/docs/_images/example_01.png b/docs/_images/example_01.png
index 1420b736..08a728f5 100644
Binary files a/docs/_images/example_01.png and b/docs/_images/example_01.png differ
diff --git a/docs/_images/example_01b.png b/docs/_images/example_01b.png
index a64f5ef8..cf809c40 100644
Binary files a/docs/_images/example_01b.png and b/docs/_images/example_01b.png differ
diff --git a/docs/_images/example_02.png b/docs/_images/example_02.png
index a990020c..8439c50a 100644
Binary files a/docs/_images/example_02.png and b/docs/_images/example_02.png differ
diff --git a/docs/_images/example_05.png b/docs/_images/example_05.png
index f3656f5b..3f6c33d6 100644
Binary files a/docs/_images/example_05.png and b/docs/_images/example_05.png differ
diff --git a/docs/_images/example_06.png b/docs/_images/example_06.png
index 83072c3c..48f30732 100644
Binary files a/docs/_images/example_06.png and b/docs/_images/example_06.png differ
diff --git a/docs/_images/example_06b.png b/docs/_images/example_06b.png
index 4c55e84a..eb7ed09e 100644
Binary files a/docs/_images/example_06b.png and b/docs/_images/example_06b.png differ
diff --git a/docs/_images/example_07.png b/docs/_images/example_07.png
index 7ebcb51a..aaefb731 100644
Binary files a/docs/_images/example_07.png and b/docs/_images/example_07.png differ
diff --git a/docs/_images/example_08.png b/docs/_images/example_08.png
index 91323cb9..a2a823dd 100644
Binary files a/docs/_images/example_08.png and b/docs/_images/example_08.png differ
diff --git a/docs/_images/example_13.png b/docs/_images/example_13.png
index 3bfaa488..67fc2186 100644
Binary files a/docs/_images/example_13.png and b/docs/_images/example_13.png differ
diff --git a/docs/_sources/ologram.rst.txt b/docs/_sources/ologram.rst.txt
index e832c98c..67e17707 100644
--- a/docs/_sources/ologram.rst.txt
+++ b/docs/_sources/ologram.rst.txt
@@ -248,6 +248,9 @@ For a factor allowance of k and n final queried words, the matrix will be rebuil
factor allowance is K in K*n words in step 1 where n is final queries nb of words.
MODL and will discard combinations rarer than 1/10000 occurences to reduce computing times and will also reduce the abundance of all unique lines in the matrix to their square roots to reduce the emphasis on the most frequent elements.
+However, this can magnify the impact of the noise quadratically as well, and can be disabled when using the manual API.
+
+
If you are passing a custom error function, it must have the signature error_function(X_true, X_rebuilt, code). X_true is the real data, X_rebuilt is the reconstruction to evaluate, and code is the encoded version which in our case is used to assess sparsity. All are NumPY matrices.
@@ -268,7 +271,8 @@ Here is an example:
multiple_overlap_max_number_of_combinations = 3, # How many words to find ?
nb_threads = 1,
step_1_factor_allowance = 2, # How many words to ask for in each step 1 rebuilding, as a multiplier of multiple_overlap_max_number_of_combinations
- error_function = None) # Custom error function in step 2
+ error_function = None, # Custom error function in step 2
+ smother = True) # Should the smothering (quadratic reduction of abundance) be applied ?
interesting_combis = combi_miner.find_interesting_combinations()
@@ -327,7 +331,7 @@ We recommend this representation. The tsv file can be edited before passing it t
On the graph, S designated the total number of basepairs in which this combinations is encountered in the real data. Fold change gives the ratio with the number of basepairs in the shuffles, with the associated Negative Binomial p-value.
-.. command-output:: gtftk ologram_modl_treeify -i multiple_overlap_trivial_ologram_stats.tsv -o ./results/treeified.pdf -l ThisWasTheNameOfTheQuery
+.. command-output:: gtftk ologram_modl_treeify -i multiple_overlap_trivial_ologram_stats.tsv -o treeified.pdf -l ThisWasTheNameOfTheQuery
:shell:
.. raw:: html
@@ -336,7 +340,7 @@ On the graph, S designated the total number of basepairs in which this combinati
-
diff --git a/docs/_static/documentation_options.js b/docs/_static/documentation_options.js
index eb086d40..c1bb9ae4 100644
--- a/docs/_static/documentation_options.js
+++ b/docs/_static/documentation_options.js
@@ -1,6 +1,6 @@
var DOCUMENTATION_OPTIONS = {
URL_ROOT: document.getElementById("documentation_options").getAttribute('data-url_root'),
- VERSION: '1.2.0',
+ VERSION: '1.2.1',
LANGUAGE: 'en',
COLLAPSE_INDEX: false,
BUILDER: 'html',
diff --git a/docs/_static/example_01.png b/docs/_static/example_01.png
index ee872fd1..9d6fe4a4 100644
Binary files a/docs/_static/example_01.png and b/docs/_static/example_01.png differ
diff --git a/docs/_static/example_01b.png b/docs/_static/example_01b.png
index a64f5ef8..cf809c40 100644
Binary files a/docs/_static/example_01b.png and b/docs/_static/example_01b.png differ
diff --git a/docs/_static/example_02.png b/docs/_static/example_02.png
index f0489c2c..8439c50a 100644
Binary files a/docs/_static/example_02.png and b/docs/_static/example_02.png differ
diff --git a/docs/_static/example_05.png b/docs/_static/example_05.png
index c9d6d2a9..2937ac10 100644
Binary files a/docs/_static/example_05.png and b/docs/_static/example_05.png differ
diff --git a/docs/_static/example_06.png b/docs/_static/example_06.png
index 68f32282..79f3e737 100644
Binary files a/docs/_static/example_06.png and b/docs/_static/example_06.png differ
diff --git a/docs/_static/example_06b.png b/docs/_static/example_06b.png
index d6bc8a90..3cbeb7c0 100644
Binary files a/docs/_static/example_06b.png and b/docs/_static/example_06b.png differ
diff --git a/docs/_static/example_07.png b/docs/_static/example_07.png
index 76a773e0..aaefb731 100644
Binary files a/docs/_static/example_07.png and b/docs/_static/example_07.png differ
diff --git a/docs/_static/example_08.png b/docs/_static/example_08.png
index 229ab0ef..861d1066 100644
Binary files a/docs/_static/example_08.png and b/docs/_static/example_08.png differ
diff --git a/docs/_static/example_13.png b/docs/_static/example_13.png
index 8e73b9ed..1fde3047 100644
Binary files a/docs/_static/example_13.png and b/docs/_static/example_13.png differ
diff --git a/docs/_static/example_pa_01.pdf b/docs/_static/example_pa_01.pdf
index a636d1e6..54ea2927 100644
Binary files a/docs/_static/example_pa_01.pdf and b/docs/_static/example_pa_01.pdf differ
diff --git a/docs/_static/example_pa_02.pdf b/docs/_static/example_pa_02.pdf
index 16c1dff8..ec941371 100644
Binary files a/docs/_static/example_pa_02.pdf and b/docs/_static/example_pa_02.pdf differ
diff --git a/docs/_static/example_pa_03.pdf b/docs/_static/example_pa_03.pdf
index 17545e6c..379b27d2 100644
Binary files a/docs/_static/example_pa_03.pdf and b/docs/_static/example_pa_03.pdf differ
diff --git a/docs/_static/example_pa_04.pdf b/docs/_static/example_pa_04.pdf
index 7f610d82..8b24f3fa 100644
Binary files a/docs/_static/example_pa_04.pdf and b/docs/_static/example_pa_04.pdf differ
diff --git a/docs/_static/merge_ologram_stats_01.pdf b/docs/_static/merge_ologram_stats_01.pdf
index a6481bd5..72a77908 100644
Binary files a/docs/_static/merge_ologram_stats_01.pdf and b/docs/_static/merge_ologram_stats_01.pdf differ
diff --git a/docs/_static/pygments.css b/docs/_static/pygments.css
index 20c4814d..d14395ef 100644
--- a/docs/_static/pygments.css
+++ b/docs/_static/pygments.css
@@ -1,5 +1,10 @@
+pre { line-height: 125%; margin: 0; }
+td.linenos pre { color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px; }
+span.linenos { color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px; }
+td.linenos pre.special { color: #000000; background-color: #ffffc0; padding: 0 5px 0 5px; }
+span.linenos.special { color: #000000; background-color: #ffffc0; padding: 0 5px 0 5px; }
.highlight .hll { background-color: #ffffcc }
-.highlight { background: #eeffcc; }
+.highlight { background: #eeffcc; }
.highlight .c { color: #408090; font-style: italic } /* Comment */
.highlight .err { border: 1px solid #FF0000 } /* Error */
.highlight .k { color: #007020; font-weight: bold } /* Keyword */
diff --git a/docs/_static/treeified.pdf b/docs/_static/treeified.pdf
new file mode 100644
index 00000000..465cbd87
Binary files /dev/null and b/docs/_static/treeified.pdf differ
diff --git a/docs/about.html b/docs/about.html
index ccfdd5ea..1bd7dd9e 100644
--- a/docs/about.html
+++ b/docs/about.html
@@ -16,7 +16,7 @@
var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
})();
- Warning about supported GTF file formats — gtftk 1.2.0 documentation
+ Warning about supported GTF file formats — gtftk 1.2.1 documentation
@@ -45,7 +45,7 @@