@dra2020/dra-analytics 4.1.6 → 4.1.8

package/dist/lib/compactness/features.d.ts

@@ -7,6 +7,7 @@ export declare function calcBoundingBox(poly: any): number;
 export declare function calcPolsbyPopper(area: number, perimeter: number): number;
 export declare function calcConvexHullFeature(area: number, chArea: number): number;
 export declare function calcSchwartzberg(area: number, perimeter: number): number;
+export declare function featureizeCacheSize(size: number): void;
 export declare function featureizePoly(poly: any, options?: Poly.PolyOptions, { bKIWYSIFeatures }?: {
     bKIWYSIFeatures?: boolean;
 }): T.CompactnessFeatures;

package/lib/compactness/compactness.ts

@@ -5,7 +5,7 @@
 import * as GeoJSON from 'geojson';
 import {Poly} from '@dra2020/baseclient';
 
-import {featureizePoly} from './features';
+import {featureizePoly, featureizeCacheSize} from './features';
 import {scoreFeatureSet} from './kiwysi';
 import * as T from '../types/all';
 import {ratePolsby, rateReock} from '../rate/dra-ratings';
@@ -52,6 +52,9 @@ export function makeCompactnessScorecard(shapes: GeoJSON.FeatureCollection, bLog
   // Note, these use the Cartesian (flat earth) measurements
   let byDistrict: T.Compactness[] = [];
 
+  // Give hint to featureize cache about how many features we are working with
+  featureizeCacheSize(shapes.features.length);
+
   for (let i = 0; i < shapes.features.length; i++)
   {
     const f: any = shapes.features[i];

package/lib/compactness/features.ts

@@ -229,9 +229,74 @@ export function calcSchwartzberg(area: number, perimeter: number): number
 
 
 // CALCULATE THE 7 COMPACTNESS "FEATURES" FOR A POLYGON FOR THE KIWYSI COMPACTNESS MODEL
+interface CacheEntry
+{
+  lru: number,
+  ms: number,
+  features: T.CompactnessFeatures,
+}
+
+class featureizeCache
+{
+  map: Map<any, CacheEntry>;
+  size: number;
+  lru: number;
+
+  constructor()
+  {
+    this.map = new Map<any, CacheEntry>();
+    this.size = 200;
+    this.lru = 0;
+  }
+
+  setSize(size: number): void
+  {
+    this.size = Math.max(this.size, size);
+  }
+
+  find(hash: number): T.CompactnessFeatures|undefined
+  {
+    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: number, features: T.CompactnessFeatures, ms: number): void
+  {
+    this.cull();
+    this.map.set(hash, { lru: this.lru++, ms, features });
+  }
+
+  cull(): void
+  {
+    // 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: [any, CacheEntry], b: [any, CacheEntry]) => a[1].lru - b[1].lru)
+                      .map((a: [any, CacheEntry]) => 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();
+export function featureizeCacheSize(size: number): void { cache.setSize(size) }
 
 export function featureizePoly(poly: any, options?: Poly.PolyOptions, {bKIWYSIFeatures = true}: {bKIWYSIFeatures?: boolean} = {}): T.CompactnessFeatures
 {
+  let h = Poly.polyHash32(poly);
+  let r = cache.find(h);
+  if (r) return r;
+  let e = new Util.Elapsed();
+
   if (options === undefined) options = Poly.DefaultOptions;
 
   const area: number = Poly.polyArea(poly);
@@ -262,6 +327,7 @@ export function featureizePoly(poly: any, options?: Poly.PolyOptions, {bKIWYSIFe
     reockFlat: calcReock(areaFlat, diameterFlat),
     polsbyFlat: calcPolsbyPopper(areaFlat, perimeterFlat)
   };
+  cache.add(h, result, e.ms());
 
   return result;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dra2020/dra-analytics",
-  "version": "4.1.6",
+  "version": "4.1.8",
   "description": "DRA analytics",
   "main": "dist/dra-analytics.js",
   "types": "./dist/lib/all/all.d.ts",
@@ -37,16 +37,16 @@
     "@types/node": "^20.11.30",
     "@types/yargs": "^11.1.8",
     "csv-parse": "^4.16.3",
+    "elliptic": "^6.6.1",
     "jest": "^29.5.0",
     "json-loader": "^0.5.7",
+    "pbkdf2": "^3.1.3",
     "prettier": "^2.8.8",
     "shapefile": "^0.6.6",
     "source-map-loader": "^5.0.0",
     "ts-jest": "^29.1.0",
     "ts-loader": "^9.5.2",
     "tsify": "^5.0.4",
-    "elliptic": "^6.6.1",
-    "pbkdf2": "^3.1.3",
     "tslint": "^6.1.3",
     "tslint-config-prettier": "^1.18.0",
     "typescript": "^5.8.3",
@@ -54,7 +54,7 @@
     "webpack-cli": "^6.0.1"
   },
   "dependencies": {
-    "@dra2020/baseclient": "^1.0.154",
+    "@dra2020/baseclient": "^1.0.166",
     "cjs": "^0.0.11",
     "geojson": "^0.5.0",
     "yargs": "^12.0.5"