Skip to content

Commit

Permalink
Remove abandoned filter project and unneeded build dependency (#7950)
Browse files Browse the repository at this point in the history
  • Loading branch information
TedBrookings authored Jul 19, 2022
1 parent ace7821 commit 3749fa7
Show file tree
Hide file tree
Showing 10 changed files with 5 additions and 1,264 deletions.
3 changes: 0 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -363,9 +363,6 @@ dependencies {
// Required for COSMIC Funcotator data source:
implementation 'org.xerial:sqlite-jdbc:3.36.0.3'

// Required for SV Discovery machine learning
implementation group: 'biz.k11i', name: 'xgboost-predictor', version: '0.3.0'

// natural sort
implementation('net.grey-panther:natural-comparator:1.1')
implementation('com.fasterxml.jackson.module:jackson-module-scala_' + scalaVersion + ':2.9.8')
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -118,12 +118,7 @@ public static class FindBreakpointEvidenceSparkArgumentCollection implements Ser
fullName = "sv-evidence-filter-threshold-probability")
public double svEvidenceFilterThresholdProbability = 0.92;

@Argument(doc = "Filter method for selecting evidence to group into Assembly Intervals",
fullName = "sv-evidence-filter-type")
public SvEvidenceFilterType svEvidenceFilterType = SvEvidenceFilterType.DENSITY;

// ---------- options -----------

@Argument(doc = "Write GFA representation of assemblies in fastq-dir.", fullName = "write-gfas")
public boolean writeGFAs = false;

Expand Down Expand Up @@ -267,8 +262,6 @@ public void validate() {
}
}

public enum SvEvidenceFilterType {DENSITY, XGBOOST}

public static class DiscoverVariantsFromContigAlignmentsArgumentCollection implements Serializable {
private static final long serialVersionUID = 1L;

Expand Down

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -1115,17 +1115,10 @@ private static Iterator<BreakpointEvidence> getFilter(
final StructuralVariationDiscoveryArgumentCollection.FindBreakpointEvidenceSparkArgumentCollection params,
final PartitionCrossingChecker partitionCrossingChecker
) {
switch(params.svEvidenceFilterType) {
case DENSITY:
return new BreakpointDensityFilter(
evidenceItr, readMetadata, params.minEvidenceWeightPerCoverage,
params.minCoherentEvidenceWeightPerCoverage, partitionCrossingChecker, params.minEvidenceMapQ
);
case XGBOOST:
return new XGBoostEvidenceFilter(evidenceItr, readMetadata, params, partitionCrossingChecker);
default:
throw new IllegalStateException("Unknown svEvidenceFilterType: " + params.svEvidenceFilterType);
}
return new BreakpointDensityFilter(
evidenceItr, readMetadata, params.minEvidenceWeightPerCoverage,
params.minCoherentEvidenceWeightPerCoverage, partitionCrossingChecker, params.minEvidenceMapQ
);
}

private static void writeTargetLinks(final Broadcast<ReadMetadata> broadcastMetadata,
Expand Down
Loading

0 comments on commit 3749fa7

Please sign in to comment.