@dra2020/district-analytics 1.0.10 → 1.0.11

package/dist/district-analytics.js

@@ -108,12 +108,20 @@ return /******/ (function(modules) { // webpackBootstrap
 //
 // THE NODE PACKAGE API
 //
+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 });
 const preprocess_1 = __webpack_require__(/*! ./preprocess */ "./src/preprocess.ts");
 const analyze_1 = __webpack_require__(/*! ./analyze */ "./src/analyze.ts");
-const report_1 = __webpack_require__(/*! ./report */ "./src/report.ts");
-const D = __webpack_require__(/*! ./_data */ "./src/_data.ts");
-const U = __webpack_require__(/*! ./utils */ "./src/utils.ts");
+const results_1 = __webpack_require__(/*! ./results */ "./src/results.ts");
+const results_2 = __webpack_require__(/*! ./results */ "./src/results.ts");
+const D = __importStar(__webpack_require__(/*! ./_data */ "./src/_data.ts"));
+const U = __importStar(__webpack_require__(/*! ./utils */ "./src/utils.ts"));
 class AnalyticsSession {
     constructor(SessionRequest) {
         this.config = {};
@@ -122,7 +130,6 @@ class AnalyticsSession {
         this.bPostProcessingDone = false;
         this.testScales = {};
         this.tests = {};
-        this.scorecard = {};
         this.title = SessionRequest['title'];
         this.legislativeDistricts = SessionRequest['legislativeDistricts'];
         this.config = this.processConfig(SessionRequest['config']);
@@ -135,12 +142,13 @@ class AnalyticsSession {
         // 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.
-        report_1.doConfigureScales(this);
+        results_1.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 - Remove this mechanism. Always run everything.
         let defaultSuites = [0 /* Legal */, 1 /* Fair */, 2 /* Best */];
         // If the config passed in has no suites = [], use the default suites
         if (U.isArrayEmpty(config['suites'])) {
@@ -155,10 +163,10 @@ class AnalyticsSession {
     // analytics & validations, saving/updating the individual test results.
     analyzePlan(bLog = false) {
         try {
-            preprocess_1.doPreprocessData(this);
+            preprocess_1.doPreprocessData(this, bLog);
             analyze_1.doAnalyzeDistricts(this, bLog);
             analyze_1.doAnalyzePlan(this, bLog);
-            report_1.doAnalyzePostProcessing(this);
+            results_1.doAnalyzePostProcessing(this, bLog);
         }
         catch (_a) {
             console.log("Exception caught by analyzePlan()");
@@ -166,6 +174,36 @@ class AnalyticsSession {
         }
         return true;
     }
+    // NOTE - This assumes that analyzePlan() has been run!
+    getPlanAnalytics(bLog = false) {
+        return results_2.preparePlanAnalytics(this, bLog);
+    }
+    // NOTE - This assumes that analyzePlan() has been run!
+    getDistrictStatistics(bLog = false) {
+        return results_2.prepareDistrictStatistics(this, bLog);
+    }
+    // NOTE - This assumes that analyzePlan() has been run!
+    getDiscontiguousDistrictFeatures(bLog = false) {
+        // Get the (possibly empty) list of discontiguous district IDs
+        let contiguousTest = this.getTest(1 /* Contiguous */);
+        let discontiguousDistrictIDs = contiguousTest['details']['discontiguousDistricts'] || [];
+        // Convert them into a (possibly empty) list of features
+        let discontiguousDistrictFeatures = { type: 'FeatureCollection', features: [] };
+        if (!(U.isArrayEmpty(discontiguousDistrictIDs))) {
+            for (let i = 0; i < discontiguousDistrictIDs.length; i++) {
+                let poly = this.districts.getShape(i);
+                discontiguousDistrictFeatures.features.push(poly);
+            }
+        }
+        return discontiguousDistrictFeatures;
+    }
+    // TODO - DASHBOARD: Delete, when cut over to the new analytics UI.
+    // Prepare a scorecard for rendering
+    // NOTE - This assumes that analyzePlan() has been run!
+    // prepareScorecard(): any {
+    //   return doPrepareScorecard(this);
+    // }
+    // HELPERS USED INTERNALLY
     // Get an individual test, so you can drive UI with the results.
     getTest(testID) {
         // Get the existing test entries
@@ -180,18 +218,15 @@ class AnalyticsSession {
         // Return a pointer to the the test entry for this test
         return this.tests[testID];
     }
-    // Prepare a scorecard for rendering
-    // NOTE - This assumes that analyzePlan() has been run!
-    prepareScorecard() {
-        return report_1.doPrepareScorecard(this);
-    }
+    // TODO - DASHBOARD: Delete, when cut over to the new analytics UI.
     // Prepare test results for rendering
     // NOTE - This assumes that analyzePlan() has been run!
-    prepareTestLog() {
-        return report_1.doPrepareTestLog(this);
-    }
+    // prepareTestLog(): any {
+    //   return doPrepareTestLog(this);
+    // }
+    // NOTE - Not sure why this has to be up here.
     populationDeviationThreshold() {
-        return 1 - this.testScales[4 /* PopulationDeviation */]['testScale'][0];
+        return 1 - this.testScales[4 /* PopulationDeviation */]['scale'][0];
     }
 }
 exports.AnalyticsSession = AnalyticsSession;
@@ -211,8 +246,16 @@ exports.AnalyticsSession = AnalyticsSession;
 //
 // DATA ABSTRACTION LAYER
 //
+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 });
-const U = __webpack_require__(/*! ./utils */ "./src/utils.ts");
+const U = __importStar(__webpack_require__(/*! ./utils */ "./src/utils.ts"));
+const S = __importStar(__webpack_require__(/*! ./settings */ "./src/settings.ts"));
 const valid_1 = __webpack_require__(/*! ./valid */ "./src/valid.ts");
 const compact_1 = __webpack_require__(/*! ./compact */ "./src/compact.ts");
 const political_1 = __webpack_require__(/*! ./political */ "./src/political.ts");
@@ -251,23 +294,6 @@ var DistrictField;
     DistrictField[DistrictField["NativePct"] = 27] = "NativePct"; // Display
     // 1 - MORE ...
 })(DistrictField = exports.DistrictField || (exports.DistrictField = {}));
-// The fields to display in a District Statistics pane
-exports.DisplayFields = [
-    DistrictField.TotalPop,
-    DistrictField.PopDevPct,
-    DistrictField.bEqualPop,
-    DistrictField.bNotEmpty,
-    DistrictField.bContiguous,
-    DistrictField.bNotEmbedded,
-    DistrictField.DemPct,
-    DistrictField.WhitePct,
-    DistrictField.MinorityPct,
-    DistrictField.BlackPct,
-    DistrictField.HispanicPct,
-    DistrictField.PacificPct,
-    DistrictField.AsianPct,
-    DistrictField.NativePct
-];
 class Districts {
     constructor(s, ds) {
         this._geoProperties = {};
@@ -276,7 +302,13 @@ class Districts {
         this.statistics = this.initStatistics();
     }
     getShape(i) { return this._shapes.features[i]; }
-    getGeoProperties(i) { return this._geoProperties[i]; }
+    getGeoProperties(i) {
+        // Make sure the district shape exists & has geo properties
+        if (i in this._geoProperties)
+            return this._geoProperties[i];
+        else
+            return null;
+    }
     setGeoProperties(i, p) { this._geoProperties[i] = p; }
     numberOfColumns() { return U.countEnumValues(DistrictField); }
     // +1 for dummy unassigned 0 "district" and +1 for N+1 summary "district" for
@@ -299,7 +331,7 @@ class Districts {
     // TODO - Optimize for getting multiple properties from the same feature?
     // TODO - Optimize by only re-calc'ing districts that have changed?
     //        In this case, special attention to getting county-splits right.
-    // TODO - Optimize by asyn'ing this?
+    // TODO - Optimize by async'ing this?
     // TODO - Is there a way to do this programmatically off data? Does it matter?
     recalcStatistics(bLog = false) {
         // Compute these once per recalc cycle
@@ -308,6 +340,9 @@ class Districts {
         let planByDistrict = this._session.plan.byDistrictID();
         let plan = this._session.plan;
         let graph = this._session.graph;
+        // TODO - 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
         let stateTPVote = 0;
         let stateDemVote = 0;
@@ -323,7 +358,7 @@ class Districts {
         // NOTE - These plan-level booleans are set in their respective analytics:
         // - Equal population (bEqualPop)
         // - Complete (bNotEmpty)
-        // - Contiguos (bContiguous)
+        // - Contiguous (bContiguous)
         // - Free of holes (bNotEmbedded)
         // 2 - MORE ...
         // Loop over the districts (including the dummy unassigned one)
@@ -331,7 +366,8 @@ class Districts {
             // INITIALIZE DISTRICT VALUES THAT WILL BE ACCUMULATED (VS. DERIVED)
             let featurePop;
             let totalPop = 0;
-            let countySplits = U.initArray(this._session.counties.nCounties, 0);
+            // TODO - SPLITTING
+            let countySplits = U.initArray(nCountyBuckets, 0);
             let demVotes = 0;
             let repVotes = 0;
             let totalVAP = 0;
@@ -341,156 +377,178 @@ class Districts {
             let pacificPop = 0;
             let asianPop = 0;
             let nativePop = 0;
+            // NOTE - Only report explicitly found validity issues
+            let bNotEmpty = false;
+            let bContiguous = true;
+            let bNotEmbedded = true;
+            let bEqualPop = true;
             // 3 - MORE ...
             // HACK - Because "this" gets ghosted inside the forEach loop below
             let outerThis = this;
-            // Get the geoIDs assigned to it ...
+            // Get the geoIDs assigned to the district
+            // Guard against empty districts
             let geoIDs = this._session.plan.geoIDsForDistrictID(i);
-            // ... loop over them creating district-by-district statistics 
-            geoIDs.forEach(function (geoID) {
-                // Map from geoID to feature index
-                let featureID = outerThis._session.features.featureID(geoID);
-                let f = outerThis._session.features.featureByIndex(featureID);
-                // ACCUMULATE VALUES
-                // Total population of each feature (used more than once)
-                featurePop = outerThis._session.features.fieldForFeature(f, "CENSUS" /* CENSUS */, "Tot" /* TotalPop */);
-                // Total district population
-                totalPop += featurePop;
-                // Total population by counties w/in a district
-                countySplits[outerThis.getCountyIndex(geoID)] += featurePop;
-                // Democratic and Republican vote totals
-                demVotes += outerThis._session.features.fieldForFeature(f, "ELECTION" /* ELECTION */, "D" /* DemVotes */);
-                repVotes += outerThis._session.features.fieldForFeature(f, "ELECTION" /* ELECTION */, "R" /* RepVotes */);
-                // Voting-age demographic breakdowns (or citizen voting-age)
-                // Guard againt null/NaN values
-                let _totalVAP = outerThis._session.features.fieldForFeature(f, "VAP" /* VAP */, "Tot" /* TotalPop */);
-                let _whitePop = outerThis._session.features.fieldForFeature(f, "VAP" /* VAP */, "Wh" /* WhitePop */);
-                let _blackPop = outerThis._session.features.fieldForFeature(f, "VAP" /* VAP */, "BlC" /* BlackPop */);
-                let _hispanicPop = outerThis._session.features.fieldForFeature(f, "VAP" /* VAP */, "His" /* HispanicPop */);
-                let _pacificPop = outerThis._session.features.fieldForFeature(f, "VAP" /* VAP */, "PacC" /* PacificPop */);
-                let _asianPop = outerThis._session.features.fieldForFeature(f, "VAP" /* VAP */, "AsnC" /* AsianPop */);
-                let _nativePop = outerThis._session.features.fieldForFeature(f, "VAP" /* VAP */, "NatC" /* NativePop */);
-                if (_totalVAP)
-                    totalVAP += _totalVAP;
-                if (_whitePop)
-                    whitePop += _whitePop;
-                if (_blackPop)
-                    blackPop += _blackPop;
-                if (_hispanicPop)
-                    hispanicPop += _hispanicPop;
-                if (_pacificPop)
-                    pacificPop += _pacificPop;
-                if (_asianPop)
-                    asianPop += _asianPop;
-                if (_nativePop)
-                    nativePop += _nativePop;
-                // TODO - DELETE
-                // totalVAP += outerThis._session.features.fieldForFeature(f, Dataset.VAP, FeatureField.TotalPop);
-                // whitePop += outerThis._session.features.fieldForFeature(f, Dataset.VAP, FeatureField.WhitePop);
-                // blackPop += outerThis._session.features.fieldForFeature(f, Dataset.VAP, FeatureField.BlackPop);
-                // hispanicPop += outerThis._session.features.fieldForFeature(f, Dataset.VAP, FeatureField.HispanicPop);
-                // pacificPop += outerThis._session.features.fieldForFeature(f, Dataset.VAP, FeatureField.PacificPop);
-                // asianPop += outerThis._session.features.fieldForFeature(f, Dataset.VAP, FeatureField.AsianPop);
-                // nativePop += outerThis._session.features.fieldForFeature(f, Dataset.VAP, FeatureField.NativePop);
-                // 4 - MORE ...
-            });
-            // COMPUTE DERIVED VALUES
-            // Population deviation % and equal population (boolean) by district.
-            // Leave the values null for the dummy unassigned district.
-            let popDevPct = null;
-            let bEqualPop = null;
-            if (i > 0) {
-                popDevPct = (totalPop - targetSize) / targetSize;
-                bEqualPop = (popDevPct <= deviationThreshold);
-            }
-            // Total two-party (not total total!) votes, Democratic and Republican vote
-            // shares, and Democratic first-past-the-post win (= 1) or loss (= 0).
-            let totVotes;
-            let demPct = 0;
-            let repPct = 0;
-            let DemSeat = 0;
-            totVotes = demVotes + repVotes;
-            if (totVotes > 0) {
-                demPct = demVotes / totVotes;
-                repPct = repVotes / totVotes;
-                DemSeat = political_1.fptpWin(demPct);
-            }
-            // Total minority VAP
-            let minorityPop = totalVAP - whitePop;
-            // Voting-age demographic proportions (or citizen voting-age)
-            let whitePct = 0;
-            let minorityPct = 0;
-            let blackPct = 0;
-            let hispanicPct = 0;
-            let pacificPct = 0;
-            let asianPct = 0;
-            let nativePct = 0;
-            if (totalVAP > 0) {
-                whitePct = whitePop / totalVAP;
-                minorityPct = minorityPop / totalVAP;
-                blackPct = blackPop / totalVAP;
-                hispanicPct = hispanicPop / totalVAP;
-                pacificPct = pacificPop / totalVAP;
-                asianPct = asianPop / totalVAP;
-                nativePct = nativePop / totalVAP;
-            }
-            // 5 - MORE ...
-            // COMPUTE DISTRICT-LEVEL VALUES
-            // Validations
-            let bNotEmpty = (!U.isSetEmpty(geoIDs));
-            let bContiguous = null;
-            let bNotEmbedded = null;
-            // Leave the values null for the dummy unassigned district,
-            // and districts that are empty.
-            if (i > 0) {
-                if (bNotEmpty) {
+            if (geoIDs && (geoIDs.size > 0)) {
+                bNotEmpty = true;
+                // ... loop over the geoIDs creating district-by-district statistics 
+                geoIDs.forEach(function (geoID) {
+                    // Skip water-only features
+                    if (!(U.isWaterOnly(geoID))) {
+                        // Map from geoID to feature index
+                        let featureID = outerThis._session.features.featureID(geoID);
+                        let f = outerThis._session.features.featureByIndex(featureID);
+                        // ACCUMULATE VALUES
+                        // Total population of each feature
+                        // NOTE - This result is used more than once
+                        featurePop = outerThis._session.features.fieldForFeature(f, "CENSUS" /* CENSUS */, "Tot" /* TotalPop */);
+                        // Total district population
+                        totalPop += featurePop;
+                        // TODO - SPLITTING
+                        // Total population by counties w/in a district,
+                        // except the dummy unassigned district 0
+                        if (i > 0)
+                            countySplits[outerThis.getCountyIndex(geoID)] += featurePop;
+                        // Democratic and Republican vote totals
+                        demVotes += outerThis._session.features.fieldForFeature(f, "ELECTION" /* ELECTION */, "D" /* DemVotes */);
+                        repVotes += outerThis._session.features.fieldForFeature(f, "ELECTION" /* ELECTION */, "R" /* RepVotes */);
+                        // Voting-age demographic breakdowns (or citizen voting-age)
+                        totalVAP += outerThis._session.features.fieldForFeature(f, "VAP" /* VAP */, "Tot" /* TotalPop */);
+                        whitePop += outerThis._session.features.fieldForFeature(f, "VAP" /* VAP */, "Wh" /* WhitePop */);
+                        blackPop += outerThis._session.features.fieldForFeature(f, "VAP" /* VAP */, "BlC" /* BlackPop */);
+                        hispanicPop += outerThis._session.features.fieldForFeature(f, "VAP" /* VAP */, "His" /* HispanicPop */);
+                        pacificPop += outerThis._session.features.fieldForFeature(f, "VAP" /* VAP */, "PacC" /* PacificPop */);
+                        asianPop += outerThis._session.features.fieldForFeature(f, "VAP" /* VAP */, "AsnC" /* AsianPop */);
+                        nativePop += outerThis._session.features.fieldForFeature(f, "VAP" /* VAP */, "NatC" /* NativePop */);
+                        // 4 - MORE ...
+                    }
+                    // else console.log("Skipping water-only feature in district statistics:", geoID);
+                });
+                // COMPUTE DERIVED VALUES
+                // Population deviation % and equal population (boolean) by district.
+                // Don't set the values for the dummy unassigned district.
+                let popDevPct = null;
+                if (i > 0) {
+                    popDevPct = (totalPop - targetSize) / targetSize;
+                    bEqualPop = (popDevPct <= deviationThreshold);
+                }
+                // Total two-party (not total total!) votes, Democratic and Republican vote
+                // shares, and Democratic first-past-the-post win (= 1) or loss (= 0).
+                let totVotes;
+                let demPct = 0;
+                let repPct = 0;
+                let DemSeat = 0;
+                totVotes = demVotes + repVotes;
+                if (totVotes > 0) {
+                    demPct = demVotes / totVotes;
+                    repPct = repVotes / totVotes;
+                    DemSeat = political_1.fptpWin(demPct);
+                }
+                // Total minority VAP
+                let minorityPop = totalVAP - whitePop;
+                // Voting-age demographic proportions (or citizen voting-age)
+                let whitePct = 0;
+                let minorityPct = 0;
+                let blackPct = 0;
+                let hispanicPct = 0;
+                let pacificPct = 0;
+                let asianPct = 0;
+                let nativePct = 0;
+                if (totalVAP > 0) {
+                    whitePct = whitePop / totalVAP;
+                    minorityPct = minorityPop / totalVAP;
+                    blackPct = blackPop / totalVAP;
+                    hispanicPct = hispanicPop / totalVAP;
+                    pacificPct = pacificPop / totalVAP;
+                    asianPct = asianPop / totalVAP;
+                    nativePct = nativePop / totalVAP;
+                }
+                // 5 - MORE ...
+                // COMPUTE DISTRICT-LEVEL VALUES
+                // Validations
+                // Leave the default values for the dummy unassigned district,
+                // and districts that are empty.
+                if ((i > 0) && bNotEmpty) {
                     bContiguous = valid_1.isConnected(geoIDs, graph);
                     bNotEmbedded = (!valid_1.isEmbedded(i, planByDistrict[i], plan, graph));
                 }
+                // 6 - MORE ...
+                { // UPDATE THE DISTRICT STATISTICS
+                    // NOTE - These are set below for both non-empty & empty districts:
+                    // this.statistics[DistrictField.bNotEmpty][i] = bNotEmpty;
+                    // this.statistics[DistrictField.bContiguous][i] = bContiguous;
+                    // this.statistics[DistrictField.bNotEmbedded][i] = bNotEmbedded;
+                    // this.statistics[DistrictField.TotalPop][i] = totalPop;
+                    // this.statistics[DistrictField.bEqualPop][i] = bEqualPop;
+                    this.statistics[DistrictField.PopDevPct][i] = popDevPct;
+                    this.statistics[DistrictField.DemVotes][i] = demVotes;
+                    this.statistics[DistrictField.RepVotes][i] = repVotes;
+                    this.statistics[DistrictField.TwoPartyVote][i] = totVotes;
+                    this.statistics[DistrictField.DemPct][i] = demPct;
+                    this.statistics[DistrictField.RepPct][i] = repPct;
+                    this.statistics[DistrictField.DemSeat][i] = DemSeat;
+                    this.statistics[DistrictField.WhitePop][i] = whitePop;
+                    this.statistics[DistrictField.MinorityPop][i] = minorityPop;
+                    this.statistics[DistrictField.BlackPop][i] = blackPop;
+                    this.statistics[DistrictField.HispanicPop][i] = hispanicPop;
+                    this.statistics[DistrictField.PacificPop][i] = pacificPop;
+                    this.statistics[DistrictField.AsianPop][i] = asianPop;
+                    this.statistics[DistrictField.NativePop][i] = nativePop;
+                    this.statistics[DistrictField.TotalVAP][i] = totalVAP;
+                    this.statistics[DistrictField.WhitePct][i] = whitePct;
+                    this.statistics[DistrictField.MinorityPct][i] = minorityPct;
+                    this.statistics[DistrictField.BlackPct][i] = blackPct;
+                    this.statistics[DistrictField.HispanicPct][i] = hispanicPct;
+                    this.statistics[DistrictField.PacificPct][i] = pacificPct;
+                    this.statistics[DistrictField.AsianPct][i] = asianPct;
+                    this.statistics[DistrictField.NativePct][i] = nativePct;
+                }
+                // 7 - MORE ...
+                { // ACCUMULATE STATE STATISTICS FROM DISTRICT TOTALS
+                    stateTPVote += totVotes;
+                    stateDemVote += demVotes;
+                    stateRepVote += repVotes;
+                    stateVAPPop += totalVAP;
+                    stateWhitePop += whitePop;
+                    stateMinorityPop += minorityPop;
+                    stateBlackPop += blackPop;
+                    stateHispanicPop += hispanicPop;
+                    statePacificPop += pacificPop;
+                    stateAsianPop += asianPop;
+                    stateNativePop += nativePop;
+                }
+            }
+            else { // If a district is empty, zero these results (vs. null)
+                this.statistics[DistrictField.PopDevPct][i] = 0.0;
+                this.statistics[DistrictField.DemVotes][i] = 0;
+                this.statistics[DistrictField.RepVotes][i] = 0;
+                this.statistics[DistrictField.TwoPartyVote][i] = 0;
+                this.statistics[DistrictField.DemPct][i] = 0;
+                this.statistics[DistrictField.RepPct][i] = 0;
+                this.statistics[DistrictField.DemSeat][i] = 0;
+                this.statistics[DistrictField.WhitePop][i] = 0;
+                this.statistics[DistrictField.MinorityPop][i] = 0;
+                this.statistics[DistrictField.BlackPop][i] = 0;
+                this.statistics[DistrictField.HispanicPop][i] = 0;
+                this.statistics[DistrictField.PacificPop][i] = 0;
+                this.statistics[DistrictField.AsianPop][i] = 0;
+                this.statistics[DistrictField.NativePop][i] = 0;
+                this.statistics[DistrictField.TotalVAP][i] = 0;
+                this.statistics[DistrictField.WhitePct][i] = 0;
+                this.statistics[DistrictField.MinorityPct][i] = 0;
+                this.statistics[DistrictField.BlackPct][i] = 0;
+                this.statistics[DistrictField.HispanicPct][i] = 0;
+                this.statistics[DistrictField.PacificPct][i] = 0;
+                this.statistics[DistrictField.AsianPct][i] = 0;
+                this.statistics[DistrictField.NativePct][i] = 0;
+            }
+            { // UPDATE THESE DISTRICT STATISTICS, EVEN WHEN THEY ARE EMPTY
+                this.statistics[DistrictField.TotalPop][i] = totalPop;
+                this.statistics[DistrictField.bNotEmpty][i] = bNotEmpty;
+                this.statistics[DistrictField.bContiguous][i] = bContiguous;
+                this.statistics[DistrictField.bNotEmbedded][i] = bNotEmbedded;
+                this.statistics[DistrictField.bEqualPop][i] = bEqualPop;
+                this.statistics[DistrictField.CountySplits][i] = countySplits;
             }
-            // 6 - MORE ...
-            // UPDATE THE DISTRICT STATISTICS
-            this.statistics[DistrictField.bNotEmpty][i] = bNotEmpty;
-            this.statistics[DistrictField.bContiguous][i] = bContiguous;
-            this.statistics[DistrictField.bNotEmbedded][i] = bNotEmbedded;
-            this.statistics[DistrictField.TotalPop][i] = totalPop;
-            this.statistics[DistrictField.PopDevPct][i] = popDevPct;
-            this.statistics[DistrictField.bEqualPop][i] = bEqualPop;
-            this.statistics[DistrictField.CountySplits][i] = countySplits;
-            this.statistics[DistrictField.DemVotes][i] = demVotes;
-            this.statistics[DistrictField.RepVotes][i] = repVotes;
-            this.statistics[DistrictField.TwoPartyVote][i] = totVotes;
-            this.statistics[DistrictField.DemPct][i] = demPct;
-            this.statistics[DistrictField.RepPct][i] = repPct;
-            this.statistics[DistrictField.DemSeat][i] = DemSeat;
-            this.statistics[DistrictField.WhitePop][i] = whitePop;
-            this.statistics[DistrictField.MinorityPop][i] = minorityPop;
-            this.statistics[DistrictField.BlackPop][i] = blackPop;
-            this.statistics[DistrictField.HispanicPop][i] = hispanicPop;
-            this.statistics[DistrictField.PacificPop][i] = pacificPop;
-            this.statistics[DistrictField.AsianPop][i] = asianPop;
-            this.statistics[DistrictField.NativePop][i] = nativePop;
-            this.statistics[DistrictField.TotalVAP][i] = totalVAP;
-            this.statistics[DistrictField.WhitePct][i] = whitePct;
-            this.statistics[DistrictField.MinorityPct][i] = minorityPct;
-            this.statistics[DistrictField.BlackPct][i] = blackPct;
-            this.statistics[DistrictField.HispanicPct][i] = hispanicPct;
-            this.statistics[DistrictField.PacificPct][i] = pacificPct;
-            this.statistics[DistrictField.AsianPct][i] = asianPct;
-            this.statistics[DistrictField.NativePct][i] = nativePct;
-            // 7 - MORE ...
-            // ACCUMULATE STATE STATISTICS FROM DISTRICT TOTALS
-            stateTPVote += totVotes;
-            stateDemVote += demVotes;
-            stateRepVote += repVotes;
-            stateVAPPop += totalVAP;
-            stateWhitePop += whitePop;
-            stateMinorityPop += minorityPop;
-            stateBlackPop += blackPop;
-            stateHispanicPop += hispanicPop;
-            statePacificPop += pacificPop;
-            stateAsianPop += asianPop;
-            stateNativePop += nativePop;
         }
         // UPDATE STATE STATISTICS
         let summaryRow = this.numberOfRows() - 1;
@@ -524,16 +582,6 @@ class Districts {
     }
 }
 exports.Districts = Districts;
-exports.DatasetDescriptions = {
-    D16F: "2016 ACS Total Population",
-    D16T: "2016 ACS Voting Age Population",
-    E16GPR: "2016 Presidential Election",
-    D10F: "2010 Census Total Population",
-    D10T: "2010 Voting Age Population",
-    C16GCO: "2016 Presidential, US Senate, Governor, and AG election results"
-    // TODO - What other potential datasets?
-    // MORE ...
-};
 // Wrap data by feature, to abstract the specifics of the internal structure
 class Features {
     constructor(s, data, keys) {
@@ -544,15 +592,18 @@ class Features {
     }
     nFeatures() { return this._data.features.length; }
     featureByIndex(i) { return this._data.features[i]; }
-    // TODO - Generalize this
-    geoIDForFeature(f) { return f.properties['GEOID10']; }
+    geoIDForFeature(f) {
+        // GEOIDs will be one of these properties
+        let value = f.properties['GEOID10'] || f.properties['GEOID20'] || f.properties['GEOID'];
+        return value;
+    }
     fieldForFeature(f, dt, fk) {
         let dk = this._keys[dt];
         return _getFeatures(f, dk, fk);
     }
     resetDataset(d, k) {
         this._keys[d] = k;
-        // TODO - Does anything need to be recalc'd now when a dataset is changed?
+        // TODO - 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++) {
@@ -586,12 +637,15 @@ function _getFeatures(f, datasetKey, p) {
                     return o[p];
             }
             else {
-                if (o['datasets'] && o['datasets'][datasetKey])
-                    if (o['datasets'][datasetKey][p])
+                if (o['datasets'] && o['datasets'][datasetKey]) {
+                    let v = (o['datasets'][datasetKey][p]);
+                    if ((!(v == null)) && (!(v == undefined)))
                         return o['datasets'][datasetKey][p];
+                }
             }
         }
     }
+    console.log(`${p} value undefined for ${f.properties['GEOID10']}!`);
     return undefined;
 }
 function _fGetJoined(f) {
@@ -600,13 +654,13 @@ function _fGetJoined(f) {
 // Wrap data by county, to abstract the specifics of the internal structure
 class Counties {
     constructor(s, data) {
+        this._countyNameLookup = {};
         this.index = {};
+        this.totalPopulation = [];
         this._session = s;
         this._data = data;
         this.nCounties = this._data.features.length;
-        this._countyNameLookup = {};
     }
-    // nCounties(): number { return this._data.features.length; }
     countyByIndex(i) { return this._data.features[i]; }
     propertyForCounty(f, pk) { return f.properties[pk]; }
     mapFIPSToName(fips, name) { this._countyNameLookup[fips] = name; }
@@ -635,8 +689,24 @@ class Plan {
         this._planByDistrictID = {};
         this.districtIDs = []; // Set when the plan in inverted
     }
+    // NOTE - DON'T remove water-only features from the plan, as they may be required
+    // for contiguity. Just skip them in aggregating district statistics.
+    // removeWaterOnlyFeatures(plan: T.PlanByGeoID): T.PlanByGeoID {
+    //   let newPlan = {} as T.PlanByGeoID;
+    //   for (let geoID in plan) {
+    //     // Remove water-only features
+    //     if (!(U.isWaterOnly(geoID))) {
+    //       newPlan[geoID] = plan[geoID];
+    //     }
+    //     else {
+    //       console.log("Removing water-only feature", geoID);
+    //     }
+    //   }
+    //   return newPlan;
+    // }
     invertPlan() {
-        this._planByDistrictID = U.invertPlan(this._planByGeoID);
+        // TODO - UNASSIGNED
+        this._planByDistrictID = invertPlan(this._planByGeoID, this._session);
         this.districtIDs = U.getNumericObjectKeys(this._planByDistrictID);
     }
     initializeDistrict(i) { this._planByDistrictID[i] = new Set(); }
@@ -646,12 +716,49 @@ class Plan {
     geoIDsForDistrictID(i) { return this._planByDistrictID[i]; }
 }
 exports.Plan = Plan;
+// Invert a feature assignment structure to sets of ids by district
+function invertPlan(plan, s) {
+    let invertedPlan = {};
+    // Add a dummy 'unassigned' district
+    invertedPlan[S.NOT_ASSIGNED] = new Set();
+    // TODO - UNASSIGNED
+    // NOTE - 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,
+    //   and add them to the dummy unassigned district explicitly.
+    // - In the CLI-calling context, there's no session (yet) but the plan is complete.
+    if (!(s == undefined)) {
+        for (let i = 0; i < s.features.nFeatures(); i++) {
+            let f = s.features.featureByIndex(i);
+            let geoID = s.features.geoIDForFeature(f);
+            // If the feature is NOT explicitly assigned to a district, add the geoID
+            // to the dummy unassigned district 0.
+            if (!(U.keyExists(geoID, plan)))
+                invertedPlan[S.NOT_ASSIGNED].add(geoID);
+            // TODO - WATER-ONLY: NOT skipping water-only features here, because we're
+            // not skipping them below when they are explicitly assigned in plans. Should
+            // we skip them in both places?
+        }
+    }
+    for (let geoID in plan) {
+        let districtID = plan[geoID];
+        // Make sure the set for the districtID exists
+        if (!(U.objectContains(invertedPlan, districtID))) {
+            invertedPlan[districtID] = new Set();
+        }
+        // Add the geoID to the districtID's set
+        invertedPlan[districtID].add(geoID);
+        if (U.isWaterOnly(geoID))
+            console.log("Water-only feature still in plan!", geoID);
+    }
+    return invertedPlan;
+}
+exports.invertPlan = invertPlan;
 class Graph {
     constructor(s, graph) {
         this._session = s;
         this._graph = graph;
     }
-    // TODO - Rework this, when we support MIXED MAPS.
     peerNeighbors(node) {
         // Get the neighboring geoIDs connected to a geoID
         // Ignore the lengths of the shared borders (the values), for now
@@ -688,19 +795,20 @@ function doAnalyzeDistricts(s, bLog = false) {
     s.districts.extractDistrictShapeProperties(bLog);
 }
 exports.doAnalyzeDistricts = doAnalyzeDistricts;
-// TODO - I could make this table-driven, but I'm thinking that the explicit
-//   calls might make chunking for aync easier.
 // Calculate the analytics & validations and cache the results
 // NOTE - doAnalyzePlan() depends on doAnalyzeDistricts() having run first.
+// 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 - Remove this mechanism. Always run all tests
     // 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);
-        s.tests[1 /* Contiguous */] = valid_1.doIsContiguous(s);
-        s.tests[2 /* FreeOfHoles */] = valid_1.doIsFreeOfHoles(s);
-        s.tests[4 /* PopulationDeviation */] = equal_1.doPopulationDeviation(s);
+        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
@@ -710,19 +818,21 @@ function doAnalyzePlan(s, bLog = false) {
     }
     // Tests in the "Fair" suite
     if (requestedSuites.includes(1 /* Fair */)) {
-        s.tests[9 /* SeatsBias */] = political_1.doSeatsBias(s);
-        s.tests[10 /* VotesBias */] = political_1.doVotesBias(s);
-        s.tests[11 /* Responsiveness */] = political_1.doResponsiveness(s);
-        s.tests[12 /* ResponsiveDistricts */] = political_1.doResponsiveDistricts(s);
-        s.tests[13 /* EfficiencyGap */] = political_1.doEfficiencyGap(s);
-        s.tests[14 /* MajorityMinorityDistricts */] = minority_1.doMajorityMinorityDistricts(s);
+        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 /* CountySplits */] = cohesive_1.doCountySplits(s);
-        s.tests[8 /* Complexity */] = cohesive_1.doPlanComplexity(s);
+        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);
     }
     // Enable a Test Log and Scorecard to be generated
     s.bPlanAnalyzed = true;
@@ -735,8 +845,8 @@ exports.doAnalyzePlan = doAnalyzePlan;
 //
 // NOTE - Should this be conditionalized on the test suites requested? 
 //   Those are encapsulated in reports.ts right now, so not doing that.
-function doDeriveSecondaryTests(s) {
-    s.tests[3 /* EqualPopulation */] = equal_1.doHasEqualPopulations(s);
+function doDeriveSecondaryTests(s, bLog = false) {
+    s.tests[3 /* EqualPopulation */] = equal_1.doHasEqualPopulations(s, bLog);
 }
 exports.doDeriveSecondaryTests = doDeriveSecondaryTests;
 
@@ -753,19 +863,237 @@ exports.doDeriveSecondaryTests = doDeriveSecondaryTests;
 "use strict";
 
 //
-// "COHESIVE" - We're naming this category which is about county splitting.
+// SPLITTING of counties & districts
 //
+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 });
-const U = __webpack_require__(/*! ./utils */ "./src/utils.ts");
-const D = __webpack_require__(/*! ./_data */ "./src/_data.ts");
-function doCountySplits(s) {
-    let test = s.getTest(7 /* CountySplits */);
+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"));
+// 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;
+}
+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;
+}
+exports.doDistrictSplitting = doDistrictSplitting;
+// 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, 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;
+                }
+            }
+        }
+    }
+}
+// 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 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;
+            }
+        }
+    }
+    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;
+            }
+        }
+    }
+    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;
+}
+// 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;
+}
+// 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);
+}
+// 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;
+}
+// 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);
+}
+// ANALYZE SIMPLE COUNTY & VTD SPLITTING
+/*
+ 
+Sample results for NC 2016 dongressional plan
+________________________________________________________________________________
+ 
+State: NC
+Census: 2010
+Total population: 9,535,483
+Number of districts: 13
+Target district size: 733,499
+Number of counties: 100
+ 
+Equal Population: 11.24% deviation
+Compactness: None
+Proportionality: 27.67% gap
+Cohesiveness: 11 unexpected splits, affecting 27.14% of the total population
+ 
+These counties are split unexpectedly:
+ 
+   • Bladen
+   • Buncombe
+   • Catawba
+   • Cumberland
+   • Durham
+   • Guilford
+   • Iredell
+   • Johnston
+   • Pitt
+   • Rowan
+   • Wilson
+ 
+*/
+function doFindCountiesSplitUnexpectedly(s, bLog = false) {
+    let test = s.getTest(7 /* UnexpectedCountySplits */);
     // THE THREE VALUES TO DETERMINE FOR A PLAN
     let unexpectedSplits = 0;
     let unexpectedAffected = 0;
     let countiesSplitUnexpectedly = [];
-    // FIRST, ANALYZE THE COUNTY SPLITING FOR THE PLAN
-    // Pivot census totals into county-district "splits"
+    // FIRST, ANALYZE THE COUNTY SPLITTING FOR THE PLAN
+    // Get the county-district pivot ("splits")
     let countiesByDistrict = s.districts.statistics[D.DistrictField.CountySplits];
     // countiesByDistrict = countiesByDistrict.slice(1, -1);
     // Find the single-county districts, i.e., districts NOT split across counties.
@@ -775,10 +1103,13 @@ function doCountySplits(s) {
         // See if there's only one county partition
         let nCountiesInDistrict = 0;
         for (let c = 0; c < s.counties.nCounties; c++) {
-            if (countiesByDistrict[d][c] > 0) {
-                nCountiesInDistrict += 1;
-                if (nCountiesInDistrict > 1) {
-                    break;
+            // Guard against empty district
+            if (countiesByDistrict[d]) {
+                if (countiesByDistrict[d][c] > 0) {
+                    nCountiesInDistrict += 1;
+                    if (nCountiesInDistrict > 1) {
+                        break;
+                    }
                 }
             }
         }
@@ -798,11 +1129,14 @@ function doCountySplits(s) {
         let nCountyParts = 0;
         let subtotal = 0;
         for (let d = 1; d <= s.state.nDistricts; d++) {
-            if (countiesByDistrict[d][c] > 0) {
-                nPartitionsOverall += 1;
-                nCountyParts += 1;
-                if (!(U.arrayContains(singleCountyDistricts, d))) {
-                    subtotal += countiesByDistrict[d][c];
+            // Guard against empty district
+            if (countiesByDistrict[d]) {
+                if (countiesByDistrict[d][c] > 0) {
+                    nPartitionsOverall += 1;
+                    nCountyParts += 1;
+                    if (!(U.arrayContains(singleCountyDistricts, d))) {
+                        subtotal += countiesByDistrict[d][c];
+                    }
                 }
             }
         }
@@ -840,48 +1174,21 @@ function doCountySplits(s) {
         countiesSplitUnexpectedly.push(s.counties.nameFromFIPS(fips));
     }
     countiesSplitUnexpectedly = countiesSplitUnexpectedly.sort();
-    // Cache the results in the test
-    test['score'] = unexpectedAffected; // TODO - Use Moon's complexity metric here
-    test['details'] = {
-        'unexpectedSplits': unexpectedSplits,
-        'unexpectedAffected': unexpectedAffected,
-        'countiesSplitUnexpectedly': countiesSplitUnexpectedly
-    };
+    test['score'] = U.trim(unexpectedAffected);
+    test['details']['unexpectedSplits'] = unexpectedSplits;
+    test['details']['countiesSplitUnexpectedly'] = countiesSplitUnexpectedly;
     return test;
 }
-exports.doCountySplits = doCountySplits;
-// 2 - THE COMPLEXITY ANALYTIC NEEDS THE FOLLOWING DATA:
-//
-// If a map is already in simplified (mixed) form, the complexity analytic needs
-// two pieces of data:
-// - The counts of features by summary level--i.e., the numbers of counties, tracts,
-//   block groups, and blocks in a state; and
-// - The map -- So it can count the features by summary level in the map,
-//   as well as the number of BG’s that are split.
-//
-// TODO - Where would the state counts come from? Preprocessed and passed in, or
-//   done in a one-time initialization call (which would require a full set of
-//   block geo_id's for the state).
-//
-// However, if a map is not yet (fully) simplified, then determining the
-//   complexity of a map also requires a preprocessed summary level hierarchy, so
-//   you can get the child features (e.g., tracts) of a parent feature (e.g.,
-//   a county).
-//
-// NOTE - I have script for producing this hierarchy which we could repurpose.
-//
-// TODO - For mixed map processing--specfically to find the neighbors of a feature
-//   that are actually in the map (as opposed to just neighbors at the same
-//   summary level in the static graph)--you need a special hierarchy that
-//   distinguishes between the 'interior' and 'edge children of a feature.
-//
-// NOTE - The script noted above does this.
-function doPlanComplexity(s) {
-    let test = s.getTest(8 /* Complexity */);
-    console.log("TODO - Calculating plan complexity ...");
+exports.doFindCountiesSplitUnexpectedly = doFindCountiesSplitUnexpectedly;
+function doFindSplitVTDs(s, bLog = false) {
+    let test = s.getTest(10 /* VTDSplits */);
+    let splitVTDs = [];
+    // TODO - SPLITTING: Flesh this out, using Terry's virtual VTD's ...
+    test['score'] = splitVTDs.length;
+    test['details']['splitVTDs'] = splitVTDs;
     return test;
 }
-exports.doPlanComplexity = doPlanComplexity;
+exports.doFindSplitVTDs = doFindSplitVTDs;
 
 
 /***/ }),
@@ -898,9 +1205,17 @@ exports.doPlanComplexity = doPlanComplexity;
 //
 // COMPACT
 //
+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 });
+const Poly = __importStar(__webpack_require__(/*! @dra2020/poly */ "@dra2020/poly"));
 const geofeature_1 = __webpack_require__(/*! ./geofeature */ "./src/geofeature.ts");
-const U = __webpack_require__(/*! ./utils */ "./src/utils.ts");
+const U = __importStar(__webpack_require__(/*! ./utils */ "./src/utils.ts"));
 // Measures of compactness compare district shapes to various ideally compact
 // benchmarks, such as circles. All else equal, more compact districts are better.
 // 
@@ -988,16 +1303,19 @@ function doReock(s, bLog = false) {
     let scores = [];
     for (let districtID = 1; districtID <= s.state.nDistricts; districtID++) {
         let districtProps = s.districts.getGeoProperties(districtID);
-        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);
+        // 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);
+        }
     }
-    // Populate the test entry
+    // Populate the test entry ... for the shapes that exist!
     let averageReock = U.avgArray(scores);
     test['score'] = U.trim(averageReock);
     test['details'] = {}; // TODO - Any details?
@@ -1013,16 +1331,19 @@ function doPolsbyPopper(s, bLog = false) {
     let scores = [];
     for (let districtID = 1; districtID <= s.state.nDistricts; districtID++) {
         let districtProps = s.districts.getGeoProperties(districtID);
-        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);
+        // 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);
+        }
     }
-    // Populate the test entry
+    // Populate the test entry ... for the shapes that exist!
     let averagePolsbyPopper = U.avgArray(scores);
     test['score'] = U.trim(averagePolsbyPopper);
     test['details'] = {}; // TODO - Any details?
@@ -1032,19 +1353,24 @@ exports.doPolsbyPopper = doPolsbyPopper;
 // HELPER TO EXTRACT PROPERTIES OF DISTRICT SHAPES
 function extractDistrictProperties(s, bLog = false) {
     for (let i = 1; i <= s.state.nDistricts; i++) {
-        let j = i - 1; // TODO - Terry: How do you get away w/o this?!?
+        let j = i - 1; // TODO - TERRY: How do you get away w/o this?!?
         let poly = s.districts.getShape(j);
-        // TODO - Bundle these calls?
-        let area = geofeature_1.gfArea(poly);
-        let perimeter = geofeature_1.gfPerimeter(poly);
-        let diameter = geofeature_1.gfDiameter(poly);
-        let props = [0, 0, 0]; // TODO - Terry?!?
-        props[0 /* Area */] = area;
-        props[1 /* Diameter */] = diameter;
-        props[2 /* Perimeter */] = perimeter;
-        s.districts.setGeoProperties(i, props);
-        if (bLog)
-            console.log("District", i, "A =", area, "P =", perimeter, "D =", diameter);
+        // Guard against no shape for empty districts AND null shapes
+        let polyOptions = { noLatitudeCorrection: true };
+        let bNull = (!Poly.polyNormalize(poly, polyOptions));
+        if (poly && (!bNull)) {
+            // TODO - OPTIMIZE: Bundle these calls?
+            let area = geofeature_1.gfArea(poly);
+            let perimeter = geofeature_1.gfPerimeter(poly);
+            let diameter = geofeature_1.gfDiameter(poly);
+            let props = [0, 0, 0]; // TODO - TERRY?!?
+            props[0 /* Area */] = area;
+            props[1 /* Diameter */] = diameter;
+            props[2 /* Perimeter */] = perimeter;
+            s.districts.setGeoProperties(i, props);
+            if (bLog)
+                console.log("District", i, "A =", area, "P =", perimeter, "D =", diameter);
+        }
     }
 }
 exports.extractDistrictProperties = extractDistrictProperties;
@@ -1092,10 +1418,17 @@ exports.extractDistrictProperties = extractDistrictProperties;
 //
 // EQUAL POPULATION
 //
+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 });
-const U = __webpack_require__(/*! ./utils */ "./src/utils.ts");
-const D = __webpack_require__(/*! ./_data */ "./src/_data.ts");
-function doPopulationDeviation(s) {
+const U = __importStar(__webpack_require__(/*! ./utils */ "./src/utils.ts"));
+const D = __importStar(__webpack_require__(/*! ./_data */ "./src/_data.ts"));
+function doPopulationDeviation(s, bLog = false) {
     let test = s.getTest(4 /* PopulationDeviation */);
     // Compute the min, max, and average district populations,
     // excluding the dummy 'unassigned' 0 and N+1 summary "districts."
@@ -1124,7 +1457,7 @@ function doPopulationDeviation(s) {
 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) {
+function doHasEqualPopulations(s, bLog = false) {
     let test = s.getTest(3 /* EqualPopulation */);
     // Get the normalized population deviation %
     let popDevTest = s.getTest(4 /* PopulationDeviation */);
@@ -1162,14 +1495,19 @@ exports.doHasEqualPopulations = doHasEqualPopulations;
 //
 // GEO-FEATURES UTILITIES
 //
+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 });
-const Poly = __webpack_require__(/*! @dra2020/poly */ "@dra2020/poly");
+const Poly = __importStar(__webpack_require__(/*! @dra2020/poly */ "@dra2020/poly"));
 // CARTESIAN SHIMS OVER 'POLY' FUNCTIONS
-// TODO - Terry: Confirm Cartesian calculations
+// TODO - TERRY: Confirm Cartesian calculations
 function gfArea(poly) {
     let area = _polygonArea(poly);
-    // let polyOptions = { noLatitudeCorrection: false }    DELETE
-    // let area: number = Poly.polyArea(poly, polyOptions);
     return area;
 }
 exports.gfArea = gfArea;
@@ -1215,19 +1553,16 @@ function _polygonArea(poly) {
     }
     return a;
 }
-// TODO - Terry: Confirm Cartesian calculations
+// TODO - TERRY: Confirm Cartesian calculations
 // The perimeter calculation already just computes cartesian distance if you
 // pass in the noLatitudeCorrection flag. You would need to divide by 
 // Poly.EARTH_RADIUS to go from the returned units of meters to Lat/Lon “units”.
 function gfPerimeter(poly) {
     let perimeter = _polygonPerimeter(poly);
-    // let polyOptions = { noLatitudeCorrection: true }  // Cartesian distance
-    // let perimeter: number = Poly.polyPerimeter(poly, polyOptions);  DELETE
     return perimeter;
-    // return perimeter / Poly.EARTH_RADIUS;  DELETE
 }
 exports.gfPerimeter = gfPerimeter;
-// TODO - Terry: Confirm Cartesian calculations
+// TODO - TERRY: Confirm Cartesian calculations
 // Cloned from polyPerimeter() in 'poly' and revised to use Cartesian distance
 // NOTE: No conversion of degrees to radians!
 function _polygonPerimeter(poly) {
@@ -1239,10 +1574,8 @@ function _polygonPerimeter(poly) {
         let p = poly[i][0];
         for (let j = 0; j < p.length - 1; j++)
             perimeter += _distance(p[j][0], p[j][1], p[j + 1][0], p[j + 1][1]);
-        // perimeter += haversine(p[j][0], p[j][1], p[j + 1][0], p[j + 1][1], options);  DELETE
         if (p.length > 2 && (p[0][0] != p[p.length - 1][0] || p[0][1] != p[p.length - 1][1]))
             perimeter += _distance(p[0][0], p[0][1], p[p.length - 1][0], p[p.length - 1][1]);
-        // perimeter += haversine(p[0][0], p[0][1], p[p.length - 1][0], p[p.length - 1][1], options);  DELETE
     }
     return perimeter;
 }
@@ -1253,7 +1586,7 @@ function _distance(x1, y1, x2, y2) {
     d = Math.sqrt((dLat * dLat) + (dLon * dLon));
     return d;
 }
-// TODO - Terry: Confirm Cartesian calculations
+// TODO - TERRY: Confirm Cartesian calculations
 // As I mentioned, the polyCircle code was already just treating the coordinate
 // system as Cartesian. I then did polyFromCircle to convert it to a polygon that
 // then could be passed to polyArea in order to take into account the projection.
@@ -1262,9 +1595,6 @@ function _distance(x1, y1, x2, y2) {
 function gfDiameter(poly) {
     let polyOptions = { noLatitudeCorrection: true }; // NO-OP
     let circle = Poly.polyToCircle(poly, polyOptions);
-    // let circleArea: number = Poly.polyArea(Poly.polyFromCircle(circle, undefined, polyOptions), polyOptions);
-    // let circleRadius: number = Math.sqrt(circleArea / Math.PI);
-    // let diameter: number = circleRadius * 2;  DELETE
     let diameter = circle.r * 2;
     return diameter;
 }
@@ -1290,6 +1620,7 @@ function __export(m) {
 }
 Object.defineProperty(exports, "__esModule", { value: true });
 __export(__webpack_require__(/*! ./_api */ "./src/_api.ts"));
+__export(__webpack_require__(/*! ./results */ "./src/results.ts"));
 __export(__webpack_require__(/*! ./types */ "./src/types.ts"));
 
 
@@ -1308,61 +1639,17 @@ __export(__webpack_require__(/*! ./types */ "./src/types.ts"));
 // PROTECTS MINORITIES
 //
 Object.defineProperty(exports, "__esModule", { value: true });
-// TODO - This definition is wrong. Need to fix it.
-//
-// MINORITY-PROTECTION ANALYTICS NEED THE FOLLOWING DATA:
-//
-// The TOTAL, WHITE, BLACK, and HISPANIC counts from the Census, aggregated by
-// district. We *might* also ultimately need TOTAL18, WHITE18, BLACK18, and
-// HISPANIC18 counts by feature for these analytics.
-//
-// The minority population of a feature will probably be calculated as everyone
-// exceot non-Hispanic Whites:
-//
-// MINORITY = TOTAL - (WHITE - HISPANIC)
-//
-// That could be calculated as part of preprocessing the Census data, or it
-// could be computed on the fly. Since it's derived data and the formula might
-// change, it's probably best to compute it on the fly.
-//
-// In addition to the Census extract, these analytics need:
-// - The # of districts in the map, for determining minority proportionality
-// - Minorities as a % of the total population; possibly the voting age share
-//
-// TODO - Is the # of districts passed as a parameter or inferred from the # in
-//   the map?
-// TODO - Is minority share preprocessed once and passed as a parameter or
-//   computed in a initialization routine?
-function doMajorityMinorityDistricts(s) {
-    let test = s.getTest(14 /* MajorityMinorityDistricts */);
-    console.log("TODO - Calculating # of majority-minority districts ...");
+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;
-// SAVE THESE NOTES, IN CASE WE NEED TO REWORK HOW WE DO PERFORM THESE CALCS.
-// THEY REFLECT HOW I/ALEC DID THESE IN PYTHON.
-//
-// MINORITY-PROTECTION ANALYTICS WILL NEED THE FOLLOWING DATA,
-// IN ADDITION TO THE MAP (IDEALLY, GEO_IDS INDEXED BY DISTRICT_ID)
-//
-// Census data by geo_id - { total population | white | black | hispanic }
-//
-// The minority population of a feature will probably be calculated as the # of
-// non-White Hispanics:
-//
-// MINORITY = TOTAL - (WHITE - HISPANIC)
-//
-// That could be calculated as part of preprocessing the Census data, or it
-// could be computed on the fly.
-//
-// And probably:
-// 'districts' - The # of districts for determining minority proportionality.
-// 'minority_share' - Minorities as a % of the total population
-//
-// TODO - Is the # of districts passed as a parameter or inferred from the # in
-//   the map?
-// TODO - Is minority share preprocessed once and passed as a parameter or
-//   computed in a initialization routine?
+// 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
 
 
 /***/ }),
@@ -1379,10 +1666,17 @@ 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 });
 const assert_1 = __webpack_require__(/*! assert */ "assert");
-const U = __webpack_require__(/*! ./utils */ "./src/utils.ts");
-const D = __webpack_require__(/*! ./_data */ "./src/_data.ts");
+const U = __importStar(__webpack_require__(/*! ./utils */ "./src/utils.ts"));
+const D = __importStar(__webpack_require__(/*! ./_data */ "./src/_data.ts"));
 // Partisan analytics need the following data:
 //
 // An "election model" by geo_id, where each item has 4 pieces of data:
@@ -1402,36 +1696,41 @@ const D = __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) {
-    let test = s.getTest(9 /* SeatsBias */);
-    console.log("TODO - Calculating seats bias ...");
+function doSeatsBias(s, bLog = false) {
+    let test = s.getTest(11 /* SeatsBias */);
+    if (bLog)
+        console.log("TODO - Calculating seats bias ...");
     return test;
 }
 exports.doSeatsBias = doSeatsBias;
-function doVotesBias(s) {
-    let test = s.getTest(10 /* VotesBias */);
-    console.log("TODO - Calculating votes bias ...");
+function doVotesBias(s, bLog = false) {
+    let test = s.getTest(12 /* VotesBias */);
+    if (bLog)
+        console.log("TODO - Calculating votes bias ...");
     return test;
 }
 exports.doVotesBias = doVotesBias;
-function doResponsiveness(s) {
-    let test = s.getTest(11 /* Responsiveness */);
-    console.log("TODO - Calculating responsiveness ...");
+function doResponsiveness(s, bLog = false) {
+    let test = s.getTest(13 /* Responsiveness */);
+    if (bLog)
+        console.log("TODO - Calculating responsiveness ...");
     return test;
 }
 exports.doResponsiveness = doResponsiveness;
-function doResponsiveDistricts(s) {
-    let test = s.getTest(12 /* ResponsiveDistricts */);
-    console.log("TODO - Calculating # of responsive districts ...");
+function doResponsiveDistricts(s, bLog = false) {
+    let test = s.getTest(14 /* ResponsiveDistricts */);
+    if (bLog)
+        console.log("TODO - Calculating # of responsive districts ...");
     return test;
 }
 exports.doResponsiveDistricts = doResponsiveDistricts;
 // OTHER MEASURES OF PARTISAN BIAS
-// TODO - This formula might need to be inverted for D vs. R +/-
+// TODO - PARTISAN: This formula might need to be inverted for D vs. R +/-
 // TODO - Normalize the results.
-function doEfficiencyGap(s) {
-    console.log("TODO - Calculating the efficiency gap ...");
-    let test = s.getTest(13 /* EfficiencyGap */);
+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];
@@ -1478,17 +1777,25 @@ exports.fptpWin = fptpWin;
 //
 // PREPROCESS DATA
 //
+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 });
-const U = __webpack_require__(/*! ./utils */ "./src/utils.ts");
+const U = __importStar(__webpack_require__(/*! ./utils */ "./src/utils.ts"));
 // NOTE - Do preprocessing separately, so the constructor returns quickly.
-function doPreprocessData(s) {
+function doPreprocessData(s, bLog = false) {
     // If necessary, do one-time preprocessing
     if (!s.bOneTimeProcessingDone) {
-        doPreprocessCountyFeatures(s);
-        doPreprocessCensus(s);
-        doPreprocessElection(s);
+        doPreprocessCountyFeatures(s, bLog);
+        doPreprocessCensus(s, bLog);
+        doPreprocessElection(s, bLog);
         s.bOneTimeProcessingDone = true;
     }
+    // TODO - 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
@@ -1496,7 +1803,7 @@ function doPreprocessData(s) {
 }
 exports.doPreprocessData = doPreprocessData;
 // CREATE A FIPS CODE TO COUNTY NAME LOOKUP
-function doPreprocessCountyFeatures(s) {
+function doPreprocessCountyFeatures(s, bLog = false) {
     for (let i = 0; i < s.counties.nCounties; i++) {
         let county = s.counties.countyByIndex(i);
         let fips = s.counties.propertyForCounty(county, 'COUNTYFP');
@@ -1505,29 +1812,58 @@ function doPreprocessCountyFeatures(s) {
     }
 }
 // ANALYZE THE CENSUS BY COUNTY
-function doPreprocessCensus(s) {
+function doPreprocessCensus(s, bLog = false) {
     // The county-splitting analytic needs the following info, using NC as an example:
     // '_stateTotal' = The total state population, e.g., 9,535,483 for NC's 2010 Census
     // 'totalByCounty' = The total population by county FIPS code
+    // SUM TOTAL POPULATION BY COUNTY
     let totalByCounty = {};
     // NOTE - This works w/o GEOIDs, because you're looping over all features.
     for (let i = 0; i < s.features.nFeatures(); i++) {
         let f = s.features.featureByIndex(i);
         let geoID = s.features.geoIDForFeature(f);
-        let value = s.features.fieldForFeature(f, "CENSUS" /* CENSUS */, "Tot" /* TotalPop */);
-        // Sum total population across the state
-        s.state.totalPop += value;
-        // Get the county FIPS code for the feature
-        let county = U.parseGeoID(geoID)['county'];
-        let countyFIPS = U.getFIPSFromCountyGeoID(county);
-        // If a subtotal for the county doesn't exist, initialize one
-        if (!(U.keyExists(countyFIPS, totalByCounty))) {
-            totalByCounty[countyFIPS] = 0;
+        // Skip water-only features
+        if (!(U.isWaterOnly(geoID))) {
+            let value = s.features.fieldForFeature(f, "CENSUS" /* CENSUS */, "Tot" /* TotalPop */);
+            // Sum total population across the state
+            s.state.totalPop += value;
+            // Get the county FIPS code for the feature
+            let county = U.parseGeoID(geoID)['county'];
+            let countyFIPS = U.getFIPSFromCountyGeoID(county);
+            // If a subtotal for the county doesn't exist, initialize one
+            if (!(U.keyExists(countyFIPS, totalByCounty))) {
+                totalByCounty[countyFIPS] = 0;
+            }
+            // Sum total population by county
+            totalByCounty[countyFIPS] += value;
         }
-        // Sum total population by county
-        totalByCounty[countyFIPS] += value;
+        // else {
+        //   console.log("Skipping water-only feature in Census preprocessing:", geoID);
+        // }
     }
     // NOTE - The above could be replaced, if I got totals on county.geojson.
+    // CREATE A FIPS CODE-ORDINAL MAP
+    // Get the county FIPS codes
+    let fipsCodes = U.getObjectKeys(totalByCounty);
+    // Sort the results
+    fipsCodes = fipsCodes.sort();
+    // TODO - SPLITTING
+    // Add a dummy county, for county-district splitting analysis
+    fipsCodes.unshift('000');
+    // Create the ID-ordinal map
+    for (let i in fipsCodes) {
+        s.counties.index[fipsCodes[i]] = Number(i);
+    }
+    // MAKE AN ARRAY OF TOTAL POPULATIONS BY COUNTY INDEX
+    // Add an extra 0th virtual county bucket for county-district splitting analysis 
+    let nCountyBuckets = s.counties.nCounties + 1;
+    let countyTotals = U.initArray(nCountyBuckets, 0);
+    for (let fipsCode in totalByCounty) {
+        let i = s.counties.indexFromFIPS(fipsCode);
+        countyTotals[i] = totalByCounty[fipsCode];
+    }
+    s.counties.totalPopulation = countyTotals;
+    // ANALYZE THE COUNTIES
     // 'target_size': 733499, # calc as total / districts
     let targetSize = Math.round(s.state.totalPop / s.state.nDistricts);
     // Find counties that are bigger than the target district size.
@@ -1539,18 +1875,13 @@ function doPreprocessCensus(s) {
     let tooBigName = [];
     let expectedSplits = 0;
     let expectedAffected = 0;
-    // Create a FIPS code-ordinal map
-    // Get the county FIPS codes
-    let fipsCodes = U.getObjectKeys(totalByCounty);
-    // Sort the results
-    fipsCodes = fipsCodes.sort();
-    // Create the ID-ordinal map
-    for (let i in fipsCodes) {
-        s.counties.index[fipsCodes[i]] = Number(i);
-    }
     // Loop over the counties
     for (let county in fipsCodes) {
         let fipsCode = fipsCodes[county];
+        // TODO - SPLITTING
+        // Skip the dummy county
+        if (fipsCode == '000')
+            continue;
         let countyAffected = 0;
         // Find the number of required splits, assuming target district size.
         let rawQuotient = totalByCounty[fipsCode] / (targetSize + 1);
@@ -1571,34 +1902,428 @@ function doPreprocessCensus(s) {
     s.state.expectedAffected = expectedAffected;
 }
 // PREPROCESS ELECTION RESULTS
-function doPreprocessElection(s) {
-    console.log("TODO - Preprocessing election data ...");
+function doPreprocessElection(s, bLog = false) {
+    if (bLog)
+        console.log("TODO - Preprocessing election data ...");
 }
 
 
 /***/ }),
 
-/***/ "./src/report.ts":
-/*!***********************!*\
-  !*** ./src/report.ts ***!
-  \***********************/
+/***/ "./src/results.ts":
+/*!************************!*\
+  !*** ./src/results.ts ***!
+  \************************/
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 //
-// GENERATE REPORTS
-// - A test log: a simple enumeration of all analytics & validations w/ raw results
-// - A scorecard: a structured subset of analytics & validations w/ normalized
-//   results, cateories, and an overall score
+// TEMPLATES FOR UNFORMATTED ANALYTICS RESULTS
 // 
+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;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-const U = __webpack_require__(/*! ./utils */ "./src/utils.ts");
-const S = __webpack_require__(/*! ./settings */ "./src/settings.ts");
-const D = __webpack_require__(/*! ./_data */ "./src/_data.ts");
+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"));
+// TODO - DASHBOARD: Delete
+// import { doAnalyzePostProcessing } from './report'
 const analyze_1 = __webpack_require__(/*! ./analyze */ "./src/analyze.ts");
-// TEST META-DATA
+const state_reqs_json_1 = __importDefault(__webpack_require__(/*! ../static/state-reqs.json */ "./static/state-reqs.json"));
+// Example
+let sampleRequirements = {
+    score: 2 /* Red */,
+    metrics: {
+        complete: 0 /* Green */,
+        contiguous: 2 /* Red */,
+        freeOfHoles: 1 /* Yellow */,
+        equalPopulation: 2 /* 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"
+    }
+};
+let sampleCompactness = {
+    score: 60,
+    metrics: {
+        reock: 0.3773,
+        polsby: 0.3815
+    },
+    details: {},
+    datasets: {
+        shapes: "2010 VTD shapes"
+    },
+    resources: {}
+};
+let sampleSplitting = {
+    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: []
+    },
+    datasets: {},
+    resources: {}
+};
+// TODO - This category is still being fleshed out.
+let samplePartisan = {
+    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 - This category is still being fleshed out.
+let sampleMinority = {
+    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: {}
+};
+exports.samplePlanAnalytics = {
+    requirements: sampleRequirements,
+    compactness: sampleCompactness,
+    // TODO - Don't show these categories yet
+    splitting: sampleSplitting,
+    partisan: samplePartisan,
+    minority: sampleMinority
+};
+function preparePlanAnalytics(s, bLog = false) {
+    if (!(s.bPostProcessingDone)) {
+        doAnalyzePostProcessing(s);
+    }
+    // REQUIREMENTS CATEGORY
+    let paRequirements;
+    {
+        let completeTest = s.getTest(0 /* Complete */);
+        let contiguousTest = s.getTest(1 /* Contiguous */);
+        let freeOfHolesTest = s.getTest(2 /* FreeOfHoles */);
+        let equalPopulationTest = s.getTest(3 /* EqualPopulation */);
+        // Combine individual checks into an overall score
+        // TODO - DASHBOARD: Until we add three-state support top to bottom in
+        //   requirements/validations, map booleans to tri-states here.
+        let completeMetric = U.mapBooleanToTriState(completeTest['score']);
+        let contiguousMetric = U.mapBooleanToTriState(contiguousTest['score']);
+        let freeOfHolesMetric = U.mapBooleanToTriState(freeOfHolesTest['score']);
+        let equalPopulationMetric = U.mapBooleanToTriState(equalPopulationTest['score']);
+        let reqScore = 0 /* Green */;
+        let checks = [completeMetric, contiguousMetric, freeOfHolesMetric, equalPopulationMetric];
+        if (checks.includes(1 /* Yellow */))
+            reqScore = 1 /* Yellow */;
+        if (checks.includes(2 /* Red */))
+            reqScore = 2 /* Red */;
+        // Get values to support details entries
+        let unassignedFeaturesDetail = U.deepCopy(completeTest['details']['unassignedFeatures']) || [];
+        let emptyDistrictsDetail = U.deepCopy(completeTest['details']['emptyDistricts']) || [];
+        let discontiguousDistrictsDetail = U.deepCopy(contiguousTest['details']['discontiguousDistricts']) || [];
+        let embeddedDistrictsDetail = U.deepCopy(freeOfHolesTest['details']['embeddedDistricts']) || [];
+        let populationDeviationDetail = U.deepCopy(equalPopulationTest['details']['deviation']);
+        let deviationThresholdDetail = U.trim(s.populationDeviationThreshold());
+        let xx = s.state.xx;
+        // TODO - JSON: Is there a better / easier way to work with the variable?
+        let stateReqsDict = state_reqs_json_1.default;
+        let reqLinkToStateReqs = stateReqsDict[xx];
+        // Populate the category
+        paRequirements = {
+            score: reqScore,
+            metrics: {
+                complete: completeMetric,
+                contiguous: contiguousMetric,
+                freeOfHoles: freeOfHolesMetric,
+                equalPopulation: equalPopulationMetric
+            },
+            details: {
+                unassignedFeatures: unassignedFeaturesDetail,
+                emptyDistricts: emptyDistrictsDetail,
+                discontiguousDistricts: discontiguousDistrictsDetail,
+                embeddedDistricts: embeddedDistrictsDetail,
+                populationDeviation: populationDeviationDetail,
+                deviationThreshold: deviationThresholdDetail
+            },
+            datasets: {
+                census: U.deepCopy(s.config['descriptions']['CENSUS']),
+            },
+            resources: {
+                stateReqs: reqLinkToStateReqs
+            }
+        };
+    }
+    // COMPACTNESS CATEGORY
+    let paCompactness;
+    {
+        let reockWeight = 0.5;
+        let polsbyWeight = 1.0 - reockWeight;
+        let reockTest = s.getTest(5 /* Reock */);
+        let polsbyTest = s.getTest(6 /* PolsbyPopper */);
+        let normalizedReock = reockTest['normalizedScore'];
+        let normalizedPolsby = reockTest['normalizedScore'];
+        let compactnessScore = U.trim((reockWeight * normalizedReock) + (polsbyWeight * normalizedPolsby), 0);
+        let reockMetric = U.deepCopy(reockTest['score']);
+        let polsbyMetric = U.deepCopy(polsbyTest['score']);
+        // Populate the category
+        paCompactness = {
+            score: compactnessScore,
+            metrics: {
+                reock: reockMetric,
+                polsby: polsbyMetric
+            },
+            details: {
+            // None at this time
+            },
+            datasets: {
+                shapes: "2010 VTD shapes"
+                // TODO - DATASETS
+                // shapes: U.deepCopy(s.config['descriptions']['SHAPES'])
+            },
+            resources: {
+            // None at this time
+            }
+        };
+    }
+    // SPLITTING CATEGORY
+    let paSplitting;
+    {
+        let unexpectedCountySplittingTest = s.getTest(7 /* UnexpectedCountySplits */);
+        let VTDSplitsTest = s.getTest(10 /* VTDSplits */);
+        let countySplittingTest = s.getTest(8 /* CountySplitting */);
+        let districtSplittingTest = s.getTest(9 /* DistrictSplitting */);
+        let unexpectedAffectedMetric = U.deepCopy(unexpectedCountySplittingTest['score']);
+        let countiesSplitUnexpectedlyDetail = U.deepCopy(unexpectedCountySplittingTest['details']['countiesSplitUnexpectedly']);
+        let nVTDSplitsMetric = U.deepCopy(VTDSplitsTest['score']);
+        let splitVTDsDetail = U.deepCopy(VTDSplitsTest['details']['splitVTDs']);
+        let SqEnt_DCreducedMetric = U.deepCopy(countySplittingTest['score']);
+        let SqEnt_CDreducedMetric = U.deepCopy(districtSplittingTest['score']);
+        let countySplittingNormalized = countySplittingTest['normalizedScore'];
+        let districtSplittingNormalized = districtSplittingTest['normalizedScore'];
+        let splittingScore = U.trim((S.COUNTY_SPLITTING_WEIGHT * countySplittingNormalized) +
+            +(S.DISTRICT_SPLITTING_WEIGHT * districtSplittingNormalized), 0);
+        paSplitting = {
+            score: splittingScore,
+            metrics: {
+                sqEnt_DCreduced: SqEnt_DCreducedMetric,
+                sqEnt_CDreduced: SqEnt_CDreducedMetric
+                // NOTE - The un-reduced raw values
+                // sqEnt_DC    : SqEnt_DCMetric,
+                // sqEnt_CD    : SqEnt_CDMetric
+            },
+            details: {
+                countiesSplitUnexpectedly: countiesSplitUnexpectedlyDetail,
+                unexpectedAffected: unexpectedAffectedMetric,
+                nSplitVTDs: nVTDSplitsMetric,
+                splitVTDs: splitVTDsDetail
+            },
+            datasets: {
+            // None at this time
+            },
+            resources: {
+            // None at this time
+            }
+        };
+    }
+    // PARTISAN CATEGORY
+    //
+    // TODO - PARTISAN: This category is still being fleshed out. Just an example below.
+    let paPartisan;
+    {
+        paPartisan = {
+            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"
+            }
+        };
+    }
+    // MINORITY CATEGORY
+    //
+    // TODO - MINORITY: This category is still being fleshed out. Just an example below.
+    let paMinority;
+    {
+        paMinority = {
+            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: {}
+        };
+    }
+    // PLAN ANALYTICS
+    let pa = {
+        requirements: paRequirements,
+        compactness: paCompactness,
+        // TODO - Not implemented yet
+        splitting: paSplitting,
+        partisan: paPartisan,
+        minority: paMinority
+    };
+    return pa;
+}
+exports.preparePlanAnalytics = preparePlanAnalytics;
+// Example
+exports.sampleDistrictStatistics = {
+    table: [
+        // District 0 is the dummy unassigned district
+        [0, 0, 0, null, null, null, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+        [1, 653133, -0.0950, 0 /* Green */, 2 /* Red */, 0 /* Green */, 0 /* Green */, 0.4177, 0.5823, 0.8631, 0.1369, 0.0734, 0.0360, 0.0009, 0.0235, 0.0064],
+        [2, 620961, -0.1396, 0 /* Green */, 2 /* Red */, 2 /* Red */, 0 /* Green */, 0.8820, 0.1180, 0.3129, 0.6871, 0.6169, 0.0391, 0.0013, 0.0310, 0.0099],
+        [3, 971777, 0.3465, 0 /* Green */, 2 /* Red */, 0 /* Green */, 0 /* Green */, 0.7261, 0.2739, 0.5174, 0.4826, 0.1745, 0.1572, 0.0020, 0.1531, 0.0090],
+        [4, 863420, 0.1964, 0 /* Green */, 2 /* Red */, 0 /* Green */, 0 /* Green */, 0.8957, 0.1043, 0.1734, 0.8266, 0.6489, 0.1348, 0.0020, 0.0496, 0.0127],
+        [5, 805029, 0.1155, 0 /* Green */, 2 /* Red */, 0 /* Green */, 1 /* Yellow */, 0.5743, 0.4257, 0.6587, 0.3413, 0.2494, 0.0363, 0.0012, 0.0536, 0.0081],
+        [6, 824741, 0.1428, 0 /* Green */, 2 /* Red */, 0 /* Green */, 2 /* Red */, 0.5341, 0.4659, 0.7045, 0.2955, 0.1619, 0.0526, 0.0018, 0.0782, 0.0090],
+        [7, 549714, -0.2383, 0 /* Green */, 0 /* Green */, 0 /* Green */, 0 /* Green */, 0.5025, 0.4975, 0.6906, 0.3094, 0.2468, 0.0319, 0.0013, 0.0258, 0.0111],
+        [8, 484777, -0.3283, 0 /* Green */, 0 /* Green */, 0 /* Green */, 0 /* Green */, 0.4105, 0.5895, 0.8370, 0.1630, 0.1074, 0.0316, 0.0013, 0.0197, 0.0077],
+        // District N+1 is the dummy state-summary district
+        [9, 721694, 0.6748, 0 /* Green */, 2 /* Red */, 2 /* Red */, 2 /* Red */, 0.6293, 0.3707, 0.5722, 0.4278, 0.2925, 0.0729, 0.0015, 0.0618, 0.0093]
+    ],
+    details: {},
+    datasets: {
+        shapes: "2010 VTD shapes",
+        census: "2010 Census Total Population",
+        vap: "2010 Voting Age Population",
+        election: "2016 Presidential, US Senate, Governor, and AG election results"
+    },
+    resources: {}
+};
+// Create a DistrictStatistics instance, deep copying the underlying values.
+function prepareDistrictStatistics(s, bLog = false) {
+    if (!(s.bPostProcessingDone)) {
+        doAnalyzePostProcessing(s);
+    }
+    let dsTable = [];
+    for (let i = 0; i < s.districts.numberOfRows(); i++) {
+        let rawRow = [
+            i,
+            s.districts.statistics[D.DistrictField.TotalPop][i],
+            s.districts.statistics[D.DistrictField.PopDevPct][i],
+            s.districts.statistics[D.DistrictField.bEqualPop][i],
+            s.districts.statistics[D.DistrictField.bNotEmpty][i],
+            s.districts.statistics[D.DistrictField.bContiguous][i],
+            s.districts.statistics[D.DistrictField.bNotEmbedded][i],
+            s.districts.statistics[D.DistrictField.DemPct][i],
+            s.districts.statistics[D.DistrictField.RepPct][i],
+            s.districts.statistics[D.DistrictField.WhitePct][i],
+            s.districts.statistics[D.DistrictField.MinorityPct][i],
+            s.districts.statistics[D.DistrictField.BlackPct][i],
+            s.districts.statistics[D.DistrictField.HispanicPct][i],
+            s.districts.statistics[D.DistrictField.PacificPct][i],
+            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.
+        rawRow[3 /* bEqualPop */] = U.mapBooleanToTriState(rawRow[3 /* bEqualPop */]);
+        rawRow[4 /* bNotEmpty */] = U.mapBooleanToTriState(rawRow[4 /* bNotEmpty */]);
+        rawRow[5 /* bContiguous */] = U.mapBooleanToTriState(rawRow[5 /* bContiguous */]);
+        rawRow[6 /* bNotEmbedded */] = U.mapBooleanToTriState(rawRow[6 /* bNotEmbedded */]);
+        let readyRow = U.deepCopy(rawRow);
+        dsTable.push(readyRow);
+    }
+    let dsDetails = {
+    // None at this time
+    };
+    let dsDatasets = {
+        shapes: "2010 VTD shapes",
+        census: U.deepCopy(s.config['descriptions']['CENSUS']),
+        vap: U.deepCopy(s.config['descriptions']['VAP']),
+        election: U.deepCopy(s.config['descriptions']['ELECTION'])
+    };
+    let dsResources = {
+    // None at this time
+    };
+    let ds = {
+        table: dsTable,
+        details: dsDetails,
+        datasets: dsDatasets,
+        resources: dsResources
+    };
+    return ds;
+}
+exports.prepareDistrictStatistics = prepareDistrictStatistics;
+// META-DATA FOR TESTS/ANALYTICS
+// 
+// NOTE - This structure is a vestige of having created a metadata-driven
+//   scorecard w/in district-analytics at first. It works for creating the
+//   unstyled results structures, so it isn't a high priority to rationalize.
 var TestType;
 (function (TestType) {
     TestType[TestType["PassFail"] = 0] = "PassFail";
@@ -1610,7 +2335,6 @@ const completeDefn = {
     name: "Complete",
     normalize: false,
     externalType: TestType.PassFail,
-    detailsFn: doPrepareCompleteDetails,
     suites: [0 /* Legal */]
 };
 const contiguousDefn = {
@@ -1618,7 +2342,6 @@ const contiguousDefn = {
     name: "Contiguous",
     normalize: false,
     externalType: TestType.PassFail,
-    detailsFn: doPrepareContiguousDetails,
     suites: [0 /* Legal */]
 };
 const freeOfHolesDefn = {
@@ -1626,7 +2349,6 @@ const freeOfHolesDefn = {
     name: "Free of Holes",
     normalize: false,
     externalType: TestType.PassFail,
-    detailsFn: doPrepareFreeOfHolesDetails,
     suites: [0 /* Legal */]
 };
 const equalPopulationDefn = {
@@ -1634,7 +2356,6 @@ const equalPopulationDefn = {
     name: "Equal Population",
     normalize: false,
     externalType: TestType.PassFail,
-    detailsFn: doPrepareEqualPopulationDetails,
     suites: [0 /* Legal */]
 };
 const populationDeviationDefn = {
@@ -1642,7 +2363,6 @@ const populationDeviationDefn = {
     name: "Population Deviation",
     normalize: true,
     externalType: TestType.Percentage,
-    detailsFn: doPreparePopulationDeviationDetails,
     suites: [0 /* Legal */, 2 /* Best */] // Both so EqualPopulation can be assessed
 };
 const reockDefn = {
@@ -1650,7 +2370,6 @@ const reockDefn = {
     name: "Reock",
     normalize: true,
     externalType: TestType.Number,
-    detailsFn: doPrepareReockDetails,
     suites: [2 /* Best */]
 };
 const polsbyPopperDefn = {
@@ -1658,24 +2377,45 @@ const polsbyPopperDefn = {
     name: "Polsby-Popper",
     normalize: true,
     externalType: TestType.Number,
-    detailsFn: doPreparePolsbyPopperDetails,
     suites: [2 /* Best */]
 };
-const countySplitsDefn = {
-    ID: 7 /* CountySplits */,
-    name: "County splits",
-    trailer: "of the population had their county split unexpectedly.",
-    normalize: true,
+// TODO - SPLITTING
+const unexpectedCountySplitsDefn = {
+    ID: 7 /* UnexpectedCountySplits */,
+    name: "Unexpected County Splits",
+    normalize: false,
     externalType: TestType.Percentage,
-    detailsFn: doPrepareCountySplitDetails,
+    suites: [2 /* Best */]
+};
+// TODO - SPLITTING
+const VTDSplitsDefn = {
+    ID: 10 /* VTDSplits */,
+    name: "VTD Splits",
+    normalize: false,
+    externalType: TestType.Number,
+    suites: [2 /* Best */]
+};
+// TODO - SPLITTING
+const countySplittingDefn = {
+    ID: 8 /* CountySplitting */,
+    name: "County Splitting",
+    normalize: true,
+    externalType: TestType.Number,
+    suites: [2 /* Best */]
+};
+// TODO - SPLITTING
+const districtSplittingDefn = {
+    ID: 9 /* DistrictSplitting */,
+    name: "District Splitting",
+    normalize: true,
+    externalType: TestType.Number,
     suites: [2 /* Best */]
 };
 const efficiencyGapDefn = {
-    ID: 13 /* EfficiencyGap */,
+    ID: 15 /* EfficiencyGap */,
     name: "Efficiency Gap",
     normalize: false,
     externalType: TestType.Percentage,
-    detailsFn: doPrepareEfficiencyGapDetails,
     suites: [1 /* Fair */]
 };
 // All the tests that have been defined (can be reported on)
@@ -1687,72 +2427,13 @@ const testDefns = {
     [4 /* PopulationDeviation */]: populationDeviationDefn,
     [5 /* Reock */]: reockDefn,
     [6 /* PolsbyPopper */]: polsbyPopperDefn,
-    // TODO - Flesh out county splits
-    [7 /* CountySplits */]: countySplitsDefn,
-    [13 /* EfficiencyGap */]: efficiencyGapDefn
-    /* TODO - More tests ... */
-};
-// Scorecard category definitions
-const validCategory = {
-    catName: "Map Validations",
-    catTests: [
-        { testID: 0 /* Complete */ },
-        { testID: 1 /* Contiguous */ },
-        { testID: 2 /* FreeOfHoles */ },
-        { testID: 3 /* EqualPopulation */ }
-    ],
-    catNumeric: false,
-    catWeight: undefined,
-    catPrepareFn: doPrepareValidSection
-};
-const fairCategory = {
-    // TODO - Change this label
-    catName: "Is the map fair?",
-    catTests: [
-        {
-            testID: 13 /* EfficiencyGap */,
-            testWeight: 100
-        }
-    ],
-    catNumeric: true,
-    catWeight: undefined,
-    catPrepareFn: doPrepareFairSection
-};
-// TODO - Decide on the relative weights of these tests!
-// NOTE: 'testWeights' are simply relative, i.e., each normalized score is
-//   multiplied by the associated 'testWeight', and the sum of those is divided
-//   by the total weight. Weights don't have to add to 100.
-const bestCategory = {
-    catName: "Traditional Districting Principles",
-    catTests: [
-        {
-            testID: 4 /* PopulationDeviation */,
-            testWeight: 10
-        },
-        {
-            testID: 5 /* Reock */,
-            testWeight: 25
-        },
-        {
-            testID: 6 /* PolsbyPopper */,
-            testWeight: 25
-        }
-        // TODO - Re-enable, when the metric is implemented
-        // {
-        //   testID: T.Test.CountySplits,
-        //   testWeight: 50
-        // }
-    ],
-    catNumeric: true,
-    catWeight: undefined,
-    catPrepareFn: doPrepareBestSection
-};
-// The overall scorecard definition
-const scorecardDefn = {
-    [0 /* Legal */]: validCategory,
-    // TODO - NIY
-    // [T.Suite.Fair]: fairCategory,
-    [2 /* Best */]: bestCategory
+    // TODO - SPLITTING
+    [7 /* UnexpectedCountySplits */]: unexpectedCountySplitsDefn,
+    [10 /* VTDSplits */]: VTDSplitsDefn,
+    [8 /* CountySplitting */]: countySplittingDefn,
+    [9 /* DistrictSplitting */]: districtSplittingDefn,
+    // TODO - More tests ...
+    [15 /* EfficiencyGap */]: efficiencyGapDefn
 };
 // NORMALIZE RAW ANALYTICS
 //   Raw numeric analytics, such as population deviation, compactness, etc. are
@@ -1767,19 +2448,29 @@ function doConfigureScales(s) {
     const LDLimit = 10.00 / 100; // Deviation threshold for LD's
     const CDGoodEnough = 0.20 / 100;
     const LDGoodEnough = (CDGoodEnough / CDLimit) * LDLimit;
-    const scale = (s.legislativeDistricts) ? [1.0 - LDLimit, 1.0 - LDGoodEnough] : [1.0 - CDLimit, 1.0 - CDGoodEnough];
+    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 */] = { testScale: scale, testInvertp: true };
-    s.testScales[5 /* Reock */] = { testScale: [0.25, 0.50], testInvertp: false };
-    s.testScales[6 /* PolsbyPopper */] = { testScale: [0.10, 0.50], testInvertp: false };
-    const SPLITLimit = 0.1; // TODO - Just a placeholder default maximum (10%)
-    s.testScales[7 /* CountySplits */] = { testScale: [1.0 - SPLITLimit, 1.0], testInvertp: true };
+    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;
+    // TODO - 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;
 // 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) {
+function doAnalyzePostProcessing(s, bLog = false) {
     // Normalize the raw scores for all the numerics tests
     let testResults = U.getNumericObjectKeys(testDefns);
     for (let testID of testResults) {
@@ -1787,642 +2478,18 @@ function doAnalyzePostProcessing(s) {
             let testResult = s.getTest(testID);
             let rawScore = testResult['score'];
             let normalizedScore;
-            let { testScale, testInvertp } = s.testScales[testID];
-            normalizedScore = U.normalize(rawScore, testScale, testInvertp);
+            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'] = testScale;
+            testResult['details']['scale'] = s.testScales[testID].scale;
         }
     }
     // Derive secondary tests
-    analyze_1.doDeriveSecondaryTests(s);
+    analyze_1.doDeriveSecondaryTests(s, bLog);
     // Toggle the semaphore, so postprocessing isn't for both the testlog & scorecard
     s.bPostProcessingDone = true;
 }
 exports.doAnalyzePostProcessing = doAnalyzePostProcessing;
-// Prepare a structured but unformatted scorecard, from the test results
-function doGenerateScorecard(s) {
-    if (!(s.bPostProcessingDone)) {
-        doAnalyzePostProcessing(s);
-    }
-    // Create a new scorecard
-    let scorecard = {};
-    // Filter the defined scorecard categories by the requested test suites
-    let categories = U.getNumericObjectKeys(scorecardDefn);
-    let suitesRequested = s.config['suites'];
-    categories = categories.filter(x => suitesRequested.includes(x));
-    // ... and initialize each one in the new scorecard
-    for (let c of categories) {
-        scorecard[c] = {};
-        scorecard[c]['catName'] = scorecardDefn[c]['catName'];
-        scorecard[c]['catTests'] = {};
-        // scorecard[c]['catScore'] = undefined;
-    }
-    // For each scorecard category
-    for (let c of categories) {
-        // Grab the scorecard category definition
-        let { catName, catTests, catNumeric } = scorecardDefn[c];
-        let numericCategoryScore = 0;
-        let totalWeight = 0;
-        let booleanCategoryScore = true;
-        // Process the results for each test result in the category
-        for (let testDefn of catTests) {
-            // Get the config info for the test
-            let testID = testDefn['testID'];
-            // ... and the actual test result
-            let testResult = s.getTest(testID);
-            // Create a new test entry for the scorecard
-            let testReport = U.deepCopy(testResult);
-            // Add the name
-            testReport['name'] = testDefns[testID]['name'];
-            if (catNumeric) {
-                // Normalize raw numeric scores ... moved to FIRST PASS above
-                // Accumulate a category score
-                let normalizedScore = testReport['normalizedScore'];
-                numericCategoryScore += normalizedScore * testDefn['testWeight'];
-                totalWeight += testDefn['testWeight'];
-            }
-            else {
-                // AND together pass/fail tests into a category score
-                if (!testReport['score']) {
-                    booleanCategoryScore = false;
-                }
-            }
-            scorecard[c]['catTests'][testID] = testReport;
-        }
-        // Set the category score
-        if (catNumeric) {
-            scorecard[c]['catScore'] = Math.round(numericCategoryScore / totalWeight);
-        }
-        else {
-            scorecard[c]['catScore'] = booleanCategoryScore;
-        }
-    }
-    // TODO - Compute an overall score from the category weights
-    return scorecard;
-}
-// Prepare a formatted scorecard suitable for rendering
-function doPrepareScorecard(s) {
-    // Initialize the output format
-    let text = { data: [] };
-    let blocks = text.data;
-    // If the plan as already been analyzed, prepare a scorecard
-    if (s.bPlanAnalyzed) {
-        // Create and cache a new, unformatted scorecard
-        s.scorecard = doGenerateScorecard(s);
-        // Create a scorecard header
-        blocks.push({ variant: 'h4', text: `Analysis - NC 2019 Special Edition` });
-        blocks.push({ variant: 'body1', text: `In response to the recent court ruling in North Carolina and the court's requirement for transparency, we are pleased to provide the general public with early access to this base set of redistricting analytics. Stay tuned for more updates!` });
-        blocks.push({ variant: 'body1', text: `For more details, see our blog post on Medium.` });
-        // Prepare each scorecard category
-        blocks.push({ variant: 'beginExpansion', text: `Overall Plan` });
-        let categories = U.getNumericObjectKeys(s.scorecard);
-        for (let c of categories) {
-            let sectionPrepareFn = scorecardDefn[c]['catPrepareFn'];
-            let sectionText = sectionPrepareFn(s, c);
-            blocks.push(...sectionText);
-        }
-        // blocks.push({ variant: 'body1', text: `` });
-        // blocks.push({ variant: 'body1', text: `There is much more analysis coming of county splitting, partisan fairness, and the opportunity for minority representation! For now, you can glean a lot from the district statistics below.` });
-        blocks.push({ variant: 'endExpansion' });
-        // Report district statistics
-        blocks.push({ variant: 'beginExpansion', text: `Individual Districts` });
-        let districtStatisticsText = doPrepareDistrictStatistics(s);
-        blocks.push(...districtStatisticsText);
-        blocks.push({ variant: 'endExpansion' });
-        // Report what datasets were used
-        let c = s.config['datasets']["CENSUS" /* CENSUS */];
-        let v = s.config['datasets']["VAP" /* VAP */];
-        let e = s.config['datasets']["ELECTION" /* ELECTION */];
-        blocks.push({ variant: 'beginExpansion', text: `About the Data` });
-        blocks.push({ variant: 'body1', text: `These are the 4 datasets used in this analysis:` });
-        // TODO - Get the shape "dataset" from dra-client
-        blocks.push({ variant: 'body1', text: `* Shapes: 2010 VTD shapes` });
-        blocks.push({ variant: 'body1', text: `* Census: ${D.DatasetDescriptions[c]}` });
-        blocks.push({ variant: 'body1', text: `* VAP: ${D.DatasetDescriptions[v]}` });
-        blocks.push({ variant: 'body1', text: `* Elections: ${D.DatasetDescriptions[e]}` });
-        blocks.push({ variant: 'endExpansion' });
-        blocks.push({ variant: 'body1', text: `` });
-        blocks.push({
-            "variant": "link",
-            "text": "Questions or comments?",
-            "label": "analytics@davesredistricting.org",
-            "link": "mailto:analytics@davesredistricting.org"
-        });
-    }
-    // Otherwise, return a blank scorecard
-    return text;
-}
-exports.doPrepareScorecard = doPrepareScorecard;
-function doPrepareDistrictStatistics(s) {
-    let text = { data: [] };
-    let blocks = text.data;
-    blocks.push({ variant: 'beginTable' });
-    blocks.push({ variant: 'row', cells: ['ID', 'Total', 'Δ%', 'OK?', '*', 'Dem', 'Rep', 'White', 'Minority', 'Black', 'Hispanic', 'Pacific', 'Asian', 'Native'] });
-    for (let d = 0; d < s.districts.numberOfRows(); d++) {
-        let tot = s.districts.statistics[D.DistrictField.TotalPop][d];
-        if (tot == 0)
-            blocks.push({ variant: 'row', cells: [String(d), '-', '-', '-', '-', '-', '-', '-', '-', '-', '-', '-', '-', '-'] });
-        else {
-            tot = Math.round(tot);
-            let dev = fractionToPercentage(s.districts.statistics[D.DistrictField.PopDevPct][d]);
-            let bEq = s.districts.statistics[D.DistrictField.bEqualPop][d];
-            let bC = s.districts.statistics[D.DistrictField.bContiguous][d]
-                && s.districts.statistics[D.DistrictField.bNotEmbedded][d];
-            let dPct = fractionToPercentage(s.districts.statistics[D.DistrictField.DemPct][d]);
-            let rPct = fractionToPercentage(s.districts.statistics[D.DistrictField.RepPct][d]);
-            let wPct = fractionToPercentage(s.districts.statistics[D.DistrictField.WhitePct][d]);
-            let mPct = fractionToPercentage(s.districts.statistics[D.DistrictField.MinorityPct][d]);
-            let bPct = fractionToPercentage(s.districts.statistics[D.DistrictField.BlackPct][d]);
-            let hPct = fractionToPercentage(s.districts.statistics[D.DistrictField.HispanicPct][d]);
-            let pPct = fractionToPercentage(s.districts.statistics[D.DistrictField.PacificPct][d]);
-            let aPct = fractionToPercentage(s.districts.statistics[D.DistrictField.AsianPct][d]);
-            let nPct = fractionToPercentage(s.districts.statistics[D.DistrictField.NativePct][d]);
-            let id;
-            if (d == 0)
-                id = "??";
-            else if (d == (s.districts.numberOfRows() - 1))
-                id = "  ";
-            else
-                id = String(d);
-            blocks.push({
-                variant: 'row',
-                cells: [
-                    `${id}`,
-                    `${formatInteger(tot)}`,
-                    `${formatPercentage(dev)}%`,
-                    `${pfBoolToString(bEq)}`,
-                    `${pfBoolToString(bC)}`,
-                    `${formatPercentage(dPct)}%`,
-                    `${formatPercentage(rPct)}%`,
-                    `${formatPercentage(wPct)}%`,
-                    `${formatPercentage(mPct)}%`,
-                    `${formatPercentage(bPct)}%`,
-                    `${formatPercentage(hPct)}%`,
-                    `${formatPercentage(pPct)}%`,
-                    `${formatPercentage(aPct)}%`,
-                    `${formatPercentage(nPct)}%`
-                ]
-            });
-        }
-    }
-    blocks.push({ variant: 'endTable' });
-    return blocks;
-}
-// TEST LOG
-// Prepare formatted test results for rendering
-function doPrepareTestLog(s) {
-    // Initialize the output format
-    let text = { data: [] };
-    let blocks = text.data;
-    // If the plan as already been analyzed, prepare a test log
-    if (s.bPlanAnalyzed) {
-        if (!(s.bPostProcessingDone)) {
-            doAnalyzePostProcessing(s);
-        }
-        // Create a test log header
-        blocks.push({ variant: 'h4', text: `Test Log` });
-        let testResults = U.getNumericObjectKeys(testDefns);
-        let suitesRequested = new Set(s.config['suites']);
-        for (let testID of testResults) {
-            // Filter the defined tests by the requested test suites
-            let inSuites = testDefns[testID]['suites'];
-            if (!(U.isArrayEmpty(inSuites.filter(x => suitesRequested.has(x))))) {
-                // Get the test result
-                let testResult = s.getTest(testID);
-                // Prepare the text for it, and append it to the output
-                let testText = prepareTestEntry(testID, testResult);
-                blocks.push(...testText);
-            }
-        }
-    }
-    // Otherwise, return a blank test log
-    return text;
-}
-exports.doPrepareTestLog = doPrepareTestLog;
-function prepareTestEntry(testID, testResult) {
-    let text = { data: [] };
-    let blocks = text.data;
-    let testName = testDefns[testID]['name'];
-    let testNameTrailer = "";
-    if (U.keyExists('trailer', testDefns[testID])) {
-        testNameTrailer = testDefns[testID]['trailer'];
-    }
-    let testType = testDefns[testID]['externalType'];
-    let bNormalize = testDefns[testID]['normalize'];
-    let detailsFn = testDefns[testID]['detailsFn'];
-    let detailsText = detailsFn(testResult);
-    let score; // NOTE - Won't be undefined here
-    let normalizedScore;
-    let scoreText;
-    // Get the score ...
-    score = testResult['score'];
-    // ... and format it for rendering
-    switch (testType) {
-        case TestType.PassFail: {
-            scoreText = pfBoolToString(score);
-            blocks.push({ variant: 'body1', text: `<b>${testName}</b>: ${scoreText} ${testNameTrailer}` });
-            break;
-        }
-        case TestType.Percentage: {
-            score = fractionToPercentage(score);
-            if (bNormalize) {
-                normalizedScore = testResult['normalizedScore'];
-                blocks.push({ variant: 'body1', text: `<b>${testName}</b>: ${normalizedScore} / 100 : ${formatPercentage(score)}% ${testNameTrailer}` });
-            }
-            else {
-                blocks.push({ variant: 'body1', text: `<b>${testName}</b>: ${formatPercentage(score)}% ${testNameTrailer}` });
-            }
-            break;
-        }
-        case TestType.Number: {
-            if (bNormalize) {
-                normalizedScore = testResult['normalizedScore'];
-                blocks.push({ variant: 'body1', text: `<b>${testName}</b>: ${normalizedScore} / 100 : ${formatNumber(score)} ${testNameTrailer}` });
-            }
-            else {
-                blocks.push({ variant: 'body1', text: `<b>${testName}</b>: ${formatNumber(score)} ${testNameTrailer}` });
-            }
-            break;
-        }
-        default: {
-            // Unknown test type
-            throw new RangeError();
-        }
-    }
-    // Add the details text
-    blocks.push(...detailsText);
-    return blocks;
-}
-// FORMATTERS FOR TEST DETAILS
-function doPrepareCompleteDetails(testResult) {
-    let text = { data: [] };
-    let blocks = text.data;
-    if (!U.isObjectEmpty(testResult['details'])) {
-        let unassignedText = "";
-        let emptyText = "";
-        let missingText = "";
-        if (U.keyExists('unassignedFeatures', testResult['details'])) {
-            let unassignedFeatures = testResult['details']['unassignedFeatures'];
-            let unassignedList = prepareListItems(unassignedFeatures);
-            let unassignedTextTemplates = [
-                `GEOID ${unassignedList} is not assigned to a district.`,
-                `GEOIDs ${unassignedList} are not assigned to districts.`,
-                `Several GEOIDs are not assigned to districts, including ${unassignedList}.`
-            ];
-            unassignedText = prepareListText(unassignedFeatures, unassignedTextTemplates);
-        }
-        if (U.keyExists('emptyDistricts', testResult['details'])) {
-            let emptyDistricts = testResult['details']['emptyDistricts'];
-            let emptyList = prepareListItems(emptyDistricts);
-            let emptyTextTemplates = [
-                `District ${emptyList} is empty.`,
-                `Districts ${emptyList} are empty.`,
-                `Several districts are empty, including ${emptyList}.`
-            ];
-            emptyText = prepareListText(emptyDistricts, emptyTextTemplates);
-        }
-        if (U.keyExists('missingDistricts', testResult['details'])) {
-            missingText = `Not enough districts have been defined. `;
-        }
-        let detailsText = "  " + unassignedText + emptyText + missingText;
-        blocks.push({ variant: 'body1', text: detailsText });
-    }
-    return blocks;
-}
-function doPrepareContiguousDetails(testResult) {
-    let text = { data: [] };
-    let blocks = text.data;
-    if (!U.isObjectEmpty(testResult['details'])) {
-        let discontiguousDistricts = testResult['details']['discontiguousDistricts'];
-        let discontiguousList = prepareListItems(discontiguousDistricts);
-        let discontiguousTextTemplates = [
-            `District ${discontiguousList} is not contiguous.`,
-            `Districts ${discontiguousList} are not contiguous.`,
-            `Several districts are not contiguous, including ${discontiguousList}.`
-        ];
-        let detailsText = prepareListText(discontiguousDistricts, discontiguousTextTemplates);
-        blocks.push({ variant: 'body1', text: detailsText });
-    }
-    return blocks;
-}
-function doPrepareFreeOfHolesDetails(testResult) {
-    let text = { data: [] };
-    let blocks = text.data;
-    if (!U.isObjectEmpty(testResult['details'])) {
-        let embeddedDistricts = testResult['details']['embeddedDistricts'];
-        let embeddedList = prepareListItems(embeddedDistricts);
-        let embeddedTextTemplates = [
-            `District ${embeddedList} is fully embedded within another district.`,
-            `Both districts ${embeddedList} are fully embedded within other districts.`,
-            `Several districts are fully embedded within other districts, including ${embeddedList}.`
-        ];
-        let detailsText = prepareListText(embeddedDistricts, embeddedTextTemplates);
-        blocks.push({ variant: 'body1', text: detailsText });
-    }
-    return blocks;
-}
-function doPrepareEqualPopulationDetails(testResult) {
-    let text = { data: [] };
-    let blocks = text.data;
-    if (!U.isObjectEmpty(testResult['details'])) {
-        let popDevPct = fractionToPercentage(testResult['details']['deviation']);
-        let thresholdPct = fractionToPercentage(1.0 - testResult['details']['thresholds'][0]);
-        let detailsText = '';
-        if (!(testResult['score'])) {
-            detailsText = `The ${formatPercentage(popDevPct)}% population deviation is greater than the ${formatPercentage(thresholdPct)}% threshold tolerated by courts.`;
-        }
-        blocks.push({ variant: 'body1', text: detailsText });
-    }
-    return blocks;
-}
-function doPreparePopulationDeviationDetails(testResult) {
-    let text = { data: [] };
-    let blocks = text.data;
-    let n = Math.round(testResult['details']['maxDeviation']);
-    let term = "people";
-    if (n == 1) {
-        term = "person";
-    }
-    blocks.push({ variant: 'body1', text: `The maximum population deviation between districts is ${formatInteger(n)} ${term}.` });
-    return blocks;
-}
-function doPrepareReockDetails(testResult) {
-    let text = { data: [] };
-    let blocks = text.data;
-    // TODO - No details implemented yet
-    return blocks;
-}
-function doPreparePolsbyPopperDetails(testResult) {
-    let text = { data: [] };
-    let blocks = text.data;
-    // TODO - No details implemented yet
-    return blocks;
-}
-function doPrepareEfficiencyGapDetails(testResult) {
-    let text = { data: [] };
-    let blocks = text.data;
-    // TODO - Not yet implemented
-    return blocks;
-}
-function doPrepareCountySplitDetails(testResult) {
-    let text = { data: [] };
-    let blocks = text.data;
-    let unexpectedAffected = fractionToPercentage(testResult['details']['unexpectedAffected']);
-    let affectedText = `affecting ${formatPercentage(unexpectedAffected)}% of the total population.`;
-    let countiesSplitUnexpectedly = testResult['details']['countiesSplitUnexpectedly'];
-    let nCountiesSplitUnexpectedly = countiesSplitUnexpectedly.length;
-    let nUnexpectedSplits = testResult['details']['unexpectedSplits'];
-    let splitList = prepareListItems(countiesSplitUnexpectedly);
-    let splitTextTemplates = [
-        `${splitList} county is split unexpectedly, `,
-        `${splitList} counties are split unexpectedly, `,
-        // `These ${formatInteger(nCountiesSplitUnexpectedly)} counties are split unexpectedly--${splitList}--`
-        `${splitList} counties are split unexpectedly ${formatInteger(nUnexpectedSplits)} times, `
-    ];
-    let detailsText = prepareListText(countiesSplitUnexpectedly, splitTextTemplates) + affectedText;
-    blocks.push({ variant: 'body1', text: detailsText });
-    return blocks;
-}
-// FORMATTERS FOR CATEGORIES
-// This function parses & formats the 'Valid' section of a scorecard.
-function doPrepareValidSection(s, c) {
-    // Get the category meta data
-    let { catName, catScore, catTests } = s.scorecard[c];
-    let testReport;
-    // Initialize the section text
-    let text = { data: [] };
-    let blocks = text.data;
-    let testText;
-    // Section header
-    let stringScore = pfBoolToString(catScore);
-    blocks.push({ variant: 'beginExpansion', text: `${catName}` });
-    // blocks.push({ variant: 'beginExpansion', text: `${catName} ${stringScore}` });
-    // Complete
-    testReport = catTests[0 /* Complete */];
-    testText = prepareTestEntry(0 /* Complete */, testReport);
-    blocks.push(...testText);
-    // Contiguous
-    testReport = catTests[1 /* Contiguous */];
-    testText = prepareTestEntry(1 /* Contiguous */, testReport);
-    blocks.push(...testText);
-    // Free of holes (no embedded districts)
-    testReport = catTests[2 /* FreeOfHoles */];
-    testText = prepareTestEntry(2 /* FreeOfHoles */, testReport);
-    blocks.push(...testText);
-    // Equal population (w/in the appropriate legal threshold)
-    testReport = catTests[3 /* EqualPopulation */];
-    testText = prepareTestEntry(3 /* EqualPopulation */, testReport);
-    blocks.push(...testText);
-    blocks.push({ variant: 'endExpansion' });
-    return blocks;
-}
-// TODO - NIY
-// This function parses & formats the 'Fair' section of a scorecard.
-function doPrepareFairSection(s, c) {
-    // Get the category meta data
-    let { catName, catScore, catTests } = s.scorecard[c];
-    let testReport;
-    // Initialize the section text
-    let text = { data: [] };
-    let blocks = text.data;
-    let testText;
-    // Section header
-    blocks.push({ variant: 'beginExpansion', text: `${catName} ${catScore} of 100` });
-    // TODO - Flesh this out
-    // There's only one test: Population Deviation.
-    // testReport = catTests[T.Test.PopulationDeviation];
-    // testText = prepareTestEntry(T.Test.PopulationDeviation, testReport);
-    // blocks.push(...testText);
-    blocks.push({ variant: 'endExpansion' });
-    return blocks;
-}
-// This function parses & formats the 'Best' section of a scorecard.
-function doPrepareBestSection(s, c) {
-    // Get the category meta data
-    let { catName, catScore, catTests } = s.scorecard[c];
-    let testReport;
-    // Initialize the section text
-    let text = { data: [] };
-    let blocks = text.data;
-    let testText;
-    // Section header
-    blocks.push({ variant: 'beginExpansion', text: `${catName} (${catScore} of 100)` });
-    // Population deviation
-    testReport = catTests[4 /* PopulationDeviation */];
-    testText = prepareTestEntry(4 /* PopulationDeviation */, testReport);
-    blocks.push(...testText);
-    // Compactness
-    testReport = catTests[5 /* Reock */];
-    let normalizedReock = testReport['normalizedScore'];
-    let reockTestText = prepareTestEntry(5 /* Reock */, testReport);
-    testReport = catTests[6 /* PolsbyPopper */];
-    let normalizedPolsbyPopper = testReport['normalizedScore'];
-    let polsbyPopperTestText = prepareTestEntry(6 /* PolsbyPopper */, testReport);
-    let compactnessScore = (normalizedReock + normalizedPolsbyPopper) / 2;
-    blocks.push({ variant: 'body1', text: `Compactness: ${compactnessScore} / 100` });
-    blocks.push(...reockTestText);
-    blocks.push(...polsbyPopperTestText);
-    // County splits
-    // TODO - Re-enable this, when the county-splitting metric is implemented.
-    // testReport = catTests[T.Test.CountySplits];
-    // testText = prepareTestEntry(T.Test.CountySplits, testReport);
-    // blocks.push(...testText);
-    blocks.push({ variant: 'endExpansion' });
-    return blocks;
-}
-// FORMATTING HELPERS
-// Convert a boolean representing Pass/Fail to a string
-function pfBoolToString(score) {
-    if (score) {
-        return "Yes";
-    }
-    else {
-        return "No";
-    }
-}
-function fractionToPercentage(f) {
-    return f * 100;
-}
-function formatNumber(n) {
-    let p = S.PRECISION;
-    return n.toLocaleString('en-US', { minimumFractionDigits: p, maximumFractionDigits: p });
-}
-function formatPercentage(n) {
-    let p = (S.PRECISION / 2);
-    return n.toLocaleString('en-US', { minimumFractionDigits: p, maximumFractionDigits: p });
-}
-function formatInteger(i) {
-    return new Intl.NumberFormat().format(i);
-}
-// Prepare the items in a list for rendering
-function prepareListItems(list) {
-    let nItems = list.length;
-    let listStr;
-    switch (nItems) {
-        case 1: {
-            listStr = list[0];
-            break;
-        }
-        case 2: {
-            listStr = list[0] + " and " + list[1];
-            break;
-        }
-        default: {
-            let listWithCommas = list.join(', ');
-            let lastCommaIndex = listWithCommas.length - ((list[list.length - 1].length) + 1);
-            let beforeAnd = listWithCommas.substr(0, lastCommaIndex);
-            let afterAnd = listWithCommas.substr(lastCommaIndex + 1);
-            listStr = beforeAnd + " and " + afterAnd;
-            break;
-        }
-    }
-    return listStr;
-}
-// Pick the rendering text for the appropriate list length
-function prepareListText(list, listTemplates) {
-    let nItems = list.length;
-    switch (nItems) {
-        case 1: {
-            return listTemplates[0];
-            break;
-        }
-        case 2: {
-            return listTemplates[1];
-            break;
-        }
-        default: {
-            return listTemplates[2];
-            break;
-        }
-    }
-}
-/* COMMAND-LINE TESTS
-
-node main.js scorecard -v -x NC -n 13 -p ~/src/district-analytics/data/SAMPLE-BG-map.csv -d ~/src/district-analytics/data/SAMPLE-BG-data2.json -s ~/src/district-analytics/data/SAMPLE-BG-shapes.geojson -g ~/src/district-analytics/data/SAMPLE-BG-graph.json -c ~/src/district-analytics/data/SAMPLE-COUNTY.geojson
-node --inspect --inspect-brk main.js scorecard -v -x NC -n 13 -p ~/src/district-analytics/data/SAMPLE-BG-map.csv -d ~/src/district-analytics/data/SAMPLE-BG-data2.json -s ~/src/district-analytics/data/SAMPLE-BG-shapes.geojson -g ~/src/district-analytics/data/SAMPLE-BG-graph.json -c ~/src/district-analytics/data/SAMPLE-COUNTY.geojson
-
--or-
-
-./main.js scorecard -v -x NC -n 13 -p ../data/SAMPLE-BG-map.csv -d ../data/SAMPLE-BG-data2.json -s ../data/SAMPLE-BG-shapes.geojson -g ../data/SAMPLE-BG-graph.json -c ../data/SAMPLE-COUNTY.geojson
-./main.js --inspect --inspect-brk scorecard -v -x NC -n 13 -p ../data/SAMPLE-BG-map.csv -d ../data/SAMPLE-BG-data2.json -s ../data/SAMPLE-BG-shapes.geojson -g ../data/SAMPLE-BG-graph.json -c ../data/SAMPLE-COUNTY.geojson
-
-These calls work at the project directory, using samples in the data/ directory:
-
-./main.js testlog -v -x NC -n 13 -p ../data/SAMPLE-BG-map.csv -d ../data/SAMPLE-BG-data2.json -s ../data/SAMPLE-BG-shapes.geojson -g ../data/SAMPLE-BG-graph.json -c ../data/SAMPLE-COUNTY.geojson
-
-TODO - Fix this
-./main.js testlog -v -x NC -n 13 -p ../data/SAMPLE-BG-map-missing.csv -d ../data/SAMPLE-BG-data2.json -s ../data/SAMPLE-BG-shapes.geojson -g ../data/SAMPLE-BG-graph.json -c ../data/SAMPLE-COUNTY.geojson
-./main.js scorecard -v -x NC-n 13 -p ../data/SAMPLE-BG-map-missing.csv -c ../data/SAMPLE-BG-census.csv -s ../data/SAMPLE-BG-shapes.geojson -g ../data/SAMPLE-BG-graph.json -e ../data/SAMPLE-BG-election.csv -f ../data/SAMPLE-FIPS-county-name-map.csv
-
-./main.js testlog -v -x NC -n 13 -p ../data/SAMPLE-BG-map-unassigned.csv -d ../data/SAMPLE-BG-data2.json -s ../data/SAMPLE-BG-shapes.geojson -g ../data/SAMPLE-BG-graph.json -c ../data/SAMPLE-COUNTY.geojson
-./main.js scorecard -v -x NC -n 13 -p ../data/SAMPLE-BG-map-unassigned.csv -d ../data/SAMPLE-BG-data2.json -s ../data/SAMPLE-BG-shapes.geojson -g ../data/SAMPLE-BG-graph.json -c ../data/SAMPLE-COUNTY.geojson
-
-TODO - HERE
-
-./main.js -v -x NC testlog -p ../data/SAMPLE-BG-map.csv -d ../data/SAMPLE-BG-data2.json -s ../data/SAMPLE-BG-shapes.geojson -g ../data/SAMPLE-BG-graph.json -c ../data/SAMPLE-COUNTY.geojson --empty
-./main.js -v -x NC scorecard -p ../data/SAMPLE-BG-map.csv -d ../data/SAMPLE-BG-data2.json -s ../data/SAMPLE-BG-shapes.geojson -g ../data/SAMPLE-BG-graph.json -c ../data/SAMPLE-COUNTY.geojson --empty
-
-TODO
-
-./main.js testlog -n 13 -p ../data/SAMPLE-BG-map-discontiguous.csv -c ../data/SAMPLE-BG-census.csv -s ../data/SAMPLE-BG-shapes.geojson -g ../data/SAMPLE-BG-graph.json -e ../data/SAMPLE-BG-election.csv -f ../data/SAMPLE-FIPS-county-name-map.csv
-./main.js scorecard -n 13 -p ../data/SAMPLE-BG-map-discontiguous.csv -c ../data/SAMPLE-BG-census.csv -s ../data/SAMPLE-BG-shapes.geojson -g ../data/SAMPLE-BG-graph.json -e ../data/SAMPLE-BG-election.csv -f ../data/SAMPLE-FIPS-county-name-map.csv
-
-./main.js testlog -n 13 -p ../data/SAMPLE-BG-map-hole.csv -c ../data/SAMPLE-BG-census.csv -s ../data/SAMPLE-BG-shapes.geojson -g ../data/SAMPLE-BG-graph.json -e ../data/SAMPLE-BG-election.csv -f ../data/SAMPLE-FIPS-county-name-map.csv
-./main.js scorecard -n 13 -p ../data/SAMPLE-BG-map-hole.csv -c ../data/SAMPLE-BG-census.csv -s ../data/SAMPLE-BG-shapes.geojson -g ../data/SAMPLE-BG-graph.json -e ../data/SAMPLE-BG-election.csv -f ../data/SAMPLE-FIPS-county-name-map.csv
-
-
-node --inspect --inspect-brk main.js scorecard -v -n 13 -p ../data/SAMPLE-BG-map.csv -c ../data/SAMPLE-BG-census.csv -s ../data/SAMPLE-BG-shapes.geojson -g ../data/SAMPLE-BG-graph.json -e ../data/SAMPLE-BG-election.csv -f ../data/SAMPLE-FIPS-county-name-map.csv
-node main.js scorecard -v -n 13 -p ../data/SAMPLE-BG-map.csv -c ../data/SAMPLE-BG-census.csv -s ../data/SAMPLE-BG-shapes.geojson -g ../data/SAMPLE-BG-graph.json -e ../data/SAMPLE-BG-election.csv -f ../data/SAMPLE-FIPS-county-name-map.csv
-
-
-These calls test NC block-level data stored in my ~/data/redistricting-data/2010/compact/sample directory:
-
-node --inspect --inspect-brk main.js scorecard -v -n 13 -p ~/data/redistricting-data/2010/compact/sample/SAMPLE-BLOCK-map.csv -c ~/data/redistricting-data/2010/compact/sample/SAMPLE-BLOCK-census.csv -s ~/data/redistricting-data/2010/compact/sample/SAMPLE-BLOCK-shapes.geojson -g ~/data/redistricting-data/2010/compact/sample/SAMPLE-BLOCK-graph.json -e ~/data/redistricting-data/2010/compact/sample/SAMPLE-BLOCK-election.csv -f ~/data/redistricting-data/2010/compact/sample/SAMPLE-FIPS-county-name-map.csv
-node --inspect --inspect-brk main.js scorecard -v -n 13 -p ~/data/redistricting-data/2010/compact/sample/SAMPLE-BLOCK-map.csv -c ~/data/redistricting-data/2010/compact/sample/SAMPLE-BLOCK-census.csv -s ~/data/redistricting-data/2010/compact/sample/tl_2018_37_tabblock10.json -g ~/data/redistricting-data/2010/compact/sample/SAMPLE-BLOCK-graph.json -e ~/data/redistricting-data/2010/compact/sample/SAMPLE-BLOCK-election.csv -f ~/data/redistricting-data/2010/compact/sample/SAMPLE-FIPS-county-name-map.csv
-
-node main.js scorecard -v -n 13 -p ~/data/redistricting-data/2010/compact/sample/SAMPLE-BLOCK-map.csv -c ~/data/redistricting-data/2010/compact/sample/SAMPLE-BLOCK-census.csv -s ~/data/redistricting-data/2010/compact/sample/SAMPLE-BLOCK-shapes.geojson -g ~/data/redistricting-data/2010/compact/sample/SAMPLE-BLOCK-graph.json -e ~/data/redistricting-data/2010/compact/sample/SAMPLE-BLOCK-election.csv -f ~/data/redistricting-data/2010/compact/sample/SAMPLE-FIPS-county-name-map.csv
-node main.js scorecard -v -n 13 -p ~/data/redistricting-data/2010/compact/sample/SAMPLE-BLOCK-map.csv -c ~/data/redistricting-data/2010/compact/sample/SAMPLE-BLOCK-census.csv -s ~/data/redistricting-data/2010/compact/sample/tl_2018_37_tabblock10.json -g ~/data/redistricting-data/2010/compact/sample/SAMPLE-BLOCK-graph.json -e ~/data/redistricting-data/2010/compact/sample/SAMPLE-BLOCK-election.csv -f ~/data/redistricting-data/2010/compact/sample/SAMPLE-FIPS-county-name-map.csv
-
-
-
-*/
-/* TODO - DELETE
-
-These calls work at the project directory, using samples in the data/ directory:
-
-./main.js testlog -n 13 -p ../data/SAMPLE-BG-map.csv -c ../data/SAMPLE-BG-census.csv -s ../data/SAMPLE-BG-shapes.geojson -g ../data/SAMPLE-BG-graph.json -e ../data/SAMPLE-BG-election.csv -f ../data/SAMPLE-FIPS-county-name-map.csv
-./main.js scorecard -n 13 -p ../data/SAMPLE-BG-map.csv -c ../data/SAMPLE-BG-census.csv -s ../data/SAMPLE-BG-shapes.geojson -g ../data/SAMPLE-BG-graph.json -e ../data/SAMPLE-BG-election.csv -f ../data/SAMPLE-FIPS-county-name-map.csv
-
-./main.js testlog -n 13 -p ../data/SAMPLE-BG-map-missing.csv -c ../data/SAMPLE-BG-census.csv -s ../data/SAMPLE-BG-shapes.geojson -g ../data/SAMPLE-BG-graph.json -e ../data/SAMPLE-BG-election.csv -f ../data/SAMPLE-FIPS-county-name-map.csv
-./main.js scorecard -n 13 -p ../data/SAMPLE-BG-map-missing.csv -c ../data/SAMPLE-BG-census.csv -s ../data/SAMPLE-BG-shapes.geojson -g ../data/SAMPLE-BG-graph.json -e ../data/SAMPLE-BG-election.csv -f ../data/SAMPLE-FIPS-county-name-map.csv
-
-./main.js testlog -n 13 -p ../data/SAMPLE-BG-map-unassigned.csv -c ../data/SAMPLE-BG-census.csv -s ../data/SAMPLE-BG-shapes.geojson -g ../data/SAMPLE-BG-graph.json -e ../data/SAMPLE-BG-election.csv -f ../data/SAMPLE-FIPS-county-name-map.csv
-./main.js scorecard -n 13 -p ../data/SAMPLE-BG-map-unassigned.csv -c ../data/SAMPLE-BG-census.csv -s ../data/SAMPLE-BG-shapes.geojson -g ../data/SAMPLE-BG-graph.json -e ../data/SAMPLE-BG-election.csv -f ../data/SAMPLE-FIPS-county-name-map.csv
-
-./main.js testlog -n 13 -p ../data/SAMPLE-BG-map.csv -c ../data/SAMPLE-BG-census.csv -s ../data/SAMPLE-BG-shapes.geojson -g ../data/SAMPLE-BG-graph.json -e ../data/SAMPLE-BG-election.csv -f ../data/SAMPLE-FIPS-county-name-map.csv --empty
-./main.js scorecard -n 13 -p ../data/SAMPLE-BG-map.csv -c ../data/SAMPLE-BG-census.csv -s ../data/SAMPLE-BG-shapes.geojson -g ../data/SAMPLE-BG-graph.json -e ../data/SAMPLE-BG-election.csv -f ../data/SAMPLE-FIPS-county-name-map.csv --empty
-
-./main.js testlog -n 13 -p ../data/SAMPLE-BG-map-discontiguous.csv -c ../data/SAMPLE-BG-census.csv -s ../data/SAMPLE-BG-shapes.geojson -g ../data/SAMPLE-BG-graph.json -e ../data/SAMPLE-BG-election.csv -f ../data/SAMPLE-FIPS-county-name-map.csv
-./main.js scorecard -n 13 -p ../data/SAMPLE-BG-map-discontiguous.csv -c ../data/SAMPLE-BG-census.csv -s ../data/SAMPLE-BG-shapes.geojson -g ../data/SAMPLE-BG-graph.json -e ../data/SAMPLE-BG-election.csv -f ../data/SAMPLE-FIPS-county-name-map.csv
-
-./main.js testlog -n 13 -p ../data/SAMPLE-BG-map-hole.csv -c ../data/SAMPLE-BG-census.csv -s ../data/SAMPLE-BG-shapes.geojson -g ../data/SAMPLE-BG-graph.json -e ../data/SAMPLE-BG-election.csv -f ../data/SAMPLE-FIPS-county-name-map.csv
-./main.js scorecard -n 13 -p ../data/SAMPLE-BG-map-hole.csv -c ../data/SAMPLE-BG-census.csv -s ../data/SAMPLE-BG-shapes.geojson -g ../data/SAMPLE-BG-graph.json -e ../data/SAMPLE-BG-election.csv -f ../data/SAMPLE-FIPS-county-name-map.csv
-
-
-node --inspect --inspect-brk main.js scorecard -v -n 13 -p ../data/SAMPLE-BG-map.csv -c ../data/SAMPLE-BG-census.csv -s ../data/SAMPLE-BG-shapes.geojson -g ../data/SAMPLE-BG-graph.json -e ../data/SAMPLE-BG-election.csv -f ../data/SAMPLE-FIPS-county-name-map.csv
-node main.js scorecard -v -n 13 -p ../data/SAMPLE-BG-map.csv -c ../data/SAMPLE-BG-census.csv -s ../data/SAMPLE-BG-shapes.geojson -g ../data/SAMPLE-BG-graph.json -e ../data/SAMPLE-BG-election.csv -f ../data/SAMPLE-FIPS-county-name-map.csv
-
-
-These calls test NC block-level data stored in my ~/data/redistricting-data/2010/compact/sample directory:
-
-node --inspect --inspect-brk main.js scorecard -v -n 13 -p ~/data/redistricting-data/2010/compact/sample/SAMPLE-BLOCK-map.csv -c ~/data/redistricting-data/2010/compact/sample/SAMPLE-BLOCK-census.csv -s ~/data/redistricting-data/2010/compact/sample/SAMPLE-BLOCK-shapes.geojson -g ~/data/redistricting-data/2010/compact/sample/SAMPLE-BLOCK-graph.json -e ~/data/redistricting-data/2010/compact/sample/SAMPLE-BLOCK-election.csv -f ~/data/redistricting-data/2010/compact/sample/SAMPLE-FIPS-county-name-map.csv
-node --inspect --inspect-brk main.js scorecard -v -n 13 -p ~/data/redistricting-data/2010/compact/sample/SAMPLE-BLOCK-map.csv -c ~/data/redistricting-data/2010/compact/sample/SAMPLE-BLOCK-census.csv -s ~/data/redistricting-data/2010/compact/sample/tl_2018_37_tabblock10.json -g ~/data/redistricting-data/2010/compact/sample/SAMPLE-BLOCK-graph.json -e ~/data/redistricting-data/2010/compact/sample/SAMPLE-BLOCK-election.csv -f ~/data/redistricting-data/2010/compact/sample/SAMPLE-FIPS-county-name-map.csv
-
-node main.js scorecard -v -n 13 -p ~/data/redistricting-data/2010/compact/sample/SAMPLE-BLOCK-map.csv -c ~/data/redistricting-data/2010/compact/sample/SAMPLE-BLOCK-census.csv -s ~/data/redistricting-data/2010/compact/sample/SAMPLE-BLOCK-shapes.geojson -g ~/data/redistricting-data/2010/compact/sample/SAMPLE-BLOCK-graph.json -e ~/data/redistricting-data/2010/compact/sample/SAMPLE-BLOCK-election.csv -f ~/data/redistricting-data/2010/compact/sample/SAMPLE-FIPS-county-name-map.csv
-node main.js scorecard -v -n 13 -p ~/data/redistricting-data/2010/compact/sample/SAMPLE-BLOCK-map.csv -c ~/data/redistricting-data/2010/compact/sample/SAMPLE-BLOCK-census.csv -s ~/data/redistricting-data/2010/compact/sample/tl_2018_37_tabblock10.json -g ~/data/redistricting-data/2010/compact/sample/SAMPLE-BLOCK-graph.json -e ~/data/redistricting-data/2010/compact/sample/SAMPLE-BLOCK-election.csv -f ~/data/redistricting-data/2010/compact/sample/SAMPLE-FIPS-county-name-map.csv
-
-*/
 
 
 /***/ }),
@@ -2447,11 +2514,17 @@ exports.PRECISION = 4;
 exports.NORMALIZED_RANGE = 100;
 // The dummy district ID for features not assigned districts yet
 exports.NOT_ASSIGNED = 0;
-// TODO - Discuss w/ Dave & Terry
+// TODO - TERRY/DAVE: Discuss
 // # of items to report as problematic (e.g., features, districts, etc.)
 exports.NUMBER_OF_ITEMS_TO_REPORT = 10;
 // The virtual geoID for "neighbors" in other states
 exports.OUT_OF_STATE = "OUT_OF_STATE";
+// "Roughly equal" = average census block size / 2
+const AVERAGE_BLOCK_SIZE = 30;
+exports.EQUAL_TOLERANCE = AVERAGE_BLOCK_SIZE / 2;
+// County & district splitting weights
+exports.COUNTY_SPLITTING_WEIGHT = 0.8;
+exports.DISTRICT_SPLITTING_WEIGHT = 1.0 - exports.COUNTY_SPLITTING_WEIGHT;
 
 
 /***/ }),
@@ -2486,8 +2559,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
 //
 // UTILITIES
 //
+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 });
-const S = __webpack_require__(/*! ./settings */ "./src/settings.ts");
+const S = __importStar(__webpack_require__(/*! ./settings */ "./src/settings.ts"));
 // PLAN HELPERS
 // Is a "neighbor" in state?
 function isInState(geoID) {
@@ -2499,6 +2579,7 @@ function isOutOfState(geoID) {
     return geoID == S.OUT_OF_STATE;
 }
 exports.isOutOfState = isOutOfState;
+// TODO - 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
@@ -2512,24 +2593,6 @@ function getDistrict(plan, geoID) {
     }
 }
 exports.getDistrict = getDistrict;
-// Invert a feature assignment structure to sets of ids by district
-// NOTE - This is here vs. _data.ts, so it can also be used in cli.ts
-function invertPlan(plan) {
-    let invertedPlan = {};
-    // Add a dummy 'unassigned' district
-    invertedPlan[S.NOT_ASSIGNED] = new Set();
-    for (let geoID in plan) {
-        let districtID = plan[geoID];
-        // Make sure the set for the districtID exists
-        if (!(objectContains(invertedPlan, districtID))) {
-            invertedPlan[districtID] = new Set();
-        }
-        // Add the geoID to the districtID's set
-        invertedPlan[districtID].add(geoID);
-    }
-    return invertedPlan;
-}
-exports.invertPlan = invertPlan;
 // WORKING WITH GEOIDS
 function parseGeoID(geoID) {
     let parts = {};
@@ -2552,27 +2615,46 @@ function getFIPSFromCountyGeoID(geoID) {
     return geoID.substring(2, 5);
 }
 exports.getFIPSFromCountyGeoID = getFIPSFromCountyGeoID;
+function isWaterOnly(geoID) {
+    let waterOnlySignature = 'ZZZZZZ';
+    if (geoID.indexOf(waterOnlySignature) >= 0)
+        return true;
+    else
+        return false;
+}
+exports.isWaterOnly = isWaterOnly;
 // NORMALIZING RESULTS
-// Convert a raw score [0-1] into a normalized score [0-100]
-function normalize(rawScore, scale, invertp = false) {
-    // Invert the axis if necessary to make bigger = better
-    if (invertp) {
+function normalize(rawScore, testScale) {
+    let rangeMin = testScale.scale[0];
+    let rangeMax = testScale.scale[1];
+    // Invert the raw value if necessary to make bigger = better
+    // TODO - This works for Population Deviation, because the max is 1.0.
+    //   Generalize this???
+    if (testScale.bInvertRaw) {
         rawScore = 1.0 - rawScore;
     }
     // Coerce the value to be w/in the given range
-    let rangeMin = scale[0];
-    let rangeMax = scale[1];
     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);
+    // TODO - SPLITTING
+    // Invert the scaled value if necessary to make bigger = better
+    if (testScale.bInvertScaled) {
+        scaledValue = 1.0 - scaledValue;
+    }
     // Finally, make the range [0-100]
     return Math.round(scaledValue * S.NORMALIZED_RANGE);
 }
 exports.normalize = normalize;
 // Round a fractional number [0-1] to the desired level of PRECISION.
-function trim(fullFraction) {
-    let shiftPlaces = Math.pow(10, S.PRECISION);
-    return Math.round(fullFraction * shiftPlaces) / shiftPlaces;
+function trim(fullFraction, digits = undefined) {
+    if (digits == 0) {
+        return Math.round(fullFraction);
+    }
+    else {
+        let shiftPlaces = Math.pow(10, (digits || S.PRECISION));
+        return Math.round(fullFraction * shiftPlaces) / shiftPlaces;
+    }
 }
 exports.trim = trim;
 // ARRAY HELPERS
@@ -2601,13 +2683,14 @@ function andArray(arr) {
 }
 exports.andArray = andArray;
 // WORKING WITH OBJECT KEYS/PROPERTIES
-// TODO - Terry, is this copesetic?
+// TODO - TERRY, is this copesetic?
+// TODO - Handle integer keys?
 // Does an object have a key/property?
 function keyExists(k, o) {
     return k in o;
 }
 exports.keyExists = keyExists;
-// TODO - Terry, can these three be combined into a generic isEmpty() check?
+// TODO - TERRY, can these three be combined into a generic isEmpty() check?
 // Does an object (dict) have any keys/properties?
 function isObjectEmpty(o) {
     return Object.keys(o).length === 0;
@@ -2701,7 +2784,12 @@ function deepCopy(src) {
         return src;
 }
 exports.deepCopy = deepCopy;
-// TODO - Terry: What is this the simple explanation of what this thing is doing?
+// TODO - TRI-STATES: Map booleans to tri-states.
+function mapBooleanToTriState(bool) {
+    return (bool) ? 0 /* Green */ : 2 /* Red */;
+}
+exports.mapBooleanToTriState = mapBooleanToTriState;
+// TODO - TERRY: What is this the simple explanation of what this thing is doing?
 var util_1 = __webpack_require__(/*! @dra2020/util */ "@dra2020/util");
 exports.depthof = util_1.depthof;
 
@@ -2720,40 +2808,54 @@ exports.depthof = util_1.depthof;
 //
 // MAP/PLAN VALIDATIONS
 //
+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 });
-const U = __webpack_require__(/*! ./utils */ "./src/utils.ts");
-const S = __webpack_require__(/*! ./settings */ "./src/settings.ts");
-const D = __webpack_require__(/*! ./_data */ "./src/_data.ts");
+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"));
 //
 // COMPLETE - Are all geo's assigned to a district, and do all districts have
 //   at least one geo assigned to them?
 //
-function doIsComplete(s) {
+function doIsComplete(s, bLog = false) {
     let test = s.getTest(0 /* Complete */);
-    let bAllAssigned = true;
-    let bNoneEmpty = true;
-    let unassignedFeatures = [];
-    let emptyDistricts = [];
-    // Get the by district results, including the dummy unassigned district,
+    // Get the by-district results, including the dummy unassigned district,
     // but ignoring the N+1 summary district
     let bNotEmptyByDistrict = s.districts.statistics[D.DistrictField.bNotEmpty];
     bNotEmptyByDistrict = bNotEmptyByDistrict.slice(0, -1);
     // Are all features assigned to districts?
     // Check the dummy district that holds any unassigned features.
-    bAllAssigned = (!bNotEmptyByDistrict[S.NOT_ASSIGNED]);
+    let unassignedFeatures = [];
+    let bAllAssigned = (!bNotEmptyByDistrict[S.NOT_ASSIGNED]);
     if (!bAllAssigned) {
         let unassignedDistrict = s.plan.geoIDsForDistrictID(S.NOT_ASSIGNED);
         unassignedFeatures = Array.from(unassignedDistrict);
         unassignedFeatures = unassignedFeatures.slice(0, S.NUMBER_OF_ITEMS_TO_REPORT);
     }
     // Do all real districts have at least one feature assigned to them?
-    bNoneEmpty = U.andArray(bNotEmptyByDistrict.slice(1));
+    let emptyDistricts = [];
+    let bNoneEmpty = true;
+    bNotEmptyByDistrict = bNotEmptyByDistrict.slice(1);
+    let districtID = 1;
+    bNotEmptyByDistrict.forEach(function (bNotEmpty) {
+        if (!bNotEmpty) {
+            bNoneEmpty = false;
+            emptyDistricts.push(districtID);
+        }
+        districtID += 1;
+    });
     // Case 1 - One or more districts are missing:
     //   The # of enumerated districts minus the dummy NOT_ASSIGNED one should
     //   equal the number apportioned districts. This guards against a district
     //   not being included in a map that is imported.
     //
-    // TODO - I'm no longer checking for this, but DRA should!
+    // NOTE - I'm no longer checking for this, but DRA should!
     // Case 2 - Or a district is explicitly named but empty:
     //   Note, this can happen if a district is created, and then all features
     //   are removed from it (in DRA).
@@ -2780,7 +2882,7 @@ exports.doIsComplete = doIsComplete;
 //
 //   To test this, load the NC 2010 map 'SAMPLE-BG-map-discontiguous.csv'.
 //
-function doIsContiguous(s) {
+function doIsContiguous(s, bLog = false) {
     let test = s.getTest(1 /* Contiguous */);
     // Get the contiguity of each district. Ignore dummy unassigned district
     // and the N+1 summary district.
@@ -2811,7 +2913,7 @@ exports.doIsContiguous = doIsContiguous;
 // Are the features in a district fully connected?
 function isConnected(districtGeos, graph) {
     // export function isConnected(districtGeos: Set<string>, graph: T.ContiguityGraph): boolean {
-    // TODO - Terry, why does this constructor need a <T> type specification?
+    // TODO - TERRY, why does this constructor need a <T> type specification?
     let visited = new Set();
     let toProcess = [];
     // Start processing with the first geoID in the district
@@ -2826,7 +2928,7 @@ function isConnected(districtGeos, graph) {
         let actualNeighbors = graph.peerNeighbors(node).filter(x => U.isInState(x));
         // Add neighbors to visit, if they're in the same district Y haven't already been visited
         let neighborsToVisit = actualNeighbors.filter(x => districtGeos.has(x) && (!visited.has(x)));
-        // TODO - Terry, is this the quickest/best way to do this?
+        // TODO - TERRY, is this the quickest/best way to do this?
         toProcess.push(...neighborsToVisit);
     }
     // Stop when you've visited all the geoIDs in the district
@@ -2843,10 +2945,10 @@ exports.isConnected = isConnected;
 //   To test this, load the NC 2010 map 'SAMPLE-BG-map-hole.csv'. District 1,
 //   Buncombe County (37021), is a donut hole w/in District 3.
 //
-// TODO - Optimize this to take advantage of district boundary info, if/when
+// TODO - OPTIMIZE: This to take advantage of district boundary info, if/when
 //   we cache one to optimize compactness.
 //
-function doIsFreeOfHoles(s) {
+function doIsFreeOfHoles(s, bLog = false) {
     let test = s.getTest(2 /* FreeOfHoles */);
     // Initialize values
     let bFreeOfHoles = true;
@@ -2877,7 +2979,7 @@ function doIsFreeOfHoles(s) {
 exports.doIsFreeOfHoles = doIsFreeOfHoles;
 // Test whether one district is embedded w/in any other.
 function isEmbedded(districtID, geoIDs, plan, graph) {
-    // TODO - Make "features" = "geoIDs." These aren't "features" proper, just
+    // NOTE - "features" here = "geoIDs." These aren't "features" proper, just
     //   identifier strings.
     let features = geoIDs;
     let planByGeo = plan.byGeoID();
@@ -2885,7 +2987,7 @@ function isEmbedded(districtID, geoIDs, plan, graph) {
     let bEmbedded = true;
     // Keep track of the neighoring districts
     let neighboringDistricts = new Set();
-    // TODO - Use just the boundary features, when available
+    // TODO - OPTIMIZE: Use just the boundary features, when available
     // Get the features for the real district
     let featuresToCheck = Array.from(features);
     // If the district has features, check whether it is embedded
@@ -2911,7 +3013,7 @@ function isEmbedded(districtID, geoIDs, plan, graph) {
                         break;
                     }
                     else {
-                        // TODO - Since we're checking *all* features in a district right
+                        // TODO - OPTIMIZE: Since we're checking *all* features in a district right
                         //   now, not just boundary features and neighbors in other districts,
                         //   prune out the current district. If/when we optimize compactness
                         //   to cache district boundaries (as before in my Python implementation),
@@ -2937,16 +3039,19 @@ function isEmbedded(districtID, geoIDs, plan, graph) {
     return bEmbedded;
 }
 exports.isEmbedded = isEmbedded;
-// TODO - MIXED MAPS
-// - When we generalize to mixed maps, the determination of "neighbors in
-//   the map" -- which is the core function in determining connectedness -- becomes
-//   *much* more complicated and dynamic.
-// - I can write up (if not implement) the logic for this. It is a bit tricky
-//   and requires special preprocessing of the summary level hierarchy (which I
-//   also have a script for that we can repurpose) to distinguish between 'interior'
-//   and 'edge' children.
 
 
+/***/ }),
+
+/***/ "./static/state-reqs.json":
+/*!********************************!*\
+  !*** ./static/state-reqs.json ***!
+  \********************************/
+/*! exports provided: AL, AK, AZ, AR, CA, CO, CT, DE, FL, GA, HI, ID, IL, IN, IA, KS, KY, LA, ME, MD, MA, MI, MN, MS, MO, MT, NE, NV, NH, NJ, NM, NY, NC, ND, OH, OK, OR, PA, RI, SC, SD, TN, TX, UT, VT, VA, WA, WV, WI, WY, default */
+/***/ (function(module) {
+
+module.exports = JSON.parse("{\"AL\":\"https://www.brennancenter.org/sites/default/files/publications/2019_06_50States_FINALsinglepages_01.pdf\",\"AK\":\"https://www.brennancenter.org/sites/default/files/publications/2019_06_50States_FINALsinglepages_02.pdf\",\"AZ\":\"https://www.brennancenter.org/sites/default/files/publications/2019_06_50States_FINALsinglepages_03.pdf\",\"AR\":\"https://www.brennancenter.org/sites/default/files/publications/2019_06_50States_FINALsinglepages_04.pdf\",\"CA\":\"https://www.brennancenter.org/sites/default/files/publications/2019_06_50States_FINALsinglepages_05.pdf\",\"CO\":\"https://www.brennancenter.org/sites/default/files/publications/2019_06_50States_FINALsinglepages_06.pdf\",\"CT\":\"https://www.brennancenter.org/sites/default/files/publications/2019_06_50States_FINALsinglepages_07.pdf\",\"DE\":\"https://www.brennancenter.org/sites/default/files/publications/2019_06_50States_FINALsinglepages_08.pdf\",\"FL\":\"https://www.brennancenter.org/sites/default/files/publications/2019_06_50States_FINALsinglepages_09.pdf\",\"GA\":\"https://www.brennancenter.org/sites/default/files/publications/2019_06_50States_FINALsinglepages_10.pdf\",\"HI\":\"https://www.brennancenter.org/sites/default/files/publications/2019_06_50States_FINALsinglepages_11.pdf\",\"ID\":\"https://www.brennancenter.org/sites/default/files/publications/2019_06_50States_FINALsinglepages_12.pdf\",\"IL\":\"https://www.brennancenter.org/sites/default/files/publications/2019_06_50States_FINALsinglepages_13.pdf\",\"IN\":\"https://www.brennancenter.org/sites/default/files/publications/2019_06_50States_FINALsinglepages_14.pdf\",\"IA\":\"https://www.brennancenter.org/sites/default/files/publications/2019_06_50States_FINALsinglepages_15.pdf\",\"KS\":\"https://www.brennancenter.org/sites/default/files/publications/2019_06_50States_FINALsinglepages_16.pdf\",\"KY\":\"https://www.brennancenter.org/sites/default/files/publications/2019_06_50States_FINALsinglepages_17.pdf\",\"LA\":\"https://www.brennancenter.org/sites/default/files/publications/2019_06_50States_FINALsinglepages_18.pdf\",\"ME\":\"https://www.brennancenter.org/sites/default/files/publications/2019_06_50States_FINALsinglepages_19.pdf\",\"MD\":\"https://www.brennancenter.org/sites/default/files/publications/2019_06_50States_FINALsinglepages_20.pdf\",\"MA\":\"https://www.brennancenter.org/sites/default/files/publications/2019_06_50States_FINALsinglepages_21.pdf\",\"MI\":\"https://www.brennancenter.org/sites/default/files/publications/2019_06_50States_FINALsinglepages_22.pdf\",\"MN\":\"https://www.brennancenter.org/sites/default/files/publications/2019_06_50States_FINALsinglepages_23.pdf\",\"MS\":\"https://www.brennancenter.org/sites/default/files/publications/2019_06_50States_FINALsinglepages_24.pdf\",\"MO\":\"https://www.brennancenter.org/sites/default/files/publications/2019_06_50States_FINALsinglepages_25.pdf\",\"MT\":\"https://www.brennancenter.org/sites/default/files/publications/2019_06_50States_FINALsinglepages_26.pdf\",\"NE\":\"https://www.brennancenter.org/sites/default/files/publications/2019_06_50States_FINALsinglepages_27.pdf\",\"NV\":\"https://www.brennancenter.org/sites/default/files/publications/2019_06_50States_FINALsinglepages_28.pdf\",\"NH\":\"https://www.brennancenter.org/sites/default/files/publications/2019_06_50States_FINALsinglepages_29.pdf\",\"NJ\":\"https://www.brennancenter.org/sites/default/files/publications/2019_06_50States_FINALsinglepages_30.pdf\",\"NM\":\"https://www.brennancenter.org/sites/default/files/publications/2019_06_50States_FINALsinglepages_31.pdf\",\"NY\":\"https://www.brennancenter.org/sites/default/files/publications/2019_06_50States_FINALsinglepages_32.pdf\",\"NC\":\"https://www.brennancenter.org/sites/default/files/publications/2019_06_50States_FINALsinglepages_33.pdf\",\"ND\":\"https://www.brennancenter.org/sites/default/files/publications/2019_06_50States_FINALsinglepages_34.pdf\",\"OH\":\"https://www.brennancenter.org/sites/default/files/publications/2019_06_50States_FINALsinglepages_35.pdf\",\"OK\":\"https://www.brennancenter.org/sites/default/files/publications/2019_06_50States_FINALsinglepages_36.pdf\",\"OR\":\"https://www.brennancenter.org/sites/default/files/publications/2019_06_50States_FINALsinglepages_37.pdf\",\"PA\":\"https://www.brennancenter.org/sites/default/files/publications/2018_05_50States_FINALsinglepages_38.pdf\",\"RI\":\"https://www.brennancenter.org/sites/default/files/publications/2019_06_50States_FINALsinglepages_39.pdf\",\"SC\":\"https://www.brennancenter.org/sites/default/files/publications/2019_06_50States_FINALsinglepages_40.pdf\",\"SD\":\"https://www.brennancenter.org/sites/default/files/publications/2019_06_50States_FINALsinglepages_41.pdf\",\"TN\":\"https://www.brennancenter.org/sites/default/files/publications/2019_06_50States_FINALsinglepages_42.pdf\",\"TX\":\"https://www.brennancenter.org/sites/default/files/publications/2019_06_50States_FINALsinglepages_43.pdf\",\"UT\":\"https://www.brennancenter.org/sites/default/files/publications/2019_06_50States_FINALsinglepages_44.pdf\",\"VT\":\"https://www.brennancenter.org/sites/default/files/publications/2019_06_50States_FINALsinglepages_45.pdf\",\"VA\":\"https://www.brennancenter.org/sites/default/files/publications/2019_06_50States_FINALsinglepages_46.pdf\",\"WA\":\"https://www.brennancenter.org/sites/default/files/publications/2019_06_50States_FINALsinglepages_47.pdf\",\"WV\":\"https://www.brennancenter.org/sites/default/files/publications/2019_06_50States_FINALsinglepages_48.pdf\",\"WI\":\"https://www.brennancenter.org/sites/default/files/publications/2019_06_50States_FINALsinglepages_49.pdf\",\"WY\":\"https://www.brennancenter.org/sites/default/files/publications/2019_06_50States_FINALsinglepages_50.pdf\"}");
+
 /***/ }),
 
 /***/ "@dra2020/poly":