@dra2020/district-analytics 1.0.7 → 1.0.8

package/src/_data.ts

@@ -1,595 +0,0 @@
-//
-// DATA ABSTRACTION LAYER
-//
-
-import * as T from './types'
-import * as U from './utils';
-import * as S from './settings';
-
-import { AnalyticsSession } from './_api';
-import { isConnected, isEmbedded } from './valid';
-import { extractDistrictProperties } from './compact';
-import { fptpWin } from './political'
-
-
-// DISTRICT STATISTICS
-
-// Indexes for statistics fields in Districts
-// NOTE - Not a const, so the number can be determined dynamically
-export enum DistrictField {
-  TotalPop,        // Display
-  PopDevPct,       // Display
-  bEqualPop,       // Display
-  bNotEmpty,       // Display
-  bContiguous,     // Display
-  bNotEmbedded,    // Display
-  CountySplits,
-  DemVotes,
-  RepVotes,
-  TwoPartyVote,    // Two-party total ()= Dem + Rep) not all votes!
-  DemPct,          // Display (also the "VPI," by convention")
-  RepPct,          // Display
-  DemSeat,
-  TotalVAP,        // VAP or CVAP ...
-  MinorityPop,     // Derived
-  WhitePop,
-  BlackPop,
-  HispanicPop,
-  PacificPop,
-  AsianPop,
-  NativePop,
-  WhitePct,        // Display
-  MinorityPct,     // Display
-  BlackPct,        // Display
-  HispanicPct,     // Display
-  PacificPct,      // Display
-  AsianPct,        // Display
-  NativePct        // Display
-
-  // 1 - MORE ...
-}
-
-// The fields to display in a District Statistics pane
-export const 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
-];
-
-export class Districts {
-  _session: AnalyticsSession;
-
-  _shapes: T.GeoFeatureCollection;
-  _geoProperties = {} as T.DistrictProperties;
-
-  statistics: any[][];
-
-  constructor(s: AnalyticsSession, ds: T.GeoFeatureCollection) {
-    this._session = s;
-
-    this._shapes = ds;
-    this.statistics = this.initStatistics();
-  }
-  getShape(i: number): T.GeoFeature { return this._shapes.features[i]; }
-  getGeoProperties(i: number): any { return this._geoProperties[i]; }
-  setGeoProperties(i: number, p: T.DistrictShapeProperties): void { this._geoProperties[i] = p; }
-
-  numberOfColumns(): number { return U.countEnumValues(DistrictField); }
-  // +1 for dummy unassigned 0 "district" and +1 for N+1 summary "district" for
-  // state-level values. Real districts are 1–N.
-  numberOfRows(): number { return this._session.state.nDistricts + 2; }
-  numberOfWorkingDistricts(): number { return this._session.state.nDistricts + 1; }
-
-  // This is the core statistics 2D matrix:
-  // Fields on the outside, districts on the inside
-  initStatistics(): any[][] {
-    let nRows = this.numberOfRows();
-    let nCols = this.numberOfColumns();
-
-    let outer = U.initArray(nCols, undefined);
-
-    for (let i = 0; i < nCols; i++) {
-      outer[i] = U.initArray(nRows, null);
-    }
-
-    return outer;
-  }
-
-  // This is the workhorse computational routine!
-  //
-  // TODO - Optimize for getting multiple properties from the same feature?
-  // TODO - Optimize by only re-calc'ing districts that have changed?
-  //        In this case, special attention to getting county-splits right.
-  // TODO - Optimize by asyn'ing this?
-  // TODO - Is there a way to do this programmatically off data? Does it matter?
-  recalcStatistics(bLog: boolean = false): void {
-    // Compute these once per recalc cycle
-    let targetSize = this._session.state.totalPop / this._session.state.nDistricts;
-    let deviationThreshold = this._session.populationDeviationThreshold();
-    let planByDistrict = this._session.plan.byDistrictID();
-    let plan = this._session.plan;
-    let graph = this._session.graph;
-
-    // INITIALIZE STATE VALUES THAT WILL BE ACCUMULATED
-
-    let stateTPVote = 0;
-    let stateDemVote = 0;
-    let stateRepVote = 0;
-
-    let stateVAPPop = 0;
-    let stateWhitePop = 0;
-    let stateMinorityPop = 0;
-    let stateBlackPop = 0;
-    let stateHispanicPop = 0;
-    let statePacificPop = 0;
-    let stateAsianPop = 0;
-    let stateNativePop = 0;
-
-    // NOTE - These plan-level booleans are set in their respective analytics:
-    // - Equal population (bEqualPop)
-    // - Complete (bNotEmpty)
-    // - Contiguos (bContiguous)
-    // - Free of holes (bNotEmbedded)
-
-    // 2 - MORE ...
-
-    // Loop over the districts (including the dummy unassigned one)
-    for (let i = 0; i < this.numberOfWorkingDistricts(); i++) {
-
-      // INITIALIZE DISTRICT VALUES THAT WILL BE ACCUMULATED (VS. DERIVED)
-
-      let featurePop: number;
-      let totalPop: number = 0;
-
-      let countySplits: number[] = U.initArray(this._session.counties.nCounties, 0)
-
-      let demVotes: number = 0;
-      let repVotes: number = 0;
-
-      let totalVAP: number = 0;
-      let whitePop: number = 0;
-      let blackPop: number = 0;
-      let hispanicPop: number = 0;
-      let pacificPop: number = 0;
-      let asianPop: number = 0;
-      let nativePop: number = 0;
-
-      // 3 - MORE ...
-
-      // HACK - Because "this" gets ghosted inside the forEach loop below
-      let outerThis = this;
-
-      // Get the geoIDs assigned to it ...
-      let geoIDs = this._session.plan.geoIDsForDistrictID(i);
-
-      // ... loop over them creating district-by-district statistics 
-      geoIDs.forEach(function (geoID: string): void {
-        // Map from geoID to feature index
-        let featureID = outerThis._session.features.featureID(geoID);
-        let f: T.GeoFeature = outerThis._session.features.featureByIndex(featureID);
-
-        // ACCUMULATE VALUES
-
-        // Total population of each feature (used more than once)
-        featurePop = outerThis._session.features.fieldForFeature(f, Dataset.CENSUS, FeatureField.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, Dataset.ELECTION, FeatureField.DemVotes);
-        repVotes += outerThis._session.features.fieldForFeature(f, Dataset.ELECTION, FeatureField.RepVotes);
-
-        // Voting-age demographic breakdowns (or citizen voting-age)
-        // Guard againt null/NaN values
-        let _totalVAP = outerThis._session.features.fieldForFeature(f, Dataset.VAP, FeatureField.TotalPop);
-        let _whitePop = outerThis._session.features.fieldForFeature(f, Dataset.VAP, FeatureField.WhitePop);
-        let _blackPop = outerThis._session.features.fieldForFeature(f, Dataset.VAP, FeatureField.BlackPop);
-        let _hispanicPop = outerThis._session.features.fieldForFeature(f, Dataset.VAP, FeatureField.HispanicPop);
-        let _pacificPop = outerThis._session.features.fieldForFeature(f, Dataset.VAP, FeatureField.PacificPop);
-        let _asianPop = outerThis._session.features.fieldForFeature(f, Dataset.VAP, FeatureField.AsianPop);
-        let _nativePop = outerThis._session.features.fieldForFeature(f, Dataset.VAP, FeatureField.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: number;
-      let demPct: number = 0;
-      let repPct: number = 0;
-      let DemSeat: number = 0;
-
-      totVotes = demVotes + repVotes;
-      if (totVotes > 0) {
-        demPct = demVotes / totVotes;
-        repPct = repVotes / totVotes;
-        DemSeat = fptpWin(demPct);
-      }
-
-      // Total minority VAP
-      let minorityPop = totalVAP - whitePop
-
-      // Voting-age demographic proportions (or citizen voting-age)
-      let whitePct: number = 0;
-      let minorityPct: number = 0;
-      let blackPct: number = 0;
-      let hispanicPct: number = 0;
-      let pacificPct: number = 0;
-      let asianPct: number = 0;
-      let nativePct: number = 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) {
-          bContiguous = isConnected(geoIDs, graph);
-          bNotEmbedded = (!isEmbedded(i, planByDistrict[i], plan, graph));
-        }
-      }
-
-      // 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;
-
-    if (stateTPVote > 0) {
-      this.statistics[DistrictField.DemPct][summaryRow] = stateDemVote / stateTPVote;
-      this.statistics[DistrictField.RepPct][summaryRow] = stateRepVote / stateTPVote;
-    }
-
-    if (stateVAPPop > 0) {
-      this.statistics[DistrictField.WhitePct][summaryRow] = stateWhitePop / stateVAPPop;
-      this.statistics[DistrictField.MinorityPct][summaryRow] = stateMinorityPop / stateVAPPop;
-      this.statistics[DistrictField.BlackPct][summaryRow] = stateBlackPop / stateVAPPop;
-      this.statistics[DistrictField.HispanicPct][summaryRow] = stateHispanicPop / stateVAPPop;
-      this.statistics[DistrictField.PacificPct][summaryRow] = statePacificPop / stateVAPPop;
-      this.statistics[DistrictField.AsianPct][summaryRow] = stateAsianPop / stateVAPPop;
-      this.statistics[DistrictField.NativePct][summaryRow] = stateNativePop / stateVAPPop;
-    }
-  }
-  // NOTE - I did not roll these into district statistics, because creating the
-  //   district shapes themselves is the big district-by-district activity, these
-  //   calc's already work, and I'm not going to expose these values. Wrapping
-  //   the underlying function and exposing it here to illustrate the parallelism
-  //   with recalcStatistics(). These are called in tandem by doAnalyzeDistricts().
-  extractDistrictShapeProperties(bLog: boolean = false): void {
-    extractDistrictProperties(this._session, bLog)
-  }
-  getCountyIndex(geoID: string): number {
-    let countyGeoID = U.parseGeoID(geoID)['county'] as string;
-    let countyFIPS = U.getFIPSFromCountyGeoID(countyGeoID);
-    let countyIndex = this._session.counties.indexFromFIPS(countyFIPS);
-
-    return countyIndex;
-  }
-}
-
-
-// CLASSES, ETC. FOR FEATURE & COUNTY DATA
-
-// Types of datasets by feature
-export const enum Dataset {
-  CENSUS = "CENSUS",
-  VAP = "VAP",
-  ELECTION = "ELECTION"
-}
-
-export type DatasetKeys = {
-  CENSUS: string;    // A total population Census dataset
-  VAP: string;       // A voting age (or citizen voting age) dataset
-  ELECTION: string;  // An election dataset
-}
-
-export const DatasetDescriptions: any = {
-  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 ...
-}
-
-// Identifiers of fields for each feature in the datasets
-export const enum FeatureField {
-  TotalPop = "Tot",
-  WhitePop = "Wh",
-  BlackPop = "BlC",
-  HispanicPop = "His",
-  AsianPop = "AsnC",
-  PacificPop = "PacC",
-  NativePop = "NatC",
-  DemVotes = "D",
-  RepVotes = "R",
-  TotalVotes = "Tot"
-}
-
-// Wrap data by feature, to abstract the specifics of the internal structure
-export class Features {
-  _session: AnalyticsSession;
-
-  _data: T.GeoFeatureCollection;
-  _keys: DatasetKeys;
-
-  _featureIDs = {} as T.FeaturesByGeoID;
-
-  constructor(s: AnalyticsSession, data: T.GeoFeatureCollection, keys: DatasetKeys) {
-    this._session = s;
-
-    this._data = data;
-    this._keys = keys;
-  }
-  nFeatures(): number { return this._data.features.length; }
-  featureByIndex(i: number): T.GeoFeature { return this._data.features[i]; }
-  // TODO - Generalize this
-  geoIDForFeature(f: any): string { return f.properties['GEOID10']; }
-  fieldForFeature(f: any, dt: Dataset, fk: string): any {
-    let dk: string = this._keys[dt];
-
-    return _getFeatures(f, dk, fk);
-  }
-  resetDataset(d: Dataset, k: string): void {
-    this._keys[d] = k;
-    // TODO - Does anything need to be recalc'd now when a dataset is changed?
-  }
-  mapGeoIDsToFeatureIDs(): void {
-    for (let i: number = 0; i < this._session.features.nFeatures(); i++) {
-      let f: T.GeoFeature = this._session.features.featureByIndex(i);
-      let geoID: string = this._session.features.geoIDForFeature(f);
-
-      this._featureIDs[geoID] = i;
-    }
-  }
-  featureID(i: string): number { return this._featureIDs[i]; }
-}
-
-// NOTE - This accessor is cloned from fGetW() in dra-client/restrict.ts
-//  f is a direct GeoJSON feature
-//  p is a geoID
-function _getFeatures(f: any, datasetKey: string, p: string): any {
-  // Shim to load sample data2.json from disk for command-line scaffolding
-  if (f.properties && f.properties['datasets']) {
-    return f.properties['datasets'][datasetKey][p];
-  }
-
-  // NOTE - The fGetW() code from dra-client below here ...
-
-  // Direct property?
-  if (f.properties && f.properties[p] !== undefined)
-    return f.properties[p];
-
-  // Joined property?
-  let a: any[] = _fGetJoined(f);
-  if (a) {
-    for (let i: number = 0; i < a.length; i++) {
-      let o: any = a[i];
-      if (!datasetKey) {
-        if (o[p] !== undefined)
-          return o[p];
-      }
-      else {
-        if (o['datasets'] && o['datasets'][datasetKey])
-          if (o['datasets'][datasetKey][p])
-            return o['datasets'][datasetKey][p];
-      }
-    }
-  }
-  return undefined;
-}
-
-function _fGetJoined(f: any): any[] {
-  return (f.properties && f.properties.joined) ? f.properties.joined : undefined;
-}
-
-// Wrap data by county, to abstract the specifics of the internal structure
-export class Counties {
-  _session: AnalyticsSession;
-
-  _data: T.GeoFeatureCollection;
-  _countyNameLookup: T.FIPSCodeToCountyNameMap;
-
-  nCounties: number;
-  index = {} as T.FIPSToOrdinalMap;
-
-  constructor(s: AnalyticsSession, data: T.GeoFeatureCollection) {
-    this._session = s;
-
-    this._data = data;
-    this.nCounties = this._data.features.length;
-    this._countyNameLookup = {};
-  }
-  // nCounties(): number { return this._data.features.length; }
-  countyByIndex(i: number): T.GeoFeature { return this._data.features[i]; }
-  propertyForCounty(f: any, pk: string): any { return f.properties[pk]; }
-  mapFIPSToName(fips: string, name: string): void { this._countyNameLookup[fips] = name; }
-  nameFromFIPS(fips: string): string { return this._countyNameLookup[fips]; }
-  indexFromFIPS(fips: string): number { return this.index[fips]; }
-}
-
-// CLASSES TO ORGANIZE AND/OR ABSTRACT OTHER DATA
-
-export class State {
-  _session: AnalyticsSession;
-
-  xx: string;
-  nDistricts: number;
-  totalPop = 0;
-  tooBigFIPS = [] as string[];
-  tooBigName = [] as string[];
-  expectedSplits = 0;
-  expectedAffected = 0;
-
-  constructor(s: AnalyticsSession, xx: string, n: number) {
-    this._session = s;
-
-    this.xx = xx;
-    this.nDistricts = n;
-  }
-}
-
-export class Plan {
-  _session: AnalyticsSession;
-
-  // TODO - Do these need to be updated, when the plan changes?
-  _planByGeoID: T.PlanByGeoID;
-  _planByDistrictID: T.PlanByDistrictID;
-
-  districtIDs: number[];
-
-  constructor(s: AnalyticsSession, p: T.PlanByGeoID) {
-    this._session = s;
-
-    this._planByGeoID = p;
-    this._planByDistrictID = {} as T.PlanByDistrictID;
-
-    this.districtIDs = [];  // Set when the plan in inverted
-  }
-  invertPlan(): void {
-    this._planByDistrictID = U.invertPlan(this._planByGeoID);
-    this.districtIDs = U.getNumericObjectKeys(this._planByDistrictID);
-  }
-  initializeDistrict(i: number): void { this._planByDistrictID[i] = new Set(); }
-
-  byGeoID(): T.PlanByGeoID { return this._planByGeoID; }
-  byDistrictID(): T.PlanByDistrictID { return this._planByDistrictID; }
-  districtForGeoID(i: string): number { return this._planByGeoID[i]; }
-  geoIDsForDistrictID(i: number): Set<string> { return this._planByDistrictID[i]; }
-}
-
-export class Graph {
-  _session: AnalyticsSession;
-
-  _graph: T.ContiguityGraph;
-
-  constructor(s: AnalyticsSession, graph: T.ContiguityGraph) {
-    this._session = s;
-
-    this._graph = graph;
-  }
-  // TODO - Rework this, when we support MIXED MAPS.
-  peerNeighbors(node: string): string[] {
-    // Get the neighboring geoIDs connected to a geoID
-    // Ignore the lengths of the shared borders (the values), for now
-
-    return U.getObjectKeys(this._graph[node]);
-  }
-}
-
-

package/src/analyze.ts

@@ -1,92 +0,0 @@
-//
-// ANALYZE A PLAN
-//
-
-import * as T from './types'
-import * as U from './utils';
-import * as S from './settings';
-
-import { AnalyticsSession } from './_api';
-
-import { doIsComplete, doIsContiguous, doIsFreeOfHoles } from './valid'
-import { doPopulationDeviation, doHasEqualPopulations } from './equal';
-import { doReock, doPolsbyPopper, extractDistrictProperties } from './compact';
-import { doCountySplits, doPlanComplexity } from './cohesive';
-import {
-  doSeatsBias, doVotesBias,
-  doResponsiveness, doResponsiveDistricts, doEfficiencyGap
-} from './political';
-import { doMajorityMinorityDistricts } from './minority'
-
-// Compile district-level info for plan/map-level analytics
-export function doAnalyzeDistricts(s: AnalyticsSession, bLog: boolean = false): void {
-  s.districts.recalcStatistics(bLog);
-  s.districts.extractDistrictShapeProperties(bLog);
-}
-
-// 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.
-export function doAnalyzePlan(s: AnalyticsSession, bLog: boolean = false): void {
-  // Get the requested suites, and only execute those tests
-  let requestedSuites = s.config['suites'];
-
-  // Tests in the "Legal" suite, i.e., pass/ fail constraints
-  if (requestedSuites.includes(T.Suite.Legal)) {
-    s.tests[T.Test.Complete] = doIsComplete(s);
-
-    s.tests[T.Test.Contiguous] = doIsContiguous(s);
-
-    s.tests[T.Test.FreeOfHoles] = doIsFreeOfHoles(s);
-
-    s.tests[T.Test.PopulationDeviation] = doPopulationDeviation(s);
-
-    // NOTE - I can't check whether a population deviation is legal or not, until
-    // the raw % is normalized. A zero (0) would mean "too much" / "not legal," for
-    // the given type of district (CD vs. LD). The EqualPopulation test is derived
-    // from PopulationDeviation, as part of scorecard or test log preparation.
-
-    // Create an empty test entry here though ...
-    s.tests[T.Test.EqualPopulation] = s.getTest(T.Test.EqualPopulation) as T.TestEntry;
-  }
-
-  // Tests in the "Fair" suite
-  if (requestedSuites.includes(T.Suite.Fair)) {
-    s.tests[T.Test.SeatsBias] = doSeatsBias(s);
-
-    s.tests[T.Test.VotesBias] = doVotesBias(s);
-
-    s.tests[T.Test.Responsiveness] = doResponsiveness(s);
-
-    s.tests[T.Test.ResponsiveDistricts] = doResponsiveDistricts(s);
-
-    s.tests[T.Test.EfficiencyGap] = doEfficiencyGap(s);
-
-    s.tests[T.Test.MajorityMinorityDistricts] = doMajorityMinorityDistricts(s);
-  }
-
-  // Tests in the "Best" suite, i.e., criteria for better/worse
-  if (requestedSuites.includes(T.Suite.Best)) {
-    s.tests[T.Test.Reock] = doReock(s, bLog);
-    s.tests[T.Test.PolsbyPopper] = doPolsbyPopper(s, bLog);
-
-    s.tests[T.Test.CountySplits] = doCountySplits(s);
-
-    s.tests[T.Test.Complexity] = doPlanComplexity(s);
-  }
-
-  // Enable a Test Log and Scorecard to be generated
-  s.bPlanAnalyzed = true;
-  s.bPostProcessingDone = false;
-}
-
-// Derive secondary analytics that are based on primary tests.
-// This concept allows Population Deviation to be a primary numeric test and
-// Equal Population to be secondary pass/fail validation.
-//
-// NOTE - Should this be conditionalized on the test suites requested? 
-//   Those are encapsulated in reports.ts right now, so not doing that.
-export function doDeriveSecondaryTests(s: AnalyticsSession): void {
-  s.tests[T.Test.EqualPopulation] = doHasEqualPopulations(s);
-}