From 3ccee9891bd827a343a199c858d0d02ad19c8298 Mon Sep 17 00:00:00 2001
From: efischer <ej@eugenefischer.com>
Date: Wed, 23 Feb 2022 08:12:48 -0600
Subject: [PATCH] change "concentrations" to "populations" for consistency

---
 src/main/java/GraphWithMapData.java | 8 ++++----
 src/main/java/Simulator.java        | 7 +++----
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/main/java/GraphWithMapData.java b/src/main/java/GraphWithMapData.java
index 2f59e5a..3795190 100644
--- a/src/main/java/GraphWithMapData.java
+++ b/src/main/java/GraphWithMapData.java
@@ -11,7 +11,7 @@ public class GraphWithMapData implements java.io.Serializable {
     private String sourceFilename;
     private final SimpleWeightedGraph graph;
     private Integer numWells;
-    private Integer[] wellConcentrations;
+    private Integer[] wellPopulations;
     private Integer alphaCount;
     private Integer betaCount;
     private final Map<Integer, Integer> distCellsMapAlphaKey;
@@ -31,7 +31,7 @@ public class GraphWithMapData implements java.io.Serializable {
                             Map<Integer, Integer> betaWellCounts, Duration time) {
         this.graph = graph;
         this.numWells = numWells;
-        this.wellConcentrations = wellConcentrations;
+        this.wellPopulations = wellConcentrations;
         this.alphaCount = alphaCount;
         this.betaCount = betaCount;
         this.distCellsMapAlphaKey = distCellsMapAlphaKey;
@@ -52,8 +52,8 @@ public class GraphWithMapData implements java.io.Serializable {
         return numWells;
     }
 
-    public Integer[] getWellConcentrations() {
-        return wellConcentrations;
+    public Integer[] getWellPopulations() {
+        return wellPopulations;
     }
 
     public Integer getAlphaCount() {
diff --git a/src/main/java/Simulator.java b/src/main/java/Simulator.java
index 0b0702f..93d0a62 100644
--- a/src/main/java/Simulator.java
+++ b/src/main/java/Simulator.java
@@ -1,4 +1,3 @@
-import org.jgrapht.Graph;
 import org.jgrapht.alg.interfaces.MatchingAlgorithm;
 import org.jgrapht.alg.matching.MaximumWeightBipartiteMatching;
 import org.jgrapht.generate.SimpleWeightedBipartiteGraphMatrixGenerator;
@@ -248,9 +247,9 @@ public class Simulator {
         //rate of pairing error
         double pairingErrorRate = (double) falseCount / (trueCount + falseCount);
         BigDecimal pairingErrorRateTrunc = new BigDecimal(pairingErrorRate, mc);
-        //get list of well concentrations
-        Integer[] wellPopulations = data.getWellConcentrations();
-        //make string out of concentrations list
+        //get list of well populations
+        Integer[] wellPopulations = data.getWellPopulations();
+        //make string out of populations list
         StringBuilder populationsStringBuilder = new StringBuilder();
         populationsStringBuilder.append(wellPopulations[0].toString());
         for(int i = 1; i < wellPopulations.length; i++){