@dra2020/district-analytics 4.2.0 → 4.3.2

package/dist/district-analytics.js

@@ -121,6 +121,7 @@ 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"));
@@ -131,7 +132,7 @@ class AnalyticsSession {
         this.bOneTimeProcessingDone = false;
         this.bPlanAnalyzed = false;
         this.bPostProcessingDone = false;
-        this.testScales = {};
+        // testScales = {} as T.TestScales;  TODO - DELETE
         this.tests = {};
         this.title = SessionRequest['title'];
         this.legislativeDistricts = SessionRequest['legislativeDistricts'];
@@ -142,19 +143,21 @@ 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 - SCORE: Toggle
-        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.
-            results_1.doConfigureScales(this);
-        }
-        else {
-            console.log("Using dra-score analytics.");
-            // TODO - SCORE: Temporary HACK. Query dra-score for threshold.
-            results_1.doConfigureScales(this);
-        }
+        // 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:
@@ -167,13 +170,15 @@ class AnalyticsSession {
             config['cycle'] = 2010;
         return config;
     }
-    // TODO - SCORE: Toggle = Invert this logic
-    useLegacy() {
-        // 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;
+    /* 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) {
@@ -305,19 +310,21 @@ class AnalyticsSession {
     }
     // NOTE - Not sure why this has to be up here ...
     populationDeviationThreshold() {
-        // TODO - SCORE: Toggle
-        if (this.useLegacy()) {
-            return 1 - this.testScales[4 /* 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];
-        }
+        // 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;
@@ -926,10 +933,22 @@ 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");
-const compact_1 = __webpack_require__(/*! ./compact */ "./src/compact.ts");
+// import { doPopulationDeviation, doHasEqualPopulations } from './equal';  TODO - DELETE
+// import { doReock, doPolsbyPopper } from './compact';  TODO - DELETE
 const cohesive_1 = __webpack_require__(/*! ./cohesive */ "./src/cohesive.ts");
-const political_1 = __webpack_require__(/*! ./political */ "./src/political.ts");
-const minority_1 = __webpack_require__(/*! ./minority */ "./src/minority.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);
@@ -941,58 +960,65 @@ 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 - SCORE: Toggle
-    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(0 /* Legal */)) {
-            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[4 /* PopulationDeviation */] = equal_1.doPopulationDeviation(s, bLog);
-            // 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[3 /* EqualPopulation */] = s.getTest(3 /* EqualPopulation */);
-        }
-        // Tests in the "Fair" suite
-        if (requestedSuites.includes(1 /* Fair */)) {
-            s.tests[11 /* SeatsBias */] = political_1.doSeatsBias(s, bLog);
-            s.tests[12 /* VotesBias */] = political_1.doVotesBias(s, bLog);
-            s.tests[13 /* Responsiveness */] = political_1.doResponsiveness(s, bLog);
-            s.tests[14 /* ResponsiveDistricts */] = political_1.doResponsiveDistricts(s, bLog);
-            s.tests[15 /* EfficiencyGap */] = political_1.doEfficiencyGap(s, bLog);
-            s.tests[16 /* MajorityMinorityDistricts */] = minority_1.doMajorityMinorityDistricts(s, bLog);
-        }
-        // Tests in the "Best" suite, i.e., criteria for better/worse
-        if (requestedSuites.includes(2 /* Best */)) {
-            s.tests[5 /* Reock */] = compact_1.doReock(s, bLog);
-            s.tests[6 /* PolsbyPopper */] = compact_1.doPolsbyPopper(s, bLog);
-            s.tests[7 /* UnexpectedCountySplits */] = cohesive_1.doFindCountiesSplitUnexpectedly(s, bLog);
-            s.tests[10 /* VTDSplits */] = cohesive_1.doFindSplitVTDs(s, bLog);
-            s.tests[8 /* CountySplitting */] = cohesive_1.doCountySplitting(s, bLog);
-            s.tests[9 /* DistrictSplitting */] = cohesive_1.doDistrictSplitting(s, bLog);
-        }
-    }
-    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[4 /* PopulationDeviation */] = equal_1.doPopulationDeviation(s, bLog);
-        // 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[3 /* EqualPopulation */] = s.getTest(3 /* EqualPopulation */);
-        s.tests[7 /* UnexpectedCountySplits */] = cohesive_1.doFindCountiesSplitUnexpectedly(s, bLog);
-        s.tests[10 /* VTDSplits */] = cohesive_1.doFindSplitVTDs(s, bLog);
-    }
+    // 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
+    // from PopulationDeviation, as part of scorecard or test log preparation.
+    // Create an empty test entry here though ...
+    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;
@@ -1033,185 +1059,279 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const U = __importStar(__webpack_require__(/*! ./utils */ "./src/utils.ts"));
-const S = __importStar(__webpack_require__(/*! ./settings */ "./src/settings.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
-function doCountySplitting(s, bLog = false) {
-    let test = s.getTest(8 /* CountySplitting */);
-    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 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;
 }
-exports.doCountySplitting = doCountySplitting;
-function doDistrictSplitting(s, bLog = false) {
-    let test = s.getTest(9 /* DistrictSplitting */);
-    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;
+
+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;
 }
-exports.doDistrictSplitting = doDistrictSplitting;
+
+
 // HELPERS
-// Loop over all the county-district combos, skipping the virtual district 0 
+
+// 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, districtTotals) {
-    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;
-                }
-            }
+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, countyTotals) {
-    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 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) {
-    let nC = countyTotals.length;
-    let cTotal = U.sumArray(countyTotals);
-    let w = U.initArray(nC, 0.0);
-    for (let j = 0; j < nC; j++) {
-        w[j] = countyTotals[j] / cTotal;
-    }
-    return w;
-}
-function calcDistrictWeights(districtTotals) {
-    let nD = districtTotals.length;
-    let dTotal = U.sumArray(districtTotals);
-    let x = U.initArray(nD, 0.0);
-    for (let i = 0; i < nD; i++) {
-        x[i] = districtTotals[i] / dTotal;
-    }
-    return x;
-}
-function calcCountyFractions(CxDreducedD, countyTotals) {
-    let nD = CxDreducedD.length;
-    let nC = CxDreducedD[0].length;
-    let f = 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;
-            }
-        }
+
+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;
+  }
+
+  return f;
 }
-function calcDistrictFractions(CxDreducedC, districtTotals) {
-    let nD = CxDreducedC.length;
-    let nC = CxDreducedC[0].length;
-    let g = 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;
-            }
-        }
+
+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;
+  }
+
+  return g;
 }
+
 // Deal with decimal census "counts" due to disagg/re-agg
-function areRoughlyEqual(x, y) {
-    let delta = Math.abs(x - y);
-    let result = (delta < S.EQUAL_TOLERANCE) ? true : false;
-    return result;
+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, f, numD, bLog = false) {
-    let e = 0.0;
-    for (let i = 0; i < numD; i++) {
-        e += Math.sqrt(f[i][j]);
-    }
-    return e;
+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, w, bLog = false) {
-    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);
+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, g, numC, bLog = false) {
-    let e = 0.0;
-    for (let j = 0; j < numC; j++) {
-        e += Math.sqrt(g[i][j]);
-    }
-    return e;
+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, x, bLog = false) {
-    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);
+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
 /*
  
@@ -1246,7 +1366,7 @@ These counties are split unexpectedly:
  
 */
 function doFindCountiesSplitUnexpectedly(s, bLog = false) {
-    let test = s.getTest(7 /* UnexpectedCountySplits */);
+    let test = s.getTest(5 /* UnexpectedCountySplits */);
     // THE THREE VALUES TO DETERMINE FOR A PLAN
     let unexpectedSplits = 0;
     let unexpectedAffected = 0;
@@ -1339,10 +1459,10 @@ function doFindCountiesSplitUnexpectedly(s, bLog = false) {
     return test;
 }
 exports.doFindCountiesSplitUnexpectedly = doFindCountiesSplitUnexpectedly;
+// NOTE - This function just creates an empty container that dra-client fills in when generating the UI
 function doFindSplitVTDs(s, bLog = false) {
-    let test = s.getTest(10 /* VTDSplits */);
+    let test = s.getTest(6 /* VTDSplits */);
     let splitVTDs = [];
-    // TODO - SPLITTING: Flesh this out, using virtual VTD's ...
     test['score'] = splitVTDs.length;
     test['details']['splitVTDs'] = splitVTDs;
     return test;
@@ -1372,10 +1492,10 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 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");
-const U = __importStar(__webpack_require__(/*! ./utils */ "./src/utils.ts"));
-// TODO - SCORE: Remove legacy code
+// TODO - DELETE
 // Measures of compactness compare district shapes to various ideally compact
 // benchmarks, such as circles. All else equal, more compact districts are better.
 // 
@@ -1454,62 +1574,83 @@ const U = __importStar(__webpack_require__(/*! ./utils */ "./src/utils.ts"));
 // 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
-function doReock(s, bLog = false) {
-    let test = s.getTest(5 /* Reock */);
-    // Calculate Reock scores by district
-    let scores = [];
-    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[0 /* Area */];
-            let d = districtProps[1 /* Diameter */];
-            let reock = (4 * a) / (Math.PI * Math.pow(d, 2));
-            // Save each district score
-            scores.push(reock);
-            // Echo the results by district
-            if (bLog)
-                console.log("Reock for district", districtID, "=", reock);
-        }
+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;
+  }
+
+  // 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;
 }
-exports.doReock = doReock;
+
 // Calculate Polsby-Popper compactness measures:
 // polsby_popper = (4 * math.pi) * (a / p**2)
 // NOTE - Depends on extractDistrictProperties running first
-function doPolsbyPopper(s, bLog = false) {
-    let test = s.getTest(6 /* PolsbyPopper */);
-    // Calculate Polsby-Popper scores by district
-    let scores = [];
-    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[0 /* Area */];
-            let p = districtProps[2 /* Perimeter */];
-            let polsbyPopper = (4 * Math.PI) * (a / Math.pow(p, 2));
-            // Save each district score
-            scores.push(polsbyPopper);
-            // Echo the results by district
-            if (bLog)
-                console.log("Polsby-Popper for district", districtID, "=", polsbyPopper);
-        }
+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;
+  }
+
+  // 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;
 }
-exports.doPolsbyPopper = doPolsbyPopper;
+*/
 // HELPER TO EXTRACT PROPERTIES OF DISTRICT SHAPES
 // TODO - SCORE: Create an array, as opposed to a dict
 function extractDistrictProperties(s, bLog = false) {
@@ -1587,41 +1728,53 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const U = __importStar(__webpack_require__(/*! ./utils */ "./src/utils.ts"));
 const D = __importStar(__webpack_require__(/*! ./_data */ "./src/_data.ts"));
-// TODO - SCORE: Delete
-function doPopulationDeviation(s, bLog = false) {
-    let test = s.getTest(4 /* PopulationDeviation */);
-    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;
+/* 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;
 }
-exports.doPopulationDeviation = doPopulationDeviation;
+*/
 // 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) {
@@ -1671,7 +1824,6 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const Poly = __importStar(__webpack_require__(/*! @dra2020/poly */ "@dra2020/poly"));
-// TODO - SCORE: Remove legacy code
 // HELPER
 function polyParts(poly) {
     let parts = { type: 'FeatureCollection', features: [] };
@@ -1810,35 +1962,6 @@ __export(__webpack_require__(/*! ./results */ "./src/results.ts"));
 __export(__webpack_require__(/*! ./types */ "./src/types.ts"));
 
 
-/***/ }),
-
-/***/ "./src/minority.ts":
-/*!*************************!*\
-  !*** ./src/minority.ts ***!
-  \*************************/
-/*! no static exports found */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-//
-// PROTECTS MINORITIES
-//
-Object.defineProperty(exports, "__esModule", { value: true });
-// TODO - SCORE: Remove legacy code
-function doMajorityMinorityDistricts(s, bLog = false) {
-    let test = s.getTest(16 /* MajorityMinorityDistricts */);
-    if (bLog)
-        console.log("TODO - Calculating # of majority-minority districts ...");
-    return test;
-}
-exports.doMajorityMinorityDistricts = doMajorityMinorityDistricts;
-// Sources for majority-minority info:
-// - https://en.wikipedia.org/wiki/List_of_majority-minority_United_States_congressional_districts
-// TODO - 2020: Update/revise this, when the update comes out in September:
-// - http://www.ncsl.org/Portals/1/Documents/Redistricting/Redistricting_2010.pdf
-
-
 /***/ }),
 
 /***/ "./src/political.ts":
@@ -1853,18 +1976,14 @@ exports.doMajorityMinorityDistricts = doMajorityMinorityDistricts;
 //
 // FAIR/PROPORTIONAL
 //
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) result[k] = mod[k];
-    result["default"] = mod;
-    return result;
-};
 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");
-const U = __importStar(__webpack_require__(/*! ./utils */ "./src/utils.ts"));
-const D = __importStar(__webpack_require__(/*! ./_data */ "./src/_data.ts"));
-// TODO - SCORE: Remove legacy code
+/* 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:
@@ -1883,66 +2002,89 @@ const D = __importStar(__webpack_require__(/*! ./_data */ "./src/_data.ts"));
 //
 // 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)
-function doSeatsBias(s, bLog = false) {
-    let test = s.getTest(11 /* SeatsBias */);
-    if (bLog)
-        console.log("TODO - Calculating seats bias ...");
-    return test;
+
+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;
 }
-exports.doSeatsBias = doSeatsBias;
-function doVotesBias(s, bLog = false) {
-    let test = s.getTest(12 /* VotesBias */);
-    if (bLog)
-        console.log("TODO - Calculating votes 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;
 }
-exports.doVotesBias = doVotesBias;
-function doResponsiveness(s, bLog = false) {
-    let test = s.getTest(13 /* Responsiveness */);
-    if (bLog)
-        console.log("TODO - Calculating responsiveness ...");
-    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;
 }
-exports.doResponsiveness = doResponsiveness;
-function doResponsiveDistricts(s, bLog = false) {
-    let test = s.getTest(14 /* ResponsiveDistricts */);
-    if (bLog)
-        console.log("TODO - Calculating # of responsive districts ...");
-    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;
 }
-exports.doResponsiveDistricts = doResponsiveDistricts;
+
+
 // OTHER MEASURES OF PARTISAN BIAS
+
 // TODO - PARTISAN: This formula might need to be inverted for D vs. R +/-
 // TODO - Normalize the results.
-function doEfficiencyGap(s, bLog = false) {
-    if (bLog)
-        console.log("TODO - Calculating the efficiency gap ...");
-    let test = s.getTest(15 /* EfficiencyGap */);
-    // 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;
+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;
 }
-exports.doEfficiencyGap = doEfficiencyGap;
+
+
 // HELPERS
+*/
 function fptpWin(demPct) {
     // Vote shares should be fractions in the range [0.0 – 1.0]
     assert_1.strict((demPct <= 1.0) && (demPct >= 0.));
@@ -2548,24 +2690,26 @@ const populationDeviationDefn = {
     externalType: TestType.Percentage,
     suites: [0 /* Legal */, 2 /* Best */] // Both so EqualPopulation can be assessed
 };
-// TODO - SCORE: Comment these out ...
-const reockDefn = {
-    ID: 5 /* Reock */,
-    name: "Reock",
-    normalize: true,
-    externalType: TestType.Number,
-    suites: [2 /* Best */]
+/* TODO - DELETE
+const reockDefn: T.Dict = {
+  ID: T.Test.Reock,
+  name: "Reock",
+  normalize: true,
+  externalType: TestType.Number,
+  suites: [T.Suite.Best]
 };
-const polsbyPopperDefn = {
-    ID: 6 /* PolsbyPopper */,
-    name: "Polsby-Popper",
-    normalize: true,
-    externalType: TestType.Number,
-    suites: [2 /* 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: 7 /* UnexpectedCountySplits */,
+    ID: 5 /* UnexpectedCountySplits */,
     name: "Unexpected County Splits",
     normalize: false,
     externalType: TestType.Percentage,
@@ -2573,35 +2717,12 @@ const unexpectedCountySplitsDefn = {
 };
 // NOTE - SPLITTING
 const VTDSplitsDefn = {
-    ID: 10 /* VTDSplits */,
+    ID: 6 /* VTDSplits */,
     name: "VTD Splits",
     normalize: false,
     externalType: TestType.Number,
     suites: [2 /* Best */]
 };
-// NOTE - SPLITTING
-const countySplittingDefn = {
-    ID: 8 /* CountySplitting */,
-    name: "County Splitting",
-    normalize: true,
-    externalType: TestType.Number,
-    suites: [2 /* Best */]
-};
-// NOTE - SPLITTING
-const districtSplittingDefn = {
-    ID: 9 /* DistrictSplitting */,
-    name: "District Splitting",
-    normalize: true,
-    externalType: TestType.Number,
-    suites: [2 /* Best */]
-};
-const efficiencyGapDefn = {
-    ID: 15 /* EfficiencyGap */,
-    name: "Efficiency Gap",
-    normalize: false,
-    externalType: TestType.Percentage,
-    suites: [1 /* Fair */]
-};
 // All the tests that have been defined (can be reported on)
 const testDefns = {
     [0 /* Complete */]: completeDefn,
@@ -2609,94 +2730,103 @@ const testDefns = {
     [2 /* FreeOfHoles */]: freeOfHolesDefn,
     [3 /* EqualPopulation */]: equalPopulationDefn,
     [4 /* PopulationDeviation */]: populationDeviationDefn,
-    [5 /* Reock */]: reockDefn,
-    [6 /* PolsbyPopper */]: polsbyPopperDefn,
-    // NOTE - SPLITTING
-    [7 /* UnexpectedCountySplits */]: unexpectedCountySplitsDefn,
-    [10 /* VTDSplits */]: VTDSplitsDefn,
-    [8 /* CountySplitting */]: countySplittingDefn,
-    [9 /* DistrictSplitting */]: districtSplittingDefn,
-    // TODO - More tests ...
-    [15 /* EfficiencyGap */]: efficiencyGapDefn
+    // [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.
-function doConfigureScales(s) {
-    // 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[4 /* PopulationDeviation */] = { scale: popDevScale, bInvertRaw: true };
-    s.testScales[5 /* Reock */] = { scale: [0.25, 0.50] };
-    s.testScales[6 /* 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[8 /* CountySplitting */] = { scale: countySplittingScale, bInvertScaled: true };
-    const districtSplittingThreshold = 1.5;
-    const districtSplittingScale = [1.0, districtSplittingThreshold];
-    s.testScales[9 /* DistrictSplitting */] = { scale: districtSplittingScale, bInvertScaled: true };
-    // TODO - More analytics ...
-}
-exports.doConfigureScales = doConfigureScales;
+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 - SCORE: Toggle
-    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);
-                let rawScore = testResult['score'];
-                let normalizedScore;
-                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']),
-            vap: U.deepCopy(s.config['descriptions']['VAP']),
-            election: U.deepCopy(s.config['descriptions']['ELECTION'])
-        };
-        scorecard.partisan.details['election'] = datasets.election;
-        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(7 /* UnexpectedCountySplits */);
-        scorecard.traditionalPrinciples.details['unexpectedAffected'] = simpleSplits['score'];
-        scorecard.traditionalPrinciples.details['countiesSplitUnexpectedly'] = U.deepCopy(simpleSplits['details']['countiesSplitUnexpectedly']);
-        // NOTE - Add split precincts in dra-client directly
-    }
+    // 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']),
+        vap: U.deepCopy(s.config['descriptions']['VAP']),
+        election: U.deepCopy(s.config['descriptions']['ELECTION'])
+    };
+    scorecard.partisan.details['election'] = datasets.election;
+    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