@dra2020/district-analytics 2.0.1 → 2.0.4

package/dist/district-analytics.js

@@ -429,8 +429,8 @@ class Districts {
                 });
                 // COMPUTE DERIVED VALUES
                 // Population deviation % and equal population (boolean) by district.
-                // Don't set the values for the dummy unassigned district.
-                let popDevPct = null;
+                // Default the value for the dummy unassigned district to 0%.
+                let popDevPct = 0 / targetSize;
                 if (i > 0) {
                     popDevPct = (totalPop - targetSize) / targetSize;
                     bEqualPop = (popDevPct <= deviationThreshold);
@@ -1447,17 +1447,22 @@ const U = __importStar(__webpack_require__(/*! ./utils */ "./src/utils.ts"));
 const D = __importStar(__webpack_require__(/*! ./_data */ "./src/_data.ts"));
 function doPopulationDeviation(s, bLog = false) {
     let test = s.getTest(4 /* PopulationDeviation */);
-    // Compute the min, max, and average district populations,
-    // excluding the dummy 'unassigned' 0 and N+1 summary "districts."
+    let targetSize = s.state.totalPop / s.state.nDistricts;
+    // Compute the min & max district populations
+    // ... excluding the dummy the 'unassigned' 0 and N+1 summary "districts"
     let totPopByDistrict = s.districts.statistics[D.DistrictField.TotalPop];
     totPopByDistrict = totPopByDistrict.slice(1, -1);
-    let min = U.minArray(totPopByDistrict);
-    let max = U.maxArray(totPopByDistrict);
-    let total = U.sumArray(totPopByDistrict);
-    // Calculate the raw population deviation.
-    // The target size is the average population.
-    let avg = total / s.state.nDistricts;
-    let popDev = (max - min) / avg;
+    // Remove empty districts
+    totPopByDistrict = totPopByDistrict.filter(x => x > 0);
+    let min = 0;
+    let max = 0;
+    // If there's more than 1 non-empty district, calculate a non-zero deviation
+    if (totPopByDistrict.length > 1) {
+        min = U.minArray(totPopByDistrict);
+        max = U.maxArray(totPopByDistrict);
+    }
+    // Calculate the raw population deviation
+    let popDev = (max - min) / targetSize;
     // Round the raw value to the desired level of precision
     popDev = U.trim(popDev);
     // Populate the test entry
@@ -1467,7 +1472,7 @@ function doPopulationDeviation(s, bLog = false) {
     let totalPop = s.districts.statistics[D.DistrictField.TotalPop];
     let popDevPct = s.districts.statistics[D.DistrictField.PopDevPct];
     let summaryRow = s.districts.numberOfRows() - 1;
-    totalPop[summaryRow] = avg; // aka "target size"
+    totalPop[summaryRow] = targetSize;
     popDevPct[summaryRow] = popDev;
     return test;
 }
@@ -2455,8 +2460,10 @@ const testDefns = {
 //   Raw numeric analytics, such as population deviation, compactness, etc. are
 //   normalized as part of creating a scorecard, so the code to normalize results
 //   is encapsulated here.
-// Configure scale parameters for normalizing each raw test result
-//   This needs to be separate from the scorecard configuration info above,
+// Configure scale parameters for normalizing each raw test result.
+//   Scales consist of a minimum & a maximum *raw* value. If the values get
+//   inverted (to make bigger better), these will switch.
+//   This process needs to be separate from the test configuration info above,
 //   because some scales need access to the analytics session object.
 function doConfigureScales(s) {
     // Scale defn for PopulationDeviation