Skip to content

Commit

Permalink
Merge pull request #479 from ComparativeGenomicsToolkit/poa
Browse files Browse the repository at this point in the history
Update to abpoa 1.2.0
  • Loading branch information
glennhickey authored May 18, 2021
2 parents cc12da4 + 51fb8c4 commit ed53ff6
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
3 changes: 2 additions & 1 deletion bar/impl/poaBarAligner.c
Original file line number Diff line number Diff line change
Expand Up @@ -344,6 +344,7 @@ Msa *msa_make_partial_order_alignment(char **seqs, int *seq_lens, int64_t seq_no
}

// perform abpoa-msa
ab->abs->n_seq = 0; // To re-use ab, n_seq needs to be set as 0
abpoa_msa(ab, abpt, msa->seq_no, NULL, msa->seq_lens, bseqs, NULL, NULL, NULL, NULL, NULL,
&(msa->msa_seq), &(msa->column_no));

Expand Down Expand Up @@ -461,7 +462,7 @@ Msa *msa_make_partial_order_alignment(char **seqs, int *seq_lens, int64_t seq_no
free(row_overlaps);
stList_destruct(msa_windows);

abpoa_free(ab, abpt);
abpoa_free(ab);
abpoa_free_para(abpt);

// in debug mode, cactus uses the dreaded -Wall -Werror combo. This line is a hack to allow compilation with these flags
Expand Down
2 changes: 1 addition & 1 deletion submodules/abPOA
Submodule abPOA updated 96 files
+8 −1 MANIFEST.in
+5 −5 Makefile
+40 −13 README.md
+0 −26 evaluation/NanoSim_abPOA/COPYRIGHT
+0 −642 evaluation/NanoSim_abPOA/LICENSE
+0 −433 evaluation/NanoSim_abPOA/README.md
+0 −16 evaluation/NanoSim_abPOA/pre-trained_models/human_NA12878_DNA_FAB49712_guppy/README.txt
+ evaluation/NanoSim_abPOA/pre-trained_models/human_NA12878_DNA_FAB49712_guppy/training_aligned_reads.pkl
+ evaluation/NanoSim_abPOA/pre-trained_models/human_NA12878_DNA_FAB49712_guppy/training_aligned_region.pkl
+0 −8 evaluation/NanoSim_abPOA/pre-trained_models/human_NA12878_DNA_FAB49712_guppy/training_error_markov_model
+0 −4 evaluation/NanoSim_abPOA/pre-trained_models/human_NA12878_DNA_FAB49712_guppy/training_error_rate.tsv
+0 −212 evaluation/NanoSim_abPOA/pre-trained_models/human_NA12878_DNA_FAB49712_guppy/training_first_match.hist
+ evaluation/NanoSim_abPOA/pre-trained_models/human_NA12878_DNA_FAB49712_guppy/training_ht_length.pkl
+ evaluation/NanoSim_abPOA/pre-trained_models/human_NA12878_DNA_FAB49712_guppy/training_ht_ratio.pkl
+0 −381 evaluation/NanoSim_abPOA/pre-trained_models/human_NA12878_DNA_FAB49712_guppy/training_match_markov_model
+0 −4 evaluation/NanoSim_abPOA/pre-trained_models/human_NA12878_DNA_FAB49712_guppy/training_model_profile
+0 −1 evaluation/NanoSim_abPOA/pre-trained_models/human_NA12878_DNA_FAB49712_guppy/training_reads_alignment_rate
+0 −1 evaluation/NanoSim_abPOA/pre-trained_models/human_NA12878_DNA_FAB49712_guppy/training_strandness_rate
+ evaluation/NanoSim_abPOA/pre-trained_models/human_NA12878_DNA_FAB49712_guppy/training_unaligned_length.pkl
+0 −7 evaluation/NanoSim_abPOA/requirements.txt
+0 −47 evaluation/NanoSim_abPOA/src/bequeath.lua
+0 −482 evaluation/NanoSim_abPOA/src/besthit_to_histogram.py
+0 −55 evaluation/NanoSim_abPOA/src/get_besthit_maf.py
+0 −28 evaluation/NanoSim_abPOA/src/get_primary_sam.py
+0 −172 evaluation/NanoSim_abPOA/src/head_align_tail_dist.py
+0 −63 evaluation/NanoSim_abPOA/src/mixed_model.py
+0 −205 evaluation/NanoSim_abPOA/src/model_fitting.py
+0 −204 evaluation/NanoSim_abPOA/src/model_intron_retention.py
+0 −166 evaluation/NanoSim_abPOA/src/nanopore_transcript_abundance.py
+0 −144 evaluation/NanoSim_abPOA/src/norm_distr.py
+0 −85 evaluation/NanoSim_abPOA/src/pairwise2maf.py
+0 −552 evaluation/NanoSim_abPOA/src/read_analysis.py
+0 −1,510 evaluation/NanoSim_abPOA/src/simulator.py
+0 −6 evaluation/PBSIM_abPOA/AUTHORS
+0 −340 evaluation/PBSIM_abPOA/COPYING
+0 −32 evaluation/PBSIM_abPOA/ChangeLog
+0 −238 evaluation/PBSIM_abPOA/INSTALL
+0 −1 evaluation/PBSIM_abPOA/Makefile.am
+0 −0 evaluation/PBSIM_abPOA/NEWS
+0 −20 evaluation/PBSIM_abPOA/PBSIM.sln
+0 −1 evaluation/PBSIM_abPOA/README
+0 −206 evaluation/PBSIM_abPOA/README.md
+0 −29 evaluation/PBSIM_abPOA/configure.ac
+0 −101 evaluation/PBSIM_abPOA/data/model_qc_ccs
+0 −101 evaluation/PBSIM_abPOA/data/model_qc_clr
+0 −589 evaluation/PBSIM_abPOA/depcomp
+0 −519 evaluation/PBSIM_abPOA/install-sh
+0 −73,643 evaluation/PBSIM_abPOA/sample/sample.fasta
+0 −6,844 evaluation/PBSIM_abPOA/sample/sample.fastq
+0 −2 evaluation/PBSIM_abPOA/src/.gitignore
+0 −9 evaluation/PBSIM_abPOA/src/Makefile.am
+0 −45 evaluation/PBSIM_abPOA/src/PBSIM.cproj
+0 −22 evaluation/PBSIM_abPOA/src/defines.h
+0 −84 evaluation/PBSIM_abPOA/src/helpers.cpp
+0 −8 evaluation/PBSIM_abPOA/src/helpers.h
+0 −7 evaluation/PBSIM_abPOA/src/make_script.sh
+0 −164 evaluation/PBSIM_abPOA/src/output.cpp
+0 −6 evaluation/PBSIM_abPOA/src/output.h
+0 −1,699 evaluation/PBSIM_abPOA/src/pbsim.cpp
+0 −72 evaluation/PBSIM_abPOA/src/structures.h
+0 −30 evaluation/README.md
+0 −25 evaluation/Racon_abPOA/README.md
+0 −153 evaluation/Racon_abPOA/Racon_abPOA_CMakeLists.txt
+0 −563 evaluation/Racon_abPOA/polisher.cpp
+0 −95 evaluation/Racon_abPOA/polisher.hpp
+0 −172 evaluation/Racon_abPOA/window.cpp
+0 −73 evaluation/Racon_abPOA/window.hpp
+0 −257 evaluation/msa_abPOA.c
+0 −223 evaluation/msa_spoa.cpp
+13 −11 example.c
+39 −19 include/abpoa.h
+6 −5 python/README.md
+36 −9 python/cabpoa.pxd
+22 −12 python/pyabpoa.pyx
+10 −7 setup.py
+39 −91 src/abpoa.c
+39 −19 src/abpoa.h
+243 −32 src/abpoa_align.c
+9 −4 src/abpoa_align.h
+144 −142 src/abpoa_graph.c
+5 −3 src/abpoa_graph.h
+665 −0 src/abpoa_seed.c
+25 −0 src/abpoa_seed.h
+653 −0 src/abpoa_seq.c
+23 −0 src/abpoa_seq.h
+205 −0 src/kalloc.c
+38 −0 src/kalloc.h
+615 −0 src/khash.h
+153 −0 src/ksort.h
+250 −0 src/kstring.c
+277 −0 src/kstring.h
+105 −0 src/kvec.h
+0 −94 src/seq.h
+347 −307 src/simd_abpoa_align.c
+9 −2 src/utils.c
+16 −14 sub_example.c

0 comments on commit ed53ff6

Please sign in to comment.