@dra2020/dra-analytics 3.2.0 → 3.3.3

package/cli/partisan.ts

@@ -123,48 +123,48 @@ function trim(fullFraction: number, digits: number | undefined = undefined): num
 // Generate partisan details (Table 1)
 export function printPartisanDetailsHeader(): void
 {
-  console.log('XX, <V>, S(<V>), Rd, R, r, MIR, Cd, Cdf, BS_50, BV_50, Decl, GS, 𝛾, β, LO, EG, PR, MM, TO, MM\', B%, UE, LS, LPR, LPR\', LUE');
+  console.log('XX, <V>, S(<V>), R, r, MIR, Decl, LO, MM, BS_50, BV_50, β, GS, PR, EG, 𝛾, B%, LPR\', LUE');
+  // console.log('XX, <V>, S(<V>), Rd, R, r, MIR, Cd, Cdf, BS_50, BV_50, Decl, GS, 𝛾, β, LO, EG, PR, MM, TO, MM\', B%, UE, LS, LPR, LPR\', LUE');
   // console.log('XX, <V>, S(<V>), B%, BS_50, BV_50, Decl, GS, EG, Beta, PR, MM, TO, MM\', LO, Rd, R, r, MIR, Cd, Cdf, LS, LPR, LPR\'');
 }
 
 export function printPartisanDetailsRow(xx: string, name: string, N: number, Vf: number, s: T.PartisanScorecard): void
 {
-  console.log('%s, %f, %f, %f, %f, %f, %f, %f, %f, %f, %f, %f, %f, %f, %f, %f, %f, %f, %f, %f, %f, %f, %f, %f, %f, %f, %f',
+  // console.log('%s, %f, %f, %f, %f, %f, %f, %f, %f, %f, %f, %f, %f, %f, %f, %f, %f, %f, %f, %f, %f, %f, %f, %f, %f, %f, %f',
+  console.log('%s, %f, %f, %f, %f, %f, %f, %f, %f, %f, %f, %f, %f, %f, %f, %f, %f, %f, %f',
     xx,
 
     trim(Vf),
     trim(s.bias.estSf),
 
-    trim(s.responsiveness.rD),
-    (s.responsiveness.bigR) ? trim(s.responsiveness.bigR) : s.responsiveness.bigR,           // Not shown in Table 1
-    (s.responsiveness.littleR) ? trim(s.responsiveness.littleR) : s.responsiveness.littleR,  // Not shown in Table 1
-    (s.responsiveness.mIR) ? trim(s.responsiveness.mIR) : s.responsiveness.mIR,              // Not shown in Table 1 <<< Zeta
+    // trim(s.responsiveness.rD),
+    (s.responsiveness.bigR) ? trim(s.responsiveness.bigR) : s.responsiveness.bigR,
+    (s.responsiveness.littleR) ? trim(s.responsiveness.littleR) : s.responsiveness.littleR,
+    (s.responsiveness.mIR) ? trim(s.responsiveness.mIR) : s.responsiveness.mIR,
 
-    trim(s.responsiveness.cD),                                                               // Not shown in Table 1
-    trim(s.responsiveness.cDf),                                                              // Not shown in Table 1
+    // trim(s.responsiveness.cD),
+    // trim(s.responsiveness.cDf),
+
+    (s.bias.decl) ? trim(s.bias.decl) : s.bias.decl,
+    (s.bias.lO) ? trim(s.bias.lO) : s.bias.lO,
+    trim(s.bias.mMs),
+    // trim(s.bias.tOf),
+    // trim(s.bias.mMd),
 
     trim(s.bias.bS50),
     (s.bias.bV50) ? trim(s.bias.bV50) : s.bias.bV50,
-    (s.bias.decl) ? trim(s.bias.decl) : s.bias.decl,
+    (s.bias.bSV) ? trim(s.bias.bSV) : s.bias.bSV,                                            // Beta
     trim(s.bias.gSym),
-    (s.bias.gamma) ? trim(s.bias.gamma) : s.bias.gamma,
 
-    (s.bias.bSV) ? trim(s.bias.bSV) : s.bias.bSV,                                            // Beta
-    (s.bias.lO) ? trim(s.bias.lO) : s.bias.lO,
     trim(s.bias.prop),                                                                       // PR
     trim(s.bias.eG),
-
-    trim(s.bias.mMs),                                                                        // Not shown in Table 1
-    trim(s.bias.tOf),                                                                        // Not shown in Table 1
-    trim(s.bias.mMd),                                                                        // Not shown in Table 1
+    (s.bias.gamma) ? trim(s.bias.gamma) : s.bias.gamma,
 
     trim(s.bias.deviation),                                                                  // Simple deviation from best # of seats
-    trim(s.impact.unearnedS),
-
-    // EXPERIMENTAL
-    (s.experimental.lSym) ? trim(s.experimental.lSym) : s.experimental.lSym,
-    (s.experimental.lProp) ? trim(s.experimental.lProp) : s.experimental.lProp,
+    // (s.experimental.lProp) ? trim(s.experimental.lProp) : s.experimental.lProp,
     (s.experimental.lPropAlt) ? trim(s.experimental.lPropAlt) : s.experimental.lPropAlt,
+    // trim(s.impact.unearnedS),
     (s.experimental.lUE) ? trim(s.experimental.lUE) : s.experimental.lUE
+    // (s.experimental.lSym) ? trim(s.experimental.lSym) : s.experimental.lSym,
   );
 }

package/dist/dra-analytics.js

@@ -1636,7 +1636,7 @@ function makePartisanScorecard(Vf, VfArray, bLog = false) {
     const lSym = (0, bias_1.estLocalAsymmetry)(Vf, dSVpoints, rSVpoints);
     const lProp = (0, bias_1.estLocalDisproportionality)(Vf, dSVpoints);
     const lPropAlt = (0, bias_1.estLocalDisproportionalityAlt)(Vf, N, dSVpoints);
-    const lUE = (0, bias_1.estLocalUnearnedSeats)(Vf, N, VfArray, dSVpoints);
+    const lUE = (0, bias_1.estLocalUnearnedSeats)(Vf, N, dSVpoints);
     const biasMeasurements = {
         bestS: bestS,
         bestSf: bestSf,
@@ -1737,7 +1737,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.rangeUnearnedSeats = exports.estLocalUnearnedSeats = exports.rangeDisproportionalityAlt = exports.estLocalDisproportionalityAlt = exports.rangeDisproportionality = exports.estLocalDisproportionality = exports.rangeAsymmetry = exports.estLocalAsymmetry = exports.calcGamma = exports.calcMinimalInverseResponsiveness = exports.calcBigR = exports.calcDisproportionality = exports.calcGlobalSymmetry = exports.calcLopsidedOutcomes = exports.calcDeclination = exports.radiansToDegrees = exports.isASweep = exports.keyRVpoints = exports.calcMeanMedianDifference = exports.calcEfficiencyGap = exports.invertSVPoints = exports.inferGeometricSeatsBiasPoints = exports.estGeometricSeatsBias = exports.estVotesBias = exports.estSeatBias = exports.estPartisanBias = exports.calcTurnoutBias = exports.estUnearnedSeats = exports.calcDisproportionalityFromBest = exports.estSeatShare = exports.bestSeatShare = exports.bestSeats = void 0;
+exports.rangeUnearnedSeats = exports.estLocalUnearnedSeats = exports.rangeDisproportionalityAlt = exports.estLocalDisproportionalityAlt = exports.rangeDisproportionality = exports.estLocalDisproportionality = exports.rangeAsymmetry = exports.estLocalAsymmetry = exports.calcGamma = exports.calcMinimalInverseResponsiveness = exports.calcBigR = exports.calcDisproportionality = exports.calcGlobalSymmetry = exports.calcLopsidedOutcomes = exports.calcDeclination = exports.radiansToDegrees = exports.isASweep = exports.keyRVpoints = exports.calcMeanMedianDifference = exports.calcEfficiencyGapPrime = exports.calcEfficiencyGap = exports.invertSVPoints = exports.inferGeometricSeatsBiasPoints = exports.estGeometricSeatsBias = exports.estVotesBias = exports.estSeatBias = exports.estPartisanBias = exports.calcTurnoutBias = exports.estUnearnedSeats = exports.calcDisproportionalityFromBest = exports.estSeatShare = exports.bestSeatShare = exports.bestSeats = void 0;
 const U = __importStar(__webpack_require__(/*! ../utils/all */ "./lib/utils/all.ts"));
 const C = __importStar(__webpack_require__(/*! ../rate/dra-config */ "./lib/rate/dra-config.ts"));
 const method_1 = __webpack_require__(/*! ./method */ "./lib/partisan/method.ts");
@@ -1925,6 +1925,18 @@ function calcEfficiencyGap(Vf, Sf, shareType = 0 /* Democratic */) {
     return efficiencyGap;
 }
 exports.calcEfficiencyGap = calcEfficiencyGap;
+// For illustration purposes only
+// Assumes Democratic vote shares
+// Alternate specification with winner's bonus (R) heuristic built in:
+// - By convention, '+' = R bias; '-' = D bias
+// - If 1 <= R <= 2, EG is undefined (no/acceptable bias). 
+function calcEfficiencyGapPrime(Vf, Sf, R) {
+    let EG = undefined;
+    if (R && ((R > 2) || (R < 1)))
+        EG = (2.0 * (Vf - 0.5)) - (Sf - 0.5);
+    return EG;
+}
+exports.calcEfficiencyGapPrime = calcEfficiencyGapPrime;
 // MEAN–MEDIAN DIFFERENCE
 // 
 // From PlanScore.org: "The mean-median difference is a party’s median vote share
@@ -2044,7 +2056,7 @@ exports.calcLopsidedOutcomes = calcLopsidedOutcomes;
 //
 // * gSym is the area of asymmetry between the two curves.
 // * The choice of what base to normalize it by is somewhat arbitrary.
-// * We actually only infer the S–V curver over the range [0.25–0.75] <<< 101 points (not 100!)
+// * We actually only infer the S–V curve over the range [0.25–0.75] <<< 101 points (not 100!)
 // * But dividing by 100 normalizes the area of asymmetry to the area of the SxV unit square.
 function calcGlobalSymmetry(dSVpoints, rSVpoints, S50V) {
     let gSym = 0.0;
@@ -2185,19 +2197,19 @@ function rangeDisproportionalityAlt(N, dSVpoints) {
 }
 exports.rangeDisproportionalityAlt = rangeDisproportionalityAlt;
 // Average local unearned seats from the best # of seats (closest to proportional)
-function estLocalUnearnedSeats(Vf, N, VfArray, dSVpoints) {
+function estLocalUnearnedSeats(Vf, N, dSVpoints) {
     const dPts = svPointRange(Vf, dSVpoints);
     if (!dPts)
         return undefined;
-    const estS = (0, method_1.estSeats)(VfArray);
-    const lUE = rangeUnearnedSeats(N, estS, dPts);
+    const lUE = rangeUnearnedSeats(N, dPts);
     return lUE;
 }
 exports.estLocalUnearnedSeats = estLocalUnearnedSeats;
-function rangeUnearnedSeats(N, estS, dSVpoints) {
+function rangeUnearnedSeats(N, dSVpoints) {
     const ndPts = dSVpoints.length;
     let tot = 0.0;
     for (let i in dSVpoints) {
+        const estS = dSVpoints[i].s * N;
         const bestS = bestSeats(N, dSVpoints[i].v);
         tot += estUnearnedSeats(bestS, estS);
     }