Merge branch 'master' into develop

# Conflicts: # pom.xml # src/main/java/com/milaboratory/mixcr/vdjaligners/VDJCAlignerParameters.java # src/test/java/com/milaboratory/mixcr/vdjaligners/VDJCAlignerParametersTest.java
milaboratory · Mar 30, 2018 · 39cea2e · 39cea2e
2 parents 03f7e49 + 6f408fb
commit 39cea2e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/pom.xml b/pom.xml
@@ -32,7 +32,7 @@
 
     <groupId>com.milaboratory</groupId>
     <artifactId>mixcr</artifactId>
-    <version>2.1.1-SNAPSHOT</version>
+    <version>2.2-SNAPSHOT</version>
     <packaging>jar</packaging>
     <name>MiXCR</name>
 

diff --git a/src/test/java/com/milaboratory/mixcr/vdjaligners/VDJCAlignerParametersTest.java b/src/test/java/com/milaboratory/mixcr/vdjaligners/VDJCAlignerParametersTest.java
@@ -59,7 +59,7 @@ public void test1() throws Exception {
                         new KAlignerParameters(5, false, false,
                                 1.5f, 0.75f, 1.0f, -0.1f, -0.3f, 4, 10, 15, 2, -10, 40.0f, 0.87f, 7,
                                 LinearGapAlignmentScoring.getNucleotideBLASTScoring())),
-                VJAlgnmentOrder.JThenV,
+                VJAlignmentOrder.JThenV,
                 false, false,
                 120.0f, 5, 0.7f, false, false, false, PairedEndReadsLayout.Opposite, new MergerParameters(
                 QualityMergingAlgorithm.SumSubtraction, null, 12, null, 0.12, Unweighted), false, 5, 120, 10, true);