@dra2020/district-analytics 4.3.1 → 4.3.4

package/dist/cli.js

@@ -90063,6 +90063,7 @@ function scorePopulationDeviation(rawValue, bLegislative) {
     const _normalizer = new normalize_1.Normalizer(rawValue);
     // Raw range in not inverted (i.e., smaller is better)
     const range = C.popdevRange(bLegislative);
+    _normalizer.clip(0.0, 1.0); // Handle deviations bigger than a whole district
     _normalizer.invert();
     _normalizer.clip(1.0 - range[C.BEG], 1.0 - range[C.END]);
     _normalizer.unitize(1.0 - range[C.BEG], 1.0 - range[C.END]);
@@ -90216,7 +90217,7 @@ function exceedsMaximumThreshold(Mf) {
     return Mf > threshold;
 }
 function calcProportionalDistricts(proportion, nDistricts) {
-    // TODO - Bump up to get a statewide proportion on the bubble to rate one district?
+    // TODO - Maybe bump up to get a statewide proportion on the bubble to rate one district?
     const roundUp = 0.0;
     const fractional = proportion * nDistricts;
     const integral = Math.round(fractional + roundUp);
@@ -90365,14 +90366,14 @@ const normalize_1 = __webpack_require__(/*! ./normalize */ "./src/normalize.ts")
 * S# [estS] (S_V) = the estimated Democratic seats, using seat probabilities
 * S% [estSf] = the estimated Democratic seat share fraction, calculated as S# / N
 
-* BS_50 [bS50] = Seat bias as a fraction of N <<< TODO - RENAME
-* BV_50 [bV50] = Votes bias as a fraction <<< TODO - RENAME
+* BS_50 [bS50] = Seat bias as a fraction of N
+* BV_50 [bV50] = Votes bias as a fraction
 * decl [decl] = Declination
-* GS [gSym] = Global symmetry <<< TODO - RENAME
+* GS [gSym] = Global symmetry
 
 * EG [EG] = Efficiency gap as a fraction
-* BS_V [bSV] = Seats bias @ <V> (geometric) <<< TODO
-* PR [prop] = Disproportionality <<< TODO - RENAME
+* BS_V [bSV] = Seats bias @ <V> (geometric)
+* PR [prop] = Disproportionality
 * MM [mMs] = Mean – median difference using statewide Vf
 * TO [tOf] = Turnout bias
 * MM' [mMd] = Mean – median difference using average district v
@@ -90416,7 +90417,7 @@ function scorePartisan(Vf, VfArray, options) {
     const bias = estBias(estSf, bestSf);
     const biasScore = scorebias(bias, Vf, estSf);
     const unearnedS = estUnearnedSeats(bestS, estS);
-    const impactScore = scoreImpact(unearnedS, Vf, N);
+    const impactScore = scoreImpact(unearnedS, Vf, estSf, N);
     // Calculate additional alternate metrics for reference
     // NOTE - Use the uncompressed seat probability function
     const inferredSVpoints = bAlternateMetrics ? inferSVpoints(Vf, VfArray, shift) : undefined;
@@ -90439,7 +90440,8 @@ function scorePartisan(Vf, VfArray, options) {
     const rD = (!bConstrained || bAlternateMetrics) ? estResponsiveDistricts(VfArray) : undefined;
     const rDf = bAlternateMetrics ? estResponsiveDistrictsShare(rD, N) : undefined;
     const Cn = countCompetitiveDistricts(VfArray);
-    const cD = bConstrained ? estCompetitiveDistricts(VfArray) : rD;
+    const cD = estCompetitiveDistricts(VfArray); // NOTE - Cd by definition uses a more narrow probability distribution vs. Rd
+    // const cD = bConstrained ? estCompetitiveDistricts(VfArray) : rD as number;
     const cDf = estCompetitiveDistrictsShare(cD, N);
     const Mrange = findMarginalDistricts(Vf, VfArray, N);
     const Md = estMarginalCompetitiveDistricts(Mrange, VfArray);
@@ -90547,22 +90549,27 @@ function adjustBias(Vf, bias, extra) {
 }
 exports.adjustBias = adjustBias;
 // Normalize unearned seats
-function scoreImpact(rawUE, Vf, N) {
-    // Adjust impact to incorporate an acceptable winner's bonus based on Vf
-    const extra = extraBonus(Vf);
-    const adjustedBias = adjustBias(Vf, rawUE / N, extra);
-    const adjustedImpact = adjustedBias * N;
-    // Then normalize
-    const _normalizer = new normalize_1.Normalizer(adjustedImpact);
-    const worst = C.unearnedThreshold();
-    const best = 0.0;
-    _normalizer.positive();
-    _normalizer.clip(worst, best);
-    _normalizer.unitize(worst, best);
-    _normalizer.invert();
-    _normalizer.rescale();
-    const score = _normalizer.normalizedNum;
-    return score;
+function scoreImpact(rawUE, Vf, Sf, N) {
+    if (isAntimajoritarian(Vf, Sf)) {
+        return 0;
+    }
+    else {
+        // Adjust impact to incorporate an acceptable winner's bonus based on Vf
+        const extra = extraBonus(Vf);
+        const adjustedBias = adjustBias(Vf, rawUE / N, extra);
+        const adjustedImpact = adjustedBias * N;
+        // Then normalize
+        const _normalizer = new normalize_1.Normalizer(adjustedImpact);
+        const worst = C.unearnedThreshold();
+        const best = 0.0;
+        _normalizer.positive();
+        _normalizer.clip(worst, best);
+        _normalizer.unitize(worst, best);
+        _normalizer.invert();
+        _normalizer.rescale();
+        const score = _normalizer.normalizedNum;
+        return score;
+    }
 }
 exports.scoreImpact = scoreImpact;
 function isAntimajoritarian(Vf, Sf) {
@@ -91209,13 +91216,13 @@ function printPartisanScorecardRow(xx, name, N, Vf, s) {
 exports.printPartisanScorecardRow = printPartisanScorecardRow;
 // Generate partisan details (Table 1)
 function printPartisanDetailsHeader() {
-    console.log('XX, <V>, S(<V>), S50V, V50S, Decl, B_G, EG, Beta, l-gamma, mM, TO, mM\', LO, R, r, Zeta');
+    console.log('XX, <V>, S(<V>), S50V, V50S, Decl, B_G, EG, Beta, l-gamma, mM, TO, mM\', LO, Rd, R, r, Zeta');
 }
 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', xx, Vf, s.bias.estSf, s.bias.bS50, s.bias.bV50, s.bias.decl, s.bias.gSym, s.bias.eG, s.bias.bSV, // Beta
+    console.log('%s, %f, %f, %f, %f, %f, %f, %f, %f, %f, %f, %f, %f, %f, %f, %f, %f, %f', xx, Vf, s.bias.estSf, 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.mMs, s.bias.tOf, s.bias.mMd, s.bias.lO, s.competitiveness.bigR, s.competitiveness.littleR, s.competitiveness.mIR // Zeta
+    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
     );
 }
 exports.printPartisanDetailsRow = printPartisanDetailsRow;
@@ -91288,7 +91295,7 @@ function scorePlan(p, overridesJSON) {
     // PARTISAN ("fair") subcategories - bias, impact, & competitiveness (plus lots of supporting measures)
     const options = {
         alternates: true,
-        constrained: true,
+        constrained: false,
         shift: 0 /* Proportional */
     };
     const pS = partisan_1.scorePartisan(p.partisanProfile.statewideVf, p.partisanProfile.vfArray, options);