@dra2020/district-analytics 5.5.0 → 5.6.0

package/dist/cli.js

@@ -88611,13 +88611,11 @@ const U = __importStar(__webpack_require__(/*! ./utils */ "./src/utils.ts"));
 const S = __importStar(__webpack_require__(/*! ./settings */ "./src/settings.ts"));
 const C = __importStar(__webpack_require__(/*! ./config */ "./src/config.ts"));
 const normalize_1 = __webpack_require__(/*! ./normalize */ "./src/normalize.ts");
-function scoreCountySplitting(rawValue, nCounties, nDistricts) {
+function scoreCountySplitting(rawValue, nCounties, nDistricts, bLD = false) {
     const _normalizer = new normalize_1.Normalizer(rawValue);
-    const singleBest = C.countySplittingRange()[C.BEG];
-    const singleWorst = C.countySplittingRange()[C.END];
     // The practical ideal score depends on the # of counties & districts
-    const avgBest = countySplitBest(nCounties, nDistricts);
-    const avgWorst = countySplitWorst(avgBest);
+    const avgBest = countySplitBest(nCounties, nDistricts, bLD);
+    const avgWorst = countySplitWorst(avgBest, bLD);
     _normalizer.clip(avgBest, avgWorst);
     _normalizer.unitize(avgBest, avgWorst);
     _normalizer.invert();
@@ -88625,25 +88623,28 @@ function scoreCountySplitting(rawValue, nCounties, nDistricts) {
     return _normalizer.normalizedNum;
 }
 exports.scoreCountySplitting = scoreCountySplitting;
-function countySplitBest(nCounties, nDistricts) {
-    const practicalBest = C.countySplittingRange()[C.BEG];
+function countySplitBest(nCounties, nDistricts, bLD = false) {
+    const districtType = (bLD) ? 1 /* StateLegistlative */ : 0 /* Congressional */;
+    const practicalBest = C.countySplittingRange(districtType)[C.BEG];
     const nAllowableSplits = Math.min(nDistricts - 1, nCounties);
     const threshold = ((nAllowableSplits * practicalBest) + ((nCounties - nAllowableSplits) * 1.0)) / nCounties;
     return threshold;
 }
 exports.countySplitBest = countySplitBest;
-function countySplitWorst(avgBest) {
-    const singleBest = C.countySplittingRange()[C.BEG];
-    const singleWorst = C.countySplittingRange()[C.END];
+function countySplitWorst(avgBest, bLD = false) {
+    const districtType = (bLD) ? 1 /* StateLegistlative */ : 0 /* 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
     const avgWorst = avgBest * (singleWorst / singleBest);
     return avgWorst;
 }
 exports.countySplitWorst = countySplitWorst;
-function scoreDistrictSplitting(rawValue) {
+function scoreDistrictSplitting(rawValue, bLD = false) {
+    const districtType = (bLD) ? 1 /* StateLegistlative */ : 0 /* Congressional */;
     const _normalizer = new normalize_1.Normalizer(rawValue);
-    const best = C.districtSplittingRange()[C.BEG];
-    const worst = C.districtSplittingRange()[C.END];
+    const best = C.districtSplittingRange(districtType)[C.BEG];
+    const worst = C.districtSplittingRange(districtType)[C.END];
     _normalizer.clip(best, worst);
     _normalizer.unitize(best, worst);
     _normalizer.invert();
@@ -88653,14 +88654,14 @@ function scoreDistrictSplitting(rawValue) {
 exports.scoreDistrictSplitting = scoreDistrictSplitting;
 // Migrated from district-analytics
 // CALCULATE ENHANCED SQRT ENTROPY METRIC
-function doCountySplittingReduced(CxD, districtTotals, countyTotals, bLog = false) {
+function doCountySplittingReduced(CxD, districtTotals, countyTotals, bLD = false) {
     const rC = reduceCSplits(CxD, districtTotals);
     const f = calcCountyFractions(rC, countyTotals);
     const w = calcCountyWeights(countyTotals);
     const nD = districtTotals.length;
     const nC = countyTotals.length;
-    const rawSqEnt_DC = countySplitting(f, w, bLog);
-    const normalizedSqEnt_DC = scoreCountySplitting(rawSqEnt_DC, nC, nD);
+    const rawSqEnt_DC = countySplitting(f, w);
+    const normalizedSqEnt_DC = scoreCountySplitting(rawSqEnt_DC, nC, nD, bLD);
     const m = {
         raw: rawSqEnt_DC,
         normalized: normalizedSqEnt_DC,
@@ -88676,12 +88677,12 @@ function doCountySplitting(CxD, countyTotals, bLog = false) {
     return SqEnt_DC;
 }
 exports.doCountySplitting = doCountySplitting;
-function doDistrictSplittingReduced(CxD, districtTotals, countyTotals, bLog = false) {
+function doDistrictSplittingReduced(CxD, districtTotals, countyTotals, bLD = false) {
     const rD = reduceDSplits(CxD, countyTotals);
     const g = calcDistrictFractions(rD, districtTotals);
     const x = calcDistrictWeights(districtTotals);
-    const rawSqEnt_CD = districtSplitting(g, x, bLog);
-    const normalizedSqEnt_CD = scoreDistrictSplitting(rawSqEnt_CD);
+    const rawSqEnt_CD = districtSplitting(g, x);
+    const normalizedSqEnt_CD = scoreDistrictSplitting(rawSqEnt_CD, bLD);
     const m = {
         raw: rawSqEnt_CD,
         normalized: normalizedSqEnt_CD,
@@ -89101,7 +89102,7 @@ exports.scorePolsbyPopper = scorePolsbyPopper;
 /*! exports provided: partisan, minority, traditionalPrinciples, default */
 /***/ (function(module) {
 
-module.exports = JSON.parse("{\"partisan\":{\"bias\":{\"range\":[0,0.2],\"weight\":[50,80]},\"impact\":{\"weight\":[50,0],\"threshold\":4},\"competitiveness\":{\"overall\":{\"range\":[0,0.67],\"weight\":100},\"marginal\":{\"range\":[0,0.85],\"weight\":0},\"range\":[0.45,0.55],\"distribution\":[0.25,0.75],\"weight\":[0,20]},\"bonus\":2,\"weight\":[100,80]},\"minority\":{\"range\":[0.37,0.5],\"distribution\":[0.25,0.75],\"shift\":0.15,\"bonus\":20},\"traditionalPrinciples\":{\"compactness\":{\"reock\":{\"range\":[0.25,0.5],\"weight\":50},\"polsby\":{\"range\":[0.1,0.5],\"weight\":50},\"weight\":[0,50]},\"splitting\":{\"county\":{\"range\":[1.26,1.68],\"weight\":50},\"district\":{\"range\":[1.26,1.68],\"weight\":50},\"weight\":[0,50]},\"popdev\":{\"range\":[[0.0075,0.002],[0.1,-1]],\"weight\":[0,0]},\"weight\":[0,20]}}");
+module.exports = JSON.parse("{\"partisan\":{\"bias\":{\"range\":[0,0.2],\"weight\":[50,80]},\"impact\":{\"weight\":[50,0],\"threshold\":4},\"competitiveness\":{\"overall\":{\"range\":[0,0.67],\"weight\":100},\"marginal\":{\"range\":[0,0.85],\"weight\":0},\"range\":[0.45,0.55],\"distribution\":[0.25,0.75],\"weight\":[0,20]},\"bonus\":2,\"weight\":[100,80]},\"minority\":{\"range\":[0.37,0.5],\"distribution\":[0.25,0.75],\"shift\":0.15,\"bonus\":20},\"traditionalPrinciples\":{\"compactness\":{\"reock\":{\"range\":[0.25,0.5],\"weight\":50},\"polsby\":{\"range\":[0.1,0.5],\"weight\":50},\"weight\":[0,50]},\"splitting\":{\"county\":{\"range\":[[1.26,1.68],[1.16,1.55]],\"weight\":50},\"district\":{\"range\":[[1.26,1.68],[1.16,1.55]],\"weight\":50},\"weight\":[0,50]},\"popdev\":{\"range\":[[0.0075,0.002],[0.1,-1]],\"weight\":[0,0]},\"weight\":[0,20]}}");
 
 /***/ }),
 
@@ -89251,8 +89252,8 @@ function countySplittingWeight(overridesJSON) {
     return csW;
 }
 exports.countySplittingWeight = countySplittingWeight;
-function countySplittingRange(overridesJSON) {
-    const range = config_json_1.default.traditionalPrinciples.splitting.county.range;
+function countySplittingRange(d, overridesJSON) {
+    const range = config_json_1.default.traditionalPrinciples.splitting.county.range[d];
     return range;
 }
 exports.countySplittingRange = countySplittingRange;
@@ -89261,8 +89262,8 @@ function districtSplittingWeight(overridesJSON) {
     return dsW;
 }
 exports.districtSplittingWeight = districtSplittingWeight;
-function districtSplittingRange(overridesJSON) {
-    const range = config_json_1.default.traditionalPrinciples.splitting.district.range;
+function districtSplittingRange(d, overridesJSON) {
+    const range = config_json_1.default.traditionalPrinciples.splitting.district.range[d];
     return range;
 }
 exports.districtSplittingRange = districtSplittingRange;
@@ -90177,9 +90178,9 @@ function estMarginalCompetitiveDistricts(Mrange, VfArray) {
     const maxId = Mrange[C.END];
     // Sort the array values, and subset it to those districts
     // NOTE - I'm *not* keeping track of the district indexes right now
-    let subsetVfArray = VfArray.sort().slice(minId - 1, maxId);
+    let subsetVfArray = U.deepCopy(VfArray).sort().slice(minId - 1, maxId);
     // Est. competitive districts on that array
-    const Md = U.sumArray(subsetVfArray.map(v => estDistrictCompetitiveness(v)));
+    const Md = U.sumArray(subsetVfArray.map((v) => estDistrictCompetitiveness(v)));
     return U.trim(Md);
 }
 exports.estMarginalCompetitiveDistricts = estMarginalCompetitiveDistricts;
@@ -90578,7 +90579,7 @@ const equal_1 = __webpack_require__(/*! ./equal */ "./src/equal.ts");
 const partisan_1 = __webpack_require__(/*! ./partisan */ "./src/partisan.ts");
 const minority_1 = __webpack_require__(/*! ./minority */ "./src/minority.ts");
 function scorePlan(p, overridesJSON) {
-    // TRADITIONAL DISTRICTING PRINCIPLES ("best") subcategories - compactness, splitting, population deviation
+    const bLD = p.legislativeDistricts;
     // Compactness
     const reockM = compact_1.doReock(p.compactnessProfile.geometryByDistrict);
     const polsbyM = compact_1.doPolsbyPopper(p.compactnessProfile.geometryByDistrict);
@@ -90787,16 +90788,18 @@ function maxArray(arr) {
 }
 exports.maxArray = maxArray;
 // Modified from https://jsfiddle.net/Lucky500/3sy5au0c/
+// NOTE - Copy the array, because arr.sort() sorts in place!
 function medianArray(arr) {
     if (arr.length === 0)
         return 0;
-    arr.sort(function (a, b) {
+    let copyArr = deepCopy(arr);
+    copyArr.sort(function (a, b) {
         return a - b;
     });
-    var half = Math.floor(arr.length / 2);
-    if (arr.length % 2)
-        return arr[half];
-    return (arr[half - 1] + arr[half]) / 2.0;
+    var half = Math.floor(copyArr.length / 2);
+    if (copyArr.length % 2)
+        return copyArr[half];
+    return (copyArr[half - 1] + copyArr[half]) / 2.0;
 }
 exports.medianArray = medianArray;
 function initArray(n, value) {