@dra2020/district-analytics 11.2.0 → 11.4.0

package/dist/district-analytics.js

@@ -1144,15 +1144,14 @@ function doFindCountiesSplitUnexpectedly(s, bLog = false) {
     // FIRST, ANALYZE THE COUNTY SPLITTING FOR THE PLAN
     // Get the county-district pivot ("splits")
     let countiesByDistrict = s.districts.table.countySplits;
-    // let countiesByDistrict = s.districts.statistics[D.DistrictField.CountySplits];
-    // countiesByDistrict = countiesByDistrict.slice(1, -1);
     // Find the single-county districts, i.e., districts NOT split across counties.
     // Ignore the dummy unassigned 0 and N+1 summary "districts."
     let singleCountyDistricts = [];
     for (let d = 1; d <= s.state.nDistricts; d++) {
         // See if there's only one county partition
+        // Ignore the dummy unassigned 0 "county."
         let nCountiesInDistrict = 0;
-        for (let c = 0; c < s.counties.nCounties; c++) {
+        for (let c = 1; c <= s.counties.nCounties; c++) {
             // Guard against empty district
             if (countiesByDistrict[d]) {
                 if (countiesByDistrict[d][c] > 0) {
@@ -1175,9 +1174,11 @@ function doFindCountiesSplitUnexpectedly(s, bLog = false) {
     let nPartitionsOverall = 0;
     let splitCounties = new Set(); // The counties that are split across districts
     let totalAffected = 0; // The total population affected by those splits
-    for (let c = 0; c < s.counties.nCounties; c++) {
+    // Ignore the dummy unassigned 0 "county."
+    for (let c = 1; c <= s.counties.nCounties; c++) {
         let nCountyParts = 0;
         let subtotal = 0;
+        // Ignore the dummy unassigned 0 and N+1 summary "districts."
         for (let d = 1; d <= s.state.nDistricts; d++) {
             // Guard against empty district
             if (countiesByDistrict[d]) {
@@ -1235,6 +1236,9 @@ function doFindCountiesSplitUnexpectedly(s, bLog = false) {
     test['details']['nSplits'] = nSplits;
     test['details']['unexpectedSplits'] = unexpectedSplits;
     test['details']['countiesSplitUnexpectedly'] = countiesSplitUnexpectedly;
+    // 02-23-21 - Added single-county district details
+    test['details']['expectedSplits'] = s.state.expectedSplits;
+    test['details']['tooBigName'] = s.state.tooBigName;
     return test;
 }
 exports.doFindCountiesSplitUnexpectedly = doFindCountiesSplitUnexpectedly;
@@ -1334,12 +1338,10 @@ function scoreKIWYSICompactness(s, bLog = false) {
             goodShapes.features.push(f);
         }
     }
-    const scores = Compactness.scoreShapes(goodShapes);
-    // 10-21-2020 - Returned all by-district scores instead of just the average.
-    // - Round & invert the scores here at the source vs. later on, higher up.
-    return scores.map(n => 100 - Math.round(n));
-    // const avgKIWYSIScore: number = U.avgArray(scores);
-    // return avgKIWYSIScore;
+    const scores = Compactness.scoreShapes(goodShapes, 0 /* Revised */);
+    // Round & invert the scores here at the source vs. later on, higher up.
+    // Raw KIWYSI scores will be 1–100 with smaller better, so map to 1–100 bigger better.
+    return scores.map(n => 100 - Math.round(n) + 1);
 }
 exports.scoreKIWYSICompactness = scoreKIWYSICompactness;
 // SAVE THESE NOTES, IN CASE WE NEED TO REWORK HOW WE PERFORM THESE CALCS.