Add missing filtering code
This commit is contained in:
Binary file not shown.
@@ -163,7 +163,16 @@ public class Simulator {
|
|||||||
Map<Integer, Integer> betaWellCounts = data.getBetaWellCounts();
|
Map<Integer, Integer> betaWellCounts = data.getBetaWellCounts();
|
||||||
SimpleWeightedGraph<Integer, DefaultWeightedEdge> graph = data.getGraph();
|
SimpleWeightedGraph<Integer, DefaultWeightedEdge> graph = data.getGraph();
|
||||||
|
|
||||||
|
//Filter by overlap size
|
||||||
|
if(verbose){System.out.println("Eliminating edges with weights much less than occupancy values");}
|
||||||
|
filterByOverlapSize(graph, alphaWellCounts, betaWellCounts, plateVtoAMap, plateVtoBMap, minOverlapPercent);
|
||||||
|
if(verbose){System.out.println("Edges with weights much less than occupancy values set to 0.0");}
|
||||||
|
|
||||||
|
//Filter by relative occupancy
|
||||||
|
if(verbose){System.out.println("Eliminating edges between vertices of massively different occupancy");}
|
||||||
|
filterByRelativeOccupancy(graph, alphaWellCounts, betaWellCounts, plateVtoAMap, plateVtoBMap,
|
||||||
|
maxOccupancyDifference);
|
||||||
|
if(verbose){System.out.println("Edges between vertices of massively different occupancy set to 0.0");}
|
||||||
//Find Maximum Weighted Matching
|
//Find Maximum Weighted Matching
|
||||||
|
|
||||||
// if(verbose){System.out.println("Finding maximum weighted matching");}
|
// if(verbose){System.out.println("Finding maximum weighted matching");}
|
||||||
@@ -361,7 +370,6 @@ public class Simulator {
|
|||||||
if(verbose){System.out.println("Over- and under-weight edges set to 0.0");}
|
if(verbose){System.out.println("Over- and under-weight edges set to 0.0");}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
//Filter by overlap size
|
//Filter by overlap size
|
||||||
if(verbose){System.out.println("Eliminating edges with weights much less than occupancy values");}
|
if(verbose){System.out.println("Eliminating edges with weights much less than occupancy values");}
|
||||||
filterByOverlapSize(graph, alphaWellCounts, betaWellCounts, plateVtoAMap, plateVtoBMap, minOverlapPercent);
|
filterByOverlapSize(graph, alphaWellCounts, betaWellCounts, plateVtoAMap, plateVtoBMap, minOverlapPercent);
|
||||||
|
|||||||
Reference in New Issue
Block a user