@dra2020/dra-analytics 3.3.5 → 4.1.0

package/dist/lib/compactness/matrix.d.ts

@@ -1,2 +1,2 @@
-export declare type Vector = number[];
+export type Vector = number[];
 export declare function dotProduct(a: Vector, b: Vector): number;

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/types/all.d.ts

@@ -11,7 +11,7 @@ import { CompactnessScorecard } from './compactness';
 import { SplittingScorecard } from './splitting';
 import { PopulationScorecard } from './population';
 import { Dict } from './general';
-export declare type Scorecard = {
+export type Scorecard = {
     partisan: PartisanScorecard;
     minority: MinorityScorecard;
     compactness: CompactnessScorecard;

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

@@ -1,6 +1,6 @@
 import * as T from './general';
-export declare type arrPoint = [number, number];
-export declare type CompactnessFeatures = {
+export type arrPoint = [number, number];
+export type CompactnessFeatures = {
     sym_x: number;
     sym_y: number;
     reock: number;
@@ -11,7 +11,7 @@ export declare type CompactnessFeatures = {
     reockFlat: number;
     polsbyFlat: number;
 };
-export declare type FeaturesEntry = {
+export type FeaturesEntry = {
     n: number;
     features: CompactnessFeatures;
     score: number;
@@ -20,12 +20,12 @@ export declare const enum PCAModel {
     Revised = 0,
     Original = 1
 }
-export declare type GeoProperties = {
+export type GeoProperties = {
     area: number;
     perimeter: number;
     diameter: number;
 };
-export declare type CompactnessScorecard = {
+export type CompactnessScorecard = {
     avgReock: number;
     avgPolsby: number;
     avgKWIWYSI: number;
@@ -33,25 +33,25 @@ export declare type CompactnessScorecard = {
     details: T.Dict;
     score?: number;
 };
-export declare type Compactness = {
+export type Compactness = {
     rawReock: number;
     normalizedReock: number;
     rawPolsby: number;
     normalizedPolsby: number;
     kiwysiScore?: number;
 };
-export declare type CompactnessAlt = {
+export type CompactnessAlt = {
     reock: number;
     polsby: number;
     kiwysiRank: number;
 };
-export declare type CompactnessJSONReady = {
+export type CompactnessJSONReady = {
     avgReock: number;
     avgPolsby: number;
     avgKWIWYSI: number;
     byDistrict: CompactnessAlt[];
 };
-export declare type KiwysiFeatures = {
+export type KiwysiFeatures = {
     sym_x: number;
     sym_y: number;
     reock: number;
@@ -61,7 +61,7 @@ export declare type KiwysiFeatures = {
     schwartzberg: number;
     kiwysiRank: number;
 };
-export declare type KiwysiJSONReady = {
+export type KiwysiJSONReady = {
     avgKWIWYSI: number;
     byDistrict: KiwysiFeatures[];
 };

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

@@ -1,4 +1,4 @@
-export declare type Dict = {
+export type Dict = {
     [key: string]: any;
 };
 export declare const enum Party {

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

@@ -1,14 +1,14 @@
-export declare type ContiguityGraph = {
+export type ContiguityGraph = {
     [geoID: string]: UnweightedNeighbors | WeightedNeighbors;
 };
-export declare type WeightedNeighbors = {
+export type WeightedNeighbors = {
     [geoID: string]: number;
 };
-export declare type UnweightedNeighbors = string[];
-export declare type PlanByGeoID = {
+export type UnweightedNeighbors = string[];
+export type PlanByGeoID = {
     [geoID: string]: number;
 };
-export declare type PlanByDistrictID = {
+export type PlanByDistrictID = {
     [districtID: number]: Set<string>;
 };
-export declare type FeatureGroup = Set<string>;
+export type FeatureGroup = Set<string>;

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

@@ -1,5 +1,5 @@
 import * as T from './general';
-export declare type MinorityFilter = {
+export type MinorityFilter = {
     white: boolean;
     hispanic: boolean;
     black: boolean;
@@ -9,11 +9,11 @@ export declare type MinorityFilter = {
     minority: boolean;
     invertSelection: boolean;
 };
-export declare type dictPoint = {
+export type dictPoint = {
     x: number;
     y: number;
 };
-export declare type DemographicVotingByFeature = {
+export type DemographicVotingByFeature = {
     ids: string[];
     comparison: dictPoint[];
     minority: dictPoint[];
@@ -23,18 +23,18 @@ export declare type DemographicVotingByFeature = {
     asian: dictPoint[];
     native: dictPoint[];
 };
-export declare type LinearRegression = {
+export type LinearRegression = {
     slope: number;
     intercept: number;
     r2: number;
     sterrs: StErrs;
 };
-export declare type StErrs = {
+export type StErrs = {
     slope: number;
     intercept: number;
     regression: number;
 };
-export declare type RPVFactor = {
+export type RPVFactor = {
     slope: number;
     intercept: number;
     r2: number;
@@ -42,7 +42,7 @@ export declare type RPVFactor = {
     sterr: number;
     points: dictPoint[];
 };
-export declare type RPVAnalysis = {
+export type RPVAnalysis = {
     ids: string[] | undefined;
     comparison: RPVFactor | undefined;
     minority: RPVFactor | undefined;
@@ -52,7 +52,7 @@ export declare type RPVAnalysis = {
     asian: RPVFactor | undefined;
     native: RPVFactor | undefined;
 };
-export declare type Demographics = {
+export type Demographics = {
     white: number;
     minority: number;
     black: number;
@@ -61,7 +61,7 @@ export declare type Demographics = {
     asian: number;
     native: number;
 };
-export declare type DemoBreakdown = {
+export type DemoBreakdown = {
     pct35_40: number;
     pct40_45: number;
     pct45_50: number;
@@ -71,7 +71,7 @@ export declare type DemoBreakdown = {
     vapPct: number;
     propSeats: number;
 };
-export declare type DemographicPivot = {
+export type DemographicPivot = {
     minority: DemoBreakdown;
     black: DemoBreakdown;
     hispanic: DemoBreakdown;
@@ -79,7 +79,7 @@ export declare type DemographicPivot = {
     asian: DemoBreakdown;
     native: DemoBreakdown;
 };
-export declare type MinorityScorecard = {
+export type MinorityScorecard = {
     pivotByDemographic: DemographicPivot;
     opportunityDistricts: number;
     coalitionDistricts: number;

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

@@ -1,10 +1,10 @@
 import * as T from './general';
-export declare type VfArray = number[];
-export declare type SVpoint = {
+export type VfArray = number[];
+export type SVpoint = {
     v: number;
     s: number;
 };
-export declare type rVpoints = {
+export type rVpoints = {
     Sb: number;
     Ra: number;
     Rb: number;
@@ -15,7 +15,7 @@ export declare const enum Shift {
     Proportional = 0,
     Uniform = 1
 }
-export declare type Bias = {
+export type Bias = {
     bestS: number;
     bestSf: number;
     estS: number;
@@ -37,11 +37,11 @@ export declare type Bias = {
     mMd: number;
     lO: number | undefined;
 };
-export declare type Impact = {
+export type Impact = {
     unearnedS: number;
     score?: number;
 };
-export declare type Responsiveness = {
+export type Responsiveness = {
     bigR?: number;
     littleR?: number;
     mIR?: number;
@@ -52,13 +52,13 @@ export declare type Responsiveness = {
     cDf: number;
     score?: number;
 };
-export declare type Experimental = {
+export type Experimental = {
     lSym?: number;
     lProp?: number;
     lPropAlt?: number;
     lUE?: number;
 };
-export declare type PartisanScorecard = {
+export type PartisanScorecard = {
     bias: Bias;
     impact: Impact;
     responsiveness: Responsiveness;
@@ -69,7 +69,7 @@ export declare type PartisanScorecard = {
     experimental: Experimental;
     details: T.Dict;
 };
-export declare type PartisanJSONReady = {
+export type PartisanJSONReady = {
     bias: Bias;
     responsiveness: Responsiveness;
     dSVpoints: SVpoint[];

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

@@ -1,5 +1,5 @@
 import * as T from './general';
-export declare type PopulationScorecard = {
+export type PopulationScorecard = {
     deviation: number;
     roughlyEqual: boolean;
     score?: number;

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

@@ -1,25 +1,25 @@
 import * as T from './general';
-export declare type CountyProfile = CxD;
-export declare type CxD = number[][];
-export declare type SplittingScorecard = {
+export type CountyProfile = CxD;
+export type CxD = number[][];
+export type SplittingScorecard = {
     county: number;
     district: number;
     details: T.Dict;
     score?: number;
 };
-export declare type SplittingJSONReady = {
+export type SplittingJSONReady = {
     county: number;
     district: number;
 };
-export declare type COISplits = {
+export type COISplits = {
     name: string;
     splits: number[];
 };
-export declare type COISplitting = {
+export type COISplitting = {
     name: string;
     effectiveSplits: number;
     uncertainty: number;
 };
-export declare type COISplittingJSONReady = {
+export type COISplittingJSONReady = {
     byCOI: COISplitting[];
 };

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/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

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.5",
+  "version": "4.1.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.3",
-    "@types/node": "^12.20.20",
-    "@types/yargs": "^16.0.4",
-    "csv-parse": "^4.16.0",
-    "jest": "^27.4.3",
+    "@types/geojson": "^7946.0.10",
+    "@types/node": "^12.20.55",
+    "@types/yargs": "^12.0.20",
+    "csv-parse": "^4.16.3",
     "json-loader": "^0.5.7",
-    "prettier": "^2.3.2",
+    "prettier": "^2.7.1",
     "shapefile": "^0.6.6",
-    "source-map-loader": "^3.0.0",
-    "ts-jest": "^27.1.1",
-    "ts-loader": "^9.2.6",
+    "source-map-loader": "^4.0.1",
+    "ts-loader": "^9.4.1",
     "tsify": "^5.0.4",
     "tslint": "^6.1.3",
     "tslint-config-prettier": "^1.18.0",
-    "typescript": "^4.5.2",
-    "webpack": "^5.65.0",
-    "webpack-cli": "^4.9.1",
-    "yargs": "^17.1.1"
+    "typescript": "^4.9.3",
+    "webpack": "^5.75.0",
+    "webpack-cli": "^4.10.0",
+    "yargs": "^12.0.5"
   },
   "dependencies": {
-    "@dra2020/baseclient": "^1.0.67",
-    "geojson": "^0.5.0"
+    "@dra2020/baseclient": "^1.0.89",
+    "@types/jest": "^26.0.24",
+    "geojson": "^0.5.0",
+    "jest": "^26.6.3",
+    "ts-jest": "^26.5.6"
   }
-}
+}