@dra2020/district-analytics 7.1.7 → 8.0.0

package/dist/cli.js

@@ -89056,7 +89056,7 @@ exports.scorePolsbyPopper = scorePolsbyPopper;
 /*! exports provided: partisan, minority, compactness, splitting, popdev, default */
 /***/ (function(module) {
 
-module.exports = JSON.parse("{\"partisan\":{\"bias\":{\"range\":[0,0.2],\"weight\":[50,80]},\"impact\":{\"weight\":[50,0],\"threshold\":4},\"competitiveness\":{\"range\":[0,0.75],\"distribution\":[0.25,0.75],\"simpleRange\":[0.45,0.55],\"weight\":[0,20]},\"bonus\":2},\"minority\":{\"range\":[0.37,0.5],\"distribution\":[0.25,0.75],\"shift\":0.15,\"coalition\":{\"weight\":0.5}},\"compactness\":{\"reock\":{\"range\":[0.25,0.5],\"weight\":50},\"polsby\":{\"range\":[0.1,0.5],\"weight\":50}},\"splitting\":{\"county\":{\"range\":[[1.26,1.68],[1.09,1.45]],\"weight\":50},\"district\":{\"range\":[[1.26,1.68],[1.09,1.45]],\"weight\":50}},\"popdev\":{\"range\":[[0.0075,0.002],[0.1,-1]]}}");
+module.exports = JSON.parse("{\"partisan\":{\"bias\":{\"range\":[0,0.2],\"weight\":[50,80]},\"impact\":{\"weight\":[50,0],\"threshold\":4},\"competitiveness\":{\"range\":[0,0.75],\"distribution\":[0.25,0.75],\"simpleRange\":[0.45,0.55],\"weight\":[0,20]},\"bonus\":2},\"minority\":{\"range\":[0.37,0.5],\"distribution\":[0.25,0.75],\"shift\":[0.15,0.5],\"coalition\":{\"weight\":0.5}},\"compactness\":{\"reock\":{\"range\":[0.25,0.5],\"weight\":50},\"polsby\":{\"range\":[0.1,0.5],\"weight\":50}},\"splitting\":{\"county\":{\"range\":[[1.26,1.68],[1.09,1.45]],\"weight\":50},\"district\":{\"range\":[[1.26,1.68],[1.09,1.45]],\"weight\":50}},\"popdev\":{\"range\":[[0.0075,0.002],[0.1,-1]]}}");
 
 /***/ }),
 
@@ -89160,11 +89160,20 @@ function minorityOpportunityDistribution(overridesJSON) {
     return dist;
 }
 exports.minorityOpportunityDistribution = minorityOpportunityDistribution;
+// For Black VAP %
 function minorityShift(overridesJSON) {
-    const shift = config_json_1.default.minority.shift;
+    const BLACK = 0;
+    const shift = config_json_1.default.minority.shift[BLACK];
     return shift;
 }
 exports.minorityShift = minorityShift;
+// Dilution for other demos
+function minorityShiftDilution(overridesJSON) {
+    const DILUTION = 1;
+    const shift = config_json_1.default.minority.shift[DILUTION];
+    return shift;
+}
+exports.minorityShiftDilution = minorityShiftDilution;
 function coalitionDistrictWeight(overridesJSON) {
     const weight = config_json_1.default.minority.coalition.weight;
     return weight;
@@ -89357,47 +89366,36 @@ const normalize_1 = __webpack_require__(/*! ./normalize */ "./src/normalize.ts")
 const partisan_1 = __webpack_require__(/*! ./partisan */ "./src/partisan.ts");
 function evalMinorityOpportunity(p, bLog = false) {
     // Initialize arrays for results
-    const offset = 1; // Don't process 'White'
-    const nDemos = 6 /* Total */; // Ditto
-    // const nDemos = T.DemographicField.Native + 1 - offset;  // Ditto
+    const nDemos = 5 /* Native */ + 1; // Profile includes 'White'
+    const offset = 1; // But don't process 'White'
     const demosByDistrict = p.demographicProfile.mfArrayByDistrict;
     // Initialize the demographic buckets
     // Get the statewide minority VAP/CVAP % (ignore 'White')
     const vapPctArray = p.demographicProfile.stateMfArray.slice(1);
     // Determine proportional minority districts by demographic (ignoring'White')
     const districtsByDemo = calcDistrictsByDemo(vapPctArray, p.nDistricts);
-    let bucketsByDemo = new Array(nDemos + 1); // Add a row for the 'Total' row
+    let bucketsByDemo = new Array(nDemos);
     let totalProportional = 0;
     for (let j = 0; j < nDemos; j++) {
         const vapPct = vapPctArray[j];
         const prop = districtsByDemo[j];
-        // Accumulate the proportional values for each demographic, ignoring the first
-        // all Minority demographic.
+        bucketsByDemo[j] = [0, 0, 0, 0, 0, 0, vapPct, prop];
+        // Sum the prop for each individual race/ethnicity demographic
         if (j > 0)
             totalProportional += prop;
-        bucketsByDemo[j] = [0, 0, 0, vapPct, prop]; // Five conceptual columns for each demographic
     }
-    // Add a 'Total' row
-    bucketsByDemo[nDemos] = [0, 0, 0, 0, totalProportional];
     let opptyByDemo = U.initArray(nDemos, 0.0); // A state-level value
     // For each district
     for (let i = 0; i < p.nDistricts; i++) {
         // Find the opportunities for minority representation
         for (let j = 0; j < nDemos; j++) {
-            const proportion = U.deepCopy(demosByDistrict[i][j + offset]); // Skip the 'White' entries
-            if (exceedsMinimumThreshold(proportion)) {
+            const Mf = demosByDistrict[i][j + offset]; // Skip the 'White' entries
+            const bucket = bucketVAPPct(Mf);
+            if (bucket > 0) {
                 // Bucket opportunity districts for each demographic
-                const bucket = (exceedsMaximumThreshold(proportion)) ? 1 : 0;
-                bucketsByDemo[j][bucket] += 1;
-                bucketsByDemo[j][2 /* Total */] += 1;
+                bucketsByDemo[j][bucket - 1] += 1; // Zero-based array
                 // Accumulate seat probabilities
-                opptyByDemo[j] += estMinorityOpportunity(proportion);
-                // Also accumulate the 'Total' row summing the opportunities for each demographic,
-                // ignoring the first all Minority demographic.
-                if (j > 0) {
-                    bucketsByDemo[nDemos][bucket] += 1;
-                    bucketsByDemo[nDemos][2 /* Total */] += 1;
-                }
+                opptyByDemo[j] += estMinorityOpportunity(Mf, j);
             }
         }
     }
@@ -89405,8 +89403,8 @@ function evalMinorityOpportunity(p, bLog = false) {
     const oD = U.sumArray(opptyByDemo.slice(1)); // Sum individual demos, skipping all minorities
     const cD = opptyByDemo[0 /* Minority */]; // All minorities
     // The # of proportional districts for each separate demographic and all minorities
-    const pOd = bucketsByDemo[6 /* Total */][4 /* PropSeats */];
-    const pCd = bucketsByDemo[0 /* Minority */][4 /* PropSeats */];
+    const pOd = totalProportional;
+    const pCd = bucketsByDemo[0 /* Minority */][7 /* PropSeats */];
     // Score opportunity
     const score = scoreMinority(oD, pOd, cD, pCd);
     let mS = {
@@ -89447,13 +89445,15 @@ exports.calcDistrictsByDemo = calcDistrictsByDemo;
 // NOTE - Sam Wang suggest 90% probability for a 37% district. That seems a little
 //   too abrupt and all or nothing, so I backed off to the ~70%.
 //
-function estMinorityOpportunity(Mf) {
+function estMinorityOpportunity(Mf, demo) {
     // NOTE - Switch to compress the probability distribution
     const bCompress = false;
     const dist = bCompress ? C.minorityOpportunityDistribution() : [0.0, 1.0];
     const range = C.minorityOpportunityRange();
     const _normalizer = new normalize_1.Normalizer(Mf);
-    const shift = C.minorityShift();
+    let shift = C.minorityShift(); // For Black VAP % (and Minority)
+    if (demo && (demo > 1)) // For other non-Black demos,
+        shift *= C.minorityShiftDilution(); //   dilute the Black shift (by half)
     _normalizer.wipNum += shift;
     _normalizer.clip(dist[C.BEG], dist[C.END]);
     _normalizer.unitize(dist[C.BEG], dist[C.END]);
@@ -89462,13 +89462,21 @@ function estMinorityOpportunity(Mf) {
 }
 exports.estMinorityOpportunity = estMinorityOpportunity;
 // HELPERS
-function exceedsMinimumThreshold(Mf) {
-    const threshold = C.minorityOpportunityRange()[C.BEG];
-    return Mf >= threshold;
-}
-function exceedsMaximumThreshold(Mf) {
-    const threshold = C.minorityOpportunityRange()[C.END];
-    return Mf > threshold;
+function bucketVAPPct(Mf) {
+    if (Mf < 0.35)
+        return 0;
+    else if ((Mf >= 0.35) && (Mf < 0.40))
+        return 1;
+    else if ((Mf >= 0.40) && (Mf < 0.45))
+        return 2;
+    else if ((Mf >= 0.45) && (Mf < 0.50))
+        return 3;
+    else if ((Mf >= 0.50) && (Mf < 0.55))
+        return 4;
+    else if ((Mf >= 0.55) && (Mf < 0.60))
+        return 5;
+    else // Mf >= 0.60
+        return 6;
 }
 function calcProportionalDistricts(proportion, nDistricts) {
     const roundUp = 0.0;