Merge pull request #1066 from milaboratory/alleles_fix

don't cut features on export library
milaboratory · Apr 5, 2023 · 4a2b973 · 4a2b973
2 parents a8a222c + 0ffb6d6
commit 4a2b973
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 25 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -134,10 +134,10 @@ val toObfuscate: Configuration by configurations.creating {
 
 val obfuscationLibs: Configuration by configurations.creating
 
-val mixcrAlgoVersion = "4.3.0-41-develop"
-val milibVersion = "2.4.0-5-master"
+val mixcrAlgoVersion = "4.3.0-46-allele_fix"
+val milibVersion = "2.4.0-7-master"
 val mitoolVersion = "1.7.0-5-main"
-val repseqioVersion = "1.8.0-11-master"
+val repseqioVersion = "1.8.0-20-master"
 
 val picocliVersion = "4.6.3"
 val jacksonBomVersion = "2.14.2"

diff --git a/src/main/kotlin/com/milaboratory/mixcr/cli/CommandFindAlleles.kt b/src/main/kotlin/com/milaboratory/mixcr/cli/CommandFindAlleles.kt
@@ -445,28 +445,12 @@ class CommandFindAlleles : MiXCRCommandWithOutputs() {
             primaryGenes
                 .sortedBy { it.name }
                 .forEach { gene ->
-                    val geneFeaturesForFoundAllele =
-                        gene.data.meta[metaKey.alleleMutationsReliableRegion]
-                            ?.map { GeneFeature.parse(it) }
-                            ?.sorted()
-                    when {
-                        geneFeaturesForFoundAllele != null -> {
-                            geneFeaturesForFoundAllele.forEach { geneFeature ->
-                                val range = gene.referencePoints.getRange(geneFeature)
-                                val sequence = gene.getFeature(geneFeature)
-                                writer.write(FastaRecord(id++, "${gene.name} $range $geneFeature", sequence))
-                            }
-                        }
-
-                        else -> {
-                            val range = Range(
-                                gene.referencePoints.firstAvailablePosition,
-                                gene.referencePoints.lastAvailablePosition
-                            )
-                            val sequence = gene.getSequence(range)
-                            writer.write(FastaRecord(id++, "${gene.name} $range", sequence))
-                        }
-                    }
+                    val range = Range(
+                        gene.referencePoints.firstAvailablePosition,
+                        gene.referencePoints.lastAvailablePosition
+                    )
+                    val sequence = gene.getSequence(range)
+                    writer.write(FastaRecord(id++, "${gene.name} $range", sequence))
                 }
         }
     }

diff --git a/src/main/resources/parameters/find_alleles_parameters.json b/src/main/resources/parameters/find_alleles_parameters.json
@@ -8,6 +8,7 @@
       "useClonesWithCountGreaterThen": 1
     },
     "searchAlleleParameterForFirstRound": {
+      "clonesToSearchCap": 10000,
       "minClonesCountForAlleleSearch": 20,
       "topByScore": 0.3,
       "coefficientForNaiveClonesInScore": 2.0,
@@ -21,6 +22,7 @@
       "minCountOfNaiveClonesToAddAllele": 0
     },
     "searchAlleleParameterForSecondRound": {
+      "clonesToSearchCap": 10000,
       "minClonesCountForAlleleSearch": 10,
       "topByScore": 0.65,
       "coefficientForNaiveClonesInScore": 2.0,