@dra2020/dra-analytics 3.3.5 → 4.1.0

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2021 Dave's Redistricting
+Copyright (c) 2021-2022 Dave's Redistricting, LLC.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/README.md

@@ -44,6 +44,10 @@ The analytics in DRA include metrics favored by [many scholars](./docs/attributi
 
 A [command-line interface](./docs/cli.md) (CLI) was added in v3.
 
+## Updates
+
+- 12/18/21 -- Added multi-member district (MMD) support to makePopulationScorecard().
+
 ## Build status for master branch
 
 [![CircleCI](https://circleci.com/gh/dra2020/dra-graph.svg?style=svg&circle-token=5c5fdd1ea8b6aa5fc80ec7657b805b3953c58e00)](https://circleci.com/gh/dra2020/dra-analytics)

package/dist/dra-analytics.js

@@ -7,7 +7,7 @@
 		exports["dra-analytics"] = factory();
 	else
 		root["dra-analytics"] = factory();
-})(global, function() {
+})(global, () => {
 return /******/ (() => { // webpackBootstrap
 /******/ 	"use strict";
 /******/ 	var __webpack_modules__ = ({
@@ -21,7 +21,11 @@ return /******/ (() => { // webpackBootstrap
 
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -263,7 +267,11 @@ Object.defineProperty(exports, "deepCopy", ({ enumerable: true, get: function ()
 
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -298,7 +306,7 @@ const dra_ratings_1 = __webpack_require__(/*! ../rate/dra-ratings */ "./lib/rate
 // Use this to get average Reock, Polsby-Popper, and KIWYSI compactness and by district for a set of shapes
 // This is used by DRA
 function makeCompactnessScorecard(shapes, bLog = false) {
-    const pca = 0 /* Revised */;
+    const pca = 0 /* T.PCAModel.Revised */;
     const options = undefined;
     // For calculating averages of by-district values
     let totReock = 0;
@@ -352,7 +360,7 @@ exports.makeCompactnessScorecard = makeCompactnessScorecard;
 // Calculate Reock & Polsby–Popper for a shape using the typical Cartesian (flat earth) calculations.
 // Also calculate the "know it when you see it" rank (smaller is better) that models human perceptions of compactness.
 function calcCompactness(shapes) {
-    const pca = 0 /* Revised */;
+    const pca = 0 /* T.PCAModel.Revised */;
     const options = undefined;
     // For calculating averages of by-district values
     let totReock = 0;
@@ -622,7 +630,11 @@ exports.featureizePoly = featureizePoly;
 //
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -674,7 +686,7 @@ exports.kiwysiScoreShapes = kiwysiScoreShapes;
 // Use this to get KIWYSI compactness features and scores ("ranks") for a set of shapes
 // Note - These calculations use the geodesic (curved earth) model
 function calcKIWYSICompactness(shapes) {
-    const pca = 0 /* Revised */;
+    const pca = 0 /* T.PCAModel.Revised */;
     const options = undefined;
     let totKIWYSI = 0;
     let byDistrict = [];
@@ -707,7 +719,7 @@ function calcKIWYSICompactness(shapes) {
 exports.calcKIWYSICompactness = calcKIWYSICompactness;
 // KIWYSI SCORE THE FEATURES FROM A FEATURE-IZED SHAPE
 function scoreFeatureSet(features, pca) {
-    if (pca == 0 /* Revised */)
+    if (pca == 0 /* T.PCAModel.Revised */)
         return applyPCAModel(features);
     else
         return applyPCAModel_ORIGINAL(features);
@@ -801,7 +813,11 @@ function protect(condition, message) {
 
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -828,7 +844,11 @@ __exportStar(__webpack_require__(/*! ./population */ "./lib/equal/population.ts"
 //
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -849,6 +869,7 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.makePopulationScorecard = exports.isRoughlyEqual = exports.calcPopulationDeviation = void 0;
 const C = __importStar(__webpack_require__(/*! ../rate/dra-config */ "./lib/rate/dra-config.ts"));
 const U = __importStar(__webpack_require__(/*! ../utils/all */ "./lib/utils/all.ts"));
+// MMD - This is the same for SMD & MMD. It's the calculation of min, max, and target size that differs.
 function calcPopulationDeviation(max, min, targetSize) {
     return (max - min) / targetSize; // Don't trim the result here!
 }
@@ -858,10 +879,35 @@ function isRoughlyEqual(devation, bLegislative) {
     return (devation <= threshold) ? true : false;
 }
 exports.isRoughlyEqual = isRoughlyEqual;
-function makePopulationScorecard(totPopByDistrict, targetSize, bLegislative, bLog = false) {
-    const nonEmptyDistricts = totPopByDistrict.filter(x => x > 0);
+// 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.
+function makePopulationScorecard(totPopByDistrict, targetSize, bLegislative, repsByDistrict, bLog = false) {
+    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 = 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);
         max = U.maxArray(nonEmptyDistricts);
@@ -898,7 +944,11 @@ exports.makePopulationScorecard = makePopulationScorecard;
 // Export everything here -- restrict package exports in all/graph.ts
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -925,7 +975,11 @@ __exportStar(__webpack_require__(/*! ./embedded */ "./lib/graph/embedded.ts"), e
 //
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -988,7 +1042,11 @@ exports.isConnected = isConnected;
 //
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -1077,7 +1135,11 @@ exports.NOT_ASSIGNED = 0;
 //
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -1144,7 +1206,11 @@ exports.invertPlan = invertPlan;
 // Export everything here -- restrict package exports in all/
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -1171,7 +1237,11 @@ __exportStar(__webpack_require__(/*! ./rpv */ "./lib/minority/rpv.ts"), exports)
 //
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -1255,64 +1325,64 @@ exports.makeMinorityScorecard = makeMinorityScorecard;
 // addressed logically by name as opposed to using array indices.
 function convertArrayToTable(a) {
     const minority = {
-        pct35_40: a[0 /* Minority */][0 /* L35_40 */],
-        pct40_45: a[0 /* Minority */][1 /* L40_45 */],
-        pct45_50: a[0 /* Minority */][2 /* L45_50 */],
-        pct50_55: a[0 /* Minority */][3 /* L50_55 */],
-        pct55_60: a[0 /* Minority */][4 /* L55_60 */],
-        pct60Plus: a[0 /* Minority */][5 /* L60Plus */],
-        vapPct: a[0 /* Minority */][6 /* VAPPct */],
-        propSeats: a[0 /* Minority */][7 /* PropSeats */]
+        pct35_40: a[0 /* Demographic.Minority */][0 /* PivotField.L35_40 */],
+        pct40_45: a[0 /* Demographic.Minority */][1 /* PivotField.L40_45 */],
+        pct45_50: a[0 /* Demographic.Minority */][2 /* PivotField.L45_50 */],
+        pct50_55: a[0 /* Demographic.Minority */][3 /* PivotField.L50_55 */],
+        pct55_60: a[0 /* Demographic.Minority */][4 /* PivotField.L55_60 */],
+        pct60Plus: a[0 /* Demographic.Minority */][5 /* PivotField.L60Plus */],
+        vapPct: a[0 /* Demographic.Minority */][6 /* PivotField.VAPPct */],
+        propSeats: a[0 /* Demographic.Minority */][7 /* PivotField.PropSeats */]
     };
     const black = {
-        pct35_40: a[1 /* Black */][0 /* L35_40 */],
-        pct40_45: a[1 /* Black */][1 /* L40_45 */],
-        pct45_50: a[1 /* Black */][2 /* L45_50 */],
-        pct50_55: a[1 /* Black */][3 /* L50_55 */],
-        pct55_60: a[1 /* Black */][4 /* L55_60 */],
-        pct60Plus: a[1 /* Black */][5 /* L60Plus */],
-        vapPct: a[1 /* Black */][6 /* VAPPct */],
-        propSeats: a[1 /* Black */][7 /* PropSeats */]
+        pct35_40: a[1 /* Demographic.Black */][0 /* PivotField.L35_40 */],
+        pct40_45: a[1 /* Demographic.Black */][1 /* PivotField.L40_45 */],
+        pct45_50: a[1 /* Demographic.Black */][2 /* PivotField.L45_50 */],
+        pct50_55: a[1 /* Demographic.Black */][3 /* PivotField.L50_55 */],
+        pct55_60: a[1 /* Demographic.Black */][4 /* PivotField.L55_60 */],
+        pct60Plus: a[1 /* Demographic.Black */][5 /* PivotField.L60Plus */],
+        vapPct: a[1 /* Demographic.Black */][6 /* PivotField.VAPPct */],
+        propSeats: a[1 /* Demographic.Black */][7 /* PivotField.PropSeats */]
     };
     const hispanic = {
-        pct35_40: a[2 /* Hispanic */][0 /* L35_40 */],
-        pct40_45: a[2 /* Hispanic */][1 /* L40_45 */],
-        pct45_50: a[2 /* Hispanic */][2 /* L45_50 */],
-        pct50_55: a[2 /* Hispanic */][3 /* L50_55 */],
-        pct55_60: a[2 /* Hispanic */][4 /* L55_60 */],
-        pct60Plus: a[2 /* Hispanic */][5 /* L60Plus */],
-        vapPct: a[2 /* Hispanic */][6 /* VAPPct */],
-        propSeats: a[2 /* Hispanic */][7 /* PropSeats */]
+        pct35_40: a[2 /* Demographic.Hispanic */][0 /* PivotField.L35_40 */],
+        pct40_45: a[2 /* Demographic.Hispanic */][1 /* PivotField.L40_45 */],
+        pct45_50: a[2 /* Demographic.Hispanic */][2 /* PivotField.L45_50 */],
+        pct50_55: a[2 /* Demographic.Hispanic */][3 /* PivotField.L50_55 */],
+        pct55_60: a[2 /* Demographic.Hispanic */][4 /* PivotField.L55_60 */],
+        pct60Plus: a[2 /* Demographic.Hispanic */][5 /* PivotField.L60Plus */],
+        vapPct: a[2 /* Demographic.Hispanic */][6 /* PivotField.VAPPct */],
+        propSeats: a[2 /* Demographic.Hispanic */][7 /* PivotField.PropSeats */]
     };
     const pacific = {
-        pct35_40: a[3 /* Pacific */][0 /* L35_40 */],
-        pct40_45: a[3 /* Pacific */][1 /* L40_45 */],
-        pct45_50: a[3 /* Pacific */][2 /* L45_50 */],
-        pct50_55: a[3 /* Pacific */][3 /* L50_55 */],
-        pct55_60: a[3 /* Pacific */][4 /* L55_60 */],
-        pct60Plus: a[3 /* Pacific */][5 /* L60Plus */],
-        vapPct: a[3 /* Pacific */][6 /* VAPPct */],
-        propSeats: a[3 /* Pacific */][7 /* PropSeats */]
+        pct35_40: a[3 /* Demographic.Pacific */][0 /* PivotField.L35_40 */],
+        pct40_45: a[3 /* Demographic.Pacific */][1 /* PivotField.L40_45 */],
+        pct45_50: a[3 /* Demographic.Pacific */][2 /* PivotField.L45_50 */],
+        pct50_55: a[3 /* Demographic.Pacific */][3 /* PivotField.L50_55 */],
+        pct55_60: a[3 /* Demographic.Pacific */][4 /* PivotField.L55_60 */],
+        pct60Plus: a[3 /* Demographic.Pacific */][5 /* PivotField.L60Plus */],
+        vapPct: a[3 /* Demographic.Pacific */][6 /* PivotField.VAPPct */],
+        propSeats: a[3 /* Demographic.Pacific */][7 /* PivotField.PropSeats */]
     };
     const asian = {
-        pct35_40: a[4 /* Asian */][0 /* L35_40 */],
-        pct40_45: a[4 /* Asian */][1 /* L40_45 */],
-        pct45_50: a[4 /* Asian */][2 /* L45_50 */],
-        pct50_55: a[4 /* Asian */][3 /* L50_55 */],
-        pct55_60: a[4 /* Asian */][4 /* L55_60 */],
-        pct60Plus: a[4 /* Asian */][5 /* L60Plus */],
-        vapPct: a[4 /* Asian */][6 /* VAPPct */],
-        propSeats: a[4 /* Asian */][7 /* PropSeats */]
+        pct35_40: a[4 /* Demographic.Asian */][0 /* PivotField.L35_40 */],
+        pct40_45: a[4 /* Demographic.Asian */][1 /* PivotField.L40_45 */],
+        pct45_50: a[4 /* Demographic.Asian */][2 /* PivotField.L45_50 */],
+        pct50_55: a[4 /* Demographic.Asian */][3 /* PivotField.L50_55 */],
+        pct55_60: a[4 /* Demographic.Asian */][4 /* PivotField.L55_60 */],
+        pct60Plus: a[4 /* Demographic.Asian */][5 /* PivotField.L60Plus */],
+        vapPct: a[4 /* Demographic.Asian */][6 /* PivotField.VAPPct */],
+        propSeats: a[4 /* Demographic.Asian */][7 /* PivotField.PropSeats */]
     };
     const native = {
-        pct35_40: a[5 /* Native */][0 /* L35_40 */],
-        pct40_45: a[5 /* Native */][1 /* L40_45 */],
-        pct45_50: a[5 /* Native */][2 /* L45_50 */],
-        pct50_55: a[5 /* Native */][3 /* L50_55 */],
-        pct55_60: a[5 /* Native */][4 /* L55_60 */],
-        pct60Plus: a[5 /* Native */][5 /* L60Plus */],
-        vapPct: a[5 /* Native */][6 /* VAPPct */],
-        propSeats: a[5 /* Native */][7 /* PropSeats */]
+        pct35_40: a[5 /* Demographic.Native */][0 /* PivotField.L35_40 */],
+        pct40_45: a[5 /* Demographic.Native */][1 /* PivotField.L40_45 */],
+        pct45_50: a[5 /* Demographic.Native */][2 /* PivotField.L45_50 */],
+        pct50_55: a[5 /* Demographic.Native */][3 /* PivotField.L50_55 */],
+        pct55_60: a[5 /* Demographic.Native */][4 /* PivotField.L55_60 */],
+        pct60Plus: a[5 /* Demographic.Native */][5 /* PivotField.L60Plus */],
+        vapPct: a[5 /* Demographic.Native */][6 /* PivotField.VAPPct */],
+        propSeats: a[5 /* Demographic.Native */][7 /* PivotField.PropSeats */]
     };
     const t = {
         minority: minority,
@@ -1562,7 +1632,11 @@ const invertX = (pt) => { return { x: 1 - pt.x, y: pt.y }; };
 // Export everything here -- restrict package exports in all/partisan.ts
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -1594,7 +1668,7 @@ const bias_1 = __webpack_require__(/*! ../../lib/partisan/bias */ "./lib/partisa
 const responsiveness_1 = __webpack_require__(/*! ../../lib/partisan/responsiveness */ "./lib/partisan/responsiveness.ts");
 const all_1 = __webpack_require__(/*! ../all/all */ "./lib/all/all.ts");
 function makePartisanScorecard(Vf, VfArray, bLog = false) {
-    const shift = 0 /* Proportional */;
+    const shift = 0 /* T.Shift.Proportional */;
     const N = VfArray.length;
     const bestS = (0, bias_1.bestSeats)(N, Vf);
     const bestSf = (0, bias_1.bestSeatShare)(bestS, N);
@@ -1720,7 +1794,11 @@ exports.calcPartisanMetrics = calcPartisanMetrics;
 //
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -1908,9 +1986,9 @@ function invertSVPoints(inferredSVpoints) {
 exports.invertSVPoints = invertSVPoints;
 // EFFICIENCY GAP -- note the formulation used. Also, to accommodate turnout bias,
 //   we would need to have D & R votes, not just shares.
-function calcEfficiencyGap(Vf, Sf, shareType = 0 /* Democratic */) {
+function calcEfficiencyGap(Vf, Sf, shareType = 0 /* T.Party.Democratic */) {
     let efficiencyGap;
-    if (shareType == 1 /* Republican */) {
+    if (shareType == 1 /* T.Party.Republican */) {
         // NOTE - This is the  common formulation:
         //
         //   EG = (Sf – 0.5)  – (2 × (Vf – 0.5))
@@ -2310,7 +2388,11 @@ describe('erf approximation', () =>
 //
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -2386,7 +2468,7 @@ function inferSVpoints(Vf, VfArray, shift, range) {
 }
 exports.inferSVpoints = inferSVpoints;
 function shiftDistricts(Vf, VfArray, shiftedVf, shift) {
-    if (shift == 0 /* Proportional */)
+    if (shift == 0 /* T.Shift.Proportional */)
         return shiftProportionally(Vf, VfArray, shiftedVf);
     else
         return shiftUniformly(Vf, VfArray, shiftedVf);
@@ -2516,7 +2598,11 @@ exports.fptpWin = fptpWin;
 //
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -2673,7 +2759,11 @@ exports.findMarginalDistricts = findMarginalDistricts;
 
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -2828,10 +2918,10 @@ exports.districtSplittingRange = districtSplittingRange;
 // NOTE - Raw ranges, not inverted (i.e., smaller is better)
 // NOTE - This could be optimized to not calc LD values for CD's (or do it once)
 function popdevRange(bLegislative, overridesJSON) {
-    const cdRange = config.popdev.range[0 /* Congressional */];
+    const cdRange = config.popdev.range[0 /* T.DistrictType.Congressional */];
     const worstCD = cdRange[exports.BEG];
     const bestCD = cdRange[exports.END];
-    const ldRange = config.popdev.range[1 /* StateLegislative */];
+    const ldRange = config.popdev.range[1 /* T.DistrictType.StateLegislative */];
     const iRange = bLegislative ? ldRange : cdRange;
     const worst = iRange[exports.BEG];
     const best = bLegislative ? (bestCD / worstCD) * iRange[exports.BEG] : iRange[exports.END];
@@ -2861,7 +2951,11 @@ exports.popdevThreshold = popdevThreshold;
 //
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -2883,6 +2977,7 @@ exports.adjustSplittingRating = exports.rateSplittingLegacy = exports.rateDistri
 const C = __importStar(__webpack_require__(/*! ./dra-config */ "./lib/rate/dra-config.ts"));
 const normalize_1 = __webpack_require__(/*! ../rate/normalize */ "./lib/rate/normalize.ts");
 const method_1 = __webpack_require__(/*! ../partisan/method */ "./lib/partisan/method.ts");
+// MMD - This is already generalized, if deviations have been calculated based on # of reps instead of districts.
 // RATE POPULATION DEVIATION
 function ratePopulationDeviation(rawDeviation, bLegislative) {
     const _normalizer = new normalize_1.Normalizer(rawDeviation);
@@ -3133,7 +3228,7 @@ function rateCountySplittingLegacy(rawCountySplitting, nCounties, nDistricts, bL
 }
 exports.rateCountySplittingLegacy = rateCountySplittingLegacy;
 function countySplitBest(nCounties, nDistricts, bLD = false) {
-    const districtType = (bLD) ? 1 /* StateLegislative */ : 0 /* Congressional */;
+    const districtType = (bLD) ? 1 /* T.DistrictType.StateLegislative */ : 0 /* T.DistrictType.Congressional */;
     const practicalBest = C.countySplittingRange(districtType)[C.BEG];
     const nAllowableSplits = Math.min(nDistricts - 1, nCounties);
     const threshold = ((nAllowableSplits * practicalBest) + ((nCounties - nAllowableSplits) * 1.0)) / nCounties;
@@ -3141,7 +3236,7 @@ function countySplitBest(nCounties, nDistricts, bLD = false) {
 }
 exports.countySplitBest = countySplitBest;
 function countySplitWorst(avgBest, bLD = false) {
-    const districtType = (bLD) ? 1 /* StateLegislative */ : 0 /* Congressional */;
+    const districtType = (bLD) ? 1 /* T.DistrictType.StateLegislative */ : 0 /* T.DistrictType.Congressional */;
     const singleBest = C.countySplittingRange(districtType)[C.BEG];
     const singleWorst = C.countySplittingRange(districtType)[C.END];
     // The practical ideal score depends on the # of counties & districts
@@ -3150,7 +3245,7 @@ function countySplitWorst(avgBest, bLD = false) {
 }
 exports.countySplitWorst = countySplitWorst;
 function rateDistrictSplittingLegacy(rawDistrictSplitting, bLD = false) {
-    const districtType = (bLD) ? 1 /* StateLegislative */ : 0 /* Congressional */;
+    const districtType = (bLD) ? 1 /* T.DistrictType.StateLegislative */ : 0 /* T.DistrictType.Congressional */;
     const _normalizer = new normalize_1.Normalizer(rawDistrictSplitting);
     const best = C.districtSplittingRange(districtType)[C.BEG];
     const worst = C.districtSplittingRange(districtType)[C.END];
@@ -3196,7 +3291,11 @@ exports.adjustSplittingRating = adjustSplittingRating;
 //
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -3262,10 +3361,10 @@ class Normalizer {
     // Decay a value in the unit range [0.0–1.0] by its distance from zero.
     // NOTE - If the range is already such that "bigger is better," then the closer
     //   the value is to 1.0 (the best) the *less* it will decay.
-    decay(fn = 0 /* Gravity */) {
+    decay(fn = 0 /* DecayFn.Gravity */) {
         console.assert(((this.wipNum >= 0.0) && (this.wipNum <= 1.0)), "Decaying: " + S.OUT_OF_RANGE_MSG, this.wipNum);
         switch (fn) {
-            case 0 /* Gravity */: {
+            case 0 /* DecayFn.Gravity */: {
                 this.wipNum = Math.pow(this.wipNum, S.DISTANCE_WEIGHT);
                 return this.wipNum;
             }
@@ -3318,7 +3417,11 @@ exports.OUT_OF_RANGE_MSG = "%f out of range";
 // Export everything here -- restrict package exports in all/splitting.ts
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -3346,7 +3449,11 @@ __exportStar(__webpack_require__(/*! ./utils */ "./lib/splitting/utils.ts"), exp
 //
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -3419,7 +3526,11 @@ exports.calcCOISplitting = calcCOISplitting;
 //
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -3716,7 +3827,11 @@ exports.isMinusZero = isMinusZero;
 
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -3744,7 +3859,11 @@ __exportStar(__webpack_require__(/*! ./settings */ "./lib/utils/settings.ts"), e
 //
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];