triangle-utils 1.4.107 → 1.4.109

package/dist/src/UtilsMisc.d.ts

@@ -7,7 +7,15 @@ export declare class UtilsMisc {
     readonly config: GlobalConfig;
     constructor(config: GlobalConfig);
     safe_run<T>(f: () => Promise<T>): Promise<T | undefined>;
-    iterate<T, U>(inputs: T[], f: (input: T, iterator_id: number, index: number) => Promise<U>, num_iterators?: number, print_option?: number | boolean): Promise<(U | undefined)[]>;
+    iterate<T, U>(inputs: T[], f: (input: T, iterator_id: number, index: number) => Promise<U>, options?: {
+        num_iterators?: number;
+        verbosity?: number | boolean;
+    }): Promise<(U | undefined)[]>;
+    batch_iterate<T, U>(inputs: T[], f: (inputs: T[], iterator_id: number, index: number) => Promise<U>, options: {
+        batch_size?: number;
+        num_iterators?: number;
+        verbosity?: number | boolean;
+    }): Promise<(U | undefined)[]>;
     static wait(duration: number): Promise<unknown>;
     static get_current_time(): string;
     static get_current_milliseconds(): number;

package/dist/src/UtilsMisc.js

@@ -21,8 +21,9 @@ export class UtilsMisc {
         }
         return undefined;
     }
-    async iterate(inputs, f, num_iterators = 1, print_option) {
-        const print_freq = typeof print_option === "boolean" ? (print_option === true ? 1 : 0) : print_option;
+    async iterate(inputs, f, options = {}) {
+        const num_iterators = options.num_iterators || 0;
+        const verbosity = typeof options.verbosity === "boolean" ? (options.verbosity === true ? 1 : 0) : (options.verbosity || 0);
         let index = 0;
         let iterators = [];
         const outputs = new Array(inputs.length).fill(undefined);
@@ -31,7 +32,7 @@ export class UtilsMisc {
                 while (index < inputs.length) {
                     const local_index = index;
                     index += 1;
-                    if (print_freq !== undefined && (local_index % print_freq === 0)) {
+                    if (verbosity !== undefined && (local_index % verbosity === 0)) {
                         console.log(iterator_id + ":" + local_index + "/" + inputs.length);
                     }
                     const output = await this.safe_run(() => f(inputs[local_index], iterator_id, local_index));
@@ -42,6 +43,29 @@ export class UtilsMisc {
         await Promise.all(iterators);
         return outputs;
     }
+    async batch_iterate(inputs, f, options) {
+        const batch_size = options.batch_size || 1;
+        const num_iterators = options.num_iterators || 0;
+        const verbosity = typeof options.verbosity === "boolean" ? (options.verbosity === true ? 1 : 0) : (options.verbosity || 0);
+        let index = 0;
+        let iterators = [];
+        const outputs = new Array(inputs.length).fill(undefined);
+        for (let iterator_id = 0; iterator_id < num_iterators; iterator_id++) {
+            iterators.push((async () => {
+                while (index < inputs.length) {
+                    const local_index = index;
+                    index += batch_size;
+                    if (verbosity !== undefined && (local_index % verbosity === 0)) {
+                        console.log(iterator_id + ":" + local_index + "/" + inputs.length);
+                    }
+                    const output = await this.safe_run(() => f(inputs.slice(local_index, local_index + batch_size), iterator_id, local_index));
+                    outputs[local_index] = output;
+                }
+            })());
+        }
+        await Promise.all(iterators);
+        return outputs;
+    }
     static async wait(duration) {
         return new Promise(resolve => setTimeout(resolve, duration));
     }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "triangle-utils",
-    "version": "1.4.107",
+    "version": "1.4.109",
     "main": "dist/src/index.js",
     "types": "dist/src/index.d.ts",
     "directories": {

package/src/UtilsMisc.ts

@@ -31,8 +31,9 @@ export class UtilsMisc {
         return undefined
     }
 
-    async iterate<T, U>(inputs : T[], f : (input : T, iterator_id : number, index : number) => Promise<U>, num_iterators : number = 1, print_option? : number | boolean) {
-        const print_freq : number | undefined = typeof print_option === "boolean" ? (print_option === true ? 1 : 0) : print_option
+    async iterate<T, U>(inputs : T[], f : (input : T, iterator_id : number, index : number) => Promise<U>, options : { num_iterators? : number, verbosity? : number | boolean } = {}) {
+        const num_iterators = options.num_iterators || 0
+        const verbosity : number = typeof options.verbosity === "boolean" ? (options.verbosity === true ? 1 : 0) : (options.verbosity || 0)
         let index = 0
         let iterators = []
         const outputs : (U | undefined)[] = new Array(inputs.length).fill(undefined)
@@ -41,7 +42,7 @@ export class UtilsMisc {
                 while (index < inputs.length) {
                     const local_index = index
                     index += 1
-                    if (print_freq !== undefined && (local_index % print_freq === 0)) {
+                    if (verbosity !== undefined && (local_index % verbosity === 0)) {
                         console.log(iterator_id + ":" + local_index + "/" + inputs.length)
                     }
                     const output = await this.safe_run(() => f(inputs[local_index], iterator_id, local_index))
@@ -53,6 +54,31 @@ export class UtilsMisc {
         return outputs
     }
 
+    async batch_iterate<T, U>(inputs : T[], f : (inputs : T[], iterator_id : number, index : number) => Promise<U>, 
+    options : { batch_size? : number, num_iterators? : number, verbosity? : number | boolean }) {
+        const batch_size = options.batch_size || 1
+        const num_iterators = options.num_iterators || 0
+        const verbosity : number = typeof options.verbosity === "boolean" ? (options.verbosity === true ? 1 : 0) : (options.verbosity || 0)
+        let index = 0
+        let iterators = []
+        const outputs : (U | undefined)[] = new Array(inputs.length).fill(undefined)
+        for (let iterator_id = 0; iterator_id < num_iterators; iterator_id++) {
+            iterators.push((async () => {
+                while (index < inputs.length) {
+                    const local_index = index
+                    index += batch_size
+                    if (verbosity !== undefined && (local_index % verbosity === 0)) {
+                        console.log(iterator_id + ":" + local_index + "/" + inputs.length)
+                    }
+                    const output = await this.safe_run(() => f(inputs.slice(local_index, local_index + batch_size), iterator_id, local_index))
+                    outputs[local_index] = output
+                }
+            })())
+        }
+        await Promise.all(iterators)
+        return outputs
+    }
+
 
     static async wait(duration : number) {
         return new Promise(resolve => setTimeout(resolve, duration))