@dra2020/dra-analytics 3.3.5 → 4.0.0

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/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.0.0",
   "description": "DRA analytics",
   "main": "dist/dra-analytics.js",
   "types": "./dist/lib/all/all.d.ts",
@@ -30,16 +30,6 @@
   "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",