@dra2020/district-analytics 5.0.3 → 5.1.0

package/dist/cli.js

@@ -89315,23 +89315,33 @@ const C = __importStar(__webpack_require__(/*! ./config */ "./src/config.ts"));
 const normalize_1 = __webpack_require__(/*! ./normalize */ "./src/normalize.ts");
 function scoreCountySplitting(rawValue, nCounties, nDistricts) {
     const _normalizer = new normalize_1.Normalizer(rawValue);
-    const best = C.countySplittingRange()[C.BEG];
-    const worst = countySplitThreshold(nCounties, nDistricts);
-    _normalizer.clip(best, worst);
-    _normalizer.unitize(best, worst);
+    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);
+    _normalizer.clip(avgBest, avgWorst);
+    _normalizer.unitize(avgBest, avgWorst);
     _normalizer.invert();
     _normalizer.rescale();
     return _normalizer.normalizedNum;
 }
 exports.scoreCountySplitting = scoreCountySplitting;
-function countySplitThreshold(nCounties, nDistricts) {
-    const m = C.allowableSplitsMultiplier();
-    const worst = C.countySplittingRange()[1];
-    const nAllowableSplits = Math.min(m * (nDistricts - 1), nCounties);
-    const threshold = ((nAllowableSplits * worst) + ((nCounties - nAllowableSplits) * 1.0)) / nCounties;
+function countySplitBest(nCounties, nDistricts) {
+    const practicalBest = C.countySplittingRange()[C.BEG];
+    const nAllowableSplits = Math.min(nDistricts - 1, nCounties);
+    const threshold = ((nAllowableSplits * practicalBest) + ((nCounties - nAllowableSplits) * 1.0)) / nCounties;
     return threshold;
 }
-exports.countySplitThreshold = countySplitThreshold;
+exports.countySplitBest = countySplitBest;
+function countySplitWorst(avgBest) {
+    const singleBest = C.countySplittingRange()[C.BEG];
+    const singleWorst = C.countySplittingRange()[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) {
     const _normalizer = new normalize_1.Normalizer(rawValue);
     const best = C.districtSplittingRange()[C.BEG];
@@ -89793,7 +89803,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,1.71],\"allowableSplitsMultiplier\":1.5,\"weight\":50},\"district\":{\"range\":[1,1.5],\"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],\"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]}}");
 
 /***/ }),
 
@@ -89948,11 +89958,6 @@ function countySplittingRange(overridesJSON) {
     return range;
 }
 exports.countySplittingRange = countySplittingRange;
-function allowableSplitsMultiplier(overridesJSON) {
-    const m = config_json_1.default.traditionalPrinciples.splitting.county.allowableSplitsMultiplier;
-    return m;
-}
-exports.allowableSplitsMultiplier = allowableSplitsMultiplier;
 function districtSplittingWeight(overridesJSON) {
     const dsW = config_json_1.default.traditionalPrinciples.splitting.district.weight;
     return dsW;
@@ -90165,12 +90170,10 @@ function evalMinorityOpportunity(p, bLog = false) {
             averageDVf: averageDVf,
             bucketsByDemographic: bucketsByDemo
         },
-        // nOpportunity1: l1,
-        // nOpportunity2: l2,
         nProportional: pD,
         opportunityDistricts: oD,
         score: score,
-        details: {} // TODO - Add notes
+        details: {}
     };
     return mS;
 }
@@ -90500,7 +90503,7 @@ function scorePartisan(Vf, VfArray, options) {
         competitiveness: competitiveScoring,
         score: acrossStatesPartisanScore,
         score2: withinStatesPartisanScore,
-        details: {} // TODO - Add notes
+        details: {}
     };
     return s;
 }
@@ -91290,7 +91293,7 @@ function scorePlan(p, overridesJSON) {
         compactness: cS,
         splitting: sS,
         populationDeviation: pdS,
-        details: {} // TODO - Add notes
+        details: {}
     };
     // PARTISAN ("fair") subcategories - bias, impact, & competitiveness (plus lots of supporting measures)
     const options = {
@@ -91311,7 +91314,7 @@ function scorePlan(p, overridesJSON) {
         minority: mS,
         traditionalPrinciples: tpS,
         score: score,
-        details: {} // TODO - Add notes
+        details: {}
     };
     return scorecard;
 }
@@ -91366,12 +91369,7 @@ function printScorecardRow(xx, name, N, Vf, s) {
     s.partisan.bias.score, s.partisan.impact.unearnedS, // 9
     s.partisan.impact.score, s.partisan.competitiveness.cSimple, // 11
     s.partisan.competitiveness.cD, s.partisan.competitiveness.mD, s.partisan.competitiveness.score, s.partisan.score2, // 15
-    s.traditionalPrinciples.compactness.reock.raw, s.traditionalPrinciples.compactness.reock.normalized, s.traditionalPrinciples.compactness.polsby.raw, s.traditionalPrinciples.compactness.polsby.normalized, s.traditionalPrinciples.compactness.score, s.traditionalPrinciples.splitting.county.raw, s.traditionalPrinciples.splitting.county.normalized, s.traditionalPrinciples.splitting.district.raw, s.traditionalPrinciples.splitting.district.normalized, s.traditionalPrinciples.splitting.score, s.traditionalPrinciples.populationDeviation.raw, s.traditionalPrinciples.populationDeviation.normalized, s.traditionalPrinciples.score, 
-    // s.minority.nOpportunity1,
-    // s.minority.nOpportunity2,
-    s.minority.opportunityDistricts, 
-    // s.minority.nProportional,
-    s.minority.score, s.score);
+    s.traditionalPrinciples.compactness.reock.raw, s.traditionalPrinciples.compactness.reock.normalized, s.traditionalPrinciples.compactness.polsby.raw, s.traditionalPrinciples.compactness.polsby.normalized, s.traditionalPrinciples.compactness.score, s.traditionalPrinciples.splitting.county.raw, s.traditionalPrinciples.splitting.county.normalized, s.traditionalPrinciples.splitting.district.raw, s.traditionalPrinciples.splitting.district.normalized, s.traditionalPrinciples.splitting.score, s.traditionalPrinciples.populationDeviation.raw, s.traditionalPrinciples.populationDeviation.normalized, s.traditionalPrinciples.score, s.minority.opportunityDistricts, s.minority.score, s.score);
 }
 exports.printScorecardRow = printScorecardRow;