diff --git a/out/artifacts/TCellSim_jar/TCellSim.jar b/out/artifacts/TCellSim_jar/TCellSim.jar index 8fa4e30..4c9b32b 100644 Binary files a/out/artifacts/TCellSim_jar/TCellSim.jar and b/out/artifacts/TCellSim_jar/TCellSim.jar differ diff --git a/src/main/java/Simulator.java b/src/main/java/Simulator.java index 0befa2b..73c7767 100644 --- a/src/main/java/Simulator.java +++ b/src/main/java/Simulator.java @@ -163,7 +163,16 @@ public class Simulator { Map betaWellCounts = data.getBetaWellCounts(); SimpleWeightedGraph 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 // 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");} - //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);