@nshiab/simple-data-analysis-core 2.1.7 → 2.1.9

package/script/methods/shortestPath.js

@@ -92,7 +92,7 @@ function shortestPath(simpleTable, sourceColumn, targetColumn, edgeId, start, en
             ? undefined
             : (input) => (0, validateGraphTemporalEvents_js_1.default)(input, temporalOptions, "shortestPath()", parameters),
         values: (schema) => {
-            (0, prepareGraphRouteSql_js_1.validateGraphRouteInputs)(schema, sourceColumn, targetColumn, edgeId, endpoints, options.weight, "shortestPath()");
+            (0, prepareGraphRouteSql_js_1.validateGraphRouteInputs)(schema, sourceColumn, targetColumn, edgeId, endpoints, options.weight, "shortestPath()", options.weight !== undefined);
             const temporal = temporalOptions === undefined
                 ? undefined
                 : (0, prepareGraphTemporalSql_js_1.default)(schema, temporalOptions, "shortestPath()");
@@ -102,27 +102,28 @@ function shortestPath(simpleTable, sourceColumn, targetColumn, edgeId, start, en
         },
         buildSelect: (input, schema) => shortestPathSelect(input, schema, sourceColumn, targetColumn, edgeId, endpoints, direction, options.weight, temporalOptions, metrics),
         outputSchema: (schema) => {
-            const validated = (0, prepareGraphRouteSql_js_1.validateGraphRouteInputs)(schema, sourceColumn, targetColumn, edgeId, endpoints, options.weight, "shortestPath()");
+            const validated = (0, prepareGraphRouteSql_js_1.validateGraphRouteInputs)(schema, sourceColumn, targetColumn, edgeId, endpoints, options.weight, "shortestPath()", options.weight !== undefined);
             if (temporalOptions !== undefined) {
                 (0, prepareGraphTemporalSql_js_1.default)(schema, temporalOptions, "shortestPath()");
             }
-            return (0, graphRouteResultSchema_js_1.default)(schema, validated.distanceType, "shortestPath()", metrics.elapsedTime);
+            return (0, graphRouteResultSchema_js_1.default)(schema, validated.distanceType, "shortestPath()", metrics.elapsedTime, options.weight !== undefined);
         },
     });
 }
 function shortestPathSelect(input, schema, source, target, edgeId, routeEndpoints, direction, weight, temporalOptions, metrics) {
-    const route = (0, prepareGraphRouteSql_js_1.prepareGraphRouteSql)(input, schema, source, target, edgeId, routeEndpoints, weight, "shortestPath()");
+    const route = (0, prepareGraphRouteSql_js_1.prepareGraphRouteSql)(input, schema, source, target, edgeId, routeEndpoints, weight, "shortestPath()", weight !== undefined);
     const prepared = route.traversal;
     if (temporalOptions !== undefined) {
         const temporal = (0, prepareGraphTemporalSql_js_1.default)(schema, temporalOptions, "shortestPath()");
-        return temporalShortestPathSelect(route, direction, temporal, metrics);
+        return temporalShortestPathSelect(route, direction, temporal, metrics, weight !== undefined);
     }
     const distanceType = route.distanceType;
     // Exact shortest routes have optimal prefixes. Floating addition can erase
     // a prefix-cost difference later, so retain all simple prefixes up to the
     // best complete cost before selecting the full-route ties.
-    const floating = route.weightType === "FLOAT" ||
-        route.weightType === "DOUBLE";
+    const floating = metrics.minimize === "weight" &&
+        (route.weightType === "FLOAT" || route.weightType === "DOUBLE");
+    const metricType = metrics.minimize === "steps" ? "BIGINT" : distanceType;
     const relations = prepared.relationNames([
         "graph_route_endpoints",
         "graph_edges",
@@ -148,8 +149,17 @@ function shortestPathSelect(input, schema, source, target, edgeId, routeEndpoint
     const edgeToKey = `${q("edges")}.${q("__to_key")}`;
     const edgeTo = `${q("edges")}.${q("__to")}`;
     const edgeCost = `${q("edges")}.${q("__weight")}`;
+    const edgeMetric = metrics.minimize === "steps"
+        ? "CAST(1 AS BIGINT)"
+        : edgeCost;
     const routeDistance = `${q("routes")}.${q("distance")}`;
     const candidateDistance = `CAST(${routeDistance} + ${edgeCost} AS ${distanceType})`;
+    const routeMetric = metrics.minimize === "steps"
+        ? `len(${q("routes")}.${q("steps")})`
+        : routeDistance;
+    const candidateMetric = metrics.minimize === "steps"
+        ? `${routeMetric} + 1`
+        : candidateDistance;
     return `WITH RECURSIVE ${endpointRelation}(
       ${q("start")}, ${q("end")}, ${q("__start_key")}, ${q("__end_key")}
     ) AS (
@@ -181,13 +191,13 @@ function shortestPathSelect(input, schema, source, target, edgeId, routeEndpoint
       ${q("node")}, ${q("__node_key")}, ${q("distance")}
     ) USING KEY(${q("__node_key")}) AS (
       SELECT ${q("start")}, ${q("__start_key")},
-        CAST(0 AS ${distanceType})
+        CAST(0 AS ${metricType})
       FROM ${endpointRelation}
       INNER JOIN ${toEndRelation}
         ON ${q("__start_key")} = ${q("__key")}
       UNION
       SELECT ${edgeTo}, ${edgeToKey},
-        MIN(CAST(${q("reached")}.${q("distance")} + ${edgeCost} AS ${distanceType}))
+        MIN(CAST(${q("reached")}.${q("distance")} + ${edgeMetric} AS ${metricType}))
       FROM ${distancesRelation} AS ${q("reached")}
       INNER JOIN ${edgesRelation} AS ${q("edges")}
         ON ${q("reached")}.${q("__node_key")} = ${edgeFromKey}
@@ -197,7 +207,7 @@ function shortestPathSelect(input, schema, source, target, edgeId, routeEndpoint
         ON ${edgeToKey} = ${q("best")}.${q("__node_key")}
       GROUP BY ${edgeTo}, ${edgeToKey}, ${q("best")}.${q("distance")}
       HAVING ${q("best")}.${q("distance")} IS NULL
-        OR MIN(CAST(${q("reached")}.${q("distance")} + ${edgeCost} AS ${distanceType})) < ${q("best")}.${q("distance")}
+        OR MIN(CAST(${q("reached")}.${q("distance")} + ${edgeMetric} AS ${metricType})) < ${q("best")}.${q("distance")}
     ), ${bestTotalRelation} AS (
       SELECT ${q("distances")}.${q("distance")}
       FROM ${distancesRelation} AS ${q("distances")}
@@ -236,23 +246,23 @@ function shortestPathSelect(input, schema, source, target, edgeId, routeEndpoint
       WHERE ${q("routes")}.${q("__node_key")} <> ${q("__end_key")}
         AND NOT list_contains(${q("routes")}.${q("__visited")}, ${edgeToKey})
         AND ${floating
-        ? `${candidateDistance} <= ${q("best_total")}.${q("distance")}`
-        : `${candidateDistance} = ${q("best_prefix")}.${q("distance")}`}
+        ? `${candidateMetric} <= ${q("best_total")}.${q("distance")}`
+        : `${candidateMetric} = ${q("best_prefix")}.${q("distance")}`}
     ), ${shortestRelation} AS (
       SELECT ${q("__edge_keys")}, ${q("steps")}
-      FROM ${routesRelation}
+      FROM ${routesRelation} AS ${q("routes")}
       CROSS JOIN ${endpointRelation}
       CROSS JOIN ${bestTotalRelation} AS ${q("best_total")}
       WHERE ${q("__node_key")} = ${q("__end_key")}
-        AND ${routesRelation}.${q("distance")} = ${q("best_total")}.${q("distance")}
+        AND ${routeMetric} = ${q("best_total")}.${q("distance")}
     ), ${rankedRelation} AS (
       SELECT CAST(row_number() OVER (ORDER BY ${q("__edge_keys")}) - 1 AS BIGINT) AS ${q("pathId")},
         ${q("steps")}
       FROM ${shortestRelation}
     )
-    ${(0, graphRouteResultSelect_js_1.default)(rankedRelation, route.input, route.edgeIdColumn)}`;
+    ${(0, graphRouteResultSelect_js_1.default)(rankedRelation, route.input, route.edgeIdColumn, false, false, weight !== undefined)}`;
 }
-function temporalShortestPathSelect(route, direction, temporal, metrics) {
+function temporalShortestPathSelect(route, direction, temporal, metrics, includeTotal) {
     const prepared = route.traversal;
     const q = quoteIdentifier_js_1.default;
     const startsSelect = `SELECT ${q("start")},
@@ -265,7 +275,7 @@ function temporalShortestPathSelect(route, direction, temporal, metrics) {
         : (0, buildGraphTemporalCostStateSql_js_1.default)(prepared, startsSelect, direction, temporal, route.distanceType, route.edgeWeight, [
             `${route.typedEdgeId} AS ${q("__edge_id")}`,
             `${route.edgeKey} AS ${q("__edge_key")}`,
-        ]);
+        ], metrics.minimize === "steps" ? "steps" : "weight");
     const relations = prepared.relationNames([
         "graph_route_endpoints",
         "graph_nodes",
@@ -295,15 +305,21 @@ function temporalShortestPathSelect(route, direction, temporal, metrics) {
     const routeAnchor = `${q("routes")}.${q("__journey_anchor")}`;
     const firstElapsed = temporal.journeyElapsed("edges", firstAnchor, direction);
     const candidateElapsed = temporal.journeyElapsed("edges", routeAnchor, direction);
-    const firstMetric = metrics.minimize === "elapsedTime"
-        ? firstElapsed
-        : edgeCost;
-    const candidateMetric = metrics.minimize === "elapsedTime"
-        ? candidateElapsed
-        : candidateDistance;
-    const routeMetric = metrics.minimize === "elapsedTime"
-        ? `${q("routes")}.${q("__elapsed")}`
-        : routeDistance;
+    const firstMetric = metrics.minimize === "steps"
+        ? "1"
+        : metrics.minimize === "elapsedTime"
+            ? firstElapsed
+            : edgeCost;
+    const routeMetric = metrics.minimize === "steps"
+        ? `len(${q("routes")}.${q("steps")})`
+        : metrics.minimize === "elapsedTime"
+            ? `${q("routes")}.${q("__elapsed")}`
+            : routeDistance;
+    const candidateMetric = metrics.minimize === "steps"
+        ? `${routeMetric} + 1`
+        : metrics.minimize === "elapsedTime"
+            ? candidateElapsed
+            : candidateDistance;
     const step = (distance, elapsed) => `struct_pack(
           ${q("edgeId")} := ${q("edges")}.${q("__edge_id")},
           ${q("source")} := ${q("edges")}.${q("__from")},
@@ -336,7 +352,7 @@ function temporalShortestPathSelect(route, direction, temporal, metrics) {
       INNER JOIN ${edgesRelation} AS ${q("edges")}
         ON ${q("reached")}.${q("__key")} = ${edgeToKey}
     ), ${bestTotalRelation} AS (
-      SELECT MIN(${q("costs")}.${q("distance")}) AS ${q("distance")}
+      SELECT MIN(${q("costs")}.${q(metrics.minimize === "steps" ? "steps" : "distance")}) AS ${q("distance")}
       FROM ${costs.costRelation} AS ${q("costs")}
       INNER JOIN ${endpointRelation}
         ON ${q("costs")}.${q("__node_key")} = ${q("__end_key")}
@@ -391,7 +407,7 @@ function temporalShortestPathSelect(route, direction, temporal, metrics) {
           AS ${q("pathId")}, ${q("steps")}
       FROM ${shortestRelation}
     )
-    ${(0, graphRouteResultSelect_js_1.default)(rankedRelation, route.input, route.edgeIdColumn, false, metrics.elapsedTime)}`;
+    ${(0, graphRouteResultSelect_js_1.default)(rankedRelation, route.input, route.edgeIdColumn, false, metrics.elapsedTime, includeTotal)}`;
 }
 // At the same physical event a later departure (or earlier incoming arrival)
 // dominates every future elapsed duration. Keyed improvements find the optimum

package/script/methods/similarityMahalanobis.js

@@ -50,11 +50,11 @@ function similarityMahalanobis(table, columns, referencePoint, newColumn, option
 }
 async function execute(table, columns, referencePoint, newColumn, options) {
     const sourceColumns = Object.keys(await table.getTypes());
-    const scoreColumn = options.similarityScoreColumn === true
+    const scoreColumn = options.similarityColumn === true
         ? "similarity"
-        : options.similarityScoreColumn === false
+        : options.similarityColumn === false
             ? undefined
-            : options.similarityScoreColumn;
+            : options.similarityColumn;
     const outputNames = scoreColumn === undefined
         ? [newColumn]
         : [newColumn, scoreColumn];