@dra2020/district-analytics 3.2.0 → 3.3.0

package/dist/cli.js

@@ -89264,7 +89264,15 @@ module.exports = g;
 //
 // 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 C = __importStar(__webpack_require__(/*! ./config */ "./src/config.ts"));
 const score_1 = __webpack_require__(/*! ./score */ "./src/score.ts");
 class Scorer {
     constructor() {
@@ -89272,6 +89280,9 @@ class Scorer {
     score(profile, overridesJSON) {
         return score_1.scorePlan(profile, overridesJSON);
     }
+    populationDeviationThreshold(bLegislative) {
+        return C.popdevThreshold(bLegislative);
+    }
 }
 exports.Scorer = Scorer;
 
@@ -89300,27 +89311,33 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const U = __importStar(__webpack_require__(/*! ./utils */ "./src/utils.ts"));
 const S = __importStar(__webpack_require__(/*! ./settings */ "./src/settings.ts"));
+const C = __importStar(__webpack_require__(/*! ./config */ "./src/config.ts"));
 const normalize_1 = __webpack_require__(/*! ./normalize */ "./src/normalize.ts");
 function scoreCountySplitting(rawValue, nCounties, nDistricts) {
     const _normalizer = new normalize_1.Normalizer(rawValue);
-    const stateCountySplitThreshold = countySplitThreshold(nCounties, nDistricts);
-    _normalizer.clip(S.COUNTY_BEST, stateCountySplitThreshold);
-    _normalizer.unitize(S.COUNTY_BEST, stateCountySplitThreshold);
+    const best = C.countySplittingRange()[C.BEG];
+    const worst = countySplitThreshold(nCounties, nDistricts);
+    _normalizer.clip(best, worst);
+    _normalizer.unitize(best, worst);
     _normalizer.invert();
     _normalizer.rescale();
     return _normalizer.normalizedNum;
 }
 exports.scoreCountySplitting = scoreCountySplitting;
 function countySplitThreshold(nCounties, nDistricts) {
-    const nAllowableSplits = Math.min(S.ALLOWABLE_SPLITS_MULTIPLIER * (nDistricts - 1));
-    const threshold = ((nAllowableSplits * S.COUNTY_WORST) + ((nCounties - nAllowableSplits) * 1.0)) / nCounties;
+    const m = C.allowableSplitsMultiplier();
+    const worst = C.countySplittingRange()[1];
+    const nAllowableSplits = Math.min(m * (nDistricts - 1));
+    const threshold = ((nAllowableSplits * worst) + ((nCounties - nAllowableSplits) * 1.0)) / nCounties;
     return threshold;
 }
 exports.countySplitThreshold = countySplitThreshold;
 function scoreDistrictSplitting(rawValue) {
     const _normalizer = new normalize_1.Normalizer(rawValue);
-    _normalizer.clip(S.DISTRICT_BEST, S.DISTRICT_WORST);
-    _normalizer.unitize(S.DISTRICT_BEST, S.DISTRICT_WORST);
+    const best = C.districtSplittingRange()[C.BEG];
+    const worst = C.districtSplittingRange()[C.END];
+    _normalizer.clip(best, worst);
+    _normalizer.unitize(best, worst);
     _normalizer.invert();
     _normalizer.rescale();
     return _normalizer.normalizedNum;
@@ -89593,7 +89610,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const U = __importStar(__webpack_require__(/*! ./utils */ "./src/utils.ts"));
-const S = __importStar(__webpack_require__(/*! ./settings */ "./src/settings.ts"));
+const C = __importStar(__webpack_require__(/*! ./config */ "./src/config.ts"));
 const normalize_1 = __webpack_require__(/*! ./normalize */ "./src/normalize.ts");
 // Migrated from district-analytics:
 // Measures of compactness compare district shapes to various ideally compact
@@ -89715,8 +89732,10 @@ function calcReock(area, diameter) {
 exports.calcReock = calcReock;
 function scoreReock(rawValue) {
     const _normalizer = new normalize_1.Normalizer(rawValue);
-    _normalizer.clip(S.REOCK_WORST, S.REOCK_BEST);
-    _normalizer.unitize(S.REOCK_WORST, S.REOCK_BEST);
+    const worst = C.reockRange()[C.BEG];
+    const best = C.reockRange()[C.END];
+    _normalizer.clip(worst, best);
+    _normalizer.unitize(worst, best);
     _normalizer.rescale();
     return _normalizer.normalizedNum;
 }
@@ -89734,12 +89753,12 @@ function doPolsbyPopper(g, bLog = false) {
         if (districtProps) {
             let a = districtProps[0 /* Area */];
             let p = districtProps[1 /* Perimeter */];
-            let polsbyPopper = calcPolsbyPopper(a, p);
+            let polsby = calcPolsbyPopper(a, p);
             // Save each district score
-            scores.push(polsbyPopper);
+            scores.push(polsby);
             // Echo the results by district
             if (bLog)
-                console.log("Polsby-Popper for district", districtID, "=", polsbyPopper);
+                console.log("Polsby-Popper for district", districtID, "=", polsby);
         }
         else {
             console.log("No shape or no geopropertes in Polsby-Popper ...");
@@ -89762,14 +89781,202 @@ function calcPolsbyPopper(area, perimeter) {
 exports.calcPolsbyPopper = calcPolsbyPopper;
 function scorePolsbyPopper(rawValue) {
     const _normalizer = new normalize_1.Normalizer(rawValue);
-    _normalizer.clip(S.POLSBY_WORST, S.POLSBY_BEST);
-    _normalizer.unitize(S.POLSBY_WORST, S.POLSBY_BEST);
+    const worst = C.polsbyRange()[C.BEG];
+    const best = C.polsbyRange()[C.END];
+    _normalizer.clip(worst, best);
+    _normalizer.unitize(worst, best);
     _normalizer.rescale();
     return _normalizer.normalizedNum;
 }
 exports.scorePolsbyPopper = scorePolsbyPopper;
 
 
+/***/ }),
+
+/***/ "./src/config.json":
+/*!*************************!*\
+  !*** ./src/config.json ***!
+  \*************************/
+/*! exports provided: partisan, traditionalPrinciples, default */
+/***/ (function(module) {
+
+module.exports = JSON.parse("{\"partisan\":{\"bias\":{\"range\":[0,0.2],\"weight\":[50,80]},\"impact\":{\"weight\":[50,0],\"threshold\":4},\"competitiveness\":{\"overall\":{\"range\":[0,0.67],\"weight\":25},\"marginal\":{\"range\":[0,0.85],\"weight\":75},\"range\":[0.45,0.55],\"distribution\":[0.25,0.75],\"weight\":[0,20]},\"weight\":[100,80]},\"traditionalPrinciples\":{\"compactness\":{\"reock\":{\"range\":[0.25,0.5],\"weight\":50},\"polsby\":{\"range\":[0.1,0.5],\"weight\":50},\"weight\":[0,50]},\"splitting\":{\"county\":{\"range\":[1,1.71],\"allowableSplitsMultiplier\":1.5,\"weight\":50},\"district\":{\"range\":[1,1.5],\"weight\":50},\"weight\":[0,50]},\"popdev\":{\"range\":[[0.0075,0.002],[0.1,-1]],\"weight\":[0,0]},\"weight\":[0,20]}}");
+
+/***/ }),
+
+/***/ "./src/config.ts":
+/*!***********************!*\
+  !*** ./src/config.ts ***!
+  \***********************/
+/*! no static exports found */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+//
+// THRESHOLDS, SCALES, AND WEIGHTS FOR SCORING MODEL
+//
+// * A layer of functions over config.json, so that they can be overridden dynamically (TODO)
+//
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+// Defaults
+const config_json_1 = __importDefault(__webpack_require__(/*! ./config.json */ "./src/config.json"));
+exports.BEG = 0;
+exports.END = 1;
+// PARTISAN
+function biasWeight(context, overridesJSON) {
+    const bW = config_json_1.default.partisan.bias.weight[context];
+    return bW;
+}
+exports.biasWeight = biasWeight;
+function biasRange(overridesJSON) {
+    const range = config_json_1.default.partisan.bias.range;
+    return range;
+}
+exports.biasRange = biasRange;
+function impactWeight(context, overridesJSON) {
+    const iW = config_json_1.default.partisan.impact.weight[context];
+    return iW;
+}
+exports.impactWeight = impactWeight;
+// The maximum # of unearned seats that scores positively
+function unearnedThreshold(overridesJSON) {
+    const threshold = config_json_1.default.partisan.impact.threshold;
+    return threshold;
+}
+exports.unearnedThreshold = unearnedThreshold;
+function competitivenessWeight(context, overridesJSON) {
+    const cW = config_json_1.default.partisan.competitiveness.weight[context];
+    return cW;
+}
+exports.competitivenessWeight = competitivenessWeight;
+function competitiveRange(overridesJSON) {
+    const range = config_json_1.default.partisan.competitiveness.range;
+    return range;
+}
+exports.competitiveRange = competitiveRange;
+function competitiveDistribution(overridesJSON) {
+    const dist = config_json_1.default.partisan.competitiveness.distribution;
+    return dist;
+}
+exports.competitiveDistribution = competitiveDistribution;
+function overallCompetitivenessRange(overridesJSON) {
+    const range = config_json_1.default.partisan.competitiveness.overall.range;
+    return range;
+}
+exports.overallCompetitivenessRange = overallCompetitivenessRange;
+function marginalCompetitivenessRange(overridesJSON) {
+    const range = config_json_1.default.partisan.competitiveness.marginal.range;
+    return range;
+}
+exports.marginalCompetitivenessRange = marginalCompetitivenessRange;
+function marginalCompetitivenessWeight(overridesJSON) {
+    const mcW = config_json_1.default.partisan.competitiveness.marginal.weight;
+    return mcW;
+}
+exports.marginalCompetitivenessWeight = marginalCompetitivenessWeight;
+function overallCompetitivenessWeight(overridesJSON) {
+    const ocW = config_json_1.default.partisan.competitiveness.overall.weight;
+    return ocW;
+}
+exports.overallCompetitivenessWeight = overallCompetitivenessWeight;
+// TRADITIONAL DISTRICTING PRINCIPLES
+function compactnessWeight(context, overridesJSON) {
+    const cW = config_json_1.default.traditionalPrinciples.compactness.weight[context];
+    return cW;
+}
+exports.compactnessWeight = compactnessWeight;
+function reockWeight(overridesJSON) {
+    const rW = config_json_1.default.traditionalPrinciples.compactness.reock.weight;
+    return rW;
+}
+exports.reockWeight = reockWeight;
+function reockRange(overridesJSON) {
+    const range = config_json_1.default.traditionalPrinciples.compactness.reock.range;
+    return range;
+}
+exports.reockRange = reockRange;
+function polsbyWeight(overridesJSON) {
+    const ppW = config_json_1.default.traditionalPrinciples.compactness.polsby.weight;
+    return ppW;
+}
+exports.polsbyWeight = polsbyWeight;
+function polsbyRange(overridesJSON) {
+    const range = config_json_1.default.traditionalPrinciples.compactness.polsby.range;
+    return range;
+}
+exports.polsbyRange = polsbyRange;
+function splittingWeight(context, overridesJSON) {
+    const sW = config_json_1.default.traditionalPrinciples.splitting.weight[context];
+    return sW;
+}
+exports.splittingWeight = splittingWeight;
+function countySplittingWeight(overridesJSON) {
+    const csW = config_json_1.default.traditionalPrinciples.splitting.county.weight;
+    return csW;
+}
+exports.countySplittingWeight = countySplittingWeight;
+function countySplittingRange(overridesJSON) {
+    const range = config_json_1.default.traditionalPrinciples.splitting.county.range;
+    return range;
+}
+exports.countySplittingRange = countySplittingRange;
+function allowableSplitsMultiplier(overridesJSON) {
+    const m = config_json_1.default.traditionalPrinciples.splitting.county.allowableSplitsMultiplier;
+    return m;
+}
+exports.allowableSplitsMultiplier = allowableSplitsMultiplier;
+function districtSplittingWeight(overridesJSON) {
+    const dsW = config_json_1.default.traditionalPrinciples.splitting.district.weight;
+    return dsW;
+}
+exports.districtSplittingWeight = districtSplittingWeight;
+function districtSplittingRange(overridesJSON) {
+    const range = config_json_1.default.traditionalPrinciples.splitting.district.range;
+    return range;
+}
+exports.districtSplittingRange = districtSplittingRange;
+function popdevWeight(context, overridesJSON) {
+    const pdW = config_json_1.default.traditionalPrinciples.popdev.weight[context];
+    return pdW;
+}
+exports.popdevWeight = popdevWeight;
+// NOTE - Raw ranges, not inverted (i.e., smaller is better)
+// NOTE - This could be optimized to not calc LD values for CD's (or do it once)
+function popdevRange(bLegislative, overridesJSON) {
+    const cdRange = config_json_1.default.traditionalPrinciples.popdev.range[0 /* Congressional */];
+    const worstCD = cdRange[exports.BEG];
+    const bestCD = cdRange[exports.END];
+    const ldRange = config_json_1.default.traditionalPrinciples.popdev.range[1 /* StateLegislative */];
+    const iRange = bLegislative ? ldRange : cdRange;
+    const worst = iRange[exports.BEG];
+    const best = bLegislative ? (bestCD / worstCD) * iRange[exports.BEG] : iRange[exports.END];
+    // Invert the range, so bigger is better.
+    return [worst, best];
+}
+exports.popdevRange = popdevRange;
+// NOTE - Raw threshold, not inverted (i.e., smaller is better)
+function popdevThreshold(bLegislative, overridesJSON) {
+    const threshold = popdevRange(bLegislative)[exports.BEG];
+    return threshold;
+}
+exports.popdevThreshold = popdevThreshold;
+// OVERALL SCORE 
+function partisanWeight(context, overridesJSON) {
+    const pW = config_json_1.default.partisan.weight[context];
+    return pW;
+}
+exports.partisanWeight = partisanWeight;
+function traditionalPrinciplesWeight(context, overridesJSON) {
+    const tpW = config_json_1.default.traditionalPrinciples.weight[context];
+    return tpW;
+}
+exports.traditionalPrinciplesWeight = traditionalPrinciplesWeight;
+
+
 /***/ }),
 
 /***/ "./src/equal.ts":
@@ -89793,7 +90000,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const U = __importStar(__webpack_require__(/*! ./utils */ "./src/utils.ts"));
-const S = __importStar(__webpack_require__(/*! ./settings */ "./src/settings.ts"));
+const C = __importStar(__webpack_require__(/*! ./config */ "./src/config.ts"));
 const normalize_1 = __webpack_require__(/*! ./normalize */ "./src/normalize.ts");
 // Migrated from district-analytics
 // Expect a full dict of district IDs & values (which might be zero = empty)
@@ -89814,7 +90021,7 @@ function doPopulationDeviation(e, targetSize, bLegislative, bLog = false) {
     // Round the raw value to the desired level of precision
     const popDev = U.trim((max - min) / targetSize);
     const score = scorePopulationDeviation(popDev, bLegislative);
-    const threshold = bLegislative ? S.POPDEV_WORST_LD : S.POPDEV_WORST;
+    const threshold = C.popdevThreshold(bLegislative);
     const notes = {
         'maxDeviation': max - min,
         'threshold': threshold
@@ -89830,11 +90037,11 @@ function doPopulationDeviation(e, targetSize, bLegislative, bLog = false) {
 exports.doPopulationDeviation = doPopulationDeviation;
 function scorePopulationDeviation(rawValue, bLegislative) {
     const _normalizer = new normalize_1.Normalizer(rawValue);
-    const rangeMin = bLegislative ? S.POPEQ_MIN_LD : S.POPEQ_MIN;
-    const rangeMax = bLegislative ? S.POPEQ_MAX_LD : S.POPEQ_MAX;
+    // Raw range in not inverted (i.e., smaller is better)
+    const range = C.popdevRange(bLegislative);
     _normalizer.invert();
-    _normalizer.clip(rangeMin, rangeMax);
-    _normalizer.unitize(rangeMin, rangeMax);
+    _normalizer.clip(1.0 - range[C.BEG], 1.0 - range[C.END]);
+    _normalizer.unitize(1.0 - range[C.BEG], 1.0 - range[C.END]);
     _normalizer.rescale();
     return _normalizer.normalizedNum;
 }
@@ -89843,10 +90050,129 @@ exports.scorePopulationDeviation = scorePopulationDeviation;
 
 /***/ }),
 
-/***/ "./src/fair.ts":
-/*!*********************!*\
-  !*** ./src/fair.ts ***!
-  \*********************/
+/***/ "./src/index.ts":
+/*!**********************!*\
+  !*** ./src/index.ts ***!
+  \**********************/
+/*! no static exports found */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+//
+// SCORE PACKAGE API
+//
+function __export(m) {
+    for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
+}
+Object.defineProperty(exports, "__esModule", { value: true });
+__export(__webpack_require__(/*! ./_api */ "./src/_api.ts"));
+var types_1 = __webpack_require__(/*! ./types */ "./src/types.ts");
+exports.sampleProfile = types_1.sampleProfile;
+exports.sampleScorecard = types_1.sampleScorecard;
+
+
+/***/ }),
+
+/***/ "./src/normalize.ts":
+/*!**************************!*\
+  !*** ./src/normalize.ts ***!
+  \**************************/
+/*! no static exports found */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+//
+// NORMALIZATION 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 = __importStar(__webpack_require__(/*! ./settings */ "./src/settings.ts"));
+class Normalizer {
+    constructor(rawValue) {
+        this.rawNum = rawValue;
+        this.wipNum = this.rawNum;
+    }
+    // *Don't* transform the input.
+    identity() {
+        return this.wipNum;
+    }
+    positive() {
+        this.wipNum = Math.abs(this.wipNum);
+        return this.wipNum;
+    }
+    // Invert a value in the unit range [0.0–1.0] (so that bigger is better).
+    invert() {
+        // TODO - DAVID: Can we make this throw an Error and expect that in unit test?
+        console.assert(((this.wipNum >= 0.0) && (this.wipNum <= 1.0)), "Inverting: " + S.OUT_OF_RANGE_MSG, this.wipNum);
+        this.wipNum = 1.0 - this.wipNum;
+        return this.wipNum;
+    }
+    // Constrain the value to be within a specified range.
+    clip(begin_range, end_range) {
+        // Handle the ends of the range being given either order
+        const min_range = Math.min(begin_range, end_range);
+        const max_range = Math.max(begin_range, end_range);
+        this.wipNum = Math.max(Math.min(this.wipNum, max_range), min_range);
+        return this.wipNum;
+    }
+    // Recast the value as the delta from a baseline value. NOOP if it is zero.
+    // NOTE - Values can be + or -.
+    rebase(base) {
+        this.wipNum = this.wipNum - base;
+        return this.wipNum;
+    }
+    // Re-scale a value into the [0.0 – 1.0] range, using a given range.
+    // NOTE - This assumes that values have alrady been clipped into the range.
+    unitize(begin_range, end_range) {
+        const min_range = Math.min(begin_range, end_range);
+        const max_range = Math.max(begin_range, end_range);
+        // TODO - DAVID: Can we make this throw an Error and expect that in unit test?
+        console.assert(((this.wipNum >= min_range) && (this.wipNum <= max_range)), "Unitizing: " + S.OUT_OF_RANGE_MSG, this.wipNum);
+        const ranged = this.wipNum - min_range;
+        this.wipNum = Math.abs(ranged / (end_range - begin_range));
+        return this.wipNum;
+    }
+    // Decay a value in the unit range [0.0–1.0] by its distance from zero.
+    // NOTE - If the range is already such that "bigger is better," then the closer
+    //   the value is to 1.0 (the best) the *less* it will decay.
+    decay(fn = 0 /* Gravity */) {
+        // TODO - DAVID: Can we make this throw an Error and expect that in unit test?
+        console.assert(((this.wipNum >= 0.0) && (this.wipNum <= 1.0)), "Decaying: " + S.OUT_OF_RANGE_MSG, this.wipNum);
+        switch (fn) {
+            case 0 /* Gravity */: {
+                this.wipNum = Math.pow(this.wipNum, S.DISTANCE_WEIGHT);
+                return this.wipNum;
+            }
+            default: {
+                throw new Error("Decay function not recognized.");
+            }
+        }
+    }
+    // Translate a value in the unit range to the user-friendly range [0 – 100].
+    rescale() {
+        // TODO - DAVID: Can we make this throw an Error and expect that in unit test?
+        console.assert(((this.wipNum >= 0.0) && (this.wipNum <= 1.0)), "Rescaling: " + S.OUT_OF_RANGE_MSG, this.wipNum);
+        this.normalizedNum = Math.round(this.wipNum * S.NORMALIZED_RANGE);
+        return this.normalizedNum;
+    }
+}
+exports.Normalizer = Normalizer;
+
+
+/***/ }),
+
+/***/ "./src/partisan.ts":
+/*!*************************!*\
+  !*** ./src/partisan.ts ***!
+  \*************************/
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
@@ -89865,48 +90191,61 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const U = __importStar(__webpack_require__(/*! ./utils */ "./src/utils.ts"));
 const S = __importStar(__webpack_require__(/*! ./settings */ "./src/settings.ts"));
+const C = __importStar(__webpack_require__(/*! ./config */ "./src/config.ts"));
 const normalize_1 = __webpack_require__(/*! ./normalize */ "./src/normalize.ts");
 // NOTE - I'm passing T.VfArray's into everything. District indices = array indices.
 // NOTE - I do not (cannot) assume that the values are sorted.
 // SCORE BIAS & COMPETITIVENESS
-/* SCORECARD FIELDS:
+/* SCORECARD FIELDS <<< TODO: Update
 
 * ^S# [BestS] = the Democratic seats closest to proportional
 * ^S% [BestSf] = the corresponding Democratic seat share
-* F# [FptpS] = the estimated number of Democratic seats using first past the post
+* S! [FptpS] = the estimated number of Democratic seats using first past the post
 * S# [ProbableS] = the estimated Democratic seats, using seat probabilities
 * S% [ProbableSf] = the estimated Democratic seat share fraction, calculated as S# / N
+* UE# [UnearnedS] = the number of unearned seats (R = positive; D = negative)
 * B% [Bias]= the bias calculated as S% – ^S%
 * B$ [BiasScore] = the bias score normalized [0–100]
 
 * R# [R] = the responsiveness at V%
 * Rd [Rd] = the estimated # of responsive districts (using probabilities)
 * Rd% [Rdf] = the estimated # of responsive districts, as a fraction of N
+
+* C [C] = the number of districts that fall into the range [45–55%]
 * Cd [Cd] = the estimated # of competitive districts, using probabilities & a narrower [0.25–0.75] range
 * Cd% [Cdf] = the estimated # of competitive districts, as a fraction of N
+* [beg, end] [Mrange] = the 1–N indices for the first and last district that separate the likely result and the proportional result
+* Md [Md] = the competitiveness of the marginal districts
 * Md% [Mdf] = the probability that the marginal seats will flip, so S% => ^S%
 * C$ [CompetitiveScore] = the competitiveness score normalized [0–100]
 
-* $$$ = the combined partisan score normalize [0–100]
+* F$ = the combined partisan score normalize [0–100]
 
 */
-function scorePartisan(Vf, VfArray, all = false) {
+function scorePartisan(Vf, VfArray, bAll = false, bConstrained = true) {
     const N = VfArray.length;
     const BestS = bestSeats(N, Vf);
     const BestSf = bestSeatShare(BestS, N);
-    const FptpS = all ? estFPTPSeats(VfArray) : undefined;
-    const ProbableS = estProbableSeats(VfArray);
+    const FptpS = bAll ? estFPTPSeats(VfArray) : undefined;
+    const range = bConstrained ? C.competitiveDistribution() : undefined;
+    const ProbableS = estProbableSeats(VfArray, range);
     const ProbableSf = estProbableSeatShare(ProbableS, N);
     const Bias = estBias(ProbableSf, BestSf);
-    const normalizedBias = scoreBias(Bias, Vf, ProbableSf, N);
-    const inferredSVpoints = all ? inferSVpoints(Vf, VfArray) : undefined;
-    const R = all ? estResponsiveness(Vf, inferredSVpoints) : undefined;
-    const Rd = all ? estResponsiveDistricts(VfArray) : undefined;
-    const Rdf = all ? estResponsiveDistrictsShare(Rd, N) : undefined;
-    const Cd = estCompetitiveDistricts(VfArray);
+    const biasScore = scoreBias(Bias, Vf, ProbableSf, N);
+    const UnearnedS = estUnearnedSeats(BestS, ProbableS);
+    const impactScore = scoreImpact(UnearnedS);
+    const bInferSV = (bAll || (!bConstrained));
+    const inferredSVpoints = bInferSV ? inferSVpoints(Vf, VfArray, range) : undefined;
+    const R = bInferSV ? estResponsiveness(Vf, inferredSVpoints) : undefined;
+    const Rd = bInferSV ? estResponsiveDistricts(VfArray) : undefined;
+    const Rdf = bInferSV ? estResponsiveDistrictsShare(Rd, N) : undefined;
+    const Cn = countCompetitiveDistricts(VfArray);
+    const Cd = bConstrained ? estCompetitiveDistricts(VfArray) : Rd;
     const Cdf = estCompetitiveDistrictsShare(Cd, N);
-    const Mdf = estMarginalCompetitiveShare(Vf, VfArray, N);
-    const normalizedCompetitiveness = scoreCompetitiveness(Mdf, Cdf);
+    const Mrange = findMarginalDistricts(Vf, VfArray, N);
+    const Md = estMarginalCompetitiveDistricts(Mrange, VfArray);
+    const Mdf = estMarginalCompetitiveShare(Md, Mrange);
+    const competitivenessScore = scoreCompetitiveness(Mdf, Cdf);
     const biasScoring = {
         BestS: BestS,
         BestSf: BestSf,
@@ -89914,61 +90253,73 @@ function scorePartisan(Vf, VfArray, all = false) {
         ProbableS: ProbableS,
         ProbableSf: ProbableSf,
         Bias: Bias,
-        normalized: normalizedBias
+        score: biasScore
     };
-    let competitiveScoring;
-    if (all) {
-        competitiveScoring = {
-            R: R,
-            Rd: Rd,
-            Rdf: Rdf,
-            Cd: Cd,
-            Cdf: Cdf,
-            Mdf: Mdf,
-            normalized: normalizedCompetitiveness
-        };
-    }
-    else {
-        competitiveScoring = {
-            Cd: Cd,
-            Cdf: Cdf,
-            Mdf: Mdf,
-            normalized: normalizedCompetitiveness
-        };
-    }
+    const impactScoring = {
+        UnearnedS: UnearnedS,
+        score: impactScore
+    };
+    let competitiveScoring = {
+        R: R,
+        Rd: Rd,
+        Rdf: Rdf,
+        C: Cn,
+        Cd: Cd,
+        Cdf: Cdf,
+        Mrange: Mrange,
+        Md: Md,
+        Mdf: Mdf,
+        score: competitivenessScore
+    };
+    if (bAll) {
+        competitiveScoring.R = R;
+        competitiveScoring.Rd = Rd;
+        competitiveScoring.Rdf = Rdf;
+    }
+    // Weight bias, impact, and competitiveness into partisan scores to compare
+    // plans across states and within a state.
+    const bS = biasScoring.score;
+    const iS = impactScoring.score;
+    const cS = competitiveScoring.score;
+    const acrossStatesPartisanScore = weightPartisan(bS, iS, cS, 0 /* AcrossStates */);
+    const withinStatesPartisanScore = weightPartisan(bS, iS, cS, 1 /* WithinAState */);
     const s = {
         bias: biasScoring,
-        competitiveness: competitiveScoring
+        impact: impactScoring,
+        competitiveness: competitiveScoring,
+        score: acrossStatesPartisanScore,
+        score2: withinStatesPartisanScore
     };
     return s;
 }
 exports.scorePartisan = scorePartisan;
-function weightPartisan(b, c) {
-    return Math.round(((S.BIAS_WEIGHT * b) + (S.COMPETITIVE_WEIGHT * c)) / (S.BIAS_WEIGHT + S.COMPETITIVE_WEIGHT));
+function weightPartisan(bS, iS, cS, context) {
+    const bW = C.biasWeight(context);
+    const iW = C.impactWeight(context);
+    const cW = C.competitivenessWeight(context);
+    const score = Math.round(((bS * bW) + (iS * iW) + (cS * cW)) / (bW + iW + cW));
+    return score;
 }
 exports.weightPartisan = weightPartisan;
-function printFairScorecardHeader() {
-    console.log('XX, Name, N, V%, ^S#, ^S%, F#, S#, S%, B%, B$, R#, Rd, Rd%, Cd, Cd%, Md%, C$, $$$');
+function printPartisanScorecardHeader() {
+    console.log('XX, Name, N, 1/N%, V%, ^S#, ^S%, S!, S#, S%, B%, B$, UE#, I$, R#, Rd, Rd%, C#, Cd, Cd%, beg, end, Md, Md%, C$, <P$, >P$');
 }
-exports.printFairScorecardHeader = printFairScorecardHeader;
-function printFairScorecard(xx, name, N, Vf, s) {
-    console.log('%s, %s, %i, %f, %i, %f, %i, %f, %f, %f, %i, %f, %f, %f, %f, %f, %f, %f, %i', xx, name, N, Vf, s.bias.BestS, s.bias.BestSf, s.bias.FptpS, s.bias.ProbableS, s.bias.ProbableSf, s.bias.Bias, s.bias.normalized, s.competitiveness.R, s.competitiveness.Rd, s.competitiveness.Rdf, s.competitiveness.Cd, s.competitiveness.Cdf, s.competitiveness.Mdf, s.competitiveness.normalized, s.score);
+exports.printPartisanScorecardHeader = printPartisanScorecardHeader;
+function printPartisanScorecardRow(xx, name, N, Vf, s) {
+    console.log('%s, %s, %i, %f, %f, %i, %f, %i, %f, %f, %f, %i, %f, %i, %f, %f, %f, %i, %f, %f, %i, %i, %f, %f, %i, %i, %i', xx, name, N, U.trim(1 / N), Vf, s.bias.BestS, s.bias.BestSf, s.bias.FptpS, s.bias.ProbableS, s.bias.ProbableSf, s.bias.Bias, s.bias.score, s.impact.UnearnedS, s.impact.score, s.competitiveness.R, s.competitiveness.Rd, s.competitiveness.Rdf, s.competitiveness.C, s.competitiveness.Cd, s.competitiveness.Cdf, s.competitiveness.Mrange[C.BEG], s.competitiveness.Mrange[C.END], s.competitiveness.Md, s.competitiveness.Mdf, s.competitiveness.score, s.score, s.score2);
 }
-exports.printFairScorecard = printFairScorecard;
+exports.printPartisanScorecardRow = printPartisanScorecardRow;
 function scoreBias(rawBias, Vf, Sf, N) {
     if (isAntimajoritarian(Vf, Sf)) {
         return 0;
     }
     else {
         const _normalizer = new normalize_1.Normalizer(rawBias);
-        const oneSeatFraction = 1 / N;
-        const worst = Math.min(oneSeatFraction, S.BIAS_WORST);
-        const best = S.BIAS_BEST;
+        const worst = C.biasRange()[C.BEG];
+        const best = C.biasRange()[C.END];
         _normalizer.clip(worst, best);
         _normalizer.unitize(worst, best);
         _normalizer.invert();
-        // TODO - SCORE: Would also decaying raw values (e.g., by squaring them) be too
-        //   much with a small range (like 10% or one seat)?
         // _normalizer.decay();
         _normalizer.rescale();
         const score = _normalizer.normalizedNum;
@@ -89976,6 +90327,20 @@ function scoreBias(rawBias, Vf, Sf, N) {
     }
 }
 exports.scoreBias = scoreBias;
+// Normalize unearned seats
+function scoreImpact(rawUE) {
+    const _normalizer = new normalize_1.Normalizer(rawUE);
+    const worst = C.unearnedThreshold();
+    const best = 0.0;
+    _normalizer.positive();
+    _normalizer.clip(worst, best);
+    _normalizer.unitize(worst, best);
+    _normalizer.invert();
+    _normalizer.rescale();
+    const score = _normalizer.normalizedNum;
+    return score;
+}
+exports.scoreImpact = scoreImpact;
 function isAntimajoritarian(Vf, Sf) {
     const bDem = ((Vf < 0.5) && (Sf > 0.5)) ? true : false;
     const bRep = (((1 - Vf) < 0.5) && ((1 - Sf) > 0.5)) ? true : false;
@@ -89987,16 +90352,24 @@ function scoreCompetitiveness(rawMarginal, rawOverall) {
     // But the practical max is more like 2/3's, so unitize that range to [0.0–1.0].
     // Then scale the values to [0–100].
     const _overall = new normalize_1.Normalizer(rawOverall);
-    _overall.clip(S.COMPETITIVE_WORST, S.COMPETITIVE_BEST);
-    _overall.unitize(S.COMPETITIVE_WORST, S.COMPETITIVE_BEST);
+    let worst = C.overallCompetitivenessRange()[C.BEG];
+    let best = C.overallCompetitivenessRange()[C.END];
+    _overall.clip(worst, best);
+    _overall.unitize(worst, best);
     _overall.rescale();
-    const overall = _overall.normalizedNum;
+    const ocS = _overall.normalizedNum;
     // Normalize marginal competitiveness
     const _marginal = new normalize_1.Normalizer(rawMarginal);
+    worst = C.marginalCompetitivenessRange()[C.BEG];
+    best = C.marginalCompetitivenessRange()[C.END];
+    _marginal.clip(worst, best);
+    _marginal.unitize(worst, best);
     _marginal.rescale();
-    const marginal = _marginal.normalizedNum;
+    const mcS = _marginal.normalizedNum;
+    const mcW = C.marginalCompetitivenessWeight();
+    const ocW = C.overallCompetitivenessWeight();
     // Then combine the results
-    const score = Math.round(((S.MARGINAL_WEIGHT * marginal) + (S.OVERALL_WEIGHT * overall)) / (S.MARGINAL_WEIGHT + S.OVERALL_WEIGHT));
+    const score = Math.round(((mcW * mcS) + (ocW * ocS)) / (mcW + ocW));
     return score;
 }
 exports.scoreCompetitiveness = scoreCompetitiveness;
@@ -90006,23 +90379,40 @@ const { erf } = __webpack_require__(/*! mathjs */ "./node_modules/mathjs/main/es
 // console.log("erf(-0.5) =", erf(-0.5));  // returns -0.5204998778130465
 // console.log("erf(4) =", erf(4));        // returns 0.9999999845827421
 // Estimate the probability of a seat win for district, given a Vf
-function estSeatProbability(Vf) {
+function estSeatProbability(Vf, range) {
+    if (range) {
+        const _normalizer = new normalize_1.Normalizer(Vf);
+        // The end points of a compressed probability distribution
+        // NOTE - These aren't the points where races start or stop being contested,
+        //   just the end points of a distribution that yields the desired behavior
+        //   in the typical competitive range [45-55%].
+        const distBeg = range[C.BEG];
+        const distEnd = range[C.END];
+        _normalizer.clip(distBeg, distEnd);
+        _normalizer.unitize(distBeg, distEnd);
+        return seatProbabilityFn(_normalizer.wipNum);
+    }
+    else {
+        return seatProbabilityFn(Vf);
+    }
+}
+exports.estSeatProbability = estSeatProbability;
+function seatProbabilityFn(Vf) {
     // Python: 0.5 * (1 + erf((vpi - 0.50) / (0.02 * sqrt(8))))
     return U.trim(0.5 * (1.0 + erf((Vf - 0.50) / (0.02 * Math.sqrt(8)))));
 }
-exports.estSeatProbability = estSeatProbability;
 // Estimate the number of responsive districts [R(d)], given a set of Vf's
 function estDistrictResponsiveness(Vf) {
     // Python: 1 - 4 * (est_seat_probability(vpi) - 0.5)**2
     return U.trim(1.0 - 4.0 * Math.pow((estSeatProbability(Vf) - 0.5), 2));
 }
 exports.estDistrictResponsiveness = estDistrictResponsiveness;
-function inferSVpoints(Vf, VfArray) {
+function inferSVpoints(Vf, VfArray, range) {
     const nDistricts = VfArray.length;
     let SVpoints = [];
     for (let shiftedVf of shiftRange()) {
         const shiftedVPI = shiftDistricts(Vf, VfArray, shiftedVf);
-        const shiftedSf = estProbableSeats(shiftedVPI) / nDistricts;
+        const shiftedSf = estProbableSeats(shiftedVPI, range) / nDistricts;
         SVpoints.push({ v: shiftedVf, s: shiftedSf });
     }
     return SVpoints;
@@ -90060,8 +90450,9 @@ function shiftRange() {
 }
 // ESTIMATE BIAS ("FAIR")
 // ^S# - The # of Democratic seats closest to proportional @ statewide Vf
+// The "expected number of seats" from http://bit.ly/2Fcuf4q
 function bestSeats(N, Vf) {
-    return Math.round(N * Vf);
+    return Math.round((N * Vf) - S.EPSILON);
 }
 exports.bestSeats = bestSeats;
 // ^S% - The corresponding Democratic seat share 
@@ -90070,9 +90461,9 @@ function bestSeatShare(bestS, N) {
 }
 exports.bestSeatShare = bestSeatShare;
 // S# - The estimated # of Democratic seats @ statewide Vf, using seat probabilities
-function estProbableSeats(VfArray) {
+function estProbableSeats(VfArray, range) {
     // Python: sum([est_seat_probability(vpi) for vpi in vpi_by_district])
-    return U.trim(U.sumArray(VfArray.map(v => estSeatProbability(v))));
+    return U.trim(U.sumArray(VfArray.map(v => estSeatProbability(v, range))));
 }
 exports.estProbableSeats = estProbableSeats;
 // S% - The estimated Democratic seat share fraction @ statewide Vf
@@ -90098,6 +90489,13 @@ function estBias(estSeatShare, bestSeatShare) {
     return U.trim(Math.abs(estSeatShare - bestSeatShare));
 }
 exports.estBias = estBias;
+// UE# - The estimated # of unearned seats
+// UE_# from http://bit.ly/2Fcuf4q
+function estUnearnedSeats(best, probable) {
+    // NOTE - + values = unearned R seats; – values = unearned D seats
+    return U.trim(best - probable);
+}
+exports.estUnearnedSeats = estUnearnedSeats;
 // ESTIMATE RESPONSIVENESS ("COMPETITIVE")
 // R# - Estimate responsiveness at the statewide vote share
 function estResponsiveness(Vf, inferredSVpoints) {
@@ -90152,6 +90550,14 @@ function estResponsiveDistrictsShare(Rd, N) {
 }
 exports.estResponsiveDistrictsShare = estResponsiveDistrictsShare;
 // ESTIMATE COMPETITIVENESS (ENHANCED)
+// C - Count the # of competitive districts, defined as v in [45–55%]
+function countCompetitiveDistricts(VfArray) {
+    return U.trim(U.sumArray(VfArray.map(v => isCompetitive(v))));
+}
+exports.countCompetitiveDistricts = countCompetitiveDistricts;
+function isCompetitive(v) {
+    return ((v >= C.competitiveRange()[C.BEG]) && (v <= C.competitiveRange()[C.END])) ? 1 : 0;
+}
 // Cd - The estimated # of competitive districts
 function estCompetitiveDistricts(VfArray) {
     return U.trim(U.sumArray(VfArray.map(v => estDistrictCompetitiveness(v))));
@@ -90160,8 +90566,14 @@ exports.estCompetitiveDistricts = estCompetitiveDistricts;
 // Re-scale a Democratic vote share to the competitive range (e.g., 45–55%).
 function estDistrictCompetitiveness(Vf) {
     const _normalizer = new normalize_1.Normalizer(Vf);
-    _normalizer.clip(S.MIN_CONTESTED, S.MAX_CONTESTED);
-    _normalizer.unitize(S.MIN_CONTESTED, S.MAX_CONTESTED);
+    // The end points of a compressed probability distribution
+    // NOTE - These aren't the points where races start or stop being contested,
+    //   just the end points of a distribution that yields the desired behavior
+    //   in the typical competitive range [45-55%].
+    const distBeg = C.competitiveDistribution()[C.BEG];
+    const distEnd = C.competitiveDistribution()[C.END];
+    _normalizer.clip(distBeg, distEnd);
+    _normalizer.unitize(distBeg, distEnd);
     const dC = estDistrictResponsiveness(_normalizer.wipNum);
     return dC;
 }
@@ -90171,9 +90583,30 @@ function estCompetitiveDistrictsShare(Cd, N) {
     return U.trim(Cd / N);
 }
 exports.estCompetitiveDistrictsShare = estCompetitiveDistrictsShare;
+// Md - The estimated # of "marginal" districts in and around the likely FPTP
+//   seats & the best seat split that are competitive.
+function estMarginalCompetitiveDistricts(Mrange, VfArray) {
+    const minId = Mrange[C.BEG];
+    const maxId = Mrange[C.END];
+    // Sort the array values, and subset it to those districts
+    // NOTE - I'm *not* keeping track of the district indexes right now
+    let subsetVfArray = VfArray.sort().slice(minId - 1, maxId);
+    // Est. competitive districts on that array
+    const Md = U.sumArray(subsetVfArray.map(v => estDistrictCompetitiveness(v)));
+    return U.trim(Md);
+}
+exports.estMarginalCompetitiveDistricts = estMarginalCompetitiveDistricts;
 // Md% - The estimated competitiveness of the "marginal" districts in and around
 //   the likely FPTP seats & the best seat split as a fraction
-function estMarginalCompetitiveShare(Vf, VfArray, N) {
+function estMarginalCompetitiveShare(Md, Mrange) {
+    const minId = Mrange[C.BEG];
+    const maxId = Mrange[C.END];
+    // Est. competitive district share on that result
+    const MdShare = U.trim(estCompetitiveDistrictsShare(Md, maxId - minId + 1));
+    return U.trim(MdShare);
+}
+exports.estMarginalCompetitiveShare = estMarginalCompetitiveShare;
+function findMarginalDistricts(Vf, VfArray, N) {
     const bestS = bestSeats(N, Vf);
     const fptpS = estFPTPSeats(VfArray);
     // Find the marginal districts IDs (indexed 1–N)
@@ -90192,137 +90625,9 @@ function estMarginalCompetitiveShare(Vf, VfArray, N) {
         minId = Math.max((N - bestS) - 1, 1);
         maxId = Math.min((N - bestS) + 1, N);
     }
-    const deltaS = maxId - minId + 1;
-    // Sort the array values, and subset it to those districts
-    // NOTE - I'm *not* keeping track of the district indexes right now
-    let subsetVfArray = VfArray.sort().slice(minId - 1, maxId);
-    // Est. competitive districts on that array
-    const Md = U.sumArray(subsetVfArray.map(v => estDistrictCompetitiveness(v)));
-    // Est. competitive district share on that result
-    const MdShare = U.trim(estCompetitiveDistrictsShare(Md, deltaS));
-    return U.trim(MdShare);
+    return [minId, maxId];
 }
-exports.estMarginalCompetitiveShare = estMarginalCompetitiveShare;
-
-
-/***/ }),
-
-/***/ "./src/index.ts":
-/*!**********************!*\
-  !*** ./src/index.ts ***!
-  \**********************/
-/*! no static exports found */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-//
-// SCORE PACKAGE API
-//
-function __export(m) {
-    for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
-}
-Object.defineProperty(exports, "__esModule", { value: true });
-__export(__webpack_require__(/*! ./_api */ "./src/_api.ts"));
-var types_1 = __webpack_require__(/*! ./types */ "./src/types.ts");
-exports.sampleProfile = types_1.sampleProfile;
-exports.sampleScorecard = types_1.sampleScorecard;
-
-
-/***/ }),
-
-/***/ "./src/normalize.ts":
-/*!**************************!*\
-  !*** ./src/normalize.ts ***!
-  \**************************/
-/*! no static exports found */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-//
-// NORMALIZATION 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 = __importStar(__webpack_require__(/*! ./settings */ "./src/settings.ts"));
-class Normalizer {
-    constructor(rawValue) {
-        this.rawNum = rawValue;
-        this.wipNum = this.rawNum;
-    }
-    // *Don't* transform the input.
-    identity() {
-        return this.wipNum;
-    }
-    // TODO - Do I need this? If so, add TEST cases.
-    positive() {
-        this.wipNum = Math.abs(this.wipNum);
-        return this.wipNum;
-    }
-    // Invert a value in the unit range [0.0–1.0] (so that bigger is better).
-    invert() {
-        // TODO - DAVID: Can we make this throw an Error and expect that in unit test?
-        console.assert(((this.wipNum >= 0.0) && (this.wipNum <= 1.0)), S.OUT_OF_RANGE_MSG);
-        this.wipNum = 1.0 - this.wipNum;
-        return this.wipNum;
-    }
-    // Constrain the value to be within a specified range.
-    clip(begin_range, end_range) {
-        // Handle the ends of the range being given either order
-        const min_range = Math.min(begin_range, end_range);
-        const max_range = Math.max(begin_range, end_range);
-        this.wipNum = Math.max(Math.min(this.wipNum, max_range), min_range);
-        return this.wipNum;
-    }
-    // Recast the value as the delta from a baseline value. NOOP if it is zero.
-    // NOTE - Values can be + or -.
-    rebase(base) {
-        this.wipNum = this.wipNum - base;
-        return this.wipNum;
-    }
-    // Re-scale a value into the [0.0 – 1.0] range, using a given range.
-    // NOTE - This assumes that values have alrady been clipped into the range.
-    unitize(begin_range, end_range) {
-        const min_range = Math.min(begin_range, end_range);
-        const max_range = Math.max(begin_range, end_range);
-        // TODO - DAVID: Can we make this throw an Error and expect that in unit test?
-        console.assert(((this.wipNum >= min_range) && (this.wipNum <= max_range)), S.OUT_OF_RANGE_MSG);
-        const ranged = this.wipNum - min_range;
-        this.wipNum = Math.abs(ranged / (end_range - begin_range));
-        return this.wipNum;
-    }
-    // Decay a value in the unit range [0.0–1.0] by its distance from zero.
-    // NOTE - If the range is already such that "bigger is better," then the closer
-    //   the value is to 1.0 (the best) the *less* it will decay.
-    decay(fn = 0 /* Gravity */) {
-        // TODO - DAVID: Can we make this throw an Error and expect that in unit test?
-        console.assert(((this.wipNum >= 0.0) && (this.wipNum <= 1.0)), S.OUT_OF_RANGE_MSG);
-        switch (fn) {
-            case 0 /* Gravity */: {
-                this.wipNum = Math.pow(this.wipNum, S.DISTANCE_WEIGHT);
-                return this.wipNum;
-            }
-            default: {
-                throw new Error("Decay function not recognized.");
-            }
-        }
-    }
-    // Translate a value in the unit range to the user-friendly range [0 – 100].
-    rescale() {
-        // TODO - DAVID: Can we make this throw an Error and expect that in unit test?
-        console.assert(((this.wipNum >= 0.0) && (this.wipNum <= 1.0)), S.OUT_OF_RANGE_MSG);
-        this.normalizedNum = Math.round(this.wipNum * S.NORMALIZED_RANGE);
-        return this.normalizedNum;
-    }
-}
-exports.Normalizer = Normalizer;
+exports.findMarginalDistricts = findMarginalDistricts;
 
 
 /***/ }),
@@ -90347,18 +90652,19 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const S = __importStar(__webpack_require__(/*! ./settings */ "./src/settings.ts"));
+const U = __importStar(__webpack_require__(/*! ./utils */ "./src/utils.ts"));
+const C = __importStar(__webpack_require__(/*! ./config */ "./src/config.ts"));
 const compact_1 = __webpack_require__(/*! ./compact */ "./src/compact.ts");
 const cohesive_1 = __webpack_require__(/*! ./cohesive */ "./src/cohesive.ts");
 const equal_1 = __webpack_require__(/*! ./equal */ "./src/equal.ts");
-const fair_1 = __webpack_require__(/*! ./fair */ "./src/fair.ts");
+const partisan_1 = __webpack_require__(/*! ./partisan */ "./src/partisan.ts");
 // TODO - Score opportunity for minority representation
 function scorePlan(p, overridesJSON) {
-    // BEST subcategories - compactness, splitting, population deviation
+    // TRADITIONAL DISTRICTING PRINCIPLES ("best") subcategories - compactness, splitting, population deviation
     // Compactness
     const reockM = compact_1.doReock(p.compactnessProfile.GeometryByDistrict);
     const polsbyM = compact_1.doPolsbyPopper(p.compactnessProfile.GeometryByDistrict);
-    const compactnessScore = Math.round(((S.REOCK_WEIGHT * reockM.normalized) + (S.POLSBY_WEIGHT * polsbyM.normalized)) / (S.REOCK_WEIGHT + S.POLSBY_WEIGHT));
+    const compactnessScore = weightCompactness(reockM.normalized, polsbyM.normalized);
     const cS = {
         score: compactnessScore,
         reock: reockM,
@@ -90370,51 +90676,77 @@ function scorePlan(p, overridesJSON) {
     const cT = cohesive_1.totalCounties(CxD);
     const countyM = cohesive_1.doCountySplittingReduced(CxD, dT, cT);
     const districtM = cohesive_1.doDistrictSplittingReduced(CxD, dT, cT);
-    const splittingScore = Math.round(((S.COUNTY_WEIGHT * countyM.normalized) + (S.DISTANCE_WEIGHT * districtM.normalized)) / (S.COUNTY_WEIGHT + S.DISTANCE_WEIGHT));
+    const splittingScore = weightSplitting(countyM.normalized, districtM.normalized);
     const sS = {
         score: splittingScore,
         county: countyM,
         district: districtM
     };
     // Population deviation
-    const eS = equal_1.doPopulationDeviation(p.populationProfile.TotalPopByDistrict, p.populationProfile.targetSize, p.legislativeDistricts);
-    // Combine compactness, splitting, & population deviation into a "best" score
-    const bestScore = Math.round(((S.COMPACTNESS_WEIGHT * cS.score) + (S.SPLITTING_WEIGHT * sS.score) + (S.POPDEV_WEIGHT * eS.normalized)) / (S.COMPACTNESS_WEIGHT + S.SPLITTING_WEIGHT + S.POPDEV_WEIGHT));
-    // Populate the "best" scorecard
-    const bS = {
-        BestScore: bestScore,
+    const pdS = equal_1.doPopulationDeviation(p.populationProfile.TotalPopByDistrict, p.populationProfile.targetSize, p.legislativeDistricts);
+    // Combine traditional principles into a score to compare plans w/in a state
+    const tpScore = weightTradtionalPrinciples(cS.score, sS.score, pdS.normalized, 1 /* WithinAState */);
+    // Populate the "best" traditional principles scorecard
+    const tpS = {
+        score: tpScore,
         compactness: cS,
         splitting: sS,
-        populationDeviation: eS
+        populationDeviation: pdS
     };
-    // FAIR subcategories - bias & competitiveness
-    // NOTE - This calculates a # of measures of bias & competitiveness.
-    const pS = fair_1.scorePartisan(p.partisanProfile.statewideVf, p.partisanProfile.VfArray);
-    pS.score = fair_1.weightPartisan(pS.bias.normalized, pS.competitiveness.normalized);
-    // Combine "best" and "fair" scores into an overall score for the plan
-    const score = Math.round(((S.FAIR_WEIGHT * pS.score) + (S.BEST_WEIGHT * bS.BestScore)) / (S.FAIR_WEIGHT + S.BEST_WEIGHT));
+    // PARTISAN ("fair") subcategories - bias, impact, & competitiveness (plus lots of supporting measures)
+    const pS = partisan_1.scorePartisan(p.partisanProfile.statewideVf, p.partisanProfile.VfArray);
+    // Combine the partisan/partisan & traditional principles/best scores into an overall
+    // score for comparing plans w/in a state
+    const score = weightBestFair(pS.score2, tpS.score, 1 /* WithinAState */);
     // Roll up an overall scorecard
     const scorecard = {
-        score: score,
-        best: bS,
-        fair: pS
+        partisan: pS,
+        traditionalPrinciples: tpS,
+        score: score
     };
     return scorecard;
 }
 exports.scorePlan = scorePlan;
+// HELPERS
+function weightCompactness(rS, ppS) {
+    const rW = C.reockWeight();
+    const ppW = C.polsbyWeight();
+    const score = Math.round(((rS * rW) + (ppS * ppW)) / (rW + ppW));
+    return score;
+}
+exports.weightCompactness = weightCompactness;
+function weightSplitting(csS, dsS) {
+    const csW = C.countySplittingWeight();
+    const dsW = C.districtSplittingWeight();
+    const score = Math.round(((csS * csW) + (dsS * dsW)) / (csW + dsW));
+    return score;
+}
+exports.weightSplitting = weightSplitting;
+function weightTradtionalPrinciples(cS, sS, pdS, context) {
+    const cW = C.compactnessWeight(context);
+    const sW = C.splittingWeight(context);
+    const pdW = C.popdevWeight(context);
+    const score = Math.round(((cS * cW) + (sS * sW) + (pdS * pdW)) / (cW + sW + pdW));
+    return score;
+}
+exports.weightTradtionalPrinciples = weightTradtionalPrinciples;
+function weightBestFair(pS, tpS, context) {
+    const pW = C.partisanWeight(context);
+    const tpW = C.traditionalPrinciplesWeight(context);
+    const score = Math.round(((pS * pW) + (tpS * tpW)) / (pW + tpW));
+    return score;
+}
+exports.weightBestFair = weightBestFair;
+function printScorecardHeader() {
+    console.log('XX, Name, N, V%, ^S#, S#, B%, B$, UE#, I$, C#, Cd, Md, C$, <P$, >P$, Rc, Rc$, Pc, Pc$, G$, Cs, Cs$, Ds, Ds$, S$, Eq, Eq$, T$, $$$');
+}
+exports.printScorecardHeader = printScorecardHeader;
+function printScorecardRow(xx, name, N, Vf, s) {
+    console.log('%s, %s, %i, %f, %i, %f, %f, %i, %f, %i, %i, %f, %f, %i, %i, %i, %f, %i, %f, %i, %i, %f, %i, %f, %i, %i, %f, %i, %i, %i', xx, name, N, U.trim(Vf), s.partisan.bias.BestS, s.partisan.bias.ProbableS, s.partisan.bias.Bias, s.partisan.bias.score, s.partisan.impact.UnearnedS, s.partisan.impact.score, s.partisan.competitiveness.C, s.partisan.competitiveness.Cd, s.partisan.competitiveness.Md, s.partisan.competitiveness.score, s.partisan.score, s.partisan.score2, s.traditionalPrinciples.compactness.reock.raw, s.traditionalPrinciples.compactness.reock.normalized, s.traditionalPrinciples.compactness.polsby.raw, s.traditionalPrinciples.compactness.polsby.normalized, s.traditionalPrinciples.compactness.score, s.traditionalPrinciples.splitting.county.raw, s.traditionalPrinciples.splitting.county.normalized, s.traditionalPrinciples.splitting.district.raw, s.traditionalPrinciples.splitting.district.normalized, s.traditionalPrinciples.splitting.score, s.traditionalPrinciples.populationDeviation.raw, s.traditionalPrinciples.populationDeviation.normalized, s.traditionalPrinciples.score, s.score);
+}
+exports.printScorecardRow = printScorecardRow;
 
 
-/***/ }),
-
-/***/ "./src/settings.json":
-/*!***************************!*\
-  !*** ./src/settings.json ***!
-  \***************************/
-/*! exports provided: fair, best, default */
-/***/ (function(module) {
-
-module.exports = JSON.parse("{\"fair\":{\"unbiased\":{\"worst\":0.1,\"best\":0,\"weight\":80},\"competitive\":{\"worst\":0,\"best\":0.67,\"weight\":20,\"min\":0.25,\"max\":0.75,\"marginal\":75,\"overall\":25},\"weight\":80},\"best\":{\"compact\":{\"reock\":{\"worst\":0.25,\"best\":0.5,\"weight\":50},\"polsby\":{\"worst\":0.1,\"best\":0.5,\"weight\":50},\"weight\":50},\"cohesive\":{\"county\":{\"best\":1,\"worst\":1.71,\"allowableSplitsMultiplier\":1.5,\"weight\":50},\"district\":{\"best\":1,\"worst\":1.5,\"weight\":50},\"weight\":50},\"equal\":{\"worst\":0.0075,\"best\":0.002,\"stateLeg\":{\"worst\":0.1},\"weight\":0},\"weight\":20}}");
-
 /***/ }),
 
 /***/ "./src/settings.ts":
@@ -90429,16 +90761,13 @@ module.exports = JSON.parse("{\"fair\":{\"unbiased\":{\"worst\":0.1,\"best\":0,\
 //
 // GLOBAL CONSTANTS
 //
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 // Normalized scores [0-100]
 exports.NORMALIZED_RANGE = 100;
 // Square deviations from the ideal
 exports.DISTANCE_WEIGHT = 2;
 // Out of range message
-exports.OUT_OF_RANGE_MSG = "# out of range";
+exports.OUT_OF_RANGE_MSG = "%f out of range";
 // A small delta to use when testing ranges of values
 exports.EPSILON = 1 / Math.pow(10, 6);
 // Keep 4 decimals for fractions [0.0–1.0], i.e., 2 for %'s [0–100]
@@ -90446,62 +90775,6 @@ exports.PRECISION = 4;
 // "Roughly equal" = average census block size / 2
 exports.AVERAGE_BLOCK_SIZE = 30;
 exports.EQUAL_TOLERANCE = exports.AVERAGE_BLOCK_SIZE / 2;
-// SCORING PARAMETERS
-const settings_json_1 = __importDefault(__webpack_require__(/*! ./settings.json */ "./src/settings.json"));
-// TODO - DELETE
-function readOverrides() {
-    return undefined;
-}
-const overrides = readOverrides();
-// SETTINGS FOR PARTISAN SCORING
-exports.MIN_CONTESTED = overrides ? overrides.fair.competitive.min : settings_json_1.default.fair.competitive.min;
-exports.MAX_CONTESTED = overrides ? overrides.fair.competitive.max : settings_json_1.default.fair.competitive.max;
-// SCALES FOR NORMALIZING RAW VALUES
-// Compactness scales
-exports.REOCK_WORST = overrides ? overrides.best.compact.reock.worst : settings_json_1.default.best.compact.reock.worst;
-exports.REOCK_BEST = overrides ? overrides.best.compact.reock.best : settings_json_1.default.best.compact.reock.best;
-exports.POLSBY_WORST = overrides ? overrides.best.compact.polsby.worst : settings_json_1.default.best.compact.polsby.worst;
-exports.POLSBY_BEST = overrides ? overrides.best.compact.polsby.best : settings_json_1.default.best.compact.polsby.best;
-// County-District splitting scales (not inverted)
-exports.COUNTY_BEST = overrides ? overrides.best.cohesive.county.best : settings_json_1.default.best.cohesive.county.best;
-exports.COUNTY_WORST = overrides ? overrides.best.cohesive.county.worst : settings_json_1.default.best.cohesive.county.worst;
-exports.ALLOWABLE_SPLITS_MULTIPLIER = overrides ? overrides.best.cohesive.county.allowableSplitsMultiplier : settings_json_1.default.best.cohesive.county.allowableSplitsMultiplier;
-exports.DISTRICT_BEST = overrides ? overrides.best.cohesive.district.best : settings_json_1.default.best.cohesive.district.best;
-exports.DISTRICT_WORST = overrides ? overrides.best.cohesive.district.worst : settings_json_1.default.best.cohesive.district.worst;
-// Population deviation thresholds & scales (inverted)
-exports.POPDEV_WORST = overrides ? overrides.best.equal.worst : settings_json_1.default.best.equal.worst;
-exports.POPDEV_BEST = overrides ? overrides.best.equal.best : settings_json_1.default.best.equal.best;
-exports.POPEQ_MIN = 1.0 - exports.POPDEV_WORST;
-exports.POPEQ_MAX = 1.0 - exports.POPDEV_BEST;
-exports.POPDEV_WORST_LD = overrides ? overrides.best.equal.stateLeg.worst : settings_json_1.default.best.equal.stateLeg.worst;
-exports.POPDEV_BEST_LD = ((exports.POPDEV_BEST / exports.POPDEV_WORST) * exports.POPDEV_WORST_LD);
-exports.POPEQ_MIN_LD = 1.0 - exports.POPDEV_WORST_LD;
-exports.POPEQ_MAX_LD = 1.0 - exports.POPDEV_BEST_LD;
-// Bias & competitiveness scales
-// TODO - SCORE:
-// * How wide a range do we want for bias? 10%? 20%?
-// * Do we want it to be state-specific? E.g., one seat?
-exports.BIAS_WORST = overrides ? overrides.fair.unbiased.worst : settings_json_1.default.fair.unbiased.worst;
-exports.BIAS_BEST = overrides ? overrides.fair.unbiased.best : settings_json_1.default.fair.unbiased.best;
-// The range for raw overall competitiveness values
-exports.COMPETITIVE_WORST = overrides ? overrides.fair.competitive.worst : settings_json_1.default.fair.competitive.worst;
-exports.COMPETITIVE_BEST = overrides ? overrides.fair.competitive.best : settings_json_1.default.fair.competitive.best;
-// WEIGHTS FOR COMBINING NORMALIZED VALUES
-exports.REOCK_WEIGHT = overrides ? overrides.best.compact.reock.weight : settings_json_1.default.best.compact.reock.weight;
-exports.POLSBY_WEIGHT = overrides ? overrides.best.compact.polsby.weight : settings_json_1.default.best.compact.polsby.weight;
-exports.COUNTY_WEIGHT = overrides ? overrides.best.cohesive.county.weight : settings_json_1.default.best.cohesive.county.weight;
-exports.DISTRICT_WEIGHT = overrides ? overrides.best.cohesive.district.weight : settings_json_1.default.best.cohesive.district.weight;
-exports.COMPACTNESS_WEIGHT = overrides ? overrides.best.compact.weight : settings_json_1.default.best.compact.weight;
-exports.SPLITTING_WEIGHT = overrides ? overrides.best.cohesive.weight : settings_json_1.default.best.cohesive.weight;
-exports.POPDEV_WEIGHT = overrides ? overrides.best.equal.weight : settings_json_1.default.best.equal.weight;
-// TODO - SCORE: What kind of relative weighting do we want between marginal and
-//   overall competitiveness?
-exports.MARGINAL_WEIGHT = overrides ? overrides.fair.competitive.marginal : settings_json_1.default.fair.competitive.marginal;
-exports.OVERALL_WEIGHT = overrides ? overrides.fair.competitive.overall : settings_json_1.default.fair.competitive.overall;
-exports.BIAS_WEIGHT = overrides ? overrides.fair.unbiased.weight : settings_json_1.default.fair.unbiased.weight;
-exports.COMPETITIVE_WEIGHT = overrides ? overrides.fair.competitive.weight : settings_json_1.default.fair.competitive.weight;
-exports.FAIR_WEIGHT = overrides ? overrides.fair.weight : settings_json_1.default.fair.weight;
-exports.BEST_WEIGHT = overrides ? overrides.best.weight : settings_json_1.default.best.weight;
 
 
 /***/ }),
@@ -90522,9 +90795,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const sample_profile_json_1 = __importDefault(__webpack_require__(/*! ../testdata/profiles/sample-profile.json */ "./testdata/profiles/sample-profile.json"));
+const sample_profile_json_1 = __importDefault(__webpack_require__(/*! ../testdata/samples/sample-profile.json */ "./testdata/samples/sample-profile.json"));
 exports.sampleProfile = sample_profile_json_1.default;
-const sample_scorecard_json_1 = __importDefault(__webpack_require__(/*! ../testdata/profiles/sample-scorecard.json */ "./testdata/profiles/sample-scorecard.json"));
+const sample_scorecard_json_1 = __importDefault(__webpack_require__(/*! ../testdata/samples/sample-scorecard.json */ "./testdata/samples/sample-scorecard.json"));
 exports.sampleScorecard = sample_scorecard_json_1.default;
 
 
@@ -90606,10 +90879,10 @@ exports.deepCopy = deepCopy;
 
 /***/ }),
 
-/***/ "./testdata/profiles/sample-profile.json":
-/*!***********************************************!*\
-  !*** ./testdata/profiles/sample-profile.json ***!
-  \***********************************************/
+/***/ "./testdata/samples/sample-profile.json":
+/*!**********************************************!*\
+  !*** ./testdata/samples/sample-profile.json ***!
+  \**********************************************/
 /*! exports provided: state, planName, nDistricts, nCounties, legislativeDistricts, populationProfile, compactnessProfile, splittingProfile, partisanProfile, demographicProfile, default */
 /***/ (function(module) {
 
@@ -90617,14 +90890,14 @@ module.exports = JSON.parse("{\"state\":\"NC\",\"planName\":\"Sample profile\",\
 
 /***/ }),
 
-/***/ "./testdata/profiles/sample-scorecard.json":
-/*!*************************************************!*\
-  !*** ./testdata/profiles/sample-scorecard.json ***!
-  \*************************************************/
-/*! exports provided: score, best, fair, default */
+/***/ "./testdata/samples/sample-scorecard.json":
+/*!************************************************!*\
+  !*** ./testdata/samples/sample-scorecard.json ***!
+  \************************************************/
+/*! exports provided: score, traditionalPrinciples, partisan, default */
 /***/ (function(module) {
 
-module.exports = JSON.parse("{\"score\":5,\"best\":{\"BestScore\":18,\"compactness\":{\"score\":35,\"reock\":{\"raw\":0.3373,\"normalized\":35,\"notes\":{}},\"polsby\":{\"raw\":0.2418,\"normalized\":35,\"notes\":{}}},\"splitting\":{\"score\":0,\"county\":{\"raw\":1.1474,\"normalized\":0,\"notes\":{}},\"district\":{\"raw\":1.4839,\"normalized\":3,\"notes\":{}}},\"populationDeviation\":{\"raw\":0.016,\"normalized\":0,\"notes\":{\"maxDeviation\":11693}}},\"fair\":{\"bias\":{\"BestS\":7,\"BestSf\":0.5385,\"ProbableS\":4.1925,\"ProbableSf\":0.3225,\"Bias\":0.216,\"normalized\":0,\"notes\":{}},\"competitiveness\":{\"Cd\":0.7266,\"Cdf\":0.0559,\"Mdf\":0.1019,\"normalized\":10,\"notes\":{}},\"score\":2,\"notes\":{}}}");
+module.exports = JSON.parse("{\"score\":5,\"traditionalPrinciples\":{\"score\":18,\"compactness\":{\"score\":35,\"reock\":{\"raw\":0.3373,\"normalized\":35,\"notes\":{}},\"polsby\":{\"raw\":0.2418,\"normalized\":35,\"notes\":{}}},\"splitting\":{\"score\":0,\"county\":{\"raw\":1.1474,\"normalized\":0,\"notes\":{}},\"district\":{\"raw\":1.4839,\"normalized\":3,\"notes\":{}}},\"populationDeviation\":{\"raw\":0.016,\"normalized\":0,\"notes\":{\"maxDeviation\":11693}}},\"partisan\":{\"bias\":{\"BestS\":7,\"BestSf\":0.5385,\"ProbableS\":4.1925,\"ProbableSf\":0.3225,\"Bias\":0.216,\"score\":0},\"impact\":{\"UnearnedS\":2.8075,\"score\":0},\"competitiveness\":{\"C\":6,\"Cd\":0.7266,\"Cdf\":0.0559,\"Mrange\":[5,11],\"Md\":0.7134,\"Mdf\":0.1019,\"score\":10},\"score\":3,\"score2\":2}}");
 
 /***/ })
 
@@ -100410,6 +100683,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+const Score = __importStar(__webpack_require__(/*! @dra2020/dra-score */ "./node_modules/@dra2020/dra-score/dist/dra-score.bundle.js"));
 const preprocess_1 = __webpack_require__(/*! ./preprocess */ "./src/preprocess.ts");
 const analyze_1 = __webpack_require__(/*! ./analyze */ "./src/analyze.ts");
 const score_1 = __webpack_require__(/*! ./score */ "./src/score.ts");
@@ -100603,9 +100877,13 @@ class AnalyticsSession {
             return 1 - this.testScales[4 /* PopulationDeviation */]['scale'][0];
         }
         else {
+            // NOTE - This assumes the plan has been profiled
+            const scorer = new Score.Scorer();
+            const popdev = scorer.populationDeviationThreshold(this.legislativeDistricts);
+            return popdev;
             // TODO - SCORE: Temporary HACK. Query dra-score for threshold.
             // NOTE - The plan may not have been scored yet, i.e., no scorecard yet.
-            return 1 - this.testScales[4 /* PopulationDeviation */]['scale'][0];
+            // return 1 - this.testScales[T.Test.PopulationDeviation]['scale'][0];
         }
     }
 }
@@ -102815,7 +103093,9 @@ function doAnalyzePostProcessing(s, bLog = false) {
         // Just populate the normalized population deviation score in the test
         const scorecard = s._scorecard;
         let test = s.getTest(4 /* PopulationDeviation */);
-        test['normalizedScore'] = scorecard.best.populationDeviation.normalized;
+        test['normalizedScore'] = scorecard.traditionalPrinciples.populationDeviation.normalized;
+        // TODO - DELETE
+        // test['normalizedScore'] = scorecard.best.populationDeviation.normalized;
     }
     // Derive secondary tests
     analyze_1.doDeriveSecondaryTests(s, bLog);
@@ -102861,7 +103141,7 @@ function profilePlan(s, bLog = false) {
     const geoPropsByDistrict = makeArrayOfGeoProps(s, bLog);
     const splits = makeNakedCxD(s);
     const summaryRow = s.districts.numberOfRows() - 1;
-    const statewideVf = s.districts.statistics[D.DistrictField.DemPct][summaryRow];
+    const statewideVf = U.trim(s.districts.statistics[D.DistrictField.DemPct][summaryRow], 6);
     const vpiArray = U.deepCopy(s.districts.statistics[D.DistrictField.DemPct].slice(1, -1));
     const demographicsByDistrict = makeArrayOfDemographics(s);
     const profile = {
@@ -102945,11 +103225,14 @@ function scorePlan(s, p, bLog = false, overridesJSON) {
     //   calling sequence.
     let test = s.getTest(4 /* PopulationDeviation */);
     // TODO - SCORE: U.trim(popDev)???
+    // const popDev = scorecard.best.populationDeviation.raw;
     // Get the raw population deviation
-    const popDev = scorecard.best.populationDeviation.raw;
+    const popDev = scorecard.traditionalPrinciples.populationDeviation.raw;
     // Populate the test entry
     test['score'] = popDev;
-    test['details'] = { 'maxDeviation': scorecard.best.populationDeviation.notes['maxDeviation'] };
+    test['details'] = { 'maxDeviation': scorecard.traditionalPrinciples.populationDeviation.notes['maxDeviation'] };
+    // TODO - DELETE
+    // test['details'] = { 'maxDeviation': scorecard.best.populationDeviation.notes['maxDeviation'] };
     // Populate the N+1 summary "district" in district.statistics
     let totalPop = s.districts.statistics[D.DistrictField.TotalPop];
     let popDevPct = s.districts.statistics[D.DistrictField.PopDevPct];