@dra2020/district-analytics 7.0.0 → 7.1.2

package/dist/cli.js

@@ -89649,11 +89649,8 @@ const C = __importStar(__webpack_require__(/*! ./config */ "./src/config.ts"));
 const normalize_1 = __webpack_require__(/*! ./normalize */ "./src/normalize.ts");
 // NOTE - I'm passing T.VfArray's into everything. District indices = array indices.
 // NOTE - I do not (cannot) assume that the values are sorted.
-// TODO - Revise this.
 // SCORE BIAS & COMPETITIVENESS
-/* SCORECARD FIELDS:
-
-* ??? [statewideV] (V) = the average statewide two-party vote for Democrats
+/* Report fields:
 
 * ^S# [bestS] = the Democratic seats closest to proportional
 * ^S% [bestSf] = the corresponding Democratic seat share
@@ -89707,10 +89704,11 @@ function scorePartisan(Vf, VfArray, options) {
     const estSf = estSeatShare(estS, N);
     const deviation = estDeviation(estSf, bestSf);
     const proportionalityScore = scoreDeviation(deviation, Vf, estSf);
+    const unearnedS = estUnearnedSeats(bestS, estS);
+    const impactScore = scoreImpact(unearnedS, Vf, estSf, N);
     // Calculate additional alternate metrics for reference
     const dSVpoints = inferSVpoints(Vf, VfArray, shift);
     const rSVpoints = invertSVPoints(dSVpoints);
-    // const dSVpoints = bAdvanced ? inferSVpoints(Vf, VfArray, shift) : undefined;
     const TOf = bAdvanced ? calcTurnoutBias(Vf, VfArray) : undefined;
     const Bs50 = bAdvanced ? estPartisanBias(dSVpoints, N) : undefined;
     const Bs50f = (!(Bs50 === undefined)) ? U.trim(Bs50 / N) : undefined;
@@ -89745,6 +89743,10 @@ function scorePartisan(Vf, VfArray, options) {
         deviation: deviation,
         score: proportionalityScore
     };
+    const impactScoring = {
+        unearnedS: unearnedS,
+        score: impactScore
+    };
     let competitiveScoring = {
         cSimple: Cn,
         cD: cD,
@@ -89778,6 +89780,7 @@ function scorePartisan(Vf, VfArray, options) {
     const averageRVf = (RWins.length > 0) ? U.avgArray(RWins) : undefined;
     const s = {
         bias: biasScoring,
+        impact: impactScoring,
         responsiveness: competitiveScoring,
         dSVpoints: dSVpoints,
         rSVpoints: rSVpoints,
@@ -89878,44 +89881,6 @@ function scoreCompetitiveness(Cdf) {
     return score;
 }
 exports.scoreCompetitiveness = scoreCompetitiveness;
-/* NOTE - Original version:
-export function scoreCompetitiveness(rawMarginal: number, rawOverall: number): number
-{
-  // Normalize overall competitiveness - Raw values are in the range [0.0–1.0].
-  // But the practical max is more like 2/3's, so unitize that range to [0.0–1.0].
-  // Then scale the values to [0–100].
-  const _overall = new Normalizer(rawOverall);
-
-  let worst = C.overallCompetitivenessRange()[C.BEG];
-  let best = C.overallCompetitivenessRange()[C.END];
-
-  _overall.clip(worst, best);
-  _overall.unitize(worst, best);
-  _overall.rescale();
-
-  const ocS = _overall.normalizedNum as number;
-
-
-  // Normalize marginal competitiveness
-  const _marginal = new Normalizer(rawMarginal);
-
-  worst = C.marginalCompetitivenessRange()[C.BEG];
-  best = C.marginalCompetitivenessRange()[C.END];
-
-  _marginal.clip(worst, best);
-  _marginal.unitize(worst, best);
-  _marginal.rescale();
-  const mcS = _marginal.normalizedNum as number;
-
-  const mcW = C.marginalCompetitivenessWeight();
-  const ocW = C.overallCompetitivenessWeight();
-
-  // Then combine the results
-  const score = ((mcW + ocW) > 0) ? Math.round(((mcW * mcS) + (ocW * ocS)) / (mcW + ocW)) : 0;
-
-  return score;
-}
-*/
 // CORE CAPABILITIES FROM JOHN NAGLE'S METHOD
 const { erf } = __webpack_require__(/*! mathjs */ "./node_modules/mathjs/main/esm/index.js");
 // console.log("erf(0.2) =", erf(0.2));    // returns 0.22270258921047847
@@ -104314,9 +104279,9 @@ function doAnalyzePostProcessing(s, bLog = false) {
     scorecard.details['shapes'] = datasets.shapes;
     scorecard.details['census'] = datasets.census;
     const simpleSplits = s.getTest(5 /* UnexpectedCountySplits */);
-    scorecard.compactness.details['unexpectedAffected'] = simpleSplits['score'];
-    scorecard.compactness.details['nSplits'] = simpleSplits['details']['nSplits'];
-    scorecard.compactness.details['countiesSplitUnexpectedly'] = U.deepCopy(simpleSplits['details']['countiesSplitUnexpectedly']);
+    scorecard.splitting.details['unexpectedAffected'] = simpleSplits['score'];
+    scorecard.splitting.details['nSplits'] = simpleSplits['details']['nSplits'];
+    scorecard.splitting.details['countiesSplitUnexpectedly'] = U.deepCopy(simpleSplits['details']['countiesSplitUnexpectedly']);
     // NOTE - Add split precincts in dra-client directly
     // Derive secondary tests
     analyze_1.doDeriveSecondaryTests(s, bLog);