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

Intermediate technical release (required for vidjil-server integration) #18

Open
wants to merge 84 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
84 commits
Select commit Hold shift + click to select a range
4855b0b
Add polymorphic selection of pairwise_block_aligner algorithm.
vasalf Apr 10, 2017
3b49bec
Merge branch 'master' into testing
vasalf Apr 10, 2017
9994b96
Add aligner algorithm selection to the config template
vasalf Apr 10, 2017
94e1b9e
Add InsertionSort-like algorithm to the DAG DP
vasalf Apr 14, 2017
66ec0f6
added lis algorithm
maxkvant May 7, 2017
fe60adc
Fix VJF wrapper
eodus Jun 5, 2017
f4d81d1
VJF: fix
eodus Jun 5, 2017
a15806c
VJF: beautify code
eodus Jun 5, 2017
b7e2dd0
VJF: enable profiling
eodus Jun 5, 2017
6a51503
VJF: properly link profiler
eodus Jun 5, 2017
5b82972
Add disable verify option
eodus Jun 5, 2017
9a3237b
Add google profiler globally
eodus Jun 5, 2017
961225c
added quadric_dp algo; refactor; restored block_alignment_utils.hpp
maxkvant Jun 5, 2017
e4df55b
fx
eodus Jun 5, 2017
7cfbece
VJF: Add profile option
eodus Jun 5, 2017
9c48904
Add profiling to Y
eodus Jun 5, 2017
60234f8
fx
eodus Jun 17, 2017
8211c9d
Add profiling script
eodus Jun 18, 2017
4cc8b88
Merge pull request #2 from yana-safonova/VJF_improvement
vasalf Jun 20, 2017
aaa2b47
polyhashes -> bitmaskhashes; unordered_map -> vector
maxkvant Jun 21, 2017
ed5f960
fix
maxkvant Jun 21, 2017
d1fd5a7
bad hotfix Initialization overhead
maxkvant Jun 23, 2017
b4dce26
Revert "bad hotfix Initialization overhead"
maxkvant Jun 23, 2017
6d6cf2e
Revert "Revert "bad hotfix Initialization overhead""
maxkvant Jun 23, 2017
7de41f9
Revert "Revert "Revert "bad hotfix Initialization overhead"""
maxkvant Jun 23, 2017
7168101
Fix time issue
vasalf Jun 23, 2017
ce1ba5a
Merge branch 'VJF_init_once' of https://github.com/vasalf/ig_repertoi…
maxkvant Jun 24, 2017
cc66866
aligner inits once per thread
maxkvant Jun 25, 2017
44419fc
fix in LisPairwiseBlockAligner
maxkvant Jun 25, 2017
c5ca049
Apply 4cc8b88..ed5f960
vasalf Jun 26, 2017
4724a39
Apply ce1ba5a .. 44419fc
vasalf Jun 26, 2017
1b3bdc9
restrored algorithms/hashes/*
maxkvant Jul 4, 2017
e332148
refactor vj_query_aligner
maxkvant Jul 9, 2017
9afe325
Add cropped germline
slabodkin Dec 5, 2017
d490527
Rework clone set decomposers, add decomposition by V only
slabodkin Dec 6, 2017
ecaf762
Refactor vj class processors
slabodkin Dec 6, 2017
d209dc6
Fix typo in WeightedEdge that led to warning
slabodkin Dec 6, 2017
d85b946
Use Levenshtein distance on CDR3s
slabodkin Dec 6, 2017
092d3a7
Add Masha's decomposition strategy
slabodkin Dec 7, 2017
a1c0078
Merge pull request #6 from ablab/antevolo_update
mchernigovskaya Dec 8, 2017
3117ebd
Fit v segments length to croped germline
Dec 11, 2017
6bd36bf
Add filtration of clones with empty CDR3 after changing J gene
Dec 11, 2017
f598446
Add filtration of clones with invalid annotation after changing J gene
Dec 12, 2017
7d20322
Add num_mismatches for H, K, L and remove --tau
Dec 13, 2017
e78a587
Add J_nucleotides for K and L
Dec 13, 2017
4bc608d
Merge pull request #128 from vasalf/aligner_once
Chushuhuch Dec 26, 2017
64bda2a
Merge pull request #11 from ablab/antevolo_update
mchernigovskaya Mar 5, 2018
7f7b1ef
fix compilation
slabodkin Mar 5, 2018
568a377
fix webserver docker run script
eodus Mar 19, 2018
08c883a
Add mixcr 2.1.9
eodus Mar 19, 2018
7032a39
Add vidjil to tools
eodus Mar 19, 2018
07a6787
Comment empty include
eodus Mar 19, 2018
e676ca6
Use newest mixcr, Add vidjil to bench pipeline
eodus Mar 20, 2018
d84d673
fix vidjil calling parameters
eodus Mar 20, 2018
fa940c9
Use static vidjil build
eodus Mar 20, 2018
6d0b574
vidjil: pass expanded loci arg
eodus Mar 20, 2018
f07ace7
Add vidjil for various window values
eodus Mar 28, 2018
ad2e8a6
Run divan automatically for all test datasets
eodus Mar 28, 2018
6433d49
Add .vidjil output (required for integration with vidjil-server)
eodus Apr 11, 2018
f8b1682
Separate scenario for reference-free plots on reference
eodus Apr 3, 2018
f2a5493
Fix typo in IgQUAST (Cluszer size -> Cluster size)
eodus Apr 3, 2018
9d12692
IgQUAST: plot distance distribution for larger sizes (25 and 50) as well
eodus Apr 3, 2018
ac0a5da
IgQUAST: add missed clusters sizes hist
eodus Apr 3, 2018
bea15f1
IgQUAST: inc max_val in plot_distribution_of_errors_in_reads
eodus Apr 4, 2018
e428398
wip on benchmarking script and reference dataset generator
eodus Mar 28, 2018
a2c8620
Merge pull request #13 from ablab/igquast_update
eodus Apr 13, 2018
4168740
Merge pull request #12 from ablab/vidjil_server_support
eodus Apr 14, 2018
fc9bcd4
Replace spaces with underscores and remove trailing underscores in in…
eodus Apr 18, 2018
6c4e30f
Use default values for clusters missing in DivAn
eodus Apr 18, 2018
3e8c098
Do not use obsolete from_csv
eodus Apr 18, 2018
40ee651
Merge pull request #14 from ablab/vidjil_support_spaces_in_ids_fix
eodus Apr 19, 2018
81dbde9
.vidjil export: use reversed ranks as top values
eodus Apr 23, 2018
3fd22d3
Merge pull request #15 from ablab/vidjil_support_spaces_in_ids_fix
eodus Apr 23, 2018
f03da24
2.vidjil: start ranks from 1 (instead of 0)
eodus Apr 27, 2018
4af594d
Merge pull request #16 from ablab/antevolo
mchernigovskaya May 24, 2018
c57eba7
Merge branch 'testing' into VJF_improvement
Chushuhuch Jul 5, 2018
77b83aa
fix compilation after merge
Chushuhuch Jul 5, 2018
ed8d2be
remove unused and invalid (std::vector > 0) method
Chushuhuch Jul 6, 2018
789d848
fix some gcc and clang tidy warnings
Chushuhuch Jul 10, 2018
8c5086d
rename public fields, make using namespace less global
Chushuhuch Jul 10, 2018
200ea51
Merge branch 'testing' into vasalf-testing
Chushuhuch Jul 10, 2018
e1dbf12
fix merge
Chushuhuch Jul 10, 2018
3e487f6
refactor code to avoid gcc 4.8 internal error
Chushuhuch Jul 13, 2018
2ec3b7d
change default align algorithm
Chushuhuch Jul 13, 2018
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
9 changes: 2 additions & 7 deletions antevolo.py
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,6 @@ def PrintParams(params, log):
log.info(" Output directory:\t\t" + params.output_dir)
log.info(" Number of threads:\t\t" + str(params.num_threads) + "\n")
log.info(" Loci:\t\t\t\t" + params.loci)
log.info(" Max distance between CDR3:\t" + str(params.cdr3_tau))
log.info(" Min number of shared SHMs:\t" + str(params.min_shared_shms))
log.info(" Use SHM model:\t\t" + str(params.model))

Expand Down Expand Up @@ -167,7 +166,8 @@ def ModifyCDRLabelerConfigFile(params, log):
def ModifyVjFinderConfigFile(params, log):
vj_param_dict = dict()
vj_param_dict['loci'] = params.loci
vj_param_dict['germline_dir'] = os.path.join(home_directory, "data/antevolo_germline")
# vj_param_dict['germline_dir'] = os.path.join(home_directory, "data/antevolo_germline")
vj_param_dict['germline_dir'] = os.path.join(home_directory, "data/antevolo_V_crop_allelic")
params.germline_config_file = os.path.join(params.vj_finder_config_dir, "germline_files_config.txt")
vj_param_dict['germline_filenames_config'] = params.germline_config_file
process_cfg.substitute_params(params.vj_finder_config_file, vj_param_dict, log)
Expand Down Expand Up @@ -236,11 +236,6 @@ def main(argv):
optional_args.set_defaults(compare=False)

algorithm_args = parser.add_argument_group("Algorithm arguments")
algorithm_args.add_argument("--tau",
type=int,
default=3,
dest="cdr3_tau",
help="Threshold for construction Hamming graph on CDR3s [default: %(default)d]")
algorithm_args.add_argument("-s", "--min-shared-shms",
type=int,
default=3,
Expand Down
4 changes: 3 additions & 1 deletion configs/antevolo/config.info.template
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,9 @@ algorithm_params {
model 0

similar_cdr3s_params {
num_mismatches 3
num_mismatches_igh 6
num_mismatches_igk 3
num_mismatches_igl 3
num_indels 0
}

Expand Down
3 changes: 2 additions & 1 deletion configs/vj_finder/config.info.template
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ io_params {

algorithm_params {
aligner_params {
aligner_algorithm quadratic_dag; quadratic_dag, lis, quadratic_dp
word_size_v 7
word_size_j 5
min_k_coverage_v 50
Expand All @@ -56,7 +57,7 @@ algorithm_params {
enable_filtering true
left_uncovered_limit 16
right_uncovered_limit 5
min_v_segment_length 250
min_v_segment_length 220
min_j_segment_length 30
min_aligned_length 300
}
Expand Down
54 changes: 54 additions & 0 deletions data/antevolo_V_crop_allelic/human/IG/IGHD.fa
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
>IGHD1-1*01
ggtacaactggaacgac
>IGHD1-14*01
ggtataaccggaaccac
>IGHD1-20*01
ggtataactggaacgac
>IGHD1-26*01
ggtatagtgggagctactac
>IGHD1-7*01
ggtataactggaactac
>IGHD2-15*01
aggatattgtagtggtggtagctgctactcc
>IGHD2-2*01
aggatattgtagtagtaccagctgctatgcc
>IGHD2-21*01
agcatattgtggtggtgattgctattcc
>IGHD2-8*01
aggatattgtactaatggtgtatgctatacc
>IGHD3-10*01
gtattactatggttcggggagttattataac
>IGHD3-16*01
gtattatgattacgtttgggggagttatgcttatacc
>IGHD3-22*01
gtattactatgatagtagtggttattactac
>IGHD3-3*01
gtattacgatttttggagtggttattatacc
>IGHD3-9*01
gtattacgatattttgactggttattataac
>IGHD4-11*01
tgactacagtaactac
>IGHD4-17*01
tgactacggtgactac
>IGHD4-23*01
tgactacggtggtaactcc
>IGHD4-4*01
tgactacagtaactac
>IGHD5-12*01
gtggatatagtggctacgattac
>IGHD5-18*01
gtggatacagctatggttac
>IGHD5-24*01
gtagagatggctacaattac
>IGHD5-5*01
gtggatacagctatggttac
>IGHD6-13*01
gggtatagcagcagctggtac
>IGHD6-19*01
gggtatagcagtggctggtac
>IGHD6-25*01
gggtatagcagcggctac
>IGHD6-6*01
gagtatagcagctcgtcc
>IGHD7-27*01
ctaactgggga
13 changes: 13 additions & 0 deletions data/antevolo_V_crop_allelic/human/IG/IGHJ.fa
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
>IGHJ1*01
gctgaatacttccagcactggggccagggcaccctggtcaccgtctcctcag
>IGHJ2*01
ctactggtacttcgatctctggggccgtggcaccctggtcactgtctcctcag
>IGHJ3*01
tgatgcttttgatgtctggggccaagggacaatggtcaccgtctcttcag
>IGHJ4*01
actactttgactactggggccaaggaaccctggtcaccgtctcctcag
>IGHJ5*01
acaactggttcgactcctggggccaaggaaccctggtcaccgtctcctcag
>IGHJ6*01
attactactactactacggtatggacgtctggggcaaagggaccacggtcaccgtctcctcag

Loading