@dra2020/district-analytics 4.3.4 → 5.0.0

package/dist/district-analytics.js

@@ -121,7 +121,6 @@ const preprocess_1 = __webpack_require__(/*! ./preprocess */ "./src/preprocess.t
 const analyze_1 = __webpack_require__(/*! ./analyze */ "./src/analyze.ts");
 const score_1 = __webpack_require__(/*! ./score */ "./src/score.ts");
 const results_1 = __webpack_require__(/*! ./results */ "./src/results.ts");
-// import { doConfigureScales, doAnalyzePostProcessing, RequirementsChecklist} from './results'  // TODO - DELETE
 const results_2 = __webpack_require__(/*! ./results */ "./src/results.ts");
 const geofeature_1 = __webpack_require__(/*! ./geofeature */ "./src/geofeature.ts");
 const D = __importStar(__webpack_require__(/*! ./_data */ "./src/_data.ts"));
@@ -132,7 +131,6 @@ class AnalyticsSession {
         this.bOneTimeProcessingDone = false;
         this.bPlanAnalyzed = false;
         this.bPostProcessingDone = false;
-        // testScales = {} as T.TestScales;  TODO - DELETE
         this.tests = {};
         this.title = SessionRequest['title'];
         this.legislativeDistricts = SessionRequest['legislativeDistricts'];
@@ -143,42 +141,18 @@ class AnalyticsSession {
         this.features = new D.Features(this, SessionRequest['data'], this.config['datasets']);
         this.plan = new D.Plan(this, SessionRequest['plan']);
         this.districts = new D.Districts(this, SessionRequest['districtShapes']);
-        // TODO - DELETE
-        // if (this.useLegacy())
-        // {
-        //   console.log("Using legacy district-analytics.")
-        //   // NOTE: I've pulled these out of the individual analytics to here. Eventually,
-        //   // we could want them to passed into an analytics session as data, along with
-        //   // everything else. For now, this keeps branching out of the main code.
-        //   doConfigureScales(this);
-        // }
-        // else
-        // {
-        //   console.log("Using dra-score analytics.")
-        //   // TODO - SCORE: Temporary HACK. Query dra-score for threshold.
-        //   doConfigureScales(this);
-        // }
     }
     processConfig(config) {
         // NOTE - Session settings are required:
         // - Analytics suites can be defaulted to all with [], but
         // - Dataset keys must be explicitly specified with 'dataset'
-        // TODO - SCORE: Delete
+        // NOTE - Legacy feature: Always calc everything
         config['suites'] = [0 /* Legal */, 1 /* Fair */, 2 /* Best */];
         // Default the Census & redistricting cycle to 2010
         if (!(U.keyExists('cycle', config)))
             config['cycle'] = 2010;
         return config;
     }
-    /* TODO - DELETE
-    useLegacy(): boolean
-    {
-      // TODO - SCORE: Opt-out
-      return (U.keyExists('useScore', this.config) && (this.config['useScore'] != null) && (!(this.config['useScore']))) ? true : false;
-      // TODO - SCORE: Opt-in
-      // return (U.keyExists('useScore', this.config) && (this.config['useScore'])) ? false : true;
-    }
-    */
     // Using the the data in the analytics session, calculate all the
     // analytics & validations, saving/updating the individual test results.
     analyzePlan(bLog = false, overridesJSON) {
@@ -186,7 +160,6 @@ class AnalyticsSession {
             preprocess_1.doPreprocessData(this, bLog);
             analyze_1.doAnalyzeDistricts(this, bLog);
             analyze_1.doAnalyzePlan(this, bLog);
-            // TODO - SCORE
             this._profile = score_1.profilePlan(this, bLog);
             this._scorecard = score_1.scorePlan(this, this._profile, bLog, overridesJSON);
             results_1.doAnalyzePostProcessing(this, bLog);
@@ -201,15 +174,12 @@ class AnalyticsSession {
     getDistrictStatistics(bLog = false) {
         return results_2.prepareDistrictStatistics(this, bLog);
     }
-    // TODO - SCORE
     getPlanProfile(bLog = false) {
         return this._profile;
     }
-    // TODO - SCORE
     getPlanScorecard(bLog = false) {
         return this._scorecard;
     }
-    // TODO - SCORE
     // NOTE - This assumes that analyzePlan() has been run!
     getRequirementsChecklist(bLog = false) {
         return results_2.prepareRequirementsChecklist(this, bLog);
@@ -310,21 +280,10 @@ class AnalyticsSession {
     }
     // NOTE - Not sure why this has to be up here ...
     populationDeviationThreshold() {
-        // TODO - DELETE
-        // if (this.useLegacy())
-        // {
-        //   return 1 - this.testScales[T.Test.PopulationDeviation]['scale'][0];
-        // }
-        // else
-        // {
         // NOTE - This assumes the plan has been profiled
         const scorer = new Score.Scorer();
         const popdev = scorer.populationDeviationThreshold(this.legislativeDistricts);
         return popdev;
-        // TODO - SCORE: Temporary HACK. Query dra-score for threshold.
-        // NOTE - The plan may not have been scored yet, i.e., no scorecard yet.
-        // return 1 - this.testScales[T.Test.PopulationDeviation]['scale'][0];
-        // }
     }
 }
 exports.AnalyticsSession = AnalyticsSession;
@@ -438,11 +397,11 @@ class Districts {
     }
     // This is the workhorse computational routine!
     //
-    // TODO - OPTIMIZE for getting multiple properties from the same feature?
-    // TODO - OPTIMIZE by only re-calc'ing districts that have changed?
+    // NOTE - OPTIMIZE for getting multiple properties from the same feature?
+    // NOTE - OPTIMIZE by only re-calc'ing districts that have changed?
     //        In this case, special attention to getting county-splits right.
-    // TODO - OPTIMIZE by async'ing this?
-    // TODO - Is there a way to do this programmatically off data? Does it matter?
+    // NOTE - OPTIMIZE by async'ing this?
+    // NOTE - Is there a way to do this programmatically off data? Does it matter?
     recalcStatistics(bLog = false) {
         // Initialize debug counters
         nMissingDataset = 0;
@@ -453,7 +412,6 @@ class Districts {
         let planByDistrict = this._session.plan.byDistrictID();
         let plan = this._session.plan;
         let graph = this._session.graph;
-        // NOTE - SPLITTING
         // Add an extra 0th virtual county bucket for county-district splitting analysis 
         let nCountyBuckets = this._session.counties.nCounties + 1;
         // INITIALIZE STATE VALUES THAT WILL BE ACCUMULATED
@@ -479,7 +437,6 @@ class Districts {
             // INITIALIZE DISTRICT VALUES THAT WILL BE ACCUMULATED (VS. DERIVED)
             let featurePop;
             let totalPop = 0;
-            // NOTE - SPLITTING
             let countySplits = U.initArray(nCountyBuckets, 0);
             let demVotes = 0;
             let repVotes = 0;
@@ -523,7 +480,6 @@ class Districts {
                             featurePop = outerThis._session.features.fieldForFeature(f, "CENSUS" /* CENSUS */, "Tot" /* TotalPop */);
                             // Total district population
                             totalPop += featurePop;
-                            // NOTE - SPLITTING
                             // Total population by counties w/in a district,
                             // except the dummy unassigned district 0
                             if (i > 0)
@@ -727,7 +683,7 @@ class Features {
     }
     resetDataset(d, k) {
         this._keys[d] = k;
-        // TODO - RECALC: Does anything need to be recalc'd now when a dataset is changed?
+        // NOTE - RECALC: Does anything need to be recalc'd now when a dataset is changed?
     }
     mapGeoIDsToFeatureIDs() {
         for (let i = 0; i < this._session.features.nFeatures(); i++) {
@@ -842,7 +798,6 @@ class Plan {
     //   return newPlan;
     // }
     invertPlan() {
-        // NOTE - UNASSIGNED
         this._planByDistrictID = invertPlan(this._planByGeoID, this._session);
         this.districtIDs = U.getNumericObjectKeys(this._planByDistrictID);
     }
@@ -858,7 +813,6 @@ function invertPlan(plan, s) {
     let invertedPlan = {};
     // Add a dummy 'unassigned' district
     invertedPlan[S.NOT_ASSIGNED] = new Set();
-    // NOTE - UNASSIGNED
     // The feature assignments coming from DRA do not include unassigned ones.
     // - In the DRA-calling context, there's an analytics session with a reference
     //   to the features. Loop over all the features to find the unassigned ones,
@@ -901,7 +855,6 @@ class Graph {
         // Ignore the lengths of the shared borders (the values), for now
         // Protect against getting a GEOID that's not in the graph
         if (U.keyExists(node, this._graph)) {
-            // NOTE - CONTIGUITY GRAPHS
             // Handle both unweighted & weighted neighbors
             let n = this._graph[node];
             let l = (n instanceof Array) ? n : U.getObjectKeys(n);
@@ -933,22 +886,7 @@ exports.Graph = Graph;
 Object.defineProperty(exports, "__esModule", { value: true });
 const valid_1 = __webpack_require__(/*! ./valid */ "./src/valid.ts");
 const equal_1 = __webpack_require__(/*! ./equal */ "./src/equal.ts");
-// import { doPopulationDeviation, doHasEqualPopulations } from './equal';  TODO - DELETE
-// import { doReock, doPolsbyPopper } from './compact';  TODO - DELETE
 const cohesive_1 = __webpack_require__(/*! ./cohesive */ "./src/cohesive.ts");
-/* TODO - DELETE
-import
-{
-  doFindCountiesSplitUnexpectedly, doFindSplitVTDs,
-  doCountySplitting, doDistrictSplitting
-} from './cohesive';
-import
-{
-  doSeatsBias, doVotesBias,
-  doResponsiveness, doResponsiveDistricts, doEfficiencyGap
-} from './political';
-import { doMajorityMinorityDistricts } from './minority'
-*/
 // Compile district-level info for plan/map-level analytics
 function doAnalyzeDistricts(s, bLog = false) {
     s.districts.recalcStatistics(bLog);
@@ -960,56 +898,9 @@ exports.doAnalyzeDistricts = doAnalyzeDistricts;
 // NOTE - I could make this table-driven, but I'm thinking that the explicit
 //   calls might make chunking for aync easier.
 function doAnalyzePlan(s, bLog = false) {
-    // TODO - DELETE
-    // if (s.useLegacy())
-    // {
-    //   // Disable most legacy analytics
-    //   // Get the requested suites, and only execute those tests
-    //   let requestedSuites = s.config['suites'];
-    //   // Tests in the "Legal" suite, i.e., pass/ fail constraints
-    //   if (requestedSuites.includes(T.Suite.Legal))
-    //   {
-    //     s.tests[T.Test.Complete] = doIsComplete(s, bLog);
-    //     s.tests[T.Test.Contiguous] = doIsContiguous(s, bLog);
-    //     s.tests[T.Test.FreeOfHoles] = doIsFreeOfHoles(s, bLog);
-    //     // s.tests[T.Test.PopulationDeviation] = doPopulationDeviation(s, bLog);  TODO - DELETE
-    //     // NOTE - I can't check whether a population deviation is legal or not, until
-    //     // the raw % is normalized. A zero (0) would mean "too much" / "not legal," for
-    //     // the given type of district (CD vs. LD). The EqualPopulation test is derived
-    //     // from PopulationDeviation, as part of scorecard or test log preparation.
-    //     // Create an empty test entry here though ...
-    //     s.tests[T.Test.EqualPopulation] = s.getTest(T.Test.EqualPopulation) as T.TestEntry;
-    //   }
-    //   // Tests in the "Fair" suite
-    //   if (requestedSuites.includes(T.Suite.Fair))
-    //   {
-    //     /* TODO - DELETE
-    //     s.tests[T.Test.SeatsBias] = doSeatsBias(s, bLog);
-    //     s.tests[T.Test.VotesBias] = doVotesBias(s, bLog);
-    //     s.tests[T.Test.Responsiveness] = doResponsiveness(s, bLog);
-    //     s.tests[T.Test.ResponsiveDistricts] = doResponsiveDistricts(s, bLog);
-    //     s.tests[T.Test.EfficiencyGap] = doEfficiencyGap(s, bLog);
-    //     s.tests[T.Test.MajorityMinorityDistricts] = doMajorityMinorityDistricts(s, bLog);
-    //     */
-    //   }
-    //   // Tests in the "Best" suite, i.e., criteria for better/worse
-    //   if (requestedSuites.includes(T.Suite.Best))
-    //   {
-    //     // s.tests[T.Test.Reock] = doReock(s, bLog);                TODO - DELETE
-    //     // s.tests[T.Test.PolsbyPopper] = doPolsbyPopper(s, bLog);  TODO - DELETE
-    //     s.tests[T.Test.UnexpectedCountySplits] = doFindCountiesSplitUnexpectedly(s, bLog);
-    //     s.tests[T.Test.VTDSplits] = doFindSplitVTDs(s, bLog);
-    //     // s.tests[T.Test.CountySplitting] = doCountySplitting(s, bLog);      TODO - DELETE
-    //     // s.tests[T.Test.DistrictSplitting] = doDistrictSplitting(s, bLog);  TODO - DELETE
-    //   }
-    // }
-    // else
-    // {
-    // TODO - SCORE: Except these. Continue to do these here vs. dra-score.
     s.tests[0 /* Complete */] = valid_1.doIsComplete(s, bLog);
     s.tests[1 /* Contiguous */] = valid_1.doIsContiguous(s, bLog);
     s.tests[2 /* FreeOfHoles */] = valid_1.doIsFreeOfHoles(s, bLog);
-    // s.tests[T.Test.PopulationDeviation] = doPopulationDeviation(s, bLog);  TODO - DELETE
     // NOTE - I can't check whether a population deviation is legal or not, until
     // the raw % is normalized. A zero (0) would mean "too much" / "not legal," for
     // the given type of district (CD vs. LD). The EqualPopulation test is derived
@@ -1018,7 +909,6 @@ function doAnalyzePlan(s, bLog = false) {
     s.tests[3 /* EqualPopulation */] = s.getTest(3 /* EqualPopulation */);
     s.tests[5 /* UnexpectedCountySplits */] = cohesive_1.doFindCountiesSplitUnexpectedly(s, bLog);
     s.tests[6 /* VTDSplits */] = cohesive_1.doFindSplitVTDs(s, bLog);
-    // }
     // Enable a Test Log and Scorecard to be generated
     s.bPlanAnalyzed = true;
     s.bPostProcessingDone = false;
@@ -1061,277 +951,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const U = __importStar(__webpack_require__(/*! ./utils */ "./src/utils.ts"));
 const D = __importStar(__webpack_require__(/*! ./_data */ "./src/_data.ts"));
 // NOTE - The active code is below the long multi-line section to be deleted.
-/* TODO - DELETE
-// CALCULATE ENHANCED SQRT ENTROPY METRIC
-
-export function doCountySplitting(s: AnalyticsSession, bLog: boolean = false): T.TestEntry
-{
-  let test = s.getTest(T.Test.CountySplitting) as T.TestEntry;
-
-  let CxD = s.districts.statistics[D.DistrictField.CountySplits].slice(0, -1);
-  let countyTotals = s.counties.totalPopulation;
-  let districtTotals = s.districts.statistics[D.DistrictField.TotalPop].slice(0, -1);
-
-  let f = calcCountyFractions(CxD, countyTotals);
-  let w = calcCountyWeights(countyTotals);
-
-  let SqEnt_DC = countySplitting(f, w, bLog);
-
-  let CxDreducedC = U.deepCopy(CxD);
-  reduceCSplits(CxDreducedC, districtTotals);
-
-  let fReduced = calcCountyFractions(CxDreducedC, countyTotals);
-  let wReduced = calcCountyWeights(countyTotals);
-
-  let SqEnt_DCreduced = countySplitting(fReduced, wReduced, bLog);
-
-  test['score'] = SqEnt_DCreduced;
-  test['details']['SqEnt_DC'] = SqEnt_DC;
-
-  return test;
-}
-
-export function doDistrictSplitting(s: AnalyticsSession, bLog: boolean = false): T.TestEntry
-{
-  let test = s.getTest(T.Test.DistrictSplitting) as T.TestEntry;
-
-  let CxD = s.districts.statistics[D.DistrictField.CountySplits].slice(0, -1);
-  let countyTotals = s.counties.totalPopulation;
-  let districtTotals = s.districts.statistics[D.DistrictField.TotalPop].slice(0, -1);
-
-  let g = calcDistrictFractions(CxD, districtTotals);
-  let x = calcDistrictWeights(districtTotals);
-
-  let SqEnt_CD = districtSplitting(g, x, bLog);
-
-  let CxDreducedD = U.deepCopy(CxD);
-  reduceDSplits(CxDreducedD, countyTotals);
-
-  let gReduced = calcDistrictFractions(CxDreducedD, districtTotals);
-  let xReduced = calcDistrictWeights(districtTotals);
-
-  let SqEnt_CDreduced = districtSplitting(gReduced, xReduced, bLog);
-
-  test['score'] = SqEnt_CDreduced;
-  test['details']['SqEnt_CD'] = SqEnt_CD;
-
-  return test;
-}
-
-
-// HELPERS
-
-// Loop over all the county-district combos, skipping the virtual district 0
-// and virtual county 0.
-//
-// NOTE - The county-district splits and the county & district totals may all,
-//   in general, be fractional/decimal numbers as opposed to integers, due to
-//   dissaggregation & re-aggregation. Hence, comparisons need to approximate
-//   equality.
-
-// Consolidate districts (rows) consisting of just one county (column)
-// UP into the dummy district (0).
-function reduceCSplits(CxDreducedC: number[][], districtTotals: number[]): void
-{
-  let nD = CxDreducedC.length;
-  let nC = CxDreducedC[0].length;
-
-  for (let j = 1; j < nC; j++)
-  {
-    for (let i = 1; i < nD; i++)
-    {
-      let split_total = CxDreducedC[i][j];
-
-      if (split_total > 0)
-      {
-        if (areRoughlyEqual(split_total, districtTotals[i]))
-        {
-          CxDreducedC[0][j] += split_total;
-          CxDreducedC[i][j] = 0;
-        }
-      }
-    }
-  }
-}
-
-// Consolidate whole counties (columns) in a district (row) LEFT into the
-// dummy county (0).
-function reduceDSplits(CxDreducedD: number[][], countyTotals: number[]): void
-{
-  let nD = CxDreducedD.length;
-  let nC = CxDreducedD[0].length;
-
-  for (let i = 1; i < nD; i++)
-  {
-    for (let j = 1; j < nC; j++)
-    {
-      let split_total = CxDreducedD[i][j];
-
-      if (split_total > 0)
-      {
-        if (areRoughlyEqual(split_total, countyTotals[j]))
-        {
-          CxDreducedD[i][0] += split_total;
-          CxDreducedD[i][j] = 0;
-        }
-      }
-    }
-  }
-}
-
-function calcCountyWeights(countyTotals: number[]): number[]
-{
-  let nC: number = countyTotals.length;
-  let cTotal: number = U.sumArray(countyTotals);
-
-  let w: number[] = U.initArray(nC, 0.0);
-
-  for (let j = 0; j < nC; j++)
-  {
-    w[j] = countyTotals[j] / cTotal;
-  }
-
-  return w;
-}
-
-function calcDistrictWeights(districtTotals: number[]): number[]
-{
-  let nD = districtTotals.length;
-  let dTotal: number = U.sumArray(districtTotals);
-
-  let x: number[] = U.initArray(nD, 0.0);
-
-  for (let i = 0; i < nD; i++)
-  {
-    x[i] = districtTotals[i] / dTotal;
-  }
-
-  return x;
-}
-
-function calcCountyFractions(CxDreducedD: number[][], countyTotals: number[]): number[][]
-{
-  let nD = CxDreducedD.length;
-  let nC = CxDreducedD[0].length;
-
-  let f: number[][] = new Array(nD).fill(0.0).map(() => new Array(nC).fill(0.0));
-
-  for (let j = 0; j < nC; j++)
-  {
-    for (let i = 0; i < nD; i++)
-    {
-      if (countyTotals[j] > 0)
-      {
-        f[i][j] = CxDreducedD[i][j] / countyTotals[j];
-      }
-      else
-      {
-        f[i][j] = 0.0;
-      }
-    }
-  }
-
-  return f;
-}
-
-function calcDistrictFractions(CxDreducedC: number[][], districtTotals: number[]): number[][]
-{
-  let nD = CxDreducedC.length;
-  let nC = CxDreducedC[0].length;
-
-  let g: number[][] = new Array(nD).fill(0.0).map(() => new Array(nC).fill(0.0));
-
-  for (let j = 0; j < nC; j++)
-  {
-    for (let i = 0; i < nD; i++)
-    {
-      if (districtTotals[i] > 0)
-      {
-        g[i][j] = CxDreducedC[i][j] / districtTotals[i];
-      }
-      else
-      {
-        g[i][j] = 0.0;
-      }
-    }
-  }
-
-  return g;
-}
-
-// Deal with decimal census "counts" due to disagg/re-agg
-function areRoughlyEqual(x: number, y: number): boolean
-{
-  let delta = Math.abs(x - y);
-  let result = (delta < S.EQUAL_TOLERANCE) ? true : false;
-
-  return result;
-}
-
-// For all districts in a county, sum the split score.
-function countySplitScore(j: number, f: number[][], numD: number, bLog: boolean = false): number
-{
-  let e = 0.0;
-
-  for (let i = 0; i < numD; i++)
-  {
-    e += Math.sqrt(f[i][j]);
-  }
-
-  return e;
-}
-
-// For all counties, sum the weighted county splits.
-function countySplitting(f: number[][], w: number[], bLog: boolean = false): number
-{
-  let numC = f[0].length;
-  let numD = f.length;
-
-  let e = 0.0;
-
-  for (let j = 0; j < numC; j++)
-  {
-    let splitScore = countySplitScore(j, f, numD, bLog);
-    e += w[j] * splitScore;
-
-    if (bLog) console.log("County splitting =", j, w[j], splitScore, e);
-  }
-
-  return U.trim(e, 3);
-}
-
-// For all counties in a district, sum the split score.
-function districtSplitScore(i: number, g: number[][], numC: number, bLog: boolean = false): number
-{
-  let e = 0.0;
-
-  for (let j = 0; j < numC; j++)
-  {
-    e += Math.sqrt(g[i][j]);
-  }
-
-  return e;
-}
-
-// For all districts, sum the weighted district splits.
-function districtSplitting(g: number[][], x: number[], bLog: boolean = false): number
-{
-  let numC = g[0].length;
-  let numD = g.length;
-
-  let e = 0.0;
-
-  for (let i = 0; i < numD; i++)
-  {
-    let splitScore = districtSplitScore(i, g, numC, bLog);
-    e += x[i] * splitScore;
-
-    if (bLog) console.log("District split score =", i, x[i], splitScore, e);
-  }
-
-  return U.trim(e, 3);
-}
-*/
 // ANALYZE SIMPLE COUNTY & VTD SPLITTING
 /*
  
@@ -1495,164 +1114,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 // NOTE - This file will NOT be empty, when legacy code is deleted.
 const Poly = __importStar(__webpack_require__(/*! @dra2020/poly */ "@dra2020/poly"));
 const geofeature_1 = __webpack_require__(/*! ./geofeature */ "./src/geofeature.ts");
-// TODO - DELETE
-// Measures of compactness compare district shapes to various ideally compact
-// benchmarks, such as circles. All else equal, more compact districts are better.
-// 
-// There are four popular measures of compactness. They either focus on how
-// dispersed or how indented a shapes are.
-//
-// These first two measures are the most important:
-// 
-// Reock is the primary measure of the dispersion of district shapes, calculated
-// as “the area of the district to the area of the minimum spanning circle that
-// can enclose the district.”
-//
-//    R = A / A(Minimum Bounding Circle)
-//    R = A / (π * (D / 2)^2)
-//
-//    R = 4A / πD^2
-//
-// where A is the area of the district and D is the diameter of the minimum
-// bounding circle.
-//
-// Polsby-Popper is the primary measure of the indendentation of district shapes,
-// calculated as the “the ratio of the area of the district to the area of a circle
-// whose circumference is equal to the perimeter of the district.”
-//
-//    PP = A / A(C)
-//
-// where C is that circle. In other words:
-//
-//    P = 2πRc and A(C) = π(P / 2π)^2
-//
-// where P is the perimeter of the district and Rc is the radius of the circle.
-//
-// Hence, the measure simplifies to:
-//
-//    PP = 4π * (A / P^2)
-// 
-// I propose that we use these two, normalize them, and weight equally to determine
-// our compactness value.
-// 
-// These second two measures may be used to complement the primary ones above:
-// 
-// Convex Hull is a secondary measure of the dispersion of district shapes, calculated
-// as “the ratio of the district area to the area of the minimum convex bounding
-// polygon (also known as a convex hull) enclosing the district.”
-//
-//    CH = A / A(Convex Hull)
-// 
-// where a convex hull is the minimum perimeter that encloses all points in a shape,
-// basically the shortest unstretched rubber band that fits around the shape.
-//
-// Schwartzberg is a secondary measure of the degree of indentation of district
-// shapes, calculated as “the ratio of the perimeter of the district to the circumference
-// of a circle whose area is equal to the area of the district.”
-//
-//    S = 1 / (P / C)
-//
-// where P is the perimeter of the district and C is the circumference of the circle.
-// The radius of the circle is:
-//
-//    Rc = SQRT(A / π)
-//
-// So, the circumference of the circle is:
-//
-//    C = 2πRc or C = 2π * SQRT(A / π)
-//
-// Hence:
-//
-//    S = 1 (P / 2π * SQRT(A / π))
-//
-//    S = (2π * SQRT(A / π)) / P
-//
-// All these measures produce values between 0 and 1, with 0 being the least compact
-// and 1 being the most compact. Sometimes these values are multiplied by 100 to
-// give values between 0 and 100.
-// 
-// For each measure, the compactness of a set of Congressional districts is the
-// average of that measure for all the districts.
-//
-/* TODO - DELETE
-// Calculate Reock compactness:
-// reock = (4 * a) / (math.pi * d**2)
-// NOTE - Depends on extractDistrictProperties running first
-export function doReock(s: AnalyticsSession, bLog: boolean = false): T.TestEntry
-{
-  let test = s.getTest(T.Test.Reock) as T.TestEntry;
-
-  // Calculate Reock scores by district
-  let scores: number[] = [];
-
-  for (let districtID = 1; districtID <= s.state.nDistricts; districtID++)
-  {
-    let districtProps = s.districts.getGeoProperties(districtID);
-    // Guard against no shape and no properties
-    if (districtProps)
-    {
-      let a = districtProps[T.DistrictShapeProperty.Area];
-      let d = districtProps[T.DistrictShapeProperty.Diameter];
-
-      let reock = (4 * a) / (Math.PI * d ** 2);
-
-      // Save each district score
-      scores.push(reock);
-
-      // Echo the results by district
-      if (bLog) console.log("Reock for district", districtID, "=", reock);
-    }
-  }
-
-  // Populate the test entry ... for the shapes that exist!
-  let averageReock = U.avgArray(scores);
-
-  test['score'] = U.trim(averageReock);
-  test['details'] = {};                   // TODO - Any details?
-
-  return test;
-}
-
-// Calculate Polsby-Popper compactness measures:
-// polsby_popper = (4 * math.pi) * (a / p**2)
-// NOTE - Depends on extractDistrictProperties running first
-export function doPolsbyPopper(s: AnalyticsSession, bLog: boolean = false): T.TestEntry
-{
-  let test = s.getTest(T.Test.PolsbyPopper) as T.TestEntry;
-
-  // Calculate Polsby-Popper scores by district
-  let scores: number[] = [];
-
-  for (let districtID = 1; districtID <= s.state.nDistricts; districtID++)
-  {
-    let districtProps = s.districts.getGeoProperties(districtID);
-    // Guard against no shape and no properties
-    if (districtProps)
-    {
-      let a = districtProps[T.DistrictShapeProperty.Area];
-      let p = districtProps[T.DistrictShapeProperty.Perimeter];
-
-      let polsbyPopper = (4 * Math.PI) * (a / p ** 2);
-
-      // Save each district score
-      scores.push(polsbyPopper);
-
-      // Echo the results by district
-      if (bLog) console.log("Polsby-Popper for district", districtID, "=", polsbyPopper);
-    }
-  }
-
-  // Populate the test entry ... for the shapes that exist!
-  let averagePolsbyPopper = U.avgArray(scores);
-
-  test['score'] = U.trim(averagePolsbyPopper);
-  test['details'] = {};                         // TODO - Any details?
-
-  return test;
-}
-*/
 // HELPER TO EXTRACT PROPERTIES OF DISTRICT SHAPES
-// TODO - SCORE: Create an array, as opposed to a dict
+// TODO - Create an array, as opposed to a dict
 function extractDistrictProperties(s, bLog = false) {
     // NOTE - I am assuming that district IDs are integers 1–N
     for (let i = 1; i <= s.state.nDistricts; i++) {
@@ -1729,52 +1192,6 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const D = __importStar(__webpack_require__(/*! ./_data */ "./src/_data.ts"));
-/* TODO - DELETE
-export function doPopulationDeviation(s: AnalyticsSession, bLog: boolean = false): T.TestEntry
-{
-  let test = s.getTest(T.Test.PopulationDeviation) as T.TestEntry;
-
-  let targetSize = s.state.totalPop / s.state.nDistricts;
-
-  // Compute the min & max district populations
-  // ... excluding the dummy the 'unassigned' 0 and N+1 summary "districts"
-  let totPopByDistrict = s.districts.statistics[D.DistrictField.TotalPop];
-  totPopByDistrict = totPopByDistrict.slice(1, -1);
-
-  // Remove empty districts
-  totPopByDistrict = totPopByDistrict.filter(x => x > 0);
-
-  let min = 0;
-  let max = 0;
-
-  // If there's more than 1 non-empty district, calculate a non-zero deviation
-  if (totPopByDistrict.length > 1)
-  {
-    min = U.minArray(totPopByDistrict);
-    max = U.maxArray(totPopByDistrict);
-  }
-
-  // Calculate the raw population deviation
-  let popDev = (max - min) / targetSize;
-
-  // Round the raw value to the desired level of precision
-  popDev = U.trim(popDev);
-
-  // Populate the test entry
-  test['score'] = popDev;
-  test['details'] = { 'maxDeviation': max - min };
-
-  // Populate the N+1 summary "district" in district.statistics
-  let totalPop = s.districts.statistics[D.DistrictField.TotalPop];
-  let popDevPct = s.districts.statistics[D.DistrictField.PopDevPct];
-  let summaryRow = s.districts.numberOfRows() - 1;
-
-  totalPop[summaryRow] = targetSize;
-  popDevPct[summaryRow] = popDev;
-
-  return test;
-}
-*/
 // NOTE - This validity check is *derived* and depends on population deviation %
 //   being computed (above) and normalized in test log & scorecard generation.
 function doHasEqualPopulations(s, bLog = false) {
@@ -1901,7 +1318,7 @@ function gfPerimeter(poly) {
 exports.gfPerimeter = gfPerimeter;
 // TODO - POLY: Confirm Cartesian calculations w/ Terry
 // Cloned from polyPerimeter() in 'poly' and revised to use Cartesian distance
-// NOTE: No conversion of degrees to radians!
+// NOTE - No conversion of degrees to radians!
 function _polygonPerimeter(poly) {
     let polyOptions = { noLatitudeCorrection: true }; // Cartesian distance
     poly = Poly.polyNormalize(poly, polyOptions);
@@ -1979,112 +1396,6 @@ __export(__webpack_require__(/*! ./types */ "./src/types.ts"));
 Object.defineProperty(exports, "__esModule", { value: true });
 // NOTE - This file will NOT be empty, when legacy code is deleted.
 const assert_1 = __webpack_require__(/*! assert */ "assert");
-/* TODO - DELETE
-import * as D from './_data'
-import { AnalyticsSession } from './_api';
-
-
-// Partisan analytics need the following data:
-//
-// An "election model" by geo_id, where each item has 4 pieces of data:
-//
-//   { geo_id, Democratic votes, Republican votes, Total votes }
-//
-// NOTE: D + R <= Total, because there could be third-party or write-in votes.
-//
-// An election model can simply represent one election, e.g., President 2012,
-// or combine multiple elections in some fashion. An election model is used to
-// computer a single index of the likely partisan weight / lean / preference
-// for the districts in a plan. An election model and the associated index go
-// hand in hand. So much so that the index frequently stands in as the name for
-// both, e.g., Cook's PVI is one example, Nagle's 7s, Hofeller's Formula, NDRC's
-// DPI.
-//
-// I'm labelling this general concept a "Voter Preference Index (VPI)," a
-// conscious +1 letter play on Cook's "PVI" acronymn.
-
-
-// MEASURING BIAS & RESPONSIVENESS (NAGLE'S METHOD)
-
-export function doSeatsBias(s: AnalyticsSession, bLog: boolean = false): T.TestEntry
-{
-  let test = s.getTest(T.Test.SeatsBias) as T.TestEntry;
-
-  if (bLog) console.log("TODO - Calculating seats bias ...");
-
-  return test;
-}
-
-export function doVotesBias(s: AnalyticsSession, bLog: boolean = false): T.TestEntry
-{
-  let test = s.getTest(T.Test.VotesBias) as T.TestEntry;
-
-  if (bLog) console.log("TODO - Calculating votes bias ...");
-
-  return test;
-}
-
-export function doResponsiveness(s: AnalyticsSession, bLog: boolean = false): T.TestEntry
-{
-  let test = s.getTest(T.Test.Responsiveness) as T.TestEntry;
-
-  if (bLog) console.log("TODO - Calculating responsiveness ...");
-
-  return test;
-}
-
-export function doResponsiveDistricts(s: AnalyticsSession, bLog: boolean = false): T.TestEntry
-{
-  let test = s.getTest(T.Test.ResponsiveDistricts) as T.TestEntry;
-
-  if (bLog) console.log("TODO - Calculating # of responsive districts ...");
-
-  return test;
-}
-
-
-// OTHER MEASURES OF PARTISAN BIAS
-
-// TODO - PARTISAN: This formula might need to be inverted for D vs. R +/-
-// TODO - Normalize the results.
-export function doEfficiencyGap(s: AnalyticsSession, bLog: boolean = false): T.TestEntry
-{
-  if (bLog) console.log("TODO - Calculating the efficiency gap ...");
-
-  let test = s.getTest(T.Test.EfficiencyGap) as T.TestEntry;
-
-  // Get partisan statistics by districts.
-  // Use Democratic votes, seats, and shares by convention.
-  let DVotes = s.districts.statistics[D.DistrictField.DemVotes];
-  let DSeats = s.districts.statistics[D.DistrictField.DemSeat];
-  let TPVotes = s.districts.statistics[D.DistrictField.TwoPartyVote];
-
-  // Exclude the dummy unassigned '0' and N+1 summary "districts"
-  DVotes = DVotes.slice(1, -1);
-  DSeats = DSeats.slice(1, -1);
-  TPVotes = TPVotes.slice(1, -1);
-
-  // Calculate D vote share & D seat share
-  let DVoteShare = U.sumArray(DVotes) / U.sumArray(TPVotes);
-  let DSeatShare = U.sumArray(DSeats) / s.state.nDistricts;
-
-  // Finally, calculate the Efficiency Gap
-  let efficiencyGap = (DSeatShare - 0.5) - (2.0 * (DVoteShare - 0.5));
-
-  // Round the raw value to the desired level of precision
-  efficiencyGap = U.trim(efficiencyGap);
-
-  // Populate the test entry
-  test['score'] = efficiencyGap;
-  // test['normalizedScore'] = 0;     // TODO - Normalize the raw score
-  test['details'] = {};               // TODO - Add details, if any
-
-  return test;
-}
-
-
-// HELPERS
-*/
 function fptpWin(demPct) {
     // Vote shares should be fractions in the range [0.0 – 1.0]
     assert_1.strict((demPct <= 1.0) && (demPct >= 0.));
@@ -2122,10 +1433,9 @@ function doPreprocessData(s, bLog = false) {
     if (!s.bOneTimeProcessingDone) {
         doPreprocessCountyFeatures(s, bLog);
         doPreprocessCensus(s, bLog);
-        doPreprocessElection(s, bLog);
+        // doPreprocessElection(s, bLog);
         s.bOneTimeProcessingDone = true;
     }
-    // NOTE - UNASSIGNED: Made both the planByGeoID & DistrictID are right
     // Invert the plan by district ID
     s.plan.invertPlan();
     // Create a map of geoIDs to feature IDs
@@ -2207,7 +1517,6 @@ function doPreprocessCensus(s, bLog = false) {
     // Loop over the counties
     for (let county in fipsCodes) {
         let fipsCode = fipsCodes[county];
-        // NOTE - SPLITTING
         // Skip the dummy county
         if (fipsCode == '000')
             continue;
@@ -2231,10 +1540,10 @@ function doPreprocessCensus(s, bLog = false) {
     s.state.expectedAffected = expectedAffected;
 }
 // PREPROCESS ELECTION RESULTS
-function doPreprocessElection(s, bLog = false) {
-    if (bLog)
-        console.log("TODO - Preprocessing election data ...");
-}
+// function doPreprocessElection(s: AnalyticsSession, bLog: boolean = false): void
+// {
+//   if (bLog) console.log("Preprocessing election data ...");
+// }
 
 
 /***/ }),
@@ -2267,234 +1576,6 @@ const S = __importStar(__webpack_require__(/*! ./settings */ "./src/settings.ts"
 const D = __importStar(__webpack_require__(/*! ./_data */ "./src/_data.ts"));
 const analyze_1 = __webpack_require__(/*! ./analyze */ "./src/analyze.ts");
 const state_reqs_json_1 = __importDefault(__webpack_require__(/*! ../static/state-reqs.json */ "./static/state-reqs.json"));
-// PLAN ANALYTICS
-/* TODO - DELETE
-export type RequirementsCategory = {
-  score: T.TriState;
-  metrics: {
-    complete: T.TriState;
-    contiguous: T.TriState;
-    freeOfHoles: T.TriState;
-    equalPopulation: T.TriState;
-  };
-  details: {
-    unassignedFeatures: string[];         // A possibly empty list of GEOIDs
-    emptyDistricts: number[];             // A possibly empty list of district IDs
-    discontiguousDistricts: number[];     // Ditto
-    embeddedDistricts: number[];          // Ditto
-    populationDeviation: number;          // A fraction [0.0 – 1.0] to represent as a %
-    deviationThreshold: number;           // A fraction [0.0 – 1.0] to represent as a %
-  };
-  datasets: T.Datasets;
-  resources: {
-    stateReqs: string;
-  };
-};
-*/
-/* TODO - DELETE
-export type CompactnessCategory = {
-  score: number;                          // An integer score [0–100]
-  metrics: {
-    reock: number;                        // A decimal number [0.0–1.0]
-    polsby: number;                       // A decimal number [0.0–1.0]
-  };
-  details: {
-    // None at this time
-  };
-  datasets: T.Datasets;
-  resources: {
-    // None at this time
-  };
-};
-*/
-/* TODO - DELETE
-export type SplittingCategory = {
-  score: number;                          // An integer score [0–100]
-  metrics: {
-    sqEnt_DCreduced: number,              // A decimal number [1.0 – < 2.0]
-    sqEnt_CDreduced: number               // A decimal number [1.0 – < 2.0]
-  };
-  details: {
-    countiesSplitUnexpectedly: string[],  // A possibly empty list of county names
-    unexpectedAffected: number,           // A fraction [0.0 – 1.0] to represent as a %
-    nSplitVTDs: number,                   // An integer, possibly 0
-    splitVTDs: string[]                   // A possibly empty list of GEOIDs
-  };
-  datasets: T.Datasets;
-  resources: {
-    // None at this time
-  };
-};
-*/
-/* TODO - DELETE
-export type PartisanCategory = {
-  score: number;                          // An integer score [0–100]
-  metrics: {
-    partisanBias: 0.15,                   // TBD
-    responsiveness: 2.0                   // TBD
-  };
-  details: {
-    // TODO - Need to flesh this out
-  };
-  datasets: T.Datasets;
-  resources: {
-    planScore?: string;
-  };
-};
-*/
-/* TODO - DELETE
-export type MinorityCategory = {
-  score: null;                            // Explicitly NOT scored
-  metrics: {
-    nBlack37to50: number,                 // Integer >= 0; two-digit maximum
-    nBlackMajority: number,               // Ditto
-    nHispanic37to50: number,              // Ditto
-    nHispanicMajority: number,            // Ditto
-    nPacific37to50: number,               // Ditto
-    nPacificMajority: number,             // Ditto
-    nAsian37to50: number,                 // Ditto
-    nAsianMajority: number,               // Ditto
-    nNative37to50: number,                // Ditto
-    nNativeMajority: number,              // Ditto
-    nMinority37to50: number,              // Ditto
-    nMinorityMajority: number,            // Ditto
-
-    averageDVoteShare: number             // A fraction [0.0 – 1.0] to represent as a %
-  };
-  details: {
-    vap: true,                            // true = using VAP data; false = CVAP data
-    comboCategories: true                 // true = using combo fields; false = mutually exclusive
-  };
-  datasets: T.Datasets;
-  resources: {
-    // TODO - Add these ...
-  };
-};
-*/
-/* TODO - DELETE
-export type PlanAnalytics = {
-  requirements: RequirementsCategory;
-  compactness: CompactnessCategory;
-  // TODO - Don't show these categories yet
-  splitting: SplittingCategory;
-  partisan: PartisanCategory;
-  minority: MinorityCategory;
-}
-*/
-// EXAMPLE
-/* TODO - DELETE
-let sampleRequirements: RequirementsCategory = {
-  score: T.TriState.Red,
-  metrics: {
-    complete: T.TriState.Green,
-    contiguous: T.TriState.Red,
-    freeOfHoles: T.TriState.Yellow,
-    equalPopulation: T.TriState.Red
-  },
-  details: {
-    unassignedFeatures: [],
-    emptyDistricts: [],
-    discontiguousDistricts: [2],
-    embeddedDistricts: [],
-    populationDeviation: 0.6748,
-    deviationThreshold: 0.75 / 100
-  },
-  datasets: {
-    census: "2010 Census Total Population"
-  },
-  resources: {
-    stateReqs: "https://www.brennancenter.org/sites/default/files/publications/2019_06_50States_FINALsinglepages_20.pdf"
-  }
-}
-*/
-/* TODO - DELETE
-let sampleCompactness: CompactnessCategory = {
-  score: 60,
-  metrics: {
-    reock: 0.3773,
-    polsby: 0.3815
-  },
-  details: {},
-  datasets: {
-    shapes: "2010 VTD shapes"
-  },
-  resources: {}
-}
-*/
-/* TODO - DELETE
-let sampleSplitting: SplittingCategory = {
-  score: 73,
-  metrics: {
-    sqEnt_DCreduced: 1.531,
-    sqEnt_CDreduced: 1.760
-  },
-  details: {
-    countiesSplitUnexpectedly: [
-      "Bladen", "Buncombe", "Catawba", "Cumberland", "Durham", "Guilford", "Iredell", "Johnston", "Pitt", "Rowan", "Wilson"
-    ],
-    unexpectedAffected: 0.3096,
-    nSplitVTDs: 12,
-    splitVTDs: ["VTD-01", "VTD-02", "VTD-03", "VTD-04", "VTD-05", "VTD-06", "VTD-07", "VTD-08", "VTD-09", "VTD-10", "VTD-11", "VTD-12"]
-  },
-  datasets: {},
-  resources: {}
-}
-*/
-/* TODO - DELETE
-let samplePartisan: PartisanCategory = {
-  score: 100,
-  metrics: {
-    partisanBias: 0.15,
-    responsiveness: 2.0
-  },
-  details: {},
-  datasets: {
-    election: "2016 Presidential, US Senate, Governor, and AG election results"
-  },
-  resources: {
-    planScore: "https://planscore.org/plan.html?20180219T202039.596761160Z"
-  }
-}
-*/
-/* TODO - DELETE
-let sampleMinority: MinorityCategory = {
-  score: null,
-  metrics: {
-    nBlack37to50: 1,
-    nBlackMajority: 12,
-    nHispanic37to50: 0,
-    nHispanicMajority: 0,
-    nPacific37to50: 0,
-    nPacificMajority: 0,
-    nAsian37to50: 0,
-    nAsianMajority: 0,
-    nNative37to50: 0,
-    nNativeMajority: 0,
-    nMinority37to50: 0,
-    nMinorityMajority: 0,
-
-    averageDVoteShare: 0.90
-  },
-  details: {
-    vap: true,
-    comboCategories: true
-  },
-  datasets: {
-    vap: "2010 Voting Age Population"
-  },
-  resources: {}
-}
-*/
-/* TODO - DELETE
-export const samplePlanAnalytics: PlanAnalytics = {
-  requirements: sampleRequirements,
-  compactness: sampleCompactness,
-  // TODO - Don't show these categories yet
-  splitting: sampleSplitting,
-  partisan: samplePartisan,
-  minority: sampleMinority
-}
-*/
 function prepareRequirementsChecklist(s, bLog = false) {
     if (!(s.bPostProcessingDone)) {
         doAnalyzePostProcessing(s);
@@ -2524,14 +1605,8 @@ function prepareRequirementsChecklist(s, bLog = false) {
         const emptyDistrictsDetail = U.deepCopy(completeTest['details']['emptyDistricts']) || [];
         const discontiguousDistrictsDetail = U.deepCopy(contiguousTest['details']['discontiguousDistricts']) || [];
         const embeddedDistrictsDetail = U.deepCopy(freeOfHolesTest['details']['embeddedDistricts']) || [];
-        // TODO - SCORE: DELETE - This code is hooked correctly to use dra-score
-        // const scorecard = s._scorecard as Score.Scorecard;
-        // const populationDeviation = scorecard.best.populationDeviation.raw;
         const populationDeviationDetail = U.deepCopy(equalPopulationTest['details']['deviation']);
-        // console.log("Population deviations =", populationDeviationDetail, populationDeviation);
-        // const deviationThreshold = scorecard.best.populationDeviation.notes['threshold'];
         const deviationThresholdDetail = U.trim(s.populationDeviationThreshold());
-        // console.log("Population deviation thresholds =", deviationThresholdDetail, deviationThreshold);
         const xx = s.state.xx;
         // TODO - JSON: Is there a better / easier way to work with the variable?
         const stateReqsDict = state_reqs_json_1.default;
@@ -2614,8 +1689,8 @@ function prepareDistrictStatistics(s, bLog = false) {
             s.districts.statistics[D.DistrictField.AsianPct][i],
             s.districts.statistics[D.DistrictField.NativePct][i]
         ];
-        // TODO - DASHBOARD: Until we add three-state support top to bottom in
-        //   requirements/validations, map booleans to tri-states here.
+        // NOTE - Until we add three-state support top to bottom in Requirements,
+        //   map booleans to tri-states here.
         rawRow[3 /* bEqualPop */] = U.mapBooleanToTriState(rawRow[3 /* bEqualPop */]);
         rawRow[4 /* bNotEmpty */] = U.mapBooleanToTriState(rawRow[4 /* bNotEmpty */]);
         rawRow[5 /* bContiguous */] = U.mapBooleanToTriState(rawRow[5 /* bContiguous */]);
@@ -2690,24 +1765,6 @@ const populationDeviationDefn = {
     externalType: TestType.Percentage,
     suites: [0 /* Legal */, 2 /* Best */] // Both so EqualPopulation can be assessed
 };
-/* TODO - DELETE
-const reockDefn: T.Dict = {
-  ID: T.Test.Reock,
-  name: "Reock",
-  normalize: true,
-  externalType: TestType.Number,
-  suites: [T.Suite.Best]
-};
-
-const polsbyPopperDefn: T.Dict = {
-  ID: T.Test.PolsbyPopper,
-  name: "Polsby-Popper",
-  normalize: true,
-  externalType: TestType.Number,
-  suites: [T.Suite.Best]
-};
-*/
-// NOTE - SPLITTING
 const unexpectedCountySplitsDefn = {
     ID: 5 /* UnexpectedCountySplits */,
     name: "Unexpected County Splits",
@@ -2715,7 +1772,6 @@ const unexpectedCountySplitsDefn = {
     externalType: TestType.Percentage,
     suites: [2 /* Best */]
 };
-// NOTE - SPLITTING
 const VTDSplitsDefn = {
     ID: 6 /* VTDSplits */,
     name: "VTD Splits",
@@ -2730,87 +1786,16 @@ const testDefns = {
     [2 /* FreeOfHoles */]: freeOfHolesDefn,
     [3 /* EqualPopulation */]: equalPopulationDefn,
     [4 /* PopulationDeviation */]: populationDeviationDefn,
-    // [T.Test.Reock]: reockDefn,                          TODO - DELETE
-    // [T.Test.PolsbyPopper]: polsbyPopperDefn,            TODO - DELETE
     [5 /* UnexpectedCountySplits */]: unexpectedCountySplitsDefn,
     [6 /* VTDSplits */]: VTDSplitsDefn,
 };
-/* TODO - DELETE
-// NORMALIZE RAW ANALYTICS
-//   Raw numeric analytics, such as population deviation, compactness, etc. are
-//   normalized as part of creating a scorecard, so the code to normalize results
-//   is encapsulated here.
-
-// Configure scale parameters for normalizing each raw test result.
-//   Scales consist of a minimum & a maximum *raw* value. If the values get
-//   inverted (to make bigger better), these will switch.
-//   This process needs to be separate from the test configuration info above,
-//   because some scales need access to the analytics session object.
-export function doConfigureScales(s: AnalyticsSession): void
-{
-  // Scale defn for PopulationDeviation
-  const CDLimit = 0.75 / 100;                 // Deviation threshold for CD's
-  const LDLimit = 10.00 / 100;                // Deviation threshold for LD's
-
-  const CDGoodEnough = 0.20 / 100;
-  const LDGoodEnough = (CDGoodEnough / CDLimit) * LDLimit;
-  const popDevScale = (s.legislativeDistricts) ? [1.0 - LDLimit, 1.0 - LDGoodEnough] : [1.0 - CDLimit, 1.0 - CDGoodEnough];
-  // const scale = [1.0 - CDLimit, 1.0 - CDGoodEnough];
-
-  s.testScales[T.Test.PopulationDeviation] = { scale: popDevScale, bInvertRaw: true };
-
-  s.testScales[T.Test.Reock] = { scale: [0.25, 0.50] };
-  s.testScales[T.Test.PolsbyPopper] = { scale: [0.10, 0.50] };
-
-  const nDistricts = s.state.nDistricts;
-  const nCounties = s.counties.nCounties;
-
-  // NOTE - SPLITTING: Experiment w/ this multiplier. Only allowing the expected
-  //   number of county splits seems too stringent, empirically.
-  const allowableCountySplitsMultiplier = 1.5;
-  const nAllowableSplits = Math.min(allowableCountySplitsMultiplier * (nDistricts - 1));
-  const countySplittingThreshold = ((nAllowableSplits * 1.71) + ((nCounties - nAllowableSplits) * 1.0)) / nCounties;
-  const countySplittingScale = [1.0, countySplittingThreshold];
-  s.testScales[T.Test.CountySplitting] = { scale: countySplittingScale, bInvertScaled: true };
-
-  const districtSplittingThreshold = 1.5;
-  const districtSplittingScale = [1.0, districtSplittingThreshold];
-  s.testScales[T.Test.DistrictSplitting] = { scale: districtSplittingScale, bInvertScaled: true };
-
-  // TODO - More analytics ...
-}
-*/
 // Postprocess analytics - Normalize numeric results and derive secondary tests.
 // Do this after analytics have been run and before preparing a test log or scorecard. 
 function doAnalyzePostProcessing(s, bLog = false) {
-    // TODO - DELETE
-    // if (s.useLegacy())
-    // {
-    //   // Normalize the raw scores for all the numerics tests
-    //   let testResults = U.getNumericObjectKeys(testDefns);
-    //   for (let testID of testResults)
-    //   {
-    //     if (testDefns[testID]['normalize'])
-    //     {
-    //       let testResult = s.getTest(testID) as T.TestEntry;
-    //       let rawScore = testResult['score'] as number;
-    //       let normalizedScore: number;
-    //       normalizedScore = U.normalize(rawScore, s.testScales[testID]);
-    //       testResult['normalizedScore'] = normalizedScore;
-    //       // Add the scale used to normalize the raw score to the details
-    //       testResult['details']['scale'] = s.testScales[testID].scale;
-    //     }
-    //   }
-    // }
-    // else
-    // {
     // Just populate the normalized population deviation score in the test
     const scorecard = s._scorecard;
     let popDev = s.getTest(4 /* PopulationDeviation */);
     popDev['normalizedScore'] = scorecard.traditionalPrinciples.populationDeviation.normalized;
-    // TODO - DELETE
-    // test['normalizedScore'] = scorecard.best.populationDeviation.normalized;
-    // TODO - SCORE: Add datasets used to details by tab
     const datasets = {
         shapes: S.SHAPES,
         census: U.deepCopy(s.config['descriptions']['CENSUS']),
@@ -2821,12 +1806,10 @@ function doAnalyzePostProcessing(s, bLog = false) {
     scorecard.minority.details['vap'] = datasets.vap;
     scorecard.traditionalPrinciples.details['shapes'] = datasets.shapes;
     scorecard.traditionalPrinciples.details['census'] = datasets.census;
-    // TODO - SCORE: Add legacy splits details
     const simpleSplits = s.getTest(5 /* UnexpectedCountySplits */);
     scorecard.traditionalPrinciples.details['unexpectedAffected'] = simpleSplits['score'];
     scorecard.traditionalPrinciples.details['countiesSplitUnexpectedly'] = U.deepCopy(simpleSplits['details']['countiesSplitUnexpectedly']);
     // NOTE - Add split precincts in dra-client directly
-    // }
     // Derive secondary tests
     analyze_1.doDeriveSecondaryTests(s, bLog);
     // Toggle the semaphore, so postprocessing isn't for both the testlog & scorecard
@@ -2965,19 +1948,14 @@ function getStatewideDemographics(s, bLog = false) {
 function scorePlan(s, p, bLog = false, overridesJSON) {
     let scorer = new Score.Scorer();
     const scorecard = scorer.score(p, overridesJSON);
-    // TODO - SCORE: Toggle: Before returning, create a dummy population deviation
-    //   test, for doHasEqualPopulations() to use later. This is preserving the old
-    //   calling sequence.
+    // Before returning, create a dummy population deviation test, for 
+    // doHasEqualPopulations() to use later.This is preserving the old calling sequence.
     let test = s.getTest(4 /* PopulationDeviation */);
-    // TODO - SCORE: U.trim(popDev)???
-    // const popDev = scorecard.best.populationDeviation.raw;
     // Get the raw population deviation
     const popDev = scorecard.traditionalPrinciples.populationDeviation.raw;
     // Populate the test entry
     test['score'] = popDev;
     test['details'] = { 'maxDeviation': scorecard.traditionalPrinciples.populationDeviation.notes['maxDeviation'] };
-    // TODO - DELETE
-    // test['details'] = { 'maxDeviation': scorecard.best.populationDeviation.notes['maxDeviation'] };
     // Populate the N+1 summary "district" in district.statistics
     let totalPop = s.districts.statistics[D.DistrictField.TotalPop];
     let popDevPct = s.districts.statistics[D.DistrictField.PopDevPct];
@@ -3042,7 +2020,6 @@ exports.SHAPES = "2010 VTD shapes";
 // TYPE DEFINITIONS
 //
 Object.defineProperty(exports, "__esModule", { value: true });
-// TODO - SCORE
 var dra_score_1 = __webpack_require__(/*! @dra2020/dra-score */ "@dra2020/dra-score");
 exports.sampleProfile = dra_score_1.sampleProfile;
 exports.sampleScorecard = dra_score_1.sampleScorecard;
@@ -3084,7 +2061,6 @@ function isOutOfState(geoID) {
     return geoID == S.OUT_OF_STATE;
 }
 exports.isOutOfState = isOutOfState;
-// NOTE - UNASSIGNED
 // Get the districtID to which a geoID is assigned
 function getDistrict(plan, geoID) {
     // All geoIDs in a state *should be* assigned to a district (including the
@@ -3139,7 +2115,6 @@ function normalize(rawScore, testScale) {
     let coercedValue = Math.min(Math.max(rawScore, rangeMin), rangeMax);
     // Scale the bounded value w/in the range [0 - (rangeMax - rangeMin)]
     let scaledValue = (coercedValue - rangeMin) / (rangeMax - rangeMin);
-    // NOTE - SPLITTING
     // Invert the scaled value if necessary to make bigger = better
     if (testScale.bInvertScaled) {
         scaledValue = 1.0 - scaledValue;