@dra2020/district-analytics 5.6.0 → 5.6.3

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2019 Alec Ramsay
+Copyright (c) 2020 Alec Ramsay
 
 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/dist/cli.js

@@ -89102,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],[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]}}");
+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.09,1.45]],\"weight\":50},\"district\":{\"range\":[[1.26,1.68],[1.09,1.45]],\"weight\":50},\"weight\":[0,50]},\"popdev\":{\"range\":[[0.0075,0.002],[0.1,-1]],\"weight\":[0,0]},\"weight\":[0,20]}}");
 
 /***/ }),
 
@@ -89745,10 +89745,10 @@ function scorePartisan(Vf, VfArray, options) {
     // Calculate alternate responsiveness metrics for reference
     const bigR = bAlternateMetrics ? calcBigR(Vf, estSf) : undefined;
     const littleR = bAlternateMetrics ? estResponsiveness(Vf, inferredSVpoints) : undefined;
-    const MIR = bAlternateMetrics ? calcMinimalInverseResponsiveness(Vf, littleR) : undefined;
+    const MIR = (bAlternateMetrics && littleR) ? calcMinimalInverseResponsiveness(Vf, littleR) : undefined;
     const rD = (!bConstrained || bAlternateMetrics) ? estResponsiveDistricts(VfArray) : undefined;
     const rDf = bAlternateMetrics ? estResponsiveDistrictsShare(rD, N) : undefined;
-    const gamma = bAlternateMetrics ? calcGammaNEW(Vf, estSf, littleR) : undefined;
+    const gamma = (bAlternateMetrics && littleR) ? calcGamma(Vf, estSf, littleR) : undefined;
     const Cn = countCompetitiveDistricts(VfArray);
     const cD = estCompetitiveDistricts(VfArray); // NOTE - Cd by definition uses a more narrow probability distribution vs. Rd
     // const cD = bConstrained ? estCompetitiveDistricts(VfArray) : rD as number;
@@ -89912,7 +89912,7 @@ function scoreCompetitiveness(rawMarginal, rawOverall) {
     const mcW = C.marginalCompetitivenessWeight();
     const ocW = C.overallCompetitivenessWeight();
     // Then combine the results
-    const score = Math.round(((mcW * mcS) + (ocW * ocS)) / (mcW + ocW));
+    const score = ((mcW + ocW) > 0) ? Math.round(((mcW * mcS) + (ocW * ocS)) / (mcW + ocW)) : 0;
     return score;
 }
 exports.scoreCompetitiveness = scoreCompetitiveness;
@@ -90058,15 +90058,17 @@ exports.estUnearnedSeats = estUnearnedSeats;
 // ESTIMATE RESPONSIVENESS ("COMPETITIVE")
 // R# - Estimate responsiveness at the statewide vote share
 function estResponsiveness(Vf, inferredSVpoints) {
-    let R = undefined;
+    let r = undefined;
     // NOTE - Seat values are already fractions [0.0–1.0] here.
     const lowerPt = findBracketingLowerVf(Vf, inferredSVpoints);
     const upperPt = findBracketingUpperVf(Vf, inferredSVpoints);
-    if (!(U.areRoughlyEqual((upperPt.v - lowerPt.v), 0, S.EPSILON))) {
-        R = ((upperPt.s - lowerPt.s) / (upperPt.v - lowerPt.v));
-        R = U.trim(R);
+    if (lowerPt && upperPt) {
+        if (!(U.areRoughlyEqual((upperPt.v - lowerPt.v), 0, S.EPSILON))) {
+            r = ((upperPt.s - lowerPt.s) / (upperPt.v - lowerPt.v));
+            r = U.trim(r);
+        }
     }
-    return R;
+    return r;
 }
 exports.estResponsiveness = estResponsiveness;
 // Find the S(V) point that brackets a Vf value on the lower end
@@ -90261,30 +90263,36 @@ function estSeatBias(inferredSVpoints, nDistricts) {
 exports.estSeatBias = estSeatBias;
 // VOTES BIAS -- John Nagle's simple vote bias @ 50% (alpha2), a percentage.
 function estVotesBias(inferredSVpoints, nDistricts) {
-    let extraVf = 0.0;
+    let extraVf = undefined;
     // Interpolate the extra Vf required @ Sf = 0.5
     const lowerPt = findBracketingLowerSf(0.5, inferredSVpoints);
     const upperPt = findBracketingUpperSf(0.5, inferredSVpoints);
-    if ((upperPt.s - lowerPt.s) != 0) {
-        const ratio = (upperPt.v - lowerPt.v) / (upperPt.s - lowerPt.s);
-        const deltaS = 0.5 - lowerPt.s;
-        extraVf = lowerPt.v + (ratio * deltaS) - 0.5;
+    if (lowerPt && upperPt) {
+        extraVf = 0.0;
+        if ((upperPt.s - lowerPt.s) != 0) {
+            const ratio = (upperPt.v - lowerPt.v) / (upperPt.s - lowerPt.s);
+            const deltaS = 0.5 - lowerPt.s;
+            extraVf = lowerPt.v + (ratio * deltaS) - 0.5;
+        }
+        extraVf = U.trim(extraVf);
     }
-    extraVf = U.trim(extraVf);
     return extraVf;
 }
 exports.estVotesBias = estVotesBias;
 // GEOMETRIC SEATS BIAS (@ V = statewide vote share)
 function estGeometricSeatsBias(Vf, inferredSVpoints) {
+    let BsGf = undefined;
     const bgsSVpoints = inferGeometricSeatsBiasPoints(inferredSVpoints);
     // Interpolate the seat fraction @ Vf
     const lowerPt = findBracketingLowerVf(Vf, bgsSVpoints);
     const upperPt = findBracketingUpperVf(Vf, bgsSVpoints);
-    const ratio = (upperPt.s - lowerPt.s) / (upperPt.v - lowerPt.v);
-    const deltaV = Vf - lowerPt.v;
-    const deltaS = ratio * deltaV;
-    const BsGf = lowerPt.s + deltaS;
-    return U.trim(BsGf);
+    if (lowerPt && upperPt) {
+        const ratio = (upperPt.s - lowerPt.s) / (upperPt.v - lowerPt.v);
+        const deltaV = Vf - lowerPt.v;
+        const deltaS = ratio * deltaV;
+        BsGf = U.trim(lowerPt.s + deltaS);
+    }
+    return BsGf;
 }
 exports.estGeometricSeatsBias = estGeometricSeatsBias;
 function inferGeometricSeatsBiasPoints(inferredSVpoints) {
@@ -90510,11 +90518,11 @@ function isBalanced(Vf) {
 //     return (0.5 + plan.responsiveness * (plan.statewide_vote_share - 0.5) \
 //       - (plan.predicted_D_seats / plan.districts)) \
 //         * 100
-function calcGammaNEW(Vf, Sf, r) {
+function calcGamma(Vf, Sf, r) {
     const g = 0.5 + (r * (Vf - 0.5)) - Sf;
     return U.trim(g);
 }
-exports.calcGammaNEW = calcGammaNEW;
+exports.calcGamma = calcGamma;
 // HELPERS
 function printPartisanScorecardHeader() {
     console.log('XX, Name, N, V%, ^S#, S#, B%, B$, UE#, I$, C#, Cd, Md, C$, <P$');