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

0.15.0 #12

Merged
merged 30 commits into from
Mar 27, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
df498dc
Modify mu unbias to compute no-close mutations without assuming all r…
matthewfallan Mar 5, 2024
d5d2def
Write solver for p_mut_given_span
matthewfallan Mar 5, 2024
94d9eb3
Add unit tests for more mutation unbiasing methods
matthewfallan Mar 8, 2024
7a4e079
Update unit tests for mu.unbias module
matthewfallan Mar 9, 2024
7f1ae04
Add cluster proportions to mutation rate unbiasing
matthewfallan Mar 9, 2024
6c34107
Change _calc_p_ends to accept p_noclose_given_ends instead of min_gap
matthewfallan Mar 9, 2024
0feea97
Fix issue in _calc_p_clust with false warning messages about invalid …
matthewfallan Mar 9, 2024
a3bc590
Make _calc_p_mut_given_span_noclose compatible with numba jit
matthewfallan Mar 10, 2024
f825912
Add numba>=0.59 to dependencies in pyproject.toml
matthewfallan Mar 10, 2024
40a896d
Enable EM clustering to work with end-aware observer bias correction
matthewfallan Mar 13, 2024
ba882ee
Fix bug in clipping coordinates that extend beyond the section for un…
matthewfallan Mar 13, 2024
15d864f
Prevent using discontiguous paired-end reads for clustering
matthewfallan Mar 14, 2024
185b405
Add options to mask by coverage and discontiguous reads; modify finfo…
matthewfallan Mar 14, 2024
4252c61
Fix log of 0 in EM algo; suppress Numba performance warning
matthewfallan Mar 14, 2024
5fcd4a6
Enable complete workflow (including table) with new clustering algorithm
matthewfallan Mar 19, 2024
1a396a3
Fix bug in tabulation where cluster order 1 would not match masked table
matthewfallan Mar 21, 2024
c2a92c2
Remove mu.unbias.frame module and move mu.unbias.algo module to mu.un…
matthewfallan Mar 21, 2024
0de3a22
Fix bug in expectation function with computing the probability of a r…
matthewfallan Mar 22, 2024
1ddc1ba
Correct the formula in the expectation step for computing joint proba…
matthewfallan Mar 24, 2024
34b68fc
Add noclose argument to find_dims and implement throughout
matthewfallan Mar 25, 2024
22f9485
Rearrange functions for mutation rate unbias module
matthewfallan Mar 25, 2024
f68c672
Small adjustments to code
matthewfallan Mar 25, 2024
33825e1
Begin implementing relate step simulator
matthewfallan Mar 26, 2024
076d7e2
Update relate step simulator
matthewfallan Mar 26, 2024
4d29e85
Move each cli function to the end of its main module
matthewfallan Mar 26, 2024
b2fb257
Add checks to ensure that there are no discontiguous reads in masked …
matthewfallan Mar 26, 2024
17396af
Fix bug where every step in each pipeline received the same (maximum)…
matthewfallan Mar 26, 2024
c9b1616
Update cluster documentation
matthewfallan Mar 26, 2024
e9bf9c4
Add ability to limit read lengths in simulate_p_ends
matthewfallan Mar 27, 2024
213fc69
Update mask documentation and rebuild
matthewfallan Mar 27, 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
Binary file modified docs/.doctrees/api/seismicrna.cluster.doctree
Binary file not shown.
Binary file not shown.
Binary file modified docs/.doctrees/api/seismicrna.core.batch.doctree
Binary file not shown.
Binary file not shown.
Binary file modified docs/.doctrees/api/seismicrna.core.doctree
Binary file not shown.
Binary file modified docs/.doctrees/api/seismicrna.core.io.doctree
Binary file not shown.
Binary file modified docs/.doctrees/api/seismicrna.core.mu.doctree
Binary file not shown.
Binary file modified docs/.doctrees/api/seismicrna.core.mu.tests.doctree
Binary file not shown.
Binary file removed docs/.doctrees/api/seismicrna.core.mu.unbias.doctree
Binary file not shown.
Binary file not shown.
Binary file modified docs/.doctrees/api/seismicrna.core.seq.doctree
Binary file not shown.
Binary file modified docs/.doctrees/api/seismicrna.core.seq.tests.doctree
Binary file not shown.
Binary file modified docs/.doctrees/api/seismicrna.core.tests.doctree
Binary file not shown.
Binary file modified docs/.doctrees/api/seismicrna.mask.doctree
Binary file not shown.
Binary file modified docs/.doctrees/api/seismicrna.relate.doctree
Binary file not shown.
Binary file modified docs/.doctrees/api/seismicrna.relate.py.doctree
Binary file not shown.
Binary file modified docs/.doctrees/api/seismicrna.relate.py.tests.doctree
Binary file not shown.
Binary file not shown.
Binary file modified docs/.doctrees/api/seismicrna.table.doctree
Binary file not shown.
Binary file modified docs/.doctrees/api/seismicrna.wf.doctree
Binary file not shown.
Binary file modified docs/.doctrees/cli.doctree
Binary file not shown.
Binary file modified docs/.doctrees/environment.pickle
Binary file not shown.
Binary file modified docs/.doctrees/howto/run/cluster.doctree
Binary file not shown.
Binary file modified docs/.doctrees/howto/run/mask.doctree
Binary file not shown.
8 changes: 8 additions & 0 deletions docs/_sources/api/seismicrna.cluster.rst.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,14 @@ seismicrna.cluster package
:undoc-members:
:show-inheritance:

Subpackages
-----------

.. toctree::
:maxdepth: 4

seismicrna.cluster.tests

Submodules
----------

Expand Down
16 changes: 16 additions & 0 deletions docs/_sources/api/seismicrna.cluster.tests.rst.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
seismicrna.cluster.tests package
================================

.. automodule:: seismicrna.cluster.tests
:members:
:undoc-members:
:show-inheritance:

Submodules
----------


.. automodule:: seismicrna.cluster.tests.em_test
:members:
:undoc-members:
:show-inheritance:
8 changes: 8 additions & 0 deletions docs/_sources/api/seismicrna.core.batch.rst.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,14 @@ seismicrna.core.batch package
:undoc-members:
:show-inheritance:

Subpackages
-----------

.. toctree::
:maxdepth: 4

seismicrna.core.batch.tests

Submodules
----------

Expand Down
22 changes: 22 additions & 0 deletions docs/_sources/api/seismicrna.core.batch.tests.rst.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
seismicrna.core.batch.tests package
===================================

.. automodule:: seismicrna.core.batch.tests
:members:
:undoc-members:
:show-inheritance:

Submodules
----------


.. automodule:: seismicrna.core.batch.tests.count_test
:members:
:undoc-members:
:show-inheritance:


.. automodule:: seismicrna.core.batch.tests.index_test
:members:
:undoc-members:
:show-inheritance:
7 changes: 6 additions & 1 deletion docs/_sources/api/seismicrna.core.mu.rst.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ Subpackages
:maxdepth: 4

seismicrna.core.mu.tests
seismicrna.core.mu.unbias

Submodules
----------
Expand Down Expand Up @@ -47,3 +46,9 @@ Submodules
:members:
:undoc-members:
:show-inheritance:


.. automodule:: seismicrna.core.mu.unbias
:members:
:undoc-members:
:show-inheritance:
6 changes: 6 additions & 0 deletions docs/_sources/api/seismicrna.core.mu.tests.rst.txt
Original file line number Diff line number Diff line change
Expand Up @@ -38,3 +38,9 @@ Submodules
:members:
:undoc-members:
:show-inheritance:


.. automodule:: seismicrna.core.mu.tests.unbias_test
:members:
:undoc-members:
:show-inheritance:
30 changes: 0 additions & 30 deletions docs/_sources/api/seismicrna.core.mu.unbias.rst.txt

This file was deleted.

22 changes: 0 additions & 22 deletions docs/_sources/api/seismicrna.core.mu.unbias.tests.rst.txt

This file was deleted.

6 changes: 6 additions & 0 deletions docs/_sources/api/seismicrna.core.rst.txt
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,12 @@ Submodules
:show-inheritance:


.. automodule:: seismicrna.core.dims
:members:
:undoc-members:
:show-inheritance:


.. automodule:: seismicrna.core.header
:members:
:undoc-members:
Expand Down
6 changes: 6 additions & 0 deletions docs/_sources/api/seismicrna.core.tests.rst.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,12 @@ Submodules
----------


.. automodule:: seismicrna.core.tests.dims_test
:members:
:undoc-members:
:show-inheritance:


.. automodule:: seismicrna.core.tests.header_test
:members:
:undoc-members:
Expand Down
7 changes: 7 additions & 0 deletions docs/_sources/api/seismicrna.relate.rst.txt
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ Subpackages
seismicrna.relate.aux
seismicrna.relate.c
seismicrna.relate.py
seismicrna.relate.tests

Submodules
----------
Expand Down Expand Up @@ -56,6 +57,12 @@ Submodules
:show-inheritance:


.. automodule:: seismicrna.relate.sim
:members:
:undoc-members:
:show-inheritance:


.. automodule:: seismicrna.relate.write
:members:
:undoc-members:
Expand Down
16 changes: 16 additions & 0 deletions docs/_sources/api/seismicrna.relate.tests.rst.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
seismicrna.relate.tests package
===============================

.. automodule:: seismicrna.relate.tests
:members:
:undoc-members:
:show-inheritance:

Submodules
----------


.. automodule:: seismicrna.relate.tests.sim_test
:members:
:undoc-members:
:show-inheritance:
19 changes: 7 additions & 12 deletions docs/_sources/howto/run/cluster.rst.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,14 @@ Cluster input file: Mask report
You can give any number of Mask report files as inputs for the Cluster step.
See :doc:`../inputs` for ways to list multiple files.

For example, to cluster relation vectors of reads from ``sample-1`` masked over
reference ``ref-1`` section ``abc``, and from ``sample-2`` masked over reference
``ref-2`` section ``full``, use the command ::
Cluster all masked reads in ``out``::

seismic cluster {out}/sample-1/mask/ref-1/abc {out}/sample-2/mask/ref-2/full
seismic cluster out

where ``{out}`` is the path of your output directory from the Relate step.
Cluster reads from ``sample-1`` masked over reference reference ``ref-1``,
section ``abc``::

To cluster all masked relation vectors in ``{out}``, you can use the command ::

seismic cluster {out}
seismic cluster out/sample-1/mask/ref-1/abc

Cluster: Settings
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
Expand Down Expand Up @@ -105,9 +102,7 @@ You can set the number of independent EM runs using ``--em-runs`` (``-e``).
Cluster: Output files
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

All output files go into the directory ``{out}/{sample}/cluster/{ref}/{sect}``,
where ``{out}`` is the output directory, ``{sample}`` is the sample, ``{ref}``
is the reference, and ``{sect}`` is the section.
All output files go into the directory ``OUT/SAMPLE/cluster/REFERENCE/SECTION``.

Cluster output file: Batch of cluster memberships
""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
Expand Down Expand Up @@ -171,7 +166,7 @@ In your cluster report:
If all runs converged to identical solutions, then every NRMSD would be 0 and
every Correlation would be 1.
Generally, the runs are sufficiently reproducible if runs 1 and 2 have NRMSDs
less than 0.1 and Correlations greater than 0.95 with respect to run 0.
less than 0.05 and Correlations greater than 0.98 with respect to run 0.
If not, then there you have no evidence that run 0 is the global optimum for
that number of clusters, so it would be best to rerun clustering using more
independent runs to increase the chances of finding the global optimum.
Expand Down
27 changes: 17 additions & 10 deletions docs/_sources/howto/run/mask.rst.txt
Original file line number Diff line number Diff line change
Expand Up @@ -110,20 +110,27 @@ Mask setting: Filter reads
The second substep of masking is filtering reads.
You can filter reads based on three criteria, in this order:

Filter reads by number of positions covering the section
''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''

You can require every read to contain a minimum number of bases in the section
(i.e. set a minimum coverage) using ``--min-ncov-read`` followed by the minimum
coverage.
The minimum coverage must be at least 1 because reads that do not cover the
section at all should always be filtered out.
Note that this filter considers only positions that were not pre-excluded (see
:ref:`mask_exclude`).

Filter reads by fraction of informative positions
''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''

For some applications, such as finding alternative structures, every read must
span the vast majority of positions in the section of the reference.
You can set a limit on the minimum number of informative bases in the read,
as a fraction of the number of non-excluded positions in the section, using
``--min-finfo-read {f}``.
For example, to require 95% of the non-excluded positions in the section to be
You can set a limit on the minimum information in each read, as a fraction of
the number of non-excluded positions in the read, using ``--min-finfo-read``
followed by the minimum fraction of informative positions.
For example, to require 95% of the non-excluded positions in the read to be
informative, use ``--min-finfo-read 0.95``.
If the section had 296 positions, and 141 remained after excluding positions
(see :ref:`mask_exclude`), then a read with 137 informative positions would
have an informed fraction of 97% and be kept, but a read with 133 informative
positions would have an informed fraction of 94% and be discarded.
Note that the denominator of this fraction is the number of bases in the read
that cover the section; it is not just the length of the section or of the read.

Filter reads by fraction of mutated positions
''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
Expand Down
Loading
Loading