@dra2020/district-analytics 3.2.0 → 4.1.0

package/dist/district-analytics.js

@@ -116,6 +116,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+const Score = __importStar(__webpack_require__(/*! @dra2020/dra-score */ "@dra2020/dra-score"));
 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");
@@ -309,9 +310,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];
         }
     }
 }
@@ -2545,7 +2550,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);
@@ -2591,9 +2598,10 @@ 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 statewideDemographics = getStatewideDemographics(s);
+    const demographicsByDistrict = getDemographicsByDistrict(s);
     const profile = {
         state: state,
         planName: planName,
@@ -2601,21 +2609,22 @@ function profilePlan(s, bLog = false) {
         nCounties: nCounties,
         legislativeDistricts: s.legislativeDistricts,
         populationProfile: {
-            TotalPopByDistrict: popByDistrict,
+            totalPopByDistrict: popByDistrict,
             targetSize: targetSize
         },
         compactnessProfile: {
-            GeometryByDistrict: geoPropsByDistrict
+            geometryByDistrict: geoPropsByDistrict
         },
         splittingProfile: {
-            CountyPopByDistrict: splits
+            countyPopByDistrict: splits
         },
         partisanProfile: {
             statewideVf: statewideVf,
-            VfArray: vpiArray
+            vfArray: vpiArray
         },
         demographicProfile: {
-            DemographicsByDistrict: demographicsByDistrict
+            stateMfArray: statewideDemographics,
+            mfArrayByDistrict: demographicsByDistrict
         }
     };
     return profile;
@@ -2649,7 +2658,7 @@ function makeArrayOfGeoProps(s, bLog = false) {
     }
     return geometryByDistrict;
 }
-function makeArrayOfDemographics(s, bLog = false) {
+function getDemographicsByDistrict(s, bLog = false) {
     let demographicsArray = [];
     // Remove the unassigned & total dummy "districts"
     for (let districtID = 1; districtID <= s.state.nDistricts; districtID++) {
@@ -2666,6 +2675,19 @@ function makeArrayOfDemographics(s, bLog = false) {
     }
     return demographicsArray;
 }
+function getStatewideDemographics(s, bLog = false) {
+    const summaryRow = s.districts.numberOfRows() - 1;
+    const demographicsArray = [
+        U.deepCopy(s.districts.statistics[D.DistrictField.WhitePct][summaryRow]),
+        U.deepCopy(s.districts.statistics[D.DistrictField.MinorityPct][summaryRow]),
+        U.deepCopy(s.districts.statistics[D.DistrictField.BlackPct][summaryRow]),
+        U.deepCopy(s.districts.statistics[D.DistrictField.HispanicPct][summaryRow]),
+        U.deepCopy(s.districts.statistics[D.DistrictField.PacificPct][summaryRow]),
+        U.deepCopy(s.districts.statistics[D.DistrictField.AsianPct][summaryRow]),
+        U.deepCopy(s.districts.statistics[D.DistrictField.NativePct][summaryRow])
+    ];
+    return demographicsArray;
+}
 // SCORE A PLAN
 function scorePlan(s, p, bLog = false, overridesJSON) {
     let scorer = new Score.Scorer();
@@ -2675,11 +2697,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];
@@ -2744,6 +2769,8 @@ exports.DISTRICT_SPLITTING_WEIGHT = 1.0 - exports.COUNTY_SPLITTING_WEIGHT;
 Object.defineProperty(exports, "__esModule", { value: true });
 // TODO - SCORE
 var dra_score_1 = __webpack_require__(/*! @dra2020/dra-score */ "@dra2020/dra-score");
+// PartisanProfile,
+// PopulationProfile, ShapeProfile, SplittingProfile,
 exports.sampleProfile = dra_score_1.sampleProfile;
 exports.sampleScorecard = dra_score_1.sampleScorecard;
 // END