@dra2020/district-analytics 9.0.0 → 9.1.0

package/dist/district-analytics.js

@@ -330,9 +330,10 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+const G = __importStar(__webpack_require__(/*! @dra2020/dra-graph */ "@dra2020/dra-graph"));
 const U = __importStar(__webpack_require__(/*! ./utils */ "./src/utils.ts"));
 const S = __importStar(__webpack_require__(/*! ./settings */ "./src/settings.ts"));
-const valid_1 = __webpack_require__(/*! ./valid */ "./src/valid.ts");
+// import { isConnected, isEmbedded } from './valid';
 const compact_1 = __webpack_require__(/*! ./compact */ "./src/compact.ts");
 const political_1 = __webpack_require__(/*! ./political */ "./src/political.ts");
 // DEBUG COUNTERS
@@ -512,7 +513,8 @@ class Districts {
                                     countySplits[outerThis.getCountyIndex(geoID)] += featurePop;
                             }
                             else {
-                                console.log("County not recognized:", geoID);
+                                if (bLog)
+                                    console.log("County not recognized:", geoID);
                             }
                             // Democratic and Republican vote totals
                             demVotes += outerThis._session.features.fieldForFeature(f, "ELECTION" /* ELECTION */, "D" /* DemVotes */);
@@ -578,8 +580,15 @@ class Districts {
                 // Leave the default values for the dummy unassigned district,
                 // and districts that are empty.
                 if ((i > 0) && bNotEmpty) {
-                    bContiguous = valid_1.isConnected(geoIDs, graph);
-                    bNotEmbedded = (!valid_1.isEmbedded(i, planByDistrict[i], plan, graph));
+                    // GRAPH - 10/05/2020 - Using dra-graph instead.
+                    // bContiguous = isConnected(geoIDs, graph);
+                    // bNotEmbedded = (!isEmbedded(i, planByDistrict[i], plan, graph));
+                    // GRAPH - 10/05/2020 - Using dra-graph.
+                    const features = geoIDs;
+                    const nakedGraph = graph._graph;
+                    const nakedPlan = plan._planByGeoID;
+                    bContiguous = G.isConnected(features, nakedGraph);
+                    bNotEmbedded = (!G.isEmbedded(i, features, nakedPlan, nakedGraph));
                 }
                 // 6 - MORE ...
                 { // UPDATE THE DISTRICT STATISTICS
@@ -783,7 +792,7 @@ function _getFeatures(f, datasetKey, p) {
         if (!f.properties['datasets'][datasetKey]) {
             // Feature is missing the dataset
             nMissingDataset += 1;
-            console.log(`${nMissingDataset}: Data ${datasetKey} missing for feature ${f} Returning zero.`);
+            // console.log(`${nMissingDataset}: Data ${datasetKey} missing for feature ${f} Returning zero.`);
             return 0;
         }
         return f.properties['datasets'][datasetKey][p];
@@ -815,7 +824,7 @@ function _getFeatures(f, datasetKey, p) {
     }
     // Feature is missing the property
     nMissingProperty += 1;
-    console.log(`${nMissingProperty}: ${p} value undefined for ${f.properties['GEOID10']}. Returning zero.`);
+    // console.log(`${nMissingProperty}: ${p} value undefined for ${f.properties['GEOID10']}. Returning zero.`);
     return 0;
     // return undefined;
 }
@@ -1152,8 +1161,10 @@ function doFindCountiesSplitUnexpectedly(s, bLog = false) {
         // 07-06-20 - Guard in case the FIPS code isn't in the county name lookup
         if (name)
             countiesSplitUnexpectedly.push(name);
-        else
-            console.log("County is not in the FIPS-to-name lookup table: ", fips);
+        else {
+            if (bLog)
+                console.log("County is not in the FIPS-to-name lookup table: ", fips);
+        }
     }
     countiesSplitUnexpectedly = countiesSplitUnexpectedly.sort();
     test['score'] = U.trim(unexpectedAffected);
@@ -1517,7 +1528,8 @@ function doPreprocessCensus(s, bLog = false) {
                 totalByCounty[countyFIPS] += value;
             }
             else {
-                console.log("County not recognized:", geoID);
+                if (bLog)
+                    console.log("County not recognized:", geoID);
             }
         }
         else {
@@ -2410,11 +2422,13 @@ function doIsComplete(s, bLog = false) {
         // Check the official congressional maps for CT, KY, IL, and MI.
         bAllNonWaterOnlyAssigned = !unassignedFeatures.some(function (geoID) {
             if (U.isWaterOnly(geoID, s)) {
-                console.log("Unassigned water-only feature ignored in completeness check: ", geoID);
+                if (bLog)
+                    console.log("Unassigned water-only feature ignored in completeness check: ", geoID);
                 return false;
             }
             if (U.isUninhabited(geoID, s)) {
-                console.log("Uninhabited feature ignored in completeness check: ", geoID);
+                if (bLog)
+                    console.log("Uninhabited feature ignored in completeness check: ", geoID);
                 return false;
             }
             // Not water-only and inhabited
@@ -2500,30 +2514,38 @@ function doIsContiguous(s, bLog = false) {
     return test;
 }
 exports.doIsContiguous = doIsContiguous;
+/* GRAPH - Removed 10/05/2020. Using dra-graph instead.
 // Are the features in a district fully connected?
-function isConnected(districtGeos, graph) {
-    // TODO - TERRY, why does this constructor need a <T> type specification?
-    let visited = new Set();
-    let toProcess = [];
-    // Start processing with the first geoID in the district
-    let iter = districtGeos.values();
-    toProcess.push(iter.next().value);
-    // While there are geoIDs in the district that haven't been processed
-    while (toProcess.length > 0) {
-        // Grab a geoID and process it
-        let node = toProcess.pop();
-        visited.add(node);
-        // Get its actual, in-state neighbors
-        let actualNeighbors = graph.peerNeighbors(node).filter(x => U.isInState(x));
-        // Add neighbors to visit, if they're in the same district Y haven't already been visited
-        let neighborsToVisit = actualNeighbors.filter(x => districtGeos.has(x) && (!visited.has(x)));
-        // TODO - TERRY, is this the quickest/best way to do this?
-        toProcess.push(...neighborsToVisit);
-    }
-    // Stop when you've visited all the geoIDs in the district
-    return visited.size == districtGeos.size;
-}
-exports.isConnected = isConnected;
+export function isConnected(districtGeos: Set<string>, graph: D.Graph): boolean
+{
+  // TODO - TERRY, why does this constructor need a <T> type specification?
+  let visited = new Set<string>();
+  let toProcess: string[] = [];
+
+  // Start processing with the first geoID in the district
+  let iter = districtGeos.values();
+  toProcess.push(iter.next().value);
+
+  // While there are geoIDs in the district that haven't been processed
+  while (toProcess.length > 0)
+  {
+    // Grab a geoID and process it
+    let node = toProcess.pop() as string;
+    visited.add(node);
+
+    // Get its actual, in-state neighbors
+    let actualNeighbors = graph.peerNeighbors(node).filter(x => U.isInState(x));
+
+    // Add neighbors to visit, if they're in the same district Y haven't already been visited
+    let neighborsToVisit = actualNeighbors.filter(x => districtGeos.has(x) && (!visited.has(x)));
+    // TODO - TERRY, is this the quickest/best way to do this?
+    toProcess.push(...neighborsToVisit);
+  }
+
+  // Stop when you've visited all the geoIDs in the district
+  return visited.size == districtGeos.size;
+}
+*/
 //
 // FREE OF HOLES - Are any districts fully embedded w/in another district?
 //
@@ -2566,68 +2588,89 @@ function doIsFreeOfHoles(s, bLog = false) {
     return test;
 }
 exports.doIsFreeOfHoles = doIsFreeOfHoles;
+/* GRAPH - Removed 10/05/2020. Using dra-graph instead.
 // Test whether one district is embedded w/in any other.
-function isEmbedded(districtID, geoIDs, plan, graph) {
-    // NOTE - "features" here = "geoIDs." These aren't "features" proper, just
-    //   identifier strings.
-    let features = geoIDs;
-    let planByGeo = plan.byGeoID();
-    // Assume the district is embedded
-    let bEmbedded = true;
-    // Keep track of the neighoring districts
-    let neighboringDistricts = new Set();
-    // TODO - OPTIMIZE: Use just the boundary features, when available
-    // Get the features for the real district
-    let featuresToCheck = Array.from(features);
-    // If the district has features, check whether it is embedded
-    if (!(U.isArrayEmpty(featuresToCheck))) {
-        // For each feature that needs to be checked (see above)
-        for (let feature of featuresToCheck) {
-            // Get its neighbors (including the virtual "out of state" ones)
-            let neighbors = graph.peerNeighbors(feature);
-            for (let neighbor of neighbors) {
-                if (U.isOutOfState(neighbor)) {
-                    bEmbedded = false;
-                    // No need to check any more neighbors
-                    break;
-                }
-                else {
-                    let neighboringDistrict = U.getDistrict(planByGeo, neighbor);
-                    // Assume that a missing district assignment (= None) means that the
-                    // feature is "water-only" AND part of the state border (vs. internal)
-                    // and, therefore, not in the plan/map.
-                    if (neighboringDistrict == undefined) {
-                        bEmbedded = false;
-                        // No need to check any more neighbors
-                        break;
-                    }
-                    else {
-                        // TODO - OPTIMIZE: Since we're checking *all* features in a district right
-                        //   now, not just boundary features and neighbors in other districts,
-                        //   prune out the current district. If/when we optimize compactness
-                        //   to cache district boundaries (as before in my Python implementation),
-                        //   we won't have to guard adding "neighboring" districts in this way.
-                        if (neighboringDistrict != districtID) {
-                            neighboringDistricts.add(neighboringDistrict);
-                        }
-                        if (neighboringDistricts.size > 1) {
-                            bEmbedded = false;
-                            // No need to check any more neighbors
-                            break;
-                        }
-                    }
-                }
+export function isEmbedded(districtID: number, geoIDs: Set<string>, plan: D.Plan, graph: D.Graph): boolean
+{
+  // NOTE - "features" here = "geoIDs." These aren't "features" proper, just
+  //   identifier strings.
+  let features = geoIDs;
+  let planByGeo = plan.byGeoID();
+
+  // Assume the district is embedded
+  let bEmbedded = true;
+  // Keep track of the neighoring districts
+  let neighboringDistricts = new Set();
+
+  // TODO - OPTIMIZE: Use just the boundary features, when available
+  // Get the features for the real district
+  let featuresToCheck = Array.from(features);
+
+  // If the district has features, check whether it is embedded
+  if (!(U.isArrayEmpty(featuresToCheck)))
+  {
+    // For each feature that needs to be checked (see above)
+    for (let feature of featuresToCheck)
+    {
+      // Get its neighbors (including the virtual "out of state" ones)
+      let neighbors = graph.peerNeighbors(feature);
+
+      for (let neighbor of neighbors)
+      {
+        if (U.isOutOfState(neighbor))
+        {
+          bEmbedded = false;
+          // No need to check any more neighbors
+          break;
+        }
+        else
+        {
+          let neighboringDistrict = U.getDistrict(planByGeo, neighbor);
+
+          // Assume that a missing district assignment (= None) means that the
+          // feature is "water-only" AND part of the state border (vs. internal)
+          // and, therefore, not in the plan/map.
+
+          if (neighboringDistrict == undefined)
+          {
+            bEmbedded = false;
+            // No need to check any more neighbors
+            break;
+          }
+          else
+          {
+            // TODO - OPTIMIZE: Since we're checking *all* features in a district right
+            //   now, not just boundary features and neighbors in other districts,
+            //   prune out the current district. If/when we optimize compactness
+            //   to cache district boundaries (as before in my Python implementation),
+            //   we won't have to guard adding "neighboring" districts in this way.
+            if (neighboringDistrict != districtID)
+            {
+              neighboringDistricts.add(neighboringDistrict);
             }
-            // If a district is not embedded, there's no need to check anymore
-            // border geos.
-            if (!bEmbedded) {
-                break;
+
+            if (neighboringDistricts.size > 1)
+            {
+              bEmbedded = false;
+              // No need to check any more neighbors
+              break;
             }
+          }
         }
+      }
+      // If a district is not embedded, there's no need to check anymore
+      // border geos.
+      if (!bEmbedded)
+      {
+        break;
+      }
     }
-    return bEmbedded;
+
+  }
+
+  return bEmbedded;
 }
-exports.isEmbedded = isEmbedded;
+*/
 
 
 /***/ }),
@@ -2665,6 +2708,17 @@ module.exports = require("@dra2020/compactness");
 
 /***/ }),
 
+/***/ "@dra2020/dra-graph":
+/*!*************************************!*\
+  !*** external "@dra2020/dra-graph" ***!
+  \*************************************/
+/*! no static exports found */
+/***/ (function(module, exports) {
+
+module.exports = require("@dra2020/dra-graph");
+
+/***/ }),
+
 /***/ "@dra2020/dra-score":
 /*!*************************************!*\
   !*** external "@dra2020/dra-score" ***!