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

refactor: extract all enclone only print code #415

Merged
merged 26 commits into from
Apr 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
3e8ce33
Extract all of the enclone-only part of print_clonotypes into a funct…
macklin-10x Mar 31, 2024
4ecb54a
Extract sort_exact_clonotypes as a function.
macklin-10x Mar 31, 2024
27fdb17
Unfold the loop and clean up pass 1.
macklin-10x Mar 31, 2024
c1817c5
Clean up pass 2.
macklin-10x Mar 31, 2024
fa0463a
Explode the first pass loop into the top-level scope.
macklin-10x Mar 31, 2024
e70eec3
Explode pass 2 back out into top-level scope.
macklin-10x Mar 31, 2024
73dc695
Clean up mutables and extract n_cells from the enclone-only data.
macklin-10x Mar 31, 2024
0712b9b
Implement and inject processors.
macklin-10x Mar 31, 2024
e2d8ba1
impl on &mut rather than broken blanket impl
macklin-10x Mar 31, 2024
5d7f9cd
Move most of the remaining prep code into the enclone processor.
macklin-10x Mar 31, 2024
9340973
Move stop code into sole place it is used.
macklin-10x Apr 1, 2024
4217238
Move all the enclone-specific code into enclone proper.
macklin-10x Apr 1, 2024
dbf378a
Move a bunch of print code into enclone.
macklin-10x Apr 1, 2024
1787b99
Move more print code.
macklin-10x Apr 1, 2024
0b7a3d1
Move yet more printing code.
macklin-10x Apr 1, 2024
f5b36f6
Move gene_scan.
macklin-10x Apr 1, 2024
027a70d
Move a whole ton more code into enclone.
macklin-10x Apr 1, 2024
1206c28
Scrape some more code out.
macklin-10x Apr 1, 2024
d46f74d
Pull out one more module.
macklin-10x Apr 1, 2024
916d5a7
Add an assertion to make sure we never enter moved code.
macklin-10x Apr 1, 2024
be5d09c
Remove stats_pass1.
macklin-10x Apr 2, 2024
c2fe8af
Allow orbit proc to pass data to itself.
macklin-10x Apr 2, 2024
ed93e5c
Tighten up scope of bads. Docstrings.
macklin-10x Apr 2, 2024
4b8c881
Rename enclone_print -> enclone_process.
macklin-10x Apr 2, 2024
190578b
Delete the code generation part of enclone_vars.
macklin-10x Apr 2, 2024
9bce2db
Merge branch 'main' into macklin/extract-all-enclone-only-print-code
macklin-10x Apr 23, 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
6 changes: 3 additions & 3 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ members = [
"enclone",
"enclone_args",
"enclone_core",
"enclone_print",
"enclone_process",
"enclone_proto",
"enclone_ranger",
"enclone_stuff",
Expand Down
2 changes: 1 addition & 1 deletion GUIDE
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ enclone_exec just the actual main program
enclone_help help menus from the command line
enclone_main this includes the enclone main program guts
enclone_paper calculations for enclone paper
enclone_print prints clonotypes in the sense of creating the "pictures" (much of core logic)
enclone_process final filtering and output of clonotypes
enclone_proto stuff for communicating with Loupe, and reused for other purposes
enclone_ranger entry point for cellranger
enclone_stuff things called by enclone_main and enclone_ranger
Expand Down
2 changes: 1 addition & 1 deletion enclone_core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ authors = ["""David Jaffe <david.jaffe@10xgenomics.com>,
edition = "2021"
license-file = "LICENSE.txt"
publish = false
include = ["src/*.rs", "LICENSE.txt", "src/mammalian_fixed_len.table"]
include = ["src/*.rs", "LICENSE.txt"]

# Please do not edit crate versions within this file. Instead edit the file master.toml
# in the root of the enclone repo.
Expand Down
2 changes: 0 additions & 2 deletions enclone_core/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,9 @@ pub mod hcomp;
pub mod join_one;
pub mod linear_condition;
pub mod logging;
pub mod mammalian_fixed_len;
pub mod median;
pub mod opt_d;
pub mod print_tools;
pub mod set_speakers;
pub mod slurp;
pub mod stringulate;
pub mod test_def;
Expand Down
152 changes: 0 additions & 152 deletions enclone_core/src/mammalian_fixed_len.rs

This file was deleted.

Loading
Loading