@dra2020/dra-analytics 3.2.0 → 3.3.3

package/dist/lib/all/types.d.ts

@@ -1 +1 @@
-export { Scorecard, PopulationScorecard, PartisanScorecard, MinorityScorecard, CompactnessScorecard, SplittingScorecard, Dict, PCAModel, MinorityFilter, dictPoint, DemographicVotingByFeature, RPVFactor, RPVAnalysis } from '../types/all';
+export { Scorecard, PopulationScorecard, PartisanScorecard, MinorityScorecard, CompactnessScorecard, SplittingScorecard, Dict, VfArray, SVpoint, rVpoints, PCAModel, MinorityFilter, dictPoint, DemographicVotingByFeature, RPVFactor, RPVAnalysis } from '../types/all';

package/dist/lib/partisan/bias.d.ts

@@ -12,6 +12,7 @@ export declare function estGeometricSeatsBias(Vf: number, dSVpoints: T.SVpoint[]
 export declare function inferGeometricSeatsBiasPoints(dSVpoints: T.SVpoint[], rSVpoints: T.SVpoint[]): T.SVpoint[];
 export declare function invertSVPoints(inferredSVpoints: T.SVpoint[]): T.SVpoint[];
 export declare function calcEfficiencyGap(Vf: number, Sf: number, shareType?: T.Party): number;
+export declare function calcEfficiencyGapPrime(Vf: number, Sf: number, R: number | undefined): number | undefined;
 export declare function calcMeanMedianDifference(VfArray: T.VfArray, Vf?: number): number;
 export declare function keyRVpoints(VfArray: T.VfArray): T.rVpoints;
 export declare function isASweep(Sf: number, nDistricts: number): boolean;
@@ -29,5 +30,5 @@ export declare function estLocalDisproportionality(Vf: number, dSVpoints: T.SVpo
 export declare function rangeDisproportionality(dSVpoints: T.SVpoint[]): number;
 export declare function estLocalDisproportionalityAlt(Vf: number, N: number, dSVpoints: T.SVpoint[]): number | undefined;
 export declare function rangeDisproportionalityAlt(N: number, dSVpoints: T.SVpoint[]): number;
-export declare function estLocalUnearnedSeats(Vf: number, N: number, VfArray: number[], dSVpoints: T.SVpoint[]): number | undefined;
-export declare function rangeUnearnedSeats(N: number, estS: number, dSVpoints: T.SVpoint[]): number;
+export declare function estLocalUnearnedSeats(Vf: number, N: number, dSVpoints: T.SVpoint[]): number | undefined;
+export declare function rangeUnearnedSeats(N: number, dSVpoints: T.SVpoint[]): number;

package/lib/all/types.ts

@@ -2,7 +2,7 @@
 
 export
 {
-  // Scorecards & helpers
+  // Scorecards
   Scorecard,
   PopulationScorecard,
   PartisanScorecard,
@@ -11,6 +11,9 @@ export
   SplittingScorecard,
   Dict,
 
+  // Subordinate types 
+  VfArray, SVpoint, rVpoints,
+
   // For legacy KIWYSI compactness calculations
   PCAModel,
 

package/lib/partisan/all.ts

@@ -109,7 +109,7 @@ export function makePartisanScorecard(Vf: number, VfArray: T.VfArray, bLog: bool
   const lSym = estLocalAsymmetry(Vf, dSVpoints, rSVpoints);
   const lProp = estLocalDisproportionality(Vf, dSVpoints);
   const lPropAlt = estLocalDisproportionalityAlt(Vf, N, dSVpoints);
-  const lUE = estLocalUnearnedSeats(Vf, N, VfArray, dSVpoints);
+  const lUE = estLocalUnearnedSeats(Vf, N, dSVpoints);
 
   const biasMeasurements: T.Bias = {
     bestS: bestS,

package/lib/partisan/bias.ts

@@ -262,6 +262,21 @@ export function calcEfficiencyGap(Vf: number, Sf: number, shareType = T.Party.De
   return efficiencyGap;
 }
 
+// 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). 
+export function calcEfficiencyGapPrime(Vf: number, Sf: number, R: number | undefined): number | undefined
+{
+  let EG = undefined;
+
+  if (R && ((R > 2) || (R < 1)))
+    EG = (2.0 * (Vf - 0.5)) - (Sf - 0.5);
+
+  return EG;
+}
+
 // MEAN–MEDIAN DIFFERENCE
 // 
 // From PlanScore.org: "The mean-median difference is a party’s median vote share
@@ -409,7 +424,7 @@ export function calcLopsidedOutcomes(VfArray: T.VfArray): number | undefined
 //
 // * 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.
 export function calcGlobalSymmetry(dSVpoints: T.SVpoint[], rSVpoints: T.SVpoint[], S50V: number): number
 {
@@ -610,20 +625,18 @@ export function rangeDisproportionalityAlt(N: number, dSVpoints: T.SVpoint[]): n
 }
 
 // Average local unearned seats from the best # of seats (closest to proportional)
-export function estLocalUnearnedSeats(Vf: number, N: number, VfArray: number[], dSVpoints: T.SVpoint[]): number | undefined
+export function estLocalUnearnedSeats(Vf: number, N: number, dSVpoints: T.SVpoint[]): number | undefined
 {
   const dPts = svPointRange(Vf, dSVpoints);
 
   if (!dPts) return undefined;
 
-  const estS = estSeats(VfArray);
-
-  const lUE: number = rangeUnearnedSeats(N, estS, dPts);
+  const lUE: number = rangeUnearnedSeats(N, dPts);
 
   return lUE;
 }
 
-export function rangeUnearnedSeats(N: number, estS: number, dSVpoints: T.SVpoint[]): number
+export function rangeUnearnedSeats(N: number, dSVpoints: T.SVpoint[]): number
 {
   const ndPts: number = dSVpoints.length;
 
@@ -631,6 +644,7 @@ export function rangeUnearnedSeats(N: number, estS: number, dSVpoints: T.SVpoint
 
   for (let i in dSVpoints)
   {
+    const estS: number = dSVpoints[i].s * N;
     const bestS = bestSeats(N, dSVpoints[i].v);
 
     tot += estUnearnedSeats(bestS, estS);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dra2020/dra-analytics",
-  "version": "3.2.0",
+  "version": "3.3.3",
   "description": "DRA analytics",
   "main": "dist/dra-analytics.js",
   "types": "./dist/lib/all/all.d.ts",
@@ -43,27 +43,27 @@
   "homepage": "https://github.com/dra2020/dra-analytics#readme",
   "devDependencies": {
     "@types/geojson": "^7946.0.8",
-    "@types/jest": "^27.0.1",
+    "@types/jest": "^27.0.3",
     "@types/node": "^12.20.20",
     "@types/yargs": "^16.0.4",
     "csv-parse": "^4.16.0",
-    "jest": "^27.0.6",
+    "jest": "^27.4.3",
     "json-loader": "^0.5.7",
     "prettier": "^2.3.2",
     "shapefile": "^0.6.6",
     "source-map-loader": "^3.0.0",
-    "ts-jest": "^27.0.5",
-    "ts-loader": "^9.2.5",
+    "ts-jest": "^27.1.1",
+    "ts-loader": "^9.2.6",
     "tsify": "^5.0.4",
     "tslint": "^6.1.3",
     "tslint-config-prettier": "^1.18.0",
-    "typescript": "^4.3.5",
-    "webpack": "^5.51.1",
-    "webpack-cli": "^4.8.0",
+    "typescript": "^4.5.2",
+    "webpack": "^5.65.0",
+    "webpack-cli": "^4.9.1",
     "yargs": "^17.1.1"
   },
   "dependencies": {
-    "@dra2020/baseclient": "^1.0.40",
+    "@dra2020/baseclient": "^1.0.67",
     "geojson": "^0.5.0"
   }
-}
+}