From 6249550b517e4e9dc8693eb10a018f3c2aed92d7 Mon Sep 17 00:00:00 2001 From: Melanie Kirsche Date: Tue, 10 Aug 2021 11:28:51 -0400 Subject: [PATCH] Fix bug where nonlinear_dist is not being properly enabled --- README.md | 2 +- jasmine.jar | Bin 87169 -> 87200 bytes jasmine_igv.jar | Bin 87183 -> 87214 bytes jasmine_iris.jar | Bin 62002 -> 62002 bytes jasmine_split.jar | Bin 87172 -> 87203 bytes src/Settings.java | 4 ++-- src/VariantInput.java | 2 +- 7 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 7448fa2..e3bdf04 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ JASMINE: Jointly Accurate Sv Merging with Intersample Network Edges -Version 1.1.3 +Version 1.1.4 This tool is used to merge structural variants (SVs) across samples. Each sample has a number of SV calls, consisting of position information (chromosome, start, end, length), type and strand information, and a number of other values. Jasmine represents the set of all SVs across samples as a network, and uses a modified minimum spanning forest algorithm to determine the best way of merging the variants such that each merged variants represents a set of analogous variants occurring in different samples. diff --git a/jasmine.jar b/jasmine.jar index a779861d2f0b056206b91b483f6234c704a8db89..9fd6fde1615f780b55f7c7fc9d2771bc1a4b7423 100644 GIT binary patch delta 4363 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 wycv(PDWiz~gl_ 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 F{{dE4!Q}t| delta 4373 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 diff --git a/jasmine_iris.jar b/jasmine_iris.jar index 0395a0866f3e559e445d0fbeec910cc103046470..9c0db3a4799406c1d20b811344a7bafd137d0490 100644 GIT binary patch delta 619 zcmdn=gn82wX1)M#W)=|!4h{~6i&0#`6ZtGzz_j-?mJ2}s#-|54z>LkSIF*HBKA!DDi_#@&HI%$%R*RX4w7sT)?_ya7Kpm*UOQN!VgYxAA*|w* zOFR&kXCXTagcVY10o5^~vWO9)m#w;t10vhd{F@WPs_)$jHP2$QJrhK%dg=?PDe1Gg zpsdn)Z@3|{sjH?z?ft*^9aQhf!xxz$vd50=vqM-v&;5eB>icb1sI0?%bC?|u7emxd zR(fd;)-XBtr5)Ivljp-24_|shMD$+SLl}jx0wIiJubdzZp4Sc#?E$YlAdEY&Js=E? zHzp7@32*EnB8%VHKp2l<4CS}B5RsI(W)Q{m-g-kAZ{ONMr1al;Ll|}MTp^6(@1Rng z?=2uAuJ7F;j0x{eA&isnYatA;555q_><>;5#={Se5Qf@ENV=Jv{1Ga(@*~tcZ$G*M E0JY%u5C8xG delta 619 zcmdn=gn82wX1)M#W)=|!4h{|mro0b96ZtGzz_j-?Fun2VK@Kou^D0gyCJ5^ScOx@| z70Pc673&cUV}po26Tiv@VeMDiEDK?kIY>ffC%ZYYK*X+l?O=tlCI{RRhOmlLF7ZHE zo`vjCbs?n|P}YRXB1VWTTXh-KRSnI*IU!>8y<4H?SxmNvx~h8W3#i`oSzJ(7>AW}G z5FM$jra|rfzxN$f@5jRzp?*7dT%R4H?&rB*P*;7w?FyB3xNi=#KPB;~CcgfZ`}H-z!_Ez~{w@1P=e?_42L$KOGvINw`9L|osyLl_g@ sn?e{T-`7GIULSlRjM*QcZhrW|5h9}Y5t42uCx3)Wt^5e}&fAZ!0Hb06u>b%7 diff --git a/jasmine_split.jar b/jasmine_split.jar index 8c9c1e4abc429811aee1ef96d114facab9b2ef65..a0e59c2b337f55896d19424b744cce28aa24fc63 100644 GIT binary patch delta 4402 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 diff --git a/src/Settings.java b/src/Settings.java index 629bc54..311a21b 100644 --- a/src/Settings.java +++ b/src/Settings.java @@ -78,7 +78,7 @@ public class Settings { static void usage() { System.out.println(); - System.out.println("Jasmine version 1.1.3"); + System.out.println("Jasmine version 1.1.4"); System.out.println("Usage: jasmine [args]"); System.out.println(" Example: jasmine file_list=filelist.txt out_file=out.vcf"); System.out.println(); @@ -185,7 +185,7 @@ static void parseArgs(String[] args) throws Exception { if(args.length == 1 && (args[0].equalsIgnoreCase("--version") || args[0].equalsIgnoreCase("-v"))) { - System.out.println("Jasmine version 1.1.3"); + System.out.println("Jasmine version 1.1.4"); System.exit(0); } if(args.length == 0) diff --git a/src/VariantInput.java b/src/VariantInput.java index 2b087fc..a4f9e83 100644 --- a/src/VariantInput.java +++ b/src/VariantInput.java @@ -187,7 +187,7 @@ else if(Settings.PER_SAMPLE_DISTS != null && Settings.PER_SAMPLE_DISTS.length > } // Next, check if there is a length-based threshold - else if(Settings.MAX_DIST_LINEAR > 0) + else if(Settings.USE_LINEAR_THRESHOLD && Settings.MAX_DIST_LINEAR > 0) { maxDist = (int)(Settings.MAX_DIST_LINEAR * Math.abs(entry.getLength()) + 0.5); if(Settings.MAX_DIST_SET)