@dra2020/district-analytics 5.2.3 → 5.3.2

package/dist/cli.js

@@ -89477,7 +89477,8 @@ function evalMinorityOpportunity(p, bLog = false) {
 }
 exports.evalMinorityOpportunity = evalMinorityOpportunity;
 function scoreMinority(oD, pD) {
-    const bonus = C.minorityBonus();
+    // Score minority opportunity [0–100] here; weight it later
+    const bonus = 100; // C.minorityBonus();
     const score = (pD > 0) ? Math.round((Math.min(oD, pD) / pD) * bonus) : 0;
     return score;
 }
@@ -89671,6 +89672,7 @@ const normalize_1 = __webpack_require__(/*! ./normalize */ "./src/normalize.ts")
 * BV_50 [bV50] = Votes bias as a fraction
 * decl [decl] = Declination
 * GS [gSym] = Global symmetry
+* ?? [gamma] = TODO
 
 * EG [EG] = Efficiency gap as a fraction
 * BS_V [bSV] = Seats bias @ <V> (geometric)
@@ -89740,6 +89742,7 @@ function scorePartisan(Vf, VfArray, options) {
     const MIR = bAlternateMetrics ? calcMinimalInverseResponsiveness(Vf, littleR) : undefined;
     const rD = (!bConstrained || bAlternateMetrics) ? estResponsiveDistricts(VfArray) : undefined;
     const rDf = bAlternateMetrics ? estResponsiveDistrictsShare(rD, N) : undefined;
+    const gamma = bAlternateMetrics ? calcGammaNEW(Vf, estSf, littleR) : undefined;
     const Cn = countCompetitiveDistricts(VfArray);
     const cD = estCompetitiveDistricts(VfArray); // NOTE - Cd by definition uses a more narrow probability distribution vs. Rd
     // const cD = bConstrained ? estCompetitiveDistricts(VfArray) : rD as number;
@@ -89776,6 +89779,7 @@ function scorePartisan(Vf, VfArray, options) {
         biasScoring.bV50 = Bv50f;
         biasScoring.decl = decl;
         biasScoring.gSym = gSym;
+        biasScoring.gamma = gamma;
         biasScoring.eG = EG;
         biasScoring.bSV = BsGf;
         biasScoring.prop = prop;
@@ -90441,7 +90445,6 @@ function calcLopsidedOutcomes(VfArray) {
     return LO;
 }
 exports.calcLopsidedOutcomes = calcLopsidedOutcomes;
-// TODO - Add unit tests <<< Depends on S(V)
 // GLOBAL SYMMETRY - Fig. 17 in Section 5.1
 function calcGlobalSymmetry(inferredSVpoints, S50V) {
     const invertedSVpoints = invertSVPoints(inferredSVpoints);
@@ -90451,19 +90454,18 @@ function calcGlobalSymmetry(inferredSVpoints, S50V) {
     }
     const sign = (S50V < 0) ? -1 : 1;
     gSym *= sign;
-    return U.trim(gSym);
+    return U.trim(gSym / 100);
 }
 exports.calcGlobalSymmetry = calcGlobalSymmetry;
 // RAW DISPROPORTIONALITY
 //
-// gamma = Sf – Vf     : Eq.C.1.1 on P. 42
+// PR = Sf – Vf     : Eq.C.1.1 on P. 42
 function calcDisproportionality(Vf, Sf) {
-    const gamma = Vf - Sf;
-    // const gamma = Sf - Vf;
-    return U.trim(gamma);
+    const prop = Vf - Sf;
+    // const prop = Sf - Vf;
+    return U.trim(prop);
 }
 exports.calcDisproportionality = calcDisproportionality;
-// TODO - Add unit tests <<< Depends on S(V)
 // BIG 'R': Defined in Footnote 22 on P. 10
 function calcBigR(Vf, Sf) {
     let bigR = undefined;
@@ -90474,7 +90476,6 @@ function calcBigR(Vf, Sf) {
     return bigR;
 }
 exports.calcBigR = calcBigR;
-// TODO - Add unit tests <<< Depends on S(V)
 // MINIMAL INVERSE RESPONSIVENESS
 //
 // zeta = (1 / r) - (1 / r_sub_max)     : Eq. 5.2.1
@@ -90496,6 +90497,17 @@ function isBalanced(Vf) {
     const bBalanced = ((Vf > upper) || (Vf < lower)) ? false : true;
     return bBalanced;
 }
+// GAMMA (NEW)
+// g = 50 + r<V>(<V>-50) – S(<V>)
+// def calc_gamma(plan):
+//     return (0.5 + plan.responsiveness * (plan.statewide_vote_share - 0.5) \
+//       - (plan.predicted_D_seats / plan.districts)) \
+//         * 100
+function calcGammaNEW(Vf, Sf, r) {
+    const g = 0.5 + (r * (Vf - 0.5)) - Sf;
+    return U.trim(g);
+}
+exports.calcGammaNEW = calcGammaNEW;
 // HELPERS
 function printPartisanScorecardHeader() {
     console.log('XX, Name, N, V%, ^S#, S#, B%, B$, UE#, I$, C#, Cd, Md, C$, <P$');
@@ -90523,7 +90535,7 @@ exports.printPartisanDetailsHeader = printPartisanDetailsHeader;
 function printPartisanDetailsRow(xx, name, N, Vf, s) {
     console.log('%s, %f, %f, %f, %f, %f, %f, %f, %f, %f, %f, %f, %f, %f, %f, %f, %f, %f, %f', xx, Vf, s.bias.estSf, s.bias.bias, // Simple bias
     s.bias.bS50, s.bias.bV50, s.bias.decl, s.bias.gSym, s.bias.eG, s.bias.bSV, // Beta
-    s.bias.prop, // Lower-gamma
+    s.bias.prop, // PR
     s.bias.mMs, s.bias.tOf, s.bias.mMd, s.bias.lO, s.competitiveness.rD, s.competitiveness.bigR, s.competitiveness.littleR, s.competitiveness.mIR // Zeta
     );
 }
@@ -90605,8 +90617,9 @@ function scorePlan(p, overridesJSON) {
     // score for comparing plans w/in a state
     let score = weightOverall(pS.score2, tpS.score, 1 /* WithinAState */);
     const mS = minority_1.evalMinorityOpportunity(p);
-    // Add minority bonus, keeping score it to the range [0–100]
-    score = mixinMinorityBonus(score, mS.score);
+    // Add minority bonus, keeping score to the range [0–100]
+    const bonus = C.minorityBonus() * (mS.score / 100);
+    score = mixinMinorityBonus(score, bonus);
     // Roll up an overall scorecard
     const scorecard = {
         partisan: pS,
@@ -90843,7 +90856,7 @@ module.exports = JSON.parse("{\"state\":\"NC\",\"planName\":\"NC 116th Congressi
 /*! exports provided: score, partisan, minority, traditionalPrinciples, details, default */
 /***/ (function(module) {
 
-module.exports = JSON.parse("{\"score\":5,\"partisan\":{\"bias\":{\"bestS\":7,\"bestSf\":0.5385,\"estS\":4.1925,\"estSf\":0.3225,\"bias\":0.216,\"tOf\":-0.0023,\"fptpS\":3,\"bS50\":0.2172,\"bV50\":0.045,\"decl\":36.5164,\"gSym\":6.6602,\"eG\":0.2846,\"bSV\":0.2098,\"prop\":0.2695,\"mMd\":0.0593,\"mMs\":0.057,\"lO\":0.1106,\"score\":0},\"impact\":{\"unearnedS\":2.8075,\"score\":0},\"competitiveness\":{\"bigR\":-16.926,\"littleR\":4.3523,\"mIR\":0.1298,\"rD\":4.0207,\"rDf\":0.3093,\"cSimple\":6,\"cD\":0.7266,\"cDf\":0.0559,\"mRange\":[5,11],\"mD\":0.7134,\"mDf\":0.1019,\"score\":10},\"score\":3,\"score2\":2,\"details\":{\"election\":\"2016 Presidential, US Senate, Governor, and AG election results\"}},\"minority\":{\"report\":{\"bucketsByDemographic\":[[10,14],[3,0],[1,9],[0,0],[0,0],[0,0]],\"averageDVf\":0.6737588682747838},\"nProportional\":18,\"opportunityDistricts\":12.9424,\"score\":14,\"details\":{\"vap\":\"2010 Voting Age Population\"}},\"traditionalPrinciples\":{\"score\":18,\"compactness\":{\"score\":35,\"reock\":{\"raw\":0.3373,\"normalized\":35,\"notes\":{}},\"polsby\":{\"raw\":0.2418,\"normalized\":35,\"notes\":{}}},\"splitting\":{\"score\":0,\"county\":{\"raw\":1.1474,\"normalized\":0,\"notes\":{}},\"district\":{\"raw\":1.4839,\"normalized\":3,\"notes\":{}}},\"populationDeviation\":{\"raw\":0.016,\"normalized\":0,\"notes\":{\"maxDeviation\":11693}},\"details\":{\"countiesSplitUnexpectedly\":[\"Bladen\",\"Buncombe\",\"Catawba\",\"Cumberland\",\"Durham\",\"Guilford\",\"Iredell\",\"Johnston\",\"Pitt\",\"Rowan\",\"Wilson\"],\"unexpectedAffected\":0.3096,\"nSplitVTDs\":12,\"splitVTDs\":[\"VTD-01\",\"VTD-02\",\"VTD-03\",\"VTD-04\",\"VTD-05\",\"VTD-06\",\"VTD-07\",\"VTD-08\",\"VTD-09\",\"VTD-10\",\"VTD-11\",\"VTD-12\"],\"shapes\":\"2010 VTD shapes\",\"census\":\"2010 Census Total Population\"}},\"details\":{}}");
+module.exports = JSON.parse("{\"score\":5,\"partisan\":{\"bias\":{\"bestS\":7,\"bestSf\":0.5385,\"estS\":4.1925,\"estSf\":0.3225,\"bias\":0.216,\"tOf\":-0.0023,\"fptpS\":3,\"bS50\":0.2172,\"bV50\":0.045,\"decl\":36.5164,\"gSym\":0.066602,\"gamma\":0.0123,\"eG\":0.2846,\"bSV\":0.2098,\"prop\":0.2695,\"mMd\":0.0593,\"mMs\":0.057,\"lO\":0.1106,\"score\":0},\"impact\":{\"unearnedS\":2.8075,\"score\":0},\"competitiveness\":{\"bigR\":-16.926,\"littleR\":4.3523,\"mIR\":0.1298,\"rD\":4.0207,\"rDf\":0.3093,\"cSimple\":6,\"cD\":0.7266,\"cDf\":0.0559,\"mRange\":[5,11],\"mD\":0.7134,\"mDf\":0.1019,\"score\":10},\"score\":3,\"score2\":2,\"details\":{\"election\":\"2016 Presidential, US Senate, Governor, and AG election results\"}},\"minority\":{\"report\":{\"bucketsByDemographic\":[[10,14],[3,0],[1,9],[0,0],[0,0],[0,0]],\"averageDVf\":0.6737588682747838},\"nProportional\":18,\"opportunityDistricts\":12.9424,\"score\":14,\"details\":{\"vap\":\"2010 Voting Age Population\"}},\"traditionalPrinciples\":{\"score\":18,\"compactness\":{\"score\":35,\"reock\":{\"raw\":0.3373,\"normalized\":35,\"notes\":{}},\"polsby\":{\"raw\":0.2418,\"normalized\":35,\"notes\":{}}},\"splitting\":{\"score\":0,\"county\":{\"raw\":1.1474,\"normalized\":0,\"notes\":{}},\"district\":{\"raw\":1.4839,\"normalized\":3,\"notes\":{}}},\"populationDeviation\":{\"raw\":0.016,\"normalized\":0,\"notes\":{\"maxDeviation\":11693}},\"details\":{\"countiesSplitUnexpectedly\":[\"Bladen\",\"Buncombe\",\"Catawba\",\"Cumberland\",\"Durham\",\"Guilford\",\"Iredell\",\"Johnston\",\"Pitt\",\"Rowan\",\"Wilson\"],\"unexpectedAffected\":0.3096,\"nSplitVTDs\":12,\"splitVTDs\":[\"VTD-01\",\"VTD-02\",\"VTD-03\",\"VTD-04\",\"VTD-05\",\"VTD-06\",\"VTD-07\",\"VTD-08\",\"VTD-09\",\"VTD-10\",\"VTD-11\",\"VTD-12\"],\"shapes\":\"2010 VTD shapes\",\"census\":\"2010 Census Total Population\"}},\"details\":{}}");
 
 /***/ })