@dra2020/district-analytics 9.3.0 → 9.4.1

package/dist/district-analytics.js

@@ -351,28 +351,31 @@ var DistrictField;
     DistrictField[DistrictField["bContiguous"] = 4] = "bContiguous";
     DistrictField[DistrictField["bNotEmbedded"] = 5] = "bNotEmbedded";
     DistrictField[DistrictField["CountySplits"] = 6] = "CountySplits";
+    // 10-22-2020 - Add OtherVotes
     DistrictField[DistrictField["DemVotes"] = 7] = "DemVotes";
     DistrictField[DistrictField["RepVotes"] = 8] = "RepVotes";
-    DistrictField[DistrictField["TwoPartyVote"] = 9] = "TwoPartyVote";
+    DistrictField[DistrictField["OtherVotes"] = 9] = "OtherVotes";
+    // TwoPartyVote,    // Two-party total ()= Dem + Rep) not all votes!
     DistrictField[DistrictField["DemPct"] = 10] = "DemPct";
     DistrictField[DistrictField["RepPct"] = 11] = "RepPct";
-    DistrictField[DistrictField["DemSeat"] = 12] = "DemSeat";
-    DistrictField[DistrictField["TotalVAP"] = 13] = "TotalVAP";
-    DistrictField[DistrictField["MinorityPop"] = 14] = "MinorityPop";
-    DistrictField[DistrictField["WhitePop"] = 15] = "WhitePop";
-    DistrictField[DistrictField["BlackPop"] = 16] = "BlackPop";
-    DistrictField[DistrictField["HispanicPop"] = 17] = "HispanicPop";
-    DistrictField[DistrictField["PacificPop"] = 18] = "PacificPop";
-    DistrictField[DistrictField["AsianPop"] = 19] = "AsianPop";
-    DistrictField[DistrictField["NativePop"] = 20] = "NativePop";
-    DistrictField[DistrictField["WhitePct"] = 21] = "WhitePct";
-    DistrictField[DistrictField["MinorityPct"] = 22] = "MinorityPct";
-    DistrictField[DistrictField["BlackPct"] = 23] = "BlackPct";
-    DistrictField[DistrictField["HispanicPct"] = 24] = "HispanicPct";
-    DistrictField[DistrictField["PacificPct"] = 25] = "PacificPct";
-    DistrictField[DistrictField["AsianPct"] = 26] = "AsianPct";
-    DistrictField[DistrictField["NativePct"] = 27] = "NativePct"; // Display
-    // 1 - MORE ...
+    DistrictField[DistrictField["OtherPct"] = 12] = "OtherPct";
+    // End - OtherVotes changes
+    DistrictField[DistrictField["DemSeat"] = 13] = "DemSeat";
+    DistrictField[DistrictField["TotalVAP"] = 14] = "TotalVAP";
+    DistrictField[DistrictField["MinorityPop"] = 15] = "MinorityPop";
+    DistrictField[DistrictField["WhitePop"] = 16] = "WhitePop";
+    DistrictField[DistrictField["BlackPop"] = 17] = "BlackPop";
+    DistrictField[DistrictField["HispanicPop"] = 18] = "HispanicPop";
+    DistrictField[DistrictField["PacificPop"] = 19] = "PacificPop";
+    DistrictField[DistrictField["AsianPop"] = 20] = "AsianPop";
+    DistrictField[DistrictField["NativePop"] = 21] = "NativePop";
+    DistrictField[DistrictField["WhitePct"] = 22] = "WhitePct";
+    DistrictField[DistrictField["MinorityPct"] = 23] = "MinorityPct";
+    DistrictField[DistrictField["BlackPct"] = 24] = "BlackPct";
+    DistrictField[DistrictField["HispanicPct"] = 25] = "HispanicPct";
+    DistrictField[DistrictField["PacificPct"] = 26] = "PacificPct";
+    DistrictField[DistrictField["AsianPct"] = 27] = "AsianPct";
+    DistrictField[DistrictField["NativePct"] = 28] = "NativePct"; // Display
 })(DistrictField = exports.DistrictField || (exports.DistrictField = {}));
 class Districts {
     constructor(s, ds) {
@@ -419,12 +422,6 @@ class Districts {
         return outer;
     }
     // This is the workhorse computational routine!
-    //
-    // NOTE - OPTIMIZE for getting multiple properties from the same feature?
-    // NOTE - OPTIMIZE by only re-calc'ing districts that have changed?
-    //        In this case, special attention to getting county-splits right.
-    // NOTE - OPTIMIZE by async'ing this?
-    // NOTE - Is there a way to do this programmatically off data? Does it matter?
     recalcStatistics(bLog = false) {
         // Initialize debug counters
         nMissingDataset = 0;
@@ -432,15 +429,18 @@ class Districts {
         // Compute these once per recalc cycle
         let targetSize = Math.round(this._session.state.totalPop / this._session.state.nDistricts);
         let deviationThreshold = this._session.populationDeviationThreshold();
-        let planByDistrict = this._session.plan.byDistrictID();
+        // let planByDistrict = this._session.plan.byDistrictID();
         let plan = this._session.plan;
         let graph = this._session.graph;
         // Add an extra 0th virtual county bucket for county-district splitting analysis 
         let nCountyBuckets = this._session.counties.nCounties + 1;
         // INITIALIZE STATE VALUES THAT WILL BE ACCUMULATED
-        let stateTPVote = 0;
+        // 10-22-2020 - Add OtherVotes
         let stateDemVote = 0;
         let stateRepVote = 0;
+        let stateOthVote = 0;
+        let stateTotVote = 0;
+        // let stateTPVote = 0;
         let stateVAPPop = 0;
         let stateWhitePop = 0;
         let stateMinorityPop = 0;
@@ -454,15 +454,17 @@ class Districts {
         // - Complete (bNotEmpty)
         // - Contiguous (bContiguous)
         // - Free of holes (bNotEmbedded)
-        // 2 - MORE ...
         // Loop over the districts (including the dummy unassigned one)
         for (let i = 0; i < this.numberOfWorkingDistricts(); i++) {
             // INITIALIZE DISTRICT VALUES THAT WILL BE ACCUMULATED (VS. DERIVED)
             let featurePop;
             let totalPop = 0;
             let countySplits = U.initArray(nCountyBuckets, 0);
+            // 10-22-2020 - Add OtherVotes
             let demVotes = 0;
             let repVotes = 0;
+            let othVotes = 0;
+            let totVotes = 0;
             let totalVAP = 0;
             let whitePop = 0;
             let blackPop = 0;
@@ -517,8 +519,13 @@ class Districts {
                                     console.log("County not recognized:", geoID);
                             }
                             // Democratic and Republican vote totals
+                            // 10-22-2020 - Add OtherVotes
                             demVotes += outerThis._session.features.fieldForFeature(f, "ELECTION" /* ELECTION */, "D" /* DemVotes */);
                             repVotes += outerThis._session.features.fieldForFeature(f, "ELECTION" /* ELECTION */, "R" /* RepVotes */);
+                            totVotes += outerThis._session.features.fieldForFeature(f, "ELECTION" /* ELECTION */, "Tot" /* TotalVotes */);
+                            // NOTE: Unless you grab the values above before accumulating them,
+                            //   you can't accumulate othVotes for districts. You must calculate
+                            //   them by implication later.
                             // Voting-age demographic breakdowns (or citizen voting-age)
                             totalVAP += outerThis._session.features.fieldForFeature(f, "VAP" /* VAP */, "Tot" /* TotalPop */);
                             whitePop += outerThis._session.features.fieldForFeature(f, "VAP" /* VAP */, "Wh" /* WhitePop */);
@@ -527,7 +534,6 @@ class Districts {
                             pacificPop += outerThis._session.features.fieldForFeature(f, "VAP" /* VAP */, "PacC" /* PacificPop */);
                             asianPop += outerThis._session.features.fieldForFeature(f, "VAP" /* VAP */, "AsnC" /* AsianPop */);
                             nativePop += outerThis._session.features.fieldForFeature(f, "VAP" /* VAP */, "NatC" /* NativePop */);
-                            // 4 - MORE ...
                         }
                     }
                     else {
@@ -543,16 +549,18 @@ class Districts {
                         bEqualPop = (Math.abs(popDevPct) <= deviationThreshold);
                     }
                 }
-                // Total two-party (not total total!) votes, Democratic and Republican vote
-                // shares, and Democratic first-past-the-post win (= 1) or loss (= 0).
-                let totVotes;
+                // 10-22-2020 - Add OtherVotes. Revised from two-party to include Other.
+                // let totVotes: number;  <<< Now being accumulated by district
                 let demPct = 0;
                 let repPct = 0;
+                let othPct = 0;
                 let DemSeat = 0;
-                totVotes = demVotes + repVotes;
+                // totVotes = demVotes + repVotes;  <<< Now being accumulated by district
                 if (totVotes > 0) {
+                    othVotes = totVotes - demVotes - repVotes;
                     demPct = demVotes / totVotes;
                     repPct = repVotes / totVotes;
+                    othPct = othVotes / totVotes;
                     DemSeat = political_1.fptpWin(demPct);
                 }
                 // Total minority VAP
@@ -574,7 +582,6 @@ class Districts {
                     asianPct = asianPop / totalVAP;
                     nativePct = nativePop / totalVAP;
                 }
-                // 5 - MORE ...
                 // COMPUTE DISTRICT-LEVEL VALUES
                 // Validations
                 // Leave the default values for the dummy unassigned district,
@@ -590,7 +597,6 @@ class Districts {
                     bContiguous = G.isConnected(features, nakedGraph);
                     bNotEmbedded = (!G.isEmbedded(i, features, nakedPlan, nakedGraph));
                 }
-                // 6 - MORE ...
                 { // UPDATE THE DISTRICT STATISTICS
                     // NOTE - These are set below for both non-empty & empty districts:
                     // this.statistics[DistrictField.bNotEmpty][i] = bNotEmpty;
@@ -599,11 +605,14 @@ class Districts {
                     // this.statistics[DistrictField.TotalPop][i] = totalPop;
                     // this.statistics[DistrictField.bEqualPop][i] = bEqualPop;
                     this.statistics[DistrictField.PopDevPct][i] = popDevPct;
+                    // 10-22-2020 - Add OtherVotes
                     this.statistics[DistrictField.DemVotes][i] = demVotes;
                     this.statistics[DistrictField.RepVotes][i] = repVotes;
-                    this.statistics[DistrictField.TwoPartyVote][i] = totVotes;
+                    this.statistics[DistrictField.OtherVotes][i] = othVotes;
+                    // this.statistics[DistrictField.TwoPartyVote][i] = totVotes;
                     this.statistics[DistrictField.DemPct][i] = demPct;
                     this.statistics[DistrictField.RepPct][i] = repPct;
+                    this.statistics[DistrictField.OtherPct][i] = othPct;
                     this.statistics[DistrictField.DemSeat][i] = DemSeat;
                     this.statistics[DistrictField.WhitePop][i] = whitePop;
                     this.statistics[DistrictField.MinorityPop][i] = minorityPop;
@@ -621,11 +630,13 @@ class Districts {
                     this.statistics[DistrictField.AsianPct][i] = asianPct;
                     this.statistics[DistrictField.NativePct][i] = nativePct;
                 }
-                // 7 - MORE ...
                 { // ACCUMULATE STATE STATISTICS FROM DISTRICT TOTALS
-                    stateTPVote += totVotes;
+                    // 10-22-2020 - Add OtherVotes
+                    stateTotVote += totVotes;
+                    // stateTPVote += totVotes;
                     stateDemVote += demVotes;
                     stateRepVote += repVotes;
+                    stateOthVote += othVotes;
                     stateVAPPop += totalVAP;
                     stateWhitePop += whitePop;
                     stateMinorityPop += minorityPop;
@@ -638,11 +649,14 @@ class Districts {
             }
             else { // If a district is empty, zero these results (vs. null)
                 this.statistics[DistrictField.PopDevPct][i] = popDevPct;
+                // 10-22-2020 - Add OtherVotes
                 this.statistics[DistrictField.DemVotes][i] = 0;
                 this.statistics[DistrictField.RepVotes][i] = 0;
-                this.statistics[DistrictField.TwoPartyVote][i] = 0;
+                this.statistics[DistrictField.OtherVotes][i] = 0;
+                // this.statistics[DistrictField.TwoPartyVote][i] = 0;
                 this.statistics[DistrictField.DemPct][i] = 0;
                 this.statistics[DistrictField.RepPct][i] = 0;
+                this.statistics[DistrictField.OtherPct][i] = 0;
                 this.statistics[DistrictField.DemSeat][i] = 0;
                 this.statistics[DistrictField.WhitePop][i] = 0;
                 this.statistics[DistrictField.MinorityPop][i] = 0;
@@ -671,9 +685,13 @@ class Districts {
         }
         // UPDATE STATE STATISTICS
         let summaryRow = this.numberOfRows() - 1;
-        if (stateTPVote > 0) {
-            this.statistics[DistrictField.DemPct][summaryRow] = stateDemVote / stateTPVote;
-            this.statistics[DistrictField.RepPct][summaryRow] = stateRepVote / stateTPVote;
+        // 10-22-2020 - Add OtherVotes
+        if (stateTotVote > 0) {
+            this.statistics[DistrictField.DemVotes][summaryRow] = stateDemVote;
+            this.statistics[DistrictField.RepVotes][summaryRow] = stateRepVote;
+            this.statistics[DistrictField.DemPct][summaryRow] = stateDemVote / stateTotVote;
+            this.statistics[DistrictField.RepPct][summaryRow] = stateRepVote / stateTotVote;
+            this.statistics[DistrictField.OtherPct][summaryRow] = stateOthVote / stateTotVote;
         }
         if (stateVAPPop > 0) {
             this.statistics[DistrictField.TotalVAP][summaryRow] = stateVAPPop;
@@ -1264,7 +1282,7 @@ function scoreKIWYSICompactness(s, bLog = false) {
     }
     const scores = Compactness.scoreShapes(goodShapes);
     // 10-21-2020 
-    // - Return all by - district scores instead of just the average.
+    // - Return 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);
@@ -1913,6 +1931,7 @@ const D = __importStar(__webpack_require__(/*! ./_data */ "./src/_data.ts"));
 const M = __importStar(__webpack_require__(/*! ./minority */ "./src/minority.ts"));
 const C = __importStar(__webpack_require__(/*! ./compact */ "./src/compact.ts"));
 // PROFILE A PLAN
+const KEEP_DECIMALS = 6;
 function profilePlan(s, bLog = false) {
     const state = s.state.xx;
     const planName = s.title;
@@ -1923,8 +1942,22 @@ function profilePlan(s, bLog = false) {
     const geoPropsByDistrict = makeArrayOfGeoProps(s, bLog);
     const splits = makeNakedCxD(s);
     const summaryRow = s.districts.numberOfRows() - 1;
-    const statewideVf = U.trim(s.districts.statistics[D.DistrictField.DemPct][summaryRow], 6);
-    const vpiArray = U.deepCopy(s.districts.statistics[D.DistrictField.DemPct].slice(1, -1));
+    // 10-22-2020 - TODO: Convert Dem + Rep + Other = Total to two-party vote shares for analytics.
+    const demVote = s.districts.statistics[D.DistrictField.DemVotes][summaryRow];
+    const repVote = s.districts.statistics[D.DistrictField.RepVotes][summaryRow];
+    const statewideVf = U.trim(demVote / (demVote + repVote), KEEP_DECIMALS);
+    // const statewideVf: number = U.trim(s.districts.statistics[D.DistrictField.DemPct][summaryRow], 6);
+    let vpiArray = [];
+    const demVotes = U.deepCopy(s.districts.statistics[D.DistrictField.DemVotes].slice(1, -1));
+    const repVotes = U.deepCopy(s.districts.statistics[D.DistrictField.RepVotes].slice(1, -1));
+    for (let districtID = 1; districtID <= nDistricts; districtID++) {
+        const D = demVotes[districtID - 1];
+        const R = repVotes[districtID - 1];
+        const T = D + R;
+        const v = (T > 0) ? U.trim(D / T, KEEP_DECIMALS) : 0;
+        vpiArray.push(v);
+    }
+    // const vpiArray: number[] = U.deepCopy(s.districts.statistics[D.DistrictField.DemPct].slice(1, -1)) as number[];
     const statewideDemographics = getStatewideDemographics(s);
     const demographicsByDistrict = getDemographicsByDistrict(s);
     const profile = {
@@ -1974,9 +2007,9 @@ function makeArrayOfGeoProps(s, bLog = false) {
         let districtProps = s.districts.getGeoProperties(districtID);
         // Guard against no shape and no properties
         if (districtProps) {
-            let a = districtProps[0 /* Area */];
-            let p = districtProps[2 /* Perimeter */];
-            let d = districtProps[1 /* Diameter */];
+            let a = U.trim(districtProps[0 /* Area */], KEEP_DECIMALS);
+            let p = U.trim(districtProps[2 /* Perimeter */], KEEP_DECIMALS);
+            let d = U.trim(districtProps[1 /* Diameter */], KEEP_DECIMALS);
             // Save each triple
             geometryByDistrict.push([a, p, d]);
         }
@@ -1988,13 +2021,13 @@ function getDemographicsByDistrict(s, bLog = false) {
     // Remove the unassigned & total dummy "districts"
     for (let districtID = 1; districtID <= s.state.nDistricts; districtID++) {
         const districtDemographics = [
-            U.deepCopy(s.districts.statistics[D.DistrictField.WhitePct][districtID]),
-            U.deepCopy(s.districts.statistics[D.DistrictField.MinorityPct][districtID]),
-            U.deepCopy(s.districts.statistics[D.DistrictField.BlackPct][districtID]),
-            U.deepCopy(s.districts.statistics[D.DistrictField.HispanicPct][districtID]),
-            U.deepCopy(s.districts.statistics[D.DistrictField.PacificPct][districtID]),
-            U.deepCopy(s.districts.statistics[D.DistrictField.AsianPct][districtID]),
-            U.deepCopy(s.districts.statistics[D.DistrictField.NativePct][districtID])
+            U.trim(s.districts.statistics[D.DistrictField.WhitePct][districtID], KEEP_DECIMALS),
+            U.trim(s.districts.statistics[D.DistrictField.MinorityPct][districtID], KEEP_DECIMALS),
+            U.trim(s.districts.statistics[D.DistrictField.BlackPct][districtID], KEEP_DECIMALS),
+            U.trim(s.districts.statistics[D.DistrictField.HispanicPct][districtID], KEEP_DECIMALS),
+            U.trim(s.districts.statistics[D.DistrictField.PacificPct][districtID], KEEP_DECIMALS),
+            U.trim(s.districts.statistics[D.DistrictField.AsianPct][districtID], KEEP_DECIMALS),
+            U.trim(s.districts.statistics[D.DistrictField.NativePct][districtID], KEEP_DECIMALS)
         ];
         demographicsArray.push(districtDemographics);
     }
@@ -2003,13 +2036,13 @@ function getDemographicsByDistrict(s, bLog = false) {
 function getStatewideDemographics(s, bLog = false) {
     const summaryRow = s.districts.numberOfRows() - 1;
     const demographicsArray = [
-        U.deepCopy(s.districts.statistics[D.DistrictField.WhitePct][summaryRow]),
-        U.deepCopy(s.districts.statistics[D.DistrictField.MinorityPct][summaryRow]),
-        U.deepCopy(s.districts.statistics[D.DistrictField.BlackPct][summaryRow]),
-        U.deepCopy(s.districts.statistics[D.DistrictField.HispanicPct][summaryRow]),
-        U.deepCopy(s.districts.statistics[D.DistrictField.PacificPct][summaryRow]),
-        U.deepCopy(s.districts.statistics[D.DistrictField.AsianPct][summaryRow]),
-        U.deepCopy(s.districts.statistics[D.DistrictField.NativePct][summaryRow])
+        U.trim(s.districts.statistics[D.DistrictField.WhitePct][summaryRow], KEEP_DECIMALS),
+        U.trim(s.districts.statistics[D.DistrictField.MinorityPct][summaryRow], KEEP_DECIMALS),
+        U.trim(s.districts.statistics[D.DistrictField.BlackPct][summaryRow], KEEP_DECIMALS),
+        U.trim(s.districts.statistics[D.DistrictField.HispanicPct][summaryRow], KEEP_DECIMALS),
+        U.trim(s.districts.statistics[D.DistrictField.PacificPct][summaryRow], KEEP_DECIMALS),
+        U.trim(s.districts.statistics[D.DistrictField.AsianPct][summaryRow], KEEP_DECIMALS),
+        U.trim(s.districts.statistics[D.DistrictField.NativePct][summaryRow], KEEP_DECIMALS)
     ];
     return demographicsArray;
 }
@@ -2043,8 +2076,8 @@ function scorePlan(s, p, bLog = false, overridesJSON) {
         const avgKIWYSIScore = Math.round(U.avgArray(kiwysiScores));
         scorecard.compactness.details['kiwysi'] = avgKIWYSIScore;
         // 10-21-2020 - Add KIWYSI scores to the by-district details
-        const nDistricts = s.state.nDistricts;
         let byDistrict = scorecard.compactness.details['byDistrict'];
+        const nDistricts = byDistrict.length;
         for (let districtID = 1; districtID <= nDistricts; districtID++) {
             byDistrict[districtID - 1].kiwysiScore = kiwysiScores[districtID - 1];
         }