@dra2020/district-analytics 4.3.2 → 4.3.3

package/dist/cli.js

@@ -90440,7 +90440,8 @@ function scorePartisan(Vf, VfArray, options) {
     const rD = (!bConstrained || bAlternateMetrics) ? estResponsiveDistricts(VfArray) : undefined;
     const rDf = bAlternateMetrics ? estResponsiveDistrictsShare(rD, N) : undefined;
     const Cn = countCompetitiveDistricts(VfArray);
-    const cD = bConstrained ? estCompetitiveDistricts(VfArray) : rD;
+    const cD = estCompetitiveDistricts(VfArray); // NOTE - Cd by definition uses a more narrow probability distribution vs. Rd
+    // const cD = bConstrained ? estCompetitiveDistricts(VfArray) : rD as number;
     const cDf = estCompetitiveDistrictsShare(cD, N);
     const Mrange = findMarginalDistricts(Vf, VfArray, N);
     const Md = estMarginalCompetitiveDistricts(Mrange, VfArray);
@@ -91210,13 +91211,13 @@ function printPartisanScorecardRow(xx, name, N, Vf, s) {
 exports.printPartisanScorecardRow = printPartisanScorecardRow;
 // Generate partisan details (Table 1)
 function printPartisanDetailsHeader() {
-    console.log('XX, <V>, S(<V>), S50V, V50S, Decl, B_G, EG, Beta, l-gamma, mM, TO, mM\', LO, R, r, Zeta');
+    console.log('XX, <V>, S(<V>), S50V, V50S, Decl, B_G, EG, Beta, l-gamma, mM, TO, mM\', LO, Rd, R, r, Zeta');
 }
 exports.printPartisanDetailsHeader = printPartisanDetailsHeader;
 function printPartisanDetailsRow(xx, name, N, Vf, s) {
-    console.log('%s, %f, %f, %f, %f, %f, %f, %f, %f, %f, %f, %f, %f, %f, %f, %f, %f', xx, Vf, s.bias.estSf, s.bias.bS50, s.bias.bV50, s.bias.decl, s.bias.gSym, s.bias.eG, s.bias.bSV, // Beta
+    console.log('%s, %f, %f, %f, %f, %f, %f, %f, %f, %f, %f, %f, %f, %f, %f, %f, %f, %f', xx, Vf, s.bias.estSf, s.bias.bS50, s.bias.bV50, s.bias.decl, s.bias.gSym, s.bias.eG, s.bias.bSV, // Beta
     s.bias.prop, // Lower-gamma
-    s.bias.mMs, s.bias.tOf, s.bias.mMd, s.bias.lO, s.competitiveness.bigR, s.competitiveness.littleR, s.competitiveness.mIR // Zeta
+    s.bias.mMs, s.bias.tOf, s.bias.mMd, s.bias.lO, s.competitiveness.rD, s.competitiveness.bigR, s.competitiveness.littleR, s.competitiveness.mIR // Zeta
     );
 }
 exports.printPartisanDetailsRow = printPartisanDetailsRow;
@@ -91289,7 +91290,7 @@ function scorePlan(p, overridesJSON) {
     // PARTISAN ("fair") subcategories - bias, impact, & competitiveness (plus lots of supporting measures)
     const options = {
         alternates: true,
-        constrained: true,
+        constrained: false,
         shift: 0 /* Proportional */
     };
     const pS = partisan_1.scorePartisan(p.partisanProfile.statewideVf, p.partisanProfile.vfArray, options);