@dra2020/dra-analytics 4.1.5 → 4.1.7

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2021-2024 Social Good Fund for Dave's Redistricting.
+Copyright (c) 2021-2025 Social Good Fund for Dave's Redistricting.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/dist/dra-analytics.js

@@ -345,6 +345,8 @@ function makeCompactnessScorecard(shapes, bLog = false) {
     // For returning compactness by district to DRA
     // Note, these use the Cartesian (flat earth) measurements
     let byDistrict = [];
+    // Give hint to featureize cache about how many features we are working with
+    (0, features_1.featureizeCacheSize)(shapes.features.length);
     for (let i = 0; i < shapes.features.length; i++) {
         const f = shapes.features[i];
         const features = (0, features_1.featureizePoly)(f, options, { bKIWYSIFeatures: bKIWYSIFeatures });
@@ -450,6 +452,7 @@ exports.calcBoundingBox = calcBoundingBox;
 exports.calcPolsbyPopper = calcPolsbyPopper;
 exports.calcConvexHullFeature = calcConvexHullFeature;
 exports.calcSchwartzberg = calcSchwartzberg;
+exports.featureizeCacheSize = featureizeCacheSize;
 exports.featureizePoly = featureizePoly;
 const baseclient_1 = __webpack_require__(/*! @dra2020/baseclient */ "@dra2020/baseclient");
 // FEATURES (FOR AN ML MODEL)
@@ -615,8 +618,48 @@ function calcConvexHullFeature(area, chArea) {
 function calcSchwartzberg(area, perimeter) {
     return perimeter / ((2 * Math.PI) * Math.sqrt(area / Math.PI));
 }
-// CALCULATE THE 7 COMPACTNESS "FEATURES" FOR A POLYGON FOR THE KIWYSI COMPACTNESS MODEL
+class featureizeCache {
+    constructor() {
+        this.map = new Map();
+        this.size = 200;
+        this.lru = 0;
+    }
+    setSize(size) {
+        this.size = Math.max(this.size, size);
+    }
+    find(hash) {
+        let e = this.map.get(hash);
+        if (e) {
+            e.lru = this.lru++; // refresh LRU value to most current
+            //console.log(`featureize: saved ${e.ms} milliseconds`);
+            return e.features;
+        }
+        return undefined;
+    }
+    add(hash, features, ms) {
+        this.cull();
+        this.map.set(hash, { lru: this.lru++, ms, features });
+    }
+    cull() {
+        // Let grow to twice size before culling since we do sort by lru to cull and don't want to do too often
+        if (this.map.size > 2 * this.size) {
+            let keys = Array.from(this.map.entries())
+                .sort((a, b) => a[1].lru - b[1].lru)
+                .map((a) => a[0])
+                .slice(0, this.map.size - this.size);
+            keys.forEach(key => this.map.delete(key));
+            //console.log(`featureizeCache:cull: culled to ${this.map.size}`);
+        }
+    }
+}
+let cache = new featureizeCache();
+function featureizeCacheSize(size) { cache.setSize(size); }
 function featureizePoly(poly, options, { bKIWYSIFeatures = true } = {}) {
+    let h = baseclient_1.Poly.polyHash32(poly);
+    let r = cache.find(h);
+    if (r)
+        return r;
+    let e = new baseclient_1.Util.Elapsed();
     if (options === undefined)
         options = baseclient_1.Poly.DefaultOptions;
     const area = baseclient_1.Poly.polyArea(poly);
@@ -642,6 +685,7 @@ function featureizePoly(poly, options, { bKIWYSIFeatures = true } = {}) {
         reockFlat: calcReock(areaFlat, diameterFlat),
         polsbyFlat: calcPolsbyPopper(areaFlat, perimeterFlat)
     };
+    cache.add(h, result, e.ms());
     return result;
 }