@dra2020/district-analytics 14.0.1 → 14.1.2

package/dist/district-analytics.js

@@ -106,9 +106,15 @@ class AnalyticsSession {
                 return false;
             (0, preprocess_1.doPreprocessData)(this, bLog);
             (0, analyze_1.doAnalyzeDistricts)(this, bLog);
+            // This does a little stuff that didn't get factored out into dra-score and then dra-analytics
             (0, analyze_1.doAnalyzePlan)(this, bLog);
+            // The main analytics are next
+            // Run legacy analytics
             this._profile = (0, score_1.profilePlan)(this, bLog);
             this._scorecard = (0, score_1.scorePlan)(this, this._profile, bLog, overridesJSON);
+            // TODO: Run new analytics
+            // TODO: Compare the new & legacy scorecards
+            // TODO: Set a scorecard
             (0, results_1.doAnalyzePostProcessing)(this, bLog);
         }
         catch (e) {
@@ -238,7 +244,8 @@ const dra_analytics_1 = __webpack_require__(/*! @dra2020/dra-analytics */ "@dra2
 const U = __importStar(__webpack_require__(/*! ./utils */ "./src/utils.ts"));
 const S = __importStar(__webpack_require__(/*! ./settings */ "./src/settings.ts"));
 const compact_1 = __webpack_require__(/*! ./compact */ "./src/compact.ts");
-const political_1 = __webpack_require__(/*! ./political */ "./src/political.ts");
+const dra_analytics_2 = __webpack_require__(/*! @dra2020/dra-analytics */ "@dra2020/dra-analytics");
+// import { fptpWin } from './political'
 // DEBUG COUNTERS
 let nMissingDataset = 0;
 let nMissingProperty = 0;
@@ -472,7 +479,7 @@ class Districts {
                     demPct = demVotes / totVotes;
                     repPct = repVotes / totVotes;
                     othPct = othVotes / totVotes;
-                    DemSeat = (0, political_1.fptpWin)(demPct);
+                    DemSeat = dra_analytics_2.Partisan.fptpWin(demPct);
                 }
                 // Total minority VAP
                 let minorityPop = totalVAP - whitePop;
@@ -1463,7 +1470,7 @@ function scoreKIWYSICompactness(s, bLog = false) {
             goodShapes.features.push(f);
         }
     }
-    const scores = dra_analytics_1.Compactness.scoreShapes(goodShapes, 0 /* Revised */);
+    const scores = dra_analytics_1.Compactness.kiwysiScoreShapes(goodShapes, 0 /* Revised */);
     // Round & invert the scores here at the source vs. later on, higher up.
     // Raw KIWYSI scores will be 1–100 with smaller better, so map to 1–100 bigger better.
     return scores.map(n => 100 - Math.round(n) + 1);
@@ -1566,7 +1573,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.uncertaintyOfMembership = exports.effectiveSplits = exports.inferSelectedMinority = exports.fieldForFeature = exports.geoIDForFeature = void 0;
+exports.uncertaintyOfMembership = exports.effectiveSplits = exports.avgSVError = exports.isAntimajoritarian = exports.ratePartisanBias = exports.inferSelectedMinority = exports.fieldForFeature = exports.geoIDForFeature = void 0;
 __exportStar(__webpack_require__(/*! ./_api */ "./src/_api.ts"), exports);
 var _data_1 = __webpack_require__(/*! ./_data */ "./src/_data.ts");
 Object.defineProperty(exports, "geoIDForFeature", ({ enumerable: true, get: function () { return _data_1.geoIDForFeature; } }));
@@ -1577,6 +1584,9 @@ __exportStar(__webpack_require__(/*! ./types */ "./src/types.ts"), exports);
 __exportStar(__webpack_require__(/*! ./utils */ "./src/utils.ts"), exports);
 // Re-export RPV types and COI splitting functions
 const dra_analytics_1 = __webpack_require__(/*! @dra2020/dra-analytics */ "@dra2020/dra-analytics");
+exports.ratePartisanBias = dra_analytics_1.Rate.ratePartisanBias;
+exports.isAntimajoritarian = dra_analytics_1.Rate.isAntimajoritarian;
+exports.avgSVError = dra_analytics_1.Rate.avgSVError;
 exports.effectiveSplits = dra_analytics_1.Splitting.effectiveSplits;
 exports.uncertaintyOfMembership = dra_analytics_1.Splitting.uncertaintyOfMembership;
 
@@ -1639,28 +1649,6 @@ exports.doAnalyzeRacialPolarization = doAnalyzeRacialPolarization;
 // 11-18-2020 - Moved RPV to racial-voting package.
 
 
-/***/ }),
-
-/***/ "./src/political.ts":
-/*!**************************!*\
-  !*** ./src/political.ts ***!
-  \**************************/
-/***/ ((__unused_webpack_module, exports) => {
-
-
-//
-// FAIR/PROPORTIONAL
-//
-Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.fptpWin = void 0;
-function fptpWin(demPct) {
-    // Vote shares should be fractions in the range [0.0 – 1.0]
-    //assert((demPct <= 1.0) && (demPct >= 0.0));
-    return ((demPct > 0.5) ? 1 : 0);
-}
-exports.fptpWin = fptpWin;
-
-
 /***/ }),
 
 /***/ "./src/preprocess.ts":