@dra2020/district-analytics 17.0.1 → 17.1.0

package/dist/equal.d.ts

@@ -1,3 +0,0 @@
-import * as T from './types';
-import { AnalyticsSession } from './_api';
-export declare function doHasEqualPopulations(s: AnalyticsSession, bLog?: boolean): T.TestEntry;

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 export * from './_api';
-export { geoIDForFeature, fieldForFeature, inferSelectedMinority } from './_data';
-export * from './results';
+export { geoIDForFeature, fieldForFeature } from './data';
+export { inferSelectedMinority } from './rpv';
 export * from './types';
 export { Profile, Scorecard, SplittingScorecard, Measurement } from './legacy-types';
 export * from './utils';

package/dist/legacy-types.d.ts

@@ -1,3 +1,4 @@
+import { Dict } from './types';
 export type Profile = {
     state: string;
     name: string;
@@ -159,6 +160,3 @@ export type SVpoint = {
     v: number;
     s: number;
 };
-export type Dict = {
-    [key: string]: any;
-};

package/dist/minority.d.ts

@@ -1,6 +0,0 @@
-import { Types } from '@dra2020/dra-analytics';
-import * as T from './types';
-import { AnalyticsSession } from './_api';
-export declare function getMajorityMinority(s: AnalyticsSession): T.Dict;
-export declare function getVRASection5(s: AnalyticsSession): string;
-export declare function doAnalyzeRacialPolarization(s: AnalyticsSession, districtID: number, groups: Types.MinorityFilter, bLog?: boolean): Types.RPVAnalysis | undefined;

package/dist/preprocess.d.ts

@@ -1,2 +1,2 @@
 import { AnalyticsSession } from './_api';
-export declare function doPreprocessData(s: AnalyticsSession, bLog?: boolean): void;
+export declare function initialize(s: AnalyticsSession): void;

package/dist/requirements.d.ts

@@ -0,0 +1,12 @@
+import * as D from './data';
+export declare function isComplete(popByDistricts: number[]): boolean;
+export declare function emptyDistricts(popByDistricts: number[]): number[];
+export declare function getUnassignedFeatures(container: D.SessionData): string[];
+export declare function isContiguous(geoids: Set<string>, graph: {
+    [geoID: string]: string[];
+}, bLog?: boolean): boolean;
+export declare function isEmbedded(districtID: number, geoids: Set<string>, plan: {
+    [geoID: string]: number;
+}, graph: {
+    [geoID: string]: string[];
+}, bLog?: boolean): boolean;

package/dist/results.d.ts

@@ -1,50 +0,0 @@
-import * as T from './types';
-import { AnalyticsSession } from './_api';
-export type RequirementsChecklist = {
-    score: boolean;
-    metrics: {
-        complete: boolean;
-        contiguous: boolean;
-        freeOfHoles: boolean;
-        equalPopulation: boolean;
-    };
-    details: {
-        unassignedFeatures: string[];
-        emptyDistricts: number[];
-        discontiguousDistricts: number[];
-        embeddedDistricts: number[];
-        populationDeviation: number;
-        deviationThreshold: number;
-    };
-    datasets: T.Datasets;
-    resources: {};
-};
-export declare function prepareRequirementsChecklist(s: AnalyticsSession, bLog?: boolean): RequirementsChecklist;
-export type DistrictRow = {
-    districtID: number;
-    totalPop: number;
-    popDevPct: number;
-    bEqualPop: boolean;
-    bNotEmpty: boolean;
-    bContiguous: boolean;
-    bNotEmbedded: boolean;
-    demPct: number;
-    repPct: number;
-    othPct: number;
-    totalVAP: number;
-    whitePct: number;
-    minorityPct: number;
-    blackPct: number;
-    hispanicPct: number;
-    pacificPct: number;
-    asianPct: number;
-    nativePct: number;
-};
-export type DistrictStatistics = {
-    table: DistrictRow[];
-    details: {};
-    datasets: T.Datasets;
-    resources: {};
-};
-export declare function prepareDistrictStatistics(s: AnalyticsSession, bLog?: boolean): DistrictStatistics;
-export declare function doAnalyzePostProcessing(s: AnalyticsSession, bLog?: boolean): void;

package/dist/rpv.d.ts

@@ -1,4 +1,4 @@
 import { Types } from '@dra2020/dra-analytics';
-import { AnalyticsSession } from './_api';
-export declare function doRPV(s: AnalyticsSession, districtID: number, groups: Types.MinorityFilter, bLog?: boolean): Types.RPVAnalysis | undefined;
+import * as D from './data';
+export declare function doRPV(container: D.SessionData, districtID: number, groups: Types.MinorityFilter, bLog?: boolean): Types.RPVAnalysis | undefined;
 export declare function inferSelectedMinority(groups: Types.MinorityFilter): string;

package/dist/score.d.ts

@@ -1,9 +1,8 @@
+import { Types } from '@dra2020/dra-analytics';
 import * as L from './legacy-types';
 import * as T from './types';
-import { AnalyticsSession } from './_api';
-import { Types } from '@dra2020/dra-analytics';
-export declare function profilePlan(s: AnalyticsSession, bLog?: boolean): L.Profile;
-export declare function getStatewideDemographics(s: AnalyticsSession, bLog?: boolean): L.Demographics;
+import * as D from './data';
+export declare function makeProfile(container: D.SessionData): L.Profile;
 export declare function computeMetrics(p: L.Profile, districtShapes: T.GeoFeatureCollection, bLog?: boolean): Types.Scorecard;
 export declare function rateKeyDimensions(scorecard: Types.Scorecard, p: L.Profile, bLog?: boolean): Types.Scorecard;
 export declare function thunkScorecard(newScorecard: Types.Scorecard, bLog?: boolean): L.Scorecard;

package/dist/settings.d.ts

@@ -1,4 +1,3 @@
 export declare const PRECISION: number;
 export declare const NOT_ASSIGNED: number;
-export declare const NUMBER_OF_ITEMS_TO_REPORT: number;
 export declare const OUT_OF_STATE: string;

package/dist/src/_api.d.ts

@@ -1,39 +1,16 @@
 import { Types } from '@dra2020/dra-analytics';
-import { PF } from '@dra2020/dra-types';
-import { RequirementsChecklist } from './results';
-import { DistrictStatistics } from './results';
-import * as D from './_data';
+import * as D from './data';
 import * as T from './types';
 import * as L from './legacy-types';
 export declare class AnalyticsSession {
-    title: string;
-    legislativeDistricts: boolean;
-    config: T.Dict;
-    bOneTimeProcessingDone: boolean;
-    bPlanAnalyzed: boolean;
-    bPostProcessingDone: boolean;
-    tests: T.TestEntries;
-    _profile?: L.Profile;
-    _scorecard?: L.Scorecard;
-    state: D.State;
-    counties: D.Counties;
-    graph: D.GraphClass;
-    features: D.Features;
-    plan: D.Plan;
-    districts: D.Districts;
-    aggregates: PF.PackedFields[];
-    repsByDistrict?: number[];
+    data: D.SessionData;
+    bLog: boolean;
     constructor(SessionRequest: T.SessionRequest);
-    processConfig(config: T.Dict): T.Dict;
     analyzePlan(bLog?: boolean, overridesJSON?: any): boolean;
-    getGoodShapes(): T.GeoFeatureCollection;
     analyzeRacialPolarization(districtID: number, groups: Types.MinorityFilter, bLog?: boolean): Types.RPVAnalysis | undefined;
-    getDistrictStatistics(bLog?: boolean): DistrictStatistics;
     getPlanProfile(bLog?: boolean): L.Profile;
     getPlanScorecard(bLog?: boolean): L.Scorecard;
     getRatings(bLog?: boolean): T.Ratings;
-    getRequirementsChecklist(bLog?: boolean): RequirementsChecklist;
-    getDiscontiguousDistrictFeatures(bLog?: boolean): T.GeoFeatureCollection;
-    getTest(testID: T.Test): T.TestEntry;
-    populationDeviationThreshold(): number;
+    getRequirementsChecklist(bLog?: boolean): T.RequirementsChecklist;
+    getDistrictStatistics(bLog?: boolean): T.DistrictStatistics;
 }

package/dist/src/_data.d.ts

@@ -1,5 +1,5 @@
-import { Types } from '@dra2020/dra-analytics';
 import * as T from './types';
+export * from './data';
 import { AnalyticsSession } from './_api';
 export type TransposedTable = {
     totalPop: number[];
@@ -32,7 +32,7 @@ export type TransposedTable = {
     asianPct: number[];
     nativePct: number[];
 };
-export declare class Districts {
+export declare class LegacyDistricts {
     _session: AnalyticsSession;
     _shapes: T.GeoFeatureCollection;
     _geoProperties: T.DistrictProperties;
@@ -48,69 +48,4 @@ export declare class Districts {
     recalcStatistics(bLog?: boolean): void;
     extractDistrictShapeProperties(bLog?: boolean): void;
     getCountyIndex(geoID: string): number;
-    extractVotesByDemographic(districtID: number, groups: Types.MinorityFilter, bLog?: boolean): Types.DemographicVotingByFeature | undefined;
-}
-export declare function inferSelectedMinority(groups: Types.MinorityFilter): string;
-export declare class Features {
-    _session: AnalyticsSession;
-    _data: T.GeoFeatureCollection;
-    _keys: T.DatasetKeys;
-    _featureIDs: T.FeaturesByGeoID;
-    constructor(s: AnalyticsSession, data: T.GeoFeatureCollection, keys: T.DatasetKeys);
-    nFeatures(): number;
-    featureByIndex(i: number): T.GeoFeature;
-    resetDataset(d: T.Dataset, k: string): void;
-    mapGeoIDsToFeatureIDs(): void;
-    featureID(i: string): number;
-}
-export declare function geoIDForFeature(f: any): string;
-export declare function fieldForFeature(f: any, dk: string, ff: T.FeatureField): any;
-export declare class Counties {
-    _session: AnalyticsSession;
-    _data: T.GeoFeatureCollection;
-    _countyNameLookup: T.FIPSCodeToCountyNameMap;
-    nCounties: number;
-    index: T.FIPSToOrdinalMap;
-    fips: T.OrdinalToFIPSlMap;
-    totalPopulation: number[];
-    constructor(s: AnalyticsSession, data: T.GeoFeatureCollection);
-    countyByIndex(i: number): T.GeoFeature;
-    propertyForCounty(f: any, pk: string): any;
-    mapFIPSToName(fips: string, name: string): void;
-    nameFromFIPS(fips: string): string;
-    indexFromFIPS(fips: string): number;
-}
-export declare class State {
-    _session: AnalyticsSession;
-    xx: string;
-    nDistricts: number;
-    nReps: number;
-    totalPop: number;
-    targetSize: number;
-    tooBigFIPS: string[];
-    tooBigName: string[];
-    singleCountyDistrictMax: number;
-    expectedSplits: number;
-    expectedAffected: number;
-    constructor(s: AnalyticsSession, xx: string, n: number);
-}
-export declare class Plan {
-    _session: AnalyticsSession;
-    _planByGeoID: T.PlanByGeoID;
-    _planByDistrictID: T.PlanByDistrictID;
-    districtIDs: number[];
-    constructor(s: AnalyticsSession, p: T.PlanByGeoID);
-    invertPlan(bLog?: boolean): void;
-    initializeDistrict(i: number): void;
-    byGeoID(): T.PlanByGeoID;
-    byDistrictID(): T.PlanByDistrictID;
-    districtForGeoID(i: string): number;
-    geoIDsForDistrictID(i: number): Set<string>;
-}
-export declare function invertPlan(plan: T.PlanByGeoID, s?: AnalyticsSession, bLog?: boolean): T.PlanByDistrictID;
-export declare class GraphClass {
-    _session: AnalyticsSession;
-    _graph: T.ContiguityGraph;
-    constructor(s: AnalyticsSession, graph: T.ContiguityGraph);
-    peerNeighbors(node: string): string[];
 }

package/dist/src/analyze.d.ts

@@ -1,4 +1,2 @@
 import { AnalyticsSession } from './_api';
-export declare function doAnalyzeDistricts(s: AnalyticsSession, bLog?: boolean): void;
-export declare function doAnalyzePlan(s: AnalyticsSession, bLog?: boolean): void;
-export declare function doDeriveSecondaryTests(s: AnalyticsSession, bLog?: boolean): void;
+export declare function newAnalyzePlan(s: AnalyticsSession): boolean;

package/dist/src/cohesive.d.ts

@@ -1,4 +1,3 @@
 import * as T from './types';
-import { AnalyticsSession } from './_api';
-export declare function doFindCountiesSplitUnexpectedly(s: AnalyticsSession, bLog?: boolean): T.TestEntry;
-export declare function doFindSplitVTDs(s: AnalyticsSession, bLog?: boolean): T.TestEntry;
+import * as D from './data';
+export declare function findCountiesSplitUnexpectedly(container: D.SessionData, bLog?: boolean): T.TestEntry;

package/dist/src/compact.d.ts

@@ -1,2 +0,0 @@
-import { AnalyticsSession } from './_api';
-export declare function extractDistrictProperties(s: AnalyticsSession, bLog?: boolean): void;

package/dist/src/data.d.ts

@@ -1,37 +1,80 @@
+import { PF } from '@dra2020/dra-types';
+import { Types } from '@dra2020/dra-analytics';
 import * as T from './types';
+import * as L from './legacy-types';
+import * as D from './data';
 import { AnalyticsSession } from './_api';
-export declare class Districts {
+export declare class SessionData {
     _session: AnalyticsSession;
+    profile?: L.Profile;
+    legacyScorecardAlt?: L.Scorecard;
+    newScorecard?: Types.Scorecard;
+    ratings?: T.Ratings;
+    checklist?: T.RequirementsChecklist;
+    statistics?: T.DistrictStatistics;
+    bOneTimeProcessingDone: boolean;
+    bPlanAnalyzed: boolean;
+    title: string;
+    legislativeDistricts: boolean;
+    repsByDistrict?: number[];
+    config: T.Dict;
+    state: State;
+    counties: Counties;
+    graph: T.ContiguityGraph;
+    features: Features;
+    plan: Plan;
+    districts: Districts;
+    aggregates: Aggregates;
+    CxD: number[][];
+    constructor(s: AnalyticsSession, SessionRequest: T.SessionRequest);
+}
+export declare class Aggregates {
+    _container: D.SessionData;
+    _aggregates: PF.PackedFields[];
+    unpacked: {
+        [key: string]: {
+            [key: string]: number[];
+        };
+    };
+    columns: {
+        [key: string]: any[];
+    };
+    constructor(container: D.SessionData, aggregates: PF.PackedFields[]);
+    process(): void;
+    transpose(): T.DistrictRow[];
+    private _unpack;
+    private _columnize;
+    private _checkReqs;
+    private _convert;
+}
+export declare class Districts {
+    _container: D.SessionData;
     _shapes: T.GeoFeatureCollection;
-    _geoProperties: T.DistrictProperties;
-    constructor(s: AnalyticsSession, ds: T.GeoFeatureCollection);
-    getDistrictShapes(): T.GeoFeatureCollection;
-    getDistrictShapeByID(id: number): T.GeoFeature | undefined;
-    getCountyIndex(geoID: string): number;
+    constructor(container: D.SessionData, ds: T.GeoFeatureCollection);
+    getShapes(): T.GeoFeatureCollection;
 }
 export declare class Features {
-    _session: AnalyticsSession;
+    _container: D.SessionData;
     _data: T.GeoFeatureCollection;
     _keys: T.DatasetKeys;
     _featureIDs: T.FeaturesByGeoID;
-    constructor(s: AnalyticsSession, data: T.GeoFeatureCollection, keys: T.DatasetKeys);
+    constructor(container: D.SessionData, data: T.GeoFeatureCollection, keys: T.DatasetKeys);
     nFeatures(): number;
     featureByIndex(i: number): T.GeoFeature;
-    resetDataset(d: T.Dataset, k: string): void;
     mapGeoIDsToFeatureIDs(): void;
     featureID(i: string): number;
 }
 export declare function geoIDForFeature(f: any): string;
 export declare function fieldForFeature(f: any, dk: string, ff: T.FeatureField): any;
 export declare class Counties {
-    _session: AnalyticsSession;
+    _container: D.SessionData;
     _data: T.GeoFeatureCollection;
     _countyNameLookup: T.FIPSCodeToCountyNameMap;
     nCounties: number;
     index: T.FIPSToOrdinalMap;
     fips: T.OrdinalToFIPSlMap;
     totalPopulation: number[];
-    constructor(s: AnalyticsSession, data: T.GeoFeatureCollection);
+    constructor(container: D.SessionData, data: T.GeoFeatureCollection);
     countyByIndex(i: number): T.GeoFeature;
     propertyForCounty(f: any, pk: string): any;
     mapFIPSToName(fips: string, name: string): void;
@@ -39,7 +82,7 @@ export declare class Counties {
     indexFromFIPS(fips: string): number;
 }
 export declare class State {
-    _session: AnalyticsSession;
+    _container: D.SessionData;
     xx: string;
     nDistricts: number;
     nReps: number;
@@ -50,14 +93,14 @@ export declare class State {
     singleCountyDistrictMax: number;
     expectedSplits: number;
     expectedAffected: number;
-    constructor(s: AnalyticsSession, xx: string, n: number);
+    constructor(container: D.SessionData, xx: string, n: number);
 }
 export declare class Plan {
-    _session: AnalyticsSession;
+    _container: D.SessionData;
     _planByGeoID: T.PlanByGeoID;
     _planByDistrictID: T.PlanByDistrictID;
     districtIDs: number[];
-    constructor(s: AnalyticsSession, p: T.PlanByGeoID);
+    constructor(container: D.SessionData, p: T.PlanByGeoID);
     invertPlan(bLog?: boolean): void;
     initializeDistrict(i: number): void;
     byGeoID(): T.PlanByGeoID;
@@ -65,4 +108,5 @@ export declare class Plan {
     districtForGeoID(i: string): number;
     geoIDsForDistrictID(i: number): Set<string>;
 }
-export declare function invertPlan(plan: T.PlanByGeoID, s?: AnalyticsSession, bLog?: boolean): T.PlanByDistrictID;
+export declare function invertPlan(plan: T.PlanByGeoID, container?: D.SessionData, bLog?: boolean): T.PlanByDistrictID;
+export declare function processConfig(config: T.Dict): T.Dict;

package/dist/src/equal.d.ts

@@ -1,3 +0,0 @@
-import * as T from './types';
-import { AnalyticsSession } from './_api';
-export declare function doHasEqualPopulations(s: AnalyticsSession, bLog?: boolean): T.TestEntry;

package/dist/src/index.d.ts

@@ -1,6 +1,6 @@
 export * from './_api';
-export { geoIDForFeature, fieldForFeature, inferSelectedMinority } from './_data';
-export * from './results';
+export { geoIDForFeature, fieldForFeature } from './data';
+export { inferSelectedMinority } from './rpv';
 export * from './types';
 export { Profile, Scorecard, SplittingScorecard, Measurement } from './legacy-types';
 export * from './utils';

package/dist/src/legacy-types.d.ts

@@ -1,3 +1,4 @@
+import { Dict } from './types';
 export type Profile = {
     state: string;
     name: string;
@@ -159,6 +160,3 @@ export type SVpoint = {
     v: number;
     s: number;
 };
-export type Dict = {
-    [key: string]: any;
-};

package/dist/src/minority.d.ts

@@ -1,6 +0,0 @@
-import { Types } from '@dra2020/dra-analytics';
-import * as T from './types';
-import { AnalyticsSession } from './_api';
-export declare function getMajorityMinority(s: AnalyticsSession): T.Dict;
-export declare function getVRASection5(s: AnalyticsSession): string;
-export declare function doAnalyzeRacialPolarization(s: AnalyticsSession, districtID: number, groups: Types.MinorityFilter, bLog?: boolean): Types.RPVAnalysis | undefined;

package/dist/src/preprocess.d.ts

@@ -1,2 +1,2 @@
 import { AnalyticsSession } from './_api';
-export declare function doPreprocessData(s: AnalyticsSession, bLog?: boolean): void;
+export declare function initialize(s: AnalyticsSession): void;

package/dist/src/requirements.d.ts

@@ -0,0 +1,12 @@
+import * as D from './data';
+export declare function isComplete(popByDistricts: number[]): boolean;
+export declare function emptyDistricts(popByDistricts: number[]): number[];
+export declare function getUnassignedFeatures(container: D.SessionData): string[];
+export declare function isContiguous(geoids: Set<string>, graph: {
+    [geoID: string]: string[];
+}, bLog?: boolean): boolean;
+export declare function isEmbedded(districtID: number, geoids: Set<string>, plan: {
+    [geoID: string]: number;
+}, graph: {
+    [geoID: string]: string[];
+}, bLog?: boolean): boolean;

package/dist/src/results.d.ts

@@ -1,50 +0,0 @@
-import * as T from './types';
-import { AnalyticsSession } from './_api';
-export type RequirementsChecklist = {
-    score: boolean;
-    metrics: {
-        complete: boolean;
-        contiguous: boolean;
-        freeOfHoles: boolean;
-        equalPopulation: boolean;
-    };
-    details: {
-        unassignedFeatures: string[];
-        emptyDistricts: number[];
-        discontiguousDistricts: number[];
-        embeddedDistricts: number[];
-        populationDeviation: number;
-        deviationThreshold: number;
-    };
-    datasets: T.Datasets;
-    resources: {};
-};
-export declare function prepareRequirementsChecklist(s: AnalyticsSession, bLog?: boolean): RequirementsChecklist;
-export type DistrictRow = {
-    districtID: number;
-    totalPop: number;
-    popDevPct: number;
-    bEqualPop: boolean;
-    bNotEmpty: boolean;
-    bContiguous: boolean;
-    bNotEmbedded: boolean;
-    demPct: number;
-    repPct: number;
-    othPct: number;
-    totalVAP: number;
-    whitePct: number;
-    minorityPct: number;
-    blackPct: number;
-    hispanicPct: number;
-    pacificPct: number;
-    asianPct: number;
-    nativePct: number;
-};
-export type DistrictStatistics = {
-    table: DistrictRow[];
-    details: {};
-    datasets: T.Datasets;
-    resources: {};
-};
-export declare function prepareDistrictStatistics(s: AnalyticsSession, bLog?: boolean): DistrictStatistics;
-export declare function doAnalyzePostProcessing(s: AnalyticsSession, bLog?: boolean): void;

package/dist/src/rpv.d.ts

@@ -1,4 +1,4 @@
 import { Types } from '@dra2020/dra-analytics';
-import { AnalyticsSession } from './_api';
-export declare function doRPV(s: AnalyticsSession, districtID: number, groups: Types.MinorityFilter, bLog?: boolean): Types.RPVAnalysis | undefined;
+import * as D from './data';
+export declare function doRPV(container: D.SessionData, districtID: number, groups: Types.MinorityFilter, bLog?: boolean): Types.RPVAnalysis | undefined;
 export declare function inferSelectedMinority(groups: Types.MinorityFilter): string;

package/dist/src/score.d.ts

@@ -1,9 +1,8 @@
+import { Types } from '@dra2020/dra-analytics';
 import * as L from './legacy-types';
 import * as T from './types';
-import { AnalyticsSession } from './_api';
-import { Types } from '@dra2020/dra-analytics';
-export declare function profilePlan(s: AnalyticsSession, bLog?: boolean): L.Profile;
-export declare function getStatewideDemographics(s: AnalyticsSession, bLog?: boolean): L.Demographics;
+import * as D from './data';
+export declare function makeProfile(container: D.SessionData): L.Profile;
 export declare function computeMetrics(p: L.Profile, districtShapes: T.GeoFeatureCollection, bLog?: boolean): Types.Scorecard;
 export declare function rateKeyDimensions(scorecard: Types.Scorecard, p: L.Profile, bLog?: boolean): Types.Scorecard;
 export declare function thunkScorecard(newScorecard: Types.Scorecard, bLog?: boolean): L.Scorecard;

package/dist/src/settings.d.ts

@@ -1,4 +1,3 @@
 export declare const PRECISION: number;
 export declare const NOT_ASSIGNED: number;
-export declare const NUMBER_OF_ITEMS_TO_REPORT: number;
 export declare const OUT_OF_STATE: string;