by-hand merge of needed code from custom vertex branch
This commit is contained in:
@@ -15,32 +15,33 @@ public class GraphWithMapData implements java.io.Serializable {
|
||||
private Integer alphaCount;
|
||||
private Integer betaCount;
|
||||
private final Map<Integer, Integer> distCellsMapAlphaKey;
|
||||
private final Map<Integer, Integer> plateVtoAMap;
|
||||
private final Map<Integer, Integer> plateVtoBMap;
|
||||
private final Map<Integer, Integer> plateAtoVMap;
|
||||
private final Map<Integer, Integer> plateBtoVMap;
|
||||
private final Map<Integer, Integer> alphaWellCounts;
|
||||
private final Map<Integer, Integer> betaWellCounts;
|
||||
// private final Map<Integer, Integer> plateVtoAMap;
|
||||
// private final Map<Integer, Integer> plateVtoBMap;
|
||||
// private final Map<Integer, Integer> plateAtoVMap;
|
||||
// private final Map<Integer, Integer> plateBtoVMap;
|
||||
// private final Map<Integer, Integer> alphaWellCounts;
|
||||
// private final Map<Integer, Integer> betaWellCounts;
|
||||
private final Duration time;
|
||||
|
||||
public GraphWithMapData(SimpleWeightedGraph graph, Integer numWells, Integer[] wellConcentrations,
|
||||
Integer alphaCount, Integer betaCount,
|
||||
Map<Integer, Integer> distCellsMapAlphaKey, Map<Integer, Integer> plateVtoAMap,
|
||||
Map<Integer,Integer> plateVtoBMap, Map<Integer, Integer> plateAtoVMap,
|
||||
Map<Integer, Integer> plateBtoVMap, Map<Integer, Integer> alphaWellCounts,
|
||||
Map<Integer, Integer> betaWellCounts, Duration time) {
|
||||
Map<Integer, Integer> distCellsMapAlphaKey, Duration time){
|
||||
|
||||
// Map<Integer, Integer> plateVtoAMap, Integer alphaCount, Integer betaCount,
|
||||
// Map<Integer,Integer> plateVtoBMap, Map<Integer, Integer> plateAtoVMap,
|
||||
// Map<Integer, Integer> plateBtoVMap, Map<Integer, Integer> alphaWellCounts,
|
||||
// Map<Integer, Integer> betaWellCounts,) {
|
||||
this.graph = graph;
|
||||
this.numWells = numWells;
|
||||
this.wellPopulations = wellConcentrations;
|
||||
this.alphaCount = alphaCount;
|
||||
this.betaCount = betaCount;
|
||||
this.distCellsMapAlphaKey = distCellsMapAlphaKey;
|
||||
this.plateVtoAMap = plateVtoAMap;
|
||||
this.plateVtoBMap = plateVtoBMap;
|
||||
this.plateAtoVMap = plateAtoVMap;
|
||||
this.plateBtoVMap = plateBtoVMap;
|
||||
this.alphaWellCounts = alphaWellCounts;
|
||||
this.betaWellCounts = betaWellCounts;
|
||||
// this.plateVtoAMap = plateVtoAMap;
|
||||
// this.plateVtoBMap = plateVtoBMap;
|
||||
// this.plateAtoVMap = plateAtoVMap;
|
||||
// this.plateBtoVMap = plateBtoVMap;
|
||||
// this.alphaWellCounts = alphaWellCounts;
|
||||
// this.betaWellCounts = betaWellCounts;
|
||||
this.time = time;
|
||||
}
|
||||
|
||||
@@ -56,41 +57,41 @@ public class GraphWithMapData implements java.io.Serializable {
|
||||
return wellPopulations;
|
||||
}
|
||||
|
||||
public Integer getAlphaCount() {
|
||||
return alphaCount;
|
||||
}
|
||||
|
||||
public Integer getBetaCount() {
|
||||
return betaCount;
|
||||
}
|
||||
// public Integer getAlphaCount() {
|
||||
// return alphaCount;
|
||||
// }
|
||||
//
|
||||
// public Integer getBetaCount() {
|
||||
// return betaCount;
|
||||
// }
|
||||
|
||||
public Map<Integer, Integer> getDistCellsMapAlphaKey() {
|
||||
return distCellsMapAlphaKey;
|
||||
}
|
||||
|
||||
public Map<Integer, Integer> getPlateVtoAMap() {
|
||||
return plateVtoAMap;
|
||||
}
|
||||
|
||||
public Map<Integer, Integer> getPlateVtoBMap() {
|
||||
return plateVtoBMap;
|
||||
}
|
||||
|
||||
public Map<Integer, Integer> getPlateAtoVMap() {
|
||||
return plateAtoVMap;
|
||||
}
|
||||
|
||||
public Map<Integer, Integer> getPlateBtoVMap() {
|
||||
return plateBtoVMap;
|
||||
}
|
||||
|
||||
public Map<Integer, Integer> getAlphaWellCounts() {
|
||||
return alphaWellCounts;
|
||||
}
|
||||
|
||||
public Map<Integer, Integer> getBetaWellCounts() {
|
||||
return betaWellCounts;
|
||||
}
|
||||
// public Map<Integer, Integer> getPlateVtoAMap() {
|
||||
// return plateVtoAMap;
|
||||
// }
|
||||
//
|
||||
// public Map<Integer, Integer> getPlateVtoBMap() {
|
||||
// return plateVtoBMap;
|
||||
// }
|
||||
//
|
||||
// public Map<Integer, Integer> getPlateAtoVMap() {
|
||||
// return plateAtoVMap;
|
||||
// }
|
||||
//
|
||||
// public Map<Integer, Integer> getPlateBtoVMap() {
|
||||
// return plateBtoVMap;
|
||||
// }
|
||||
//
|
||||
// public Map<Integer, Integer> getAlphaWellCounts() {
|
||||
// return alphaWellCounts;
|
||||
// }
|
||||
//
|
||||
// public Map<Integer, Integer> getBetaWellCounts() {
|
||||
// return betaWellCounts;
|
||||
// }
|
||||
|
||||
public Duration getTime() {
|
||||
return time;
|
||||
|
||||
Reference in New Issue
Block a user