@dra2020/district-analytics 6.3.0 → 6.3.1

package/dist/cli.js

@@ -89876,7 +89876,10 @@ function weightPartisan(bS, iS, cS, context) {
 }
 exports.weightPartisan = weightPartisan;
 function extraBonus(Vf) {
-    const okExtra = (0.5 - Vf) * (C.winnerBonus() - 1.0);
+    // PROPORTIONALITY - 06/24/2020 - Making the OK extra amount always positive.
+    // const okExtra: number = (0.5 - Vf) * (C.winnerBonus() - 1.0);
+    const over50Pct = (Vf > 0.5) ? (Vf - 0.5) : (0.5 - Vf);
+    const okExtra = over50Pct * (C.winnerBonus() - 1.0);
     return U.trim(okExtra);
 }
 exports.extraBonus = extraBonus;
@@ -89902,12 +89905,26 @@ function scorebias(rawBias, Vf, Sf) {
     }
 }
 exports.scorebias = scorebias;
+// PROPORTIONALITY - 06/24/2020
 // Adjust bias to account for a winner's bonus
+// * If the bias is in the *same* direction as the statewide vote %, then
+//   discount the bias by the winner's bonus (extra).
+// * But if the bias and statewide vote % go in opposite directions, leave the
+//   bias unadjusted.
 function adjustBias(Vf, bias, extra) {
-    if (Vf > 0.5)
-        return Math.min(bias - extra, 0);
-    else
-        return Math.max(bias - extra, 0);
+    let adjusted = bias;
+    if ((Vf > 0.5) && (bias < 0)) {
+        adjusted = Math.min(bias + extra, 0);
+    }
+    else if ((Vf < 0.5) && (bias > 0)) {
+        adjusted = Math.max(bias - extra, 0);
+    }
+    return adjusted;
+    // PROPORTIONALITY - 06/24/2020 - Original logic:
+    // if (Vf > 0.5)
+    //   return Math.min(bias + extra, 0);
+    // else
+    //   return Math.max(bias - extra, 0);
 }
 exports.adjustBias = adjustBias;
 // Normalize unearned seats