@dra2020/dra-analytics 4.1.8 → 5.0.0

package/dist/lib/partisan/bias.d.ts

@@ -24,11 +24,3 @@ export declare function calcDisproportionality(Vf: number, Sf: number): number;
 export declare function calcBigR(Vf: number, Sf: number): number | undefined;
 export declare function calcMinimalInverseResponsiveness(Vf: number, r: number): number | undefined;
 export declare function calcGamma(Vf: number, Sf: number, r: number): number;
-export declare function estLocalAsymmetry(Vf: number, dSVpoints: T.SVpoint[], rSVpoints: T.SVpoint[]): number | undefined;
-export declare function rangeAsymmetry(dSVpoints: T.SVpoint[], rSVpoints: T.SVpoint[]): number;
-export declare function estLocalDisproportionality(Vf: number, dSVpoints: T.SVpoint[]): number | undefined;
-export declare function rangeDisproportionality(dSVpoints: T.SVpoint[]): number;
-export declare function estLocalDisproportionalityAlt(Vf: number, N: number, dSVpoints: T.SVpoint[]): number | undefined;
-export declare function rangeDisproportionalityAlt(N: number, dSVpoints: T.SVpoint[]): number;
-export declare function estLocalUnearnedSeats(Vf: number, N: number, dSVpoints: T.SVpoint[]): number | undefined;
-export declare function rangeUnearnedSeats(N: number, dSVpoints: T.SVpoint[]): number;

package/dist/lib/types/partisan.d.ts

@@ -52,12 +52,6 @@ export type Responsiveness = {
     cDf: number;
     score?: number;
 };
-export type Experimental = {
-    lSym?: number;
-    lProp?: number;
-    lPropAlt?: number;
-    lUE?: number;
-};
 export type PartisanScorecard = {
     bias: Bias;
     impact: Impact;
@@ -66,7 +60,6 @@ export type PartisanScorecard = {
     rSVpoints: SVpoint[];
     averageDVf: number | undefined;
     averageRVf: number | undefined;
-    experimental: Experimental;
     details: T.Dict;
 };
 export type PartisanJSONReady = {

package/lib/partisan/all.ts

@@ -33,8 +33,8 @@ import
   invertSVPoints, keyRVpoints, calcDeclination,
   calcGlobalSymmetry, estGeometricSeatsBias, calcDisproportionality, calcMeanMedianDifference, calcLopsidedOutcomes, calcBigR, calcGamma,
   calcMinimalInverseResponsiveness,
-  // EXPERIMENTAL
-  estLocalAsymmetry, estLocalDisproportionality, estLocalDisproportionalityAlt, estLocalUnearnedSeats
+  // // EXPERIMENTAL
+  // estLocalAsymmetry, estLocalDisproportionality, estLocalDisproportionalityAlt, estLocalUnearnedSeats
 } from '../../lib/partisan/bias'
 
 import
@@ -104,12 +104,12 @@ export function makePartisanScorecard(Vf: number, VfArray: T.VfArray, bLog: bool
   const cD = estCompetitiveDistricts(VfArray);
   const cDf = estCompetitiveDistrictsShare(cD, N);
 
-  // EXPERIMENTAL
+  // // EXPERIMENTAL
 
-  const lSym = estLocalAsymmetry(Vf, dSVpoints, rSVpoints);
-  const lProp = estLocalDisproportionality(Vf, dSVpoints);
-  const lPropAlt = estLocalDisproportionalityAlt(Vf, N, dSVpoints);
-  const lUE = estLocalUnearnedSeats(Vf, N, dSVpoints);
+  // const lSym = estLocalAsymmetry(Vf, dSVpoints, rSVpoints);
+  // const lProp = estLocalDisproportionality(Vf, dSVpoints);
+  // const lPropAlt = estLocalDisproportionalityAlt(Vf, N, dSVpoints);
+  // const lUE = estLocalUnearnedSeats(Vf, N, dSVpoints);
 
   const biasMeasurements: T.Bias = {
     bestS: bestS,
@@ -156,12 +156,13 @@ export function makePartisanScorecard(Vf: number, VfArray: T.VfArray, bLog: bool
   const averageDVf = (DWins.length > 0) ? U.avgArray(DWins) : undefined;
   const averageRVf = (RWins.length > 0) ? U.avgArray(RWins) : undefined;
 
-  const experimentalMetrics: T.Experimental = {
-    lSym: lSym,
-    lProp: lProp,
-    lPropAlt: lPropAlt,
-    lUE: lUE
-  };
+  // // EXPERIMENTAL
+  // const experimentalMetrics: T.Experimental = {
+  //   lSym: lSym,
+  //   lProp: lProp,
+  //   lPropAlt: lPropAlt,
+  //   lUE: lUE
+  // };
 
   const s: T.PartisanScorecard = {
     bias: biasMeasurements,
@@ -171,7 +172,7 @@ export function makePartisanScorecard(Vf: number, VfArray: T.VfArray, bLog: bool
     rSVpoints: rSVpoints,
     averageDVf: averageDVf,
     averageRVf: averageRVf,
-    experimental: experimentalMetrics,
+    // experimental: experimentalMetrics,
     details: {}
   };
 

package/lib/partisan/bias.ts

@@ -518,163 +518,163 @@ export function calcGamma(Vf: number, Sf: number, r: number): number
 }
 
 
-// EXPERIMENTAL
+// // EXPERIMENTAL
 
-const pctWidth = 5;  // The size in % points of the 'local' window to bracket <V>
+// const pctWidth = 5;  // The size in % points of the 'local' window to bracket <V>
 
-// Average local asymmetry
-export function estLocalAsymmetry(Vf: number, dSVpoints: T.SVpoint[], rSVpoints: T.SVpoint[]): number | undefined
-{
-  try
-  {
-    const dPts = svPointRange(Vf, dSVpoints);
-    const rPts = svPointRange(Vf, rSVpoints);
+// // Average local asymmetry
+// export function estLocalAsymmetry(Vf: number, dSVpoints: T.SVpoint[], rSVpoints: T.SVpoint[]): number | undefined
+// {
+//   try
+//   {
+//     const dPts = svPointRange(Vf, dSVpoints);
+//     const rPts = svPointRange(Vf, rSVpoints);
 
-    if (!dPts || !rPts) return undefined;
+//     if (!dPts || !rPts) return undefined;
 
-    const lSym: number = rangeAsymmetry(dPts, rPts);
+//     const lSym: number = rangeAsymmetry(dPts, rPts);
 
-    return lSym;
-  }
-  catch (err)
-  {
-    console.log("Exception in estLocalAsymmetry ...");
-    return undefined;
-  }
-}
+//     return lSym;
+//   }
+//   catch (err)
+//   {
+//     console.log("Exception in estLocalAsymmetry ...");
+//     return undefined;
+//   }
+// }
 
-export function rangeAsymmetry(dSVpoints: T.SVpoint[], rSVpoints: T.SVpoint[]): number
-{
-  const ndPts: number = dSVpoints.length;
-  const nrPts: number = rSVpoints.length;
+// export function rangeAsymmetry(dSVpoints: T.SVpoint[], rSVpoints: T.SVpoint[]): number
+// {
+//   const ndPts: number = dSVpoints.length;
+//   const nrPts: number = rSVpoints.length;
 
-  console.assert(ndPts == nrPts, "# of D & R points don't match: ", ndPts, nrPts);
+//   console.assert(ndPts == nrPts, "# of D & R points don't match: ", ndPts, nrPts);
 
-  let tot: number = 0.0;
+//   let tot: number = 0.0;
 
-  for (let i in dSVpoints)
-  {
-    tot += calcGeometricSeatsBias(dSVpoints[i].s, rSVpoints[i].s);
-  }
+//   for (let i in dSVpoints)
+//   {
+//     tot += calcGeometricSeatsBias(dSVpoints[i].s, rSVpoints[i].s);
+//   }
 
-  return tot / ndPts;
-}
+//   return tot / ndPts;
+// }
 
-// Average local disproportionality
-export function estLocalDisproportionality(Vf: number, dSVpoints: T.SVpoint[]): number | undefined
-{
-  try
-  {
-    const dPts = svPointRange(Vf, dSVpoints);
+// // Average local disproportionality
+// export function estLocalDisproportionality(Vf: number, dSVpoints: T.SVpoint[]): number | undefined
+// {
+//   try
+//   {
+//     const dPts = svPointRange(Vf, dSVpoints);
 
-    if (!dPts) return undefined;
+//     if (!dPts) return undefined;
 
-    const lProp: number = rangeDisproportionality(dPts);
+//     const lProp: number = rangeDisproportionality(dPts);
 
-    return lProp;
-  }
-  catch (err)
-  {
-    console.log("Exception in estLocalDisproportionality ...");
-    return undefined;
-  }
-}
+//     return lProp;
+//   }
+//   catch (err)
+//   {
+//     console.log("Exception in estLocalDisproportionality ...");
+//     return undefined;
+//   }
+// }
 
-export function rangeDisproportionality(dSVpoints: T.SVpoint[]): number
-{
-  const ndPts: number = dSVpoints.length;
+// export function rangeDisproportionality(dSVpoints: T.SVpoint[]): number
+// {
+//   const ndPts: number = dSVpoints.length;
 
-  let tot: number = 0.0;
+//   let tot: number = 0.0;
 
-  for (let i in dSVpoints)
-  {
-    tot += calcProp(dSVpoints[i].v, dSVpoints[i].s);
-  }
+//   for (let i in dSVpoints)
+//   {
+//     tot += calcProp(dSVpoints[i].v, dSVpoints[i].s);
+//   }
 
-  return tot / ndPts;
-}
+//   return tot / ndPts;
+// }
 
-// Average local disproportionality from the best # of seats (closest to proportional)
-export function estLocalDisproportionalityAlt(Vf: number, N: number, dSVpoints: T.SVpoint[]): number | undefined
-{
-  const dPts = svPointRange(Vf, dSVpoints);
+// // Average local disproportionality from the best # of seats (closest to proportional)
+// export function estLocalDisproportionalityAlt(Vf: number, N: number, dSVpoints: T.SVpoint[]): number | undefined
+// {
+//   const dPts = svPointRange(Vf, dSVpoints);
 
-  if (!dPts) return undefined;
+//   if (!dPts) return undefined;
 
-  const lPropAlt: number = rangeDisproportionalityAlt(N, dPts);
+//   const lPropAlt: number = rangeDisproportionalityAlt(N, dPts);
 
-  return lPropAlt;
-}
+//   return lPropAlt;
+// }
 
-// Dynamically calculate the best # seats, so this is a step function
-export function rangeDisproportionalityAlt(N: number, dSVpoints: T.SVpoint[]): number
-{
-  const ndPts: number = dSVpoints.length;
+// // Dynamically calculate the best # seats, so this is a step function
+// export function rangeDisproportionalityAlt(N: number, dSVpoints: T.SVpoint[]): number
+// {
+//   const ndPts: number = dSVpoints.length;
 
-  let tot: number = 0.0;
+//   let tot: number = 0.0;
 
-  for (let i in dSVpoints)
-  {
-    const bestS = bestSeats(N, dSVpoints[i].v);
-    const bestSf = bestSeatShare(bestS, N);
+//   for (let i in dSVpoints)
+//   {
+//     const bestS = bestSeats(N, dSVpoints[i].v);
+//     const bestSf = bestSeatShare(bestS, N);
 
-    tot += calcDisproportionalityFromBest(dSVpoints[i].s, bestSf);
-  }
+//     tot += calcDisproportionalityFromBest(dSVpoints[i].s, bestSf);
+//   }
 
-  return tot / ndPts;
-}
+//   return tot / ndPts;
+// }
 
-// Average local unearned seats from the best # of seats (closest to proportional)
-export function estLocalUnearnedSeats(Vf: number, N: number, dSVpoints: T.SVpoint[]): number | undefined
-{
-  const dPts = svPointRange(Vf, dSVpoints);
+// // Average local unearned seats from the best # of seats (closest to proportional)
+// export function estLocalUnearnedSeats(Vf: number, N: number, dSVpoints: T.SVpoint[]): number | undefined
+// {
+//   const dPts = svPointRange(Vf, dSVpoints);
 
-  if (!dPts) return undefined;
+//   if (!dPts) return undefined;
 
-  const lUE: number = rangeUnearnedSeats(N, dPts);
+//   const lUE: number = rangeUnearnedSeats(N, dPts);
 
-  return lUE;
-}
+//   return lUE;
+// }
 
-export function rangeUnearnedSeats(N: number, dSVpoints: T.SVpoint[]): number
-{
-  const ndPts: number = dSVpoints.length;
+// export function rangeUnearnedSeats(N: number, dSVpoints: T.SVpoint[]): number
+// {
+//   const ndPts: number = dSVpoints.length;
 
-  let tot: number = 0.0;
+//   let tot: number = 0.0;
 
-  for (let i in dSVpoints)
-  {
-    const estS: number = dSVpoints[i].s * N;
-    const bestS = bestSeats(N, dSVpoints[i].v);
+//   for (let i in dSVpoints)
+//   {
+//     const estS: number = dSVpoints[i].s * N;
+//     const bestS = bestSeats(N, dSVpoints[i].v);
 
-    tot += estUnearnedSeats(bestS, estS);
-  }
+//     tot += estUnearnedSeats(bestS, estS);
+//   }
 
-  return tot / ndPts;
-}
+//   return tot / ndPts;
+// }
 
-// Filter the full [0.25–0.75] range of S–V points down to the 'local' range.
-// Make sure that range is w/in the full range.
-function svPointRange(Vf: number, svPoints: T.SVpoint[]): T.SVpoint[] | undefined
-{
-  const svRange: number[] = [0.25, 0.75];            // The range over which we infer the S–V curve points
-  const halfStep: number = (1 / 100) / 2;            // The V point increments, i.e., every half a percent
-  const localWindow: number = pctWidth / 100;        // # of % points wide as a fraction
-  const plusMinus: number = localWindow / 2;         // +/– % as a fraction
-  const delta: number = plusMinus + (halfStep / 2);  // +/– % plus half a half step to deal w/ floating point precision
+// // Filter the full [0.25–0.75] range of S–V points down to the 'local' range.
+// // Make sure that range is w/in the full range.
+// function svPointRange(Vf: number, svPoints: T.SVpoint[]): T.SVpoint[] | undefined
+// {
+//   const svRange: number[] = [0.25, 0.75];            // The range over which we infer the S–V curve points
+//   const halfStep: number = (1 / 100) / 2;            // The V point increments, i.e., every half a percent
+//   const localWindow: number = pctWidth / 100;        // # of % points wide as a fraction
+//   const plusMinus: number = localWindow / 2;         // +/– % as a fraction
+//   const delta: number = plusMinus + (halfStep / 2);  // +/– % plus half a half step to deal w/ floating point precision
 
-  if ((Vf < svRange[0]) || (Vf > svRange[1])) return undefined;
+//   if ((Vf < svRange[0]) || (Vf > svRange[1])) return undefined;
 
-  const bracketingVs: number[] = [
-    findBracketingLowerVf(Vf, svPoints).v,
-    findBracketingUpperVf(Vf, svPoints).v
-  ];
+//   const bracketingVs: number[] = [
+//     findBracketingLowerVf(Vf, svPoints).v,
+//     findBracketingUpperVf(Vf, svPoints).v
+//   ];
 
-  const localRange: number[] = [bracketingVs[0] - delta, bracketingVs[1] + delta];
+//   const localRange: number[] = [bracketingVs[0] - delta, bracketingVs[1] + delta];
 
-  const subsetPts: T.SVpoint[] = svPoints.filter(x => inRange(x, localRange));
+//   const subsetPts: T.SVpoint[] = svPoints.filter(x => inRange(x, localRange));
 
-  return subsetPts;
-}
+//   return subsetPts;
+// }
 
-const inRange = (pt: T.SVpoint, range: number[]): boolean => {return (pt.v >= range[0]) && (pt.v <= range[1]);}
+// const inRange = (pt: T.SVpoint, range: number[]): boolean => {return (pt.v >= range[0]) && (pt.v <= range[1]);}

package/lib/types/partisan.ts

@@ -79,14 +79,14 @@ export type Responsiveness = {
 }
 
 
-// EXPERIMENTAL
+// // EXPERIMENTAL
 
-export type Experimental = {
-  lSym?: number,
-  lProp?: number,
-  lPropAlt?: number,
-  lUE?: number
-}
+// export type Experimental = {
+//   lSym?: number,
+//   lProp?: number,
+//   lPropAlt?: number,
+//   lUE?: number
+// }
 
 
 // COMBINED SCORECARD
@@ -99,7 +99,7 @@ export type PartisanScorecard = {
   rSVpoints: SVpoint[],
   averageDVf: number | undefined,
   averageRVf: number | undefined,
-  experimental: Experimental,
+  // experimental: Experimental,
   details: T.Dict
 }
 

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@dra2020/dra-analytics",
-  "version": "4.1.8",
+  "version": "5.0.0",
   "description": "DRA analytics",
   "main": "dist/dra-analytics.js",
   "types": "./dist/lib/all/all.d.ts",
   "scripts": {
     "test": "jest",
     "build": "webpack",
-    "webpack": "node_modules/.bin/webpack",
+    "webpack": "webpack",
     "buildpartisan": "webpack --config cli/partisan.config.js",
     "buildcompactness": "webpack --config cli/compactness.config.js",
     "buildsplitting": "webpack --config cli/splitting.config.js"