[med-svn] [Git][med-team/beagle][upstream] New upstream version 5.1-191120+dfsg

[Dylan Aïssi]

Dylan Aïssi pushed to branch upstream at Debian Med / beagle


Commits:
51693017 by Dylan Aïssi at 2019-11-21T06:06:29Z
New upstream version 5.1-191120+dfsg
- - - - -


2 changed files:

- main/Main.java
- vcf/RefIt.java


Changes:

=====================================
main/Main.java
=====================================
@@ -65,8 +65,8 @@ public class Main {
      * The program name and version.
      */
     public static final String VERSION = "(version 5.1)";
-    public static final String PROGRAM = "beagle.08Nov19.3ec.jar";
-    public static final String COMMAND = "java -jar beagle.08Nov19.3ec.jar";
+    public static final String PROGRAM = "beagle.20Nov19.573.jar";
+    public static final String COMMAND = "java -jar beagle.20Nov19.573.jar";
 
     /**
      * The copyright string.
@@ -78,7 +78,7 @@ public class Main {
      */
     public static final String SHORT_HELP = Main.PROGRAM + " " + VERSION
             + Const.nl + Main.COPYRIGHT
-            + Const.nl + "Enter \"java -jar beagle.08Nov19.3ec.jar\" to "
+            + Const.nl + "Enter \"java -jar beagle.20Nov19.573.jar\" to "
             + "list command line argument";
 
     private final Par par;


=====================================
vcf/RefIt.java
=====================================
@@ -69,6 +69,8 @@ public class RefIt implements SampleFileIt<RefGTRec> {
     private final List<RefGTRec> midBuffer;
     private final Deque<RefGTRec> recBuffer;
     private final SeqCoder3 seqCoder;
+    private final int maxSeqCodedAlleles;
+    private final int maxSeqCodingMajorCnt;
 
     private final ExecutorService es;
 
@@ -141,6 +143,8 @@ public class RefIt implements SampleFileIt<RefGTRec> {
         } ;
         this.markerFilter = markerFilter;
         this.seqCoder = new SeqCoder3(vcfHeader.samples());
+        this.maxSeqCodedAlleles = Math.min(seqCoder.maxNSeq(), SeqCoder3.MAX_NALLELES);
+        this.maxSeqCodingMajorCnt = maxSeqCodingMajorCnt(vcfHeader.samples());
 
         this.lastChrom = -1;
         this.stringBuffer = new ArrayBlockingQueue<>(1);
@@ -152,6 +156,11 @@ public class RefIt implements SampleFileIt<RefGTRec> {
         fillEmissionBuffer();
     }
 
+    private int maxSeqCodingMajorCnt(Samples samples) {
+        int nHaps = samples.nSamples() << 1;
+        return (int) Math.floor(nHaps*SeqCoder3.COMPRESS_FREQ_THRESHOLD - 1);
+    }
+
     private static void startFileReadingThread(ExecutorService es,
             ArrayBlockingQueue<String[]> q, String firstRec, FileIt<String> it,
             int bufferSize) {
@@ -308,9 +317,9 @@ public class RefIt implements SampleFileIt<RefGTRec> {
         return sb.toString();
     }
 
-    private static boolean applySeqCoding(RefGTRec rec) {
+    private boolean applySeqCoding(RefGTRec rec) {
         assert rec.isAlleleCoded();
-        if (rec.marker().nAlleles() > SeqCoder3.MAX_NALLELES) {
+        if (rec.marker().nAlleles() >= maxSeqCodedAlleles) {
             return false;
         }
         int nHaps = rec.size();
@@ -321,6 +330,6 @@ public class RefIt implements SampleFileIt<RefGTRec> {
                 majCnt -= rec.alleleCount(a);
             }
         }
-        return (SeqCoder3.COMPRESS_FREQ_THRESHOLD >=(1.0f + majCnt)/nHaps);
+        return majCnt<=maxSeqCodingMajorCnt;
     }
 }



View it on GitLab: https://salsa.debian.org/med-team/beagle/commit/516930171ac0954afead01ef7c14db5c310caf0b

-- 
View it on GitLab: https://salsa.debian.org/med-team/beagle/commit/516930171ac0954afead01ef7c14db5c310caf0b
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20191121/a94c9a75/attachment-0001.html>