@dra2020/dra-analytics 3.3.2 → 4.0.0

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

@@ -1 +1 @@
-export { ratePopulationDeviation, rateProportionality, rateCompetitiveness, rateMinorityRepresentation, rateCompactness, rateReock, ratePolsby, rateSplitting, rateCountySplitting, rateDistrictSplitting, ratePartisanBias, isAntimajoritarian, popdevThreshold } from '../rate/all';
+export { ratePopulationDeviation, rateProportionality, rateCompetitiveness, rateMinorityRepresentation, rateCompactness, rateReock, ratePolsby, rateSplitting, rateCountySplitting, rateDistrictSplitting, ratePartisanBias, normalizePartisanBias, isAntimajoritarian, popdevThreshold } from '../rate/all';

package/dist/lib/equal/population.d.ts

@@ -1,4 +1,4 @@
 import { PopulationScorecard } from '../types/all';
 export declare function calcPopulationDeviation(max: number, min: number, targetSize: number): number;
 export declare function isRoughlyEqual(devation: number, bLegislative: boolean): boolean;
-export declare function makePopulationScorecard(totPopByDistrict: number[], targetSize: number, bLegislative: boolean, bLog?: boolean): PopulationScorecard;
+export declare function makePopulationScorecard(totPopByDistrict: number[], targetSize: number, bLegislative: boolean, repsByDistrict?: number[], bLog?: boolean): PopulationScorecard;

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;

package/dist/lib/rate/dra-ratings.d.ts

@@ -4,6 +4,7 @@ export declare function extraBonus(Vf: number): number;
 export declare function adjustDeviation(Vf: number, disproportionality: number, extra: number): number;
 export declare function isAntimajoritarian(Vf: number, Sf: number): boolean;
 export declare function ratePartisanBias(rawSeatsBias: number, rawVotesBias: number): number;
+export declare function normalizePartisanBias(biasPct: number, pctAt50: number): number;
 export declare function rateCompetitiveness(rawCdf: number): number;
 export declare function rateMinorityRepresentation(rawOd: number, pOd: number, rawCd: number, pCd: number): number;
 export declare function rateReock(rawValue: number): number;

package/lib/all/rate.ts

@@ -13,7 +13,7 @@ export
   // rateSplittingLegacy, adjustSplittingRating, rateCountySplittingLegacy, rateDistrictSplittingLegacy,
 
   // For use in DRA client UI
-  ratePartisanBias,
+  ratePartisanBias, normalizePartisanBias,
   isAntimajoritarian,
 
   popdevThreshold

package/lib/equal/population.ts

@@ -9,6 +9,7 @@ import * as T from '../types/all';
 import * as U from '../utils/all';
 
 
+// MMD - This is the same for SMD & MMD. It's the calculation of min, max, and target size that differs.
 export function calcPopulationDeviation(max: number, min: number, targetSize: number): number
 {
   return (max - min) / targetSize;  // Don't trim the result here!
@@ -21,13 +22,42 @@ export function isRoughlyEqual(devation: number, bLegislative: boolean): boolean
   return (devation <= threshold) ? true : false;
 }
 
-export function makePopulationScorecard(totPopByDistrict: number[], targetSize: number, bLegislative: boolean, bLog: boolean = false): PopulationScorecard
+// MMD
+// - Add optional # of reps per district. 
+// - Assume targetSize has been calculated correctly per # of reps not districts.
+// - If it exists, handle the MMD-specific calculations.
+export function makePopulationScorecard(totPopByDistrict: number[], targetSize: number, bLegislative: boolean, repsByDistrict?: number[], bLog: boolean = false): PopulationScorecard
 {
-  const nonEmptyDistricts = totPopByDistrict.filter(x => x > 0);
+  const nDistricts = totPopByDistrict.length;
+
+  // MMD - Validate reps per district input
+  if (repsByDistrict) 
+  {
+    if (repsByDistrict.length != nDistricts) throw new Error("Mismatched #'s of districts passed to makePopulationScorecard()!");
+    if (repsByDistrict.includes(0)) throw new Error("Zero reps for a district passed to makePopulationScorecard()!");
+    // Assume a positive integer # of reps per district
+  }
+
+  // MMD - Figure out the type of districts, SMD or MMD.
+  const nReps = (repsByDistrict) ? repsByDistrict.reduce((a, b) => a + b, 0) : nDistricts;
+  const bSMD = (!repsByDistrict || (nReps == nDistricts)) ? true : false;
+
+  // MMD - Generalize populations for non-empty districts to be per rep.
+  // const nonEmptyDistricts = totPopByDistrict.filter(x => x > 0);
+  let popPerRep: number[] = U.deepCopy(totPopByDistrict);
+  if (!bSMD && repsByDistrict)
+  {
+    for (let i = 0; i < nDistricts; i += 1)
+    {
+      popPerRep[i] = totPopByDistrict[i] / repsByDistrict[i];
+    }
+  }
+  const nonEmptyDistricts = popPerRep.filter(x => x > 0);
 
   let min = 0;
   let max = 0;
 
+  // MMD - This is already generalized, because nonEmptyDistricts is generalized.
   if (nonEmptyDistricts.length > 1)
   {
     min = U.minArray(nonEmptyDistricts);

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
 {

package/lib/rate/dra-ratings.ts

@@ -8,6 +8,7 @@ import {avgSVError} from '../partisan/method';
 import * as T from '../types/all'
 
 
+// MMD - This is already generalized, if deviations have been calculated based on # of reps instead of districts.
 // RATE POPULATION DEVIATION
 
 export function ratePopulationDeviation(rawDeviation: number, bLegislative: boolean): number
@@ -146,7 +147,7 @@ export function ratePartisanBias(rawSeatsBias: number, rawVotesBias: number): nu
 }
 
 // NOTE - John Nagle specified this function vs. simple linear normalization
-function normalizePartisanBias(biasPct: number, pctAt50: number): number 
+export function normalizePartisanBias(biasPct: number, pctAt50: number): number 
 {
   const b: number = pctAt50 / Math.log(1 / 2);
   const rating: number = 100 * Math.exp(-Math.abs(biasPct / b));

package/lib/types/population.ts

@@ -4,7 +4,6 @@
 
 import * as T from './general';
 
-
 export type PopulationScorecard = {
   deviation: number,
   roughlyEqual: boolean,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dra2020/dra-analytics",
-  "version": "3.3.2",
+  "version": "4.0.0",
   "description": "DRA analytics",
   "main": "dist/dra-analytics.js",
   "types": "./dist/lib/all/all.d.ts",
@@ -30,40 +30,30 @@
   "bugs": {
     "url": "https://github.com/dra2020/dra-analytics/issues"
   },
-  "jest": {
-    "moduleFileExtensions": [
-      "js",
-      "jsx"
-    ],
-    "moduleDirectories": [
-      "node_modules",
-      "shared"
-    ]
-  },
   "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.54",
+    "@dra2020/baseclient": "^1.0.67",
     "geojson": "^0.5.0"
   }
 }