refactor(sparse): update imports, use new Fn types

thi-ng · Sep 5, 2020 · b4a5341 · b4a5341
1 parent 174de7a
commit b4a5341
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 10 deletions.
diff --git a/packages/sparse/src/coo.ts b/packages/sparse/src/coo.ts
@@ -1,8 +1,8 @@
 import { partition } from "@thi.ng/transducers";
 import { ASparseMatrix } from "./amatrix";
+import type { NzEntry } from "./api";
 import { CSC } from "./csc";
 import { CSR } from "./csr";
-import type { NzEntry } from "./api";
 
 export class COO extends ASparseMatrix {
     static fromDense(m: number, n: number, data: ArrayLike<number>) {

diff --git a/packages/sparse/src/csc.ts b/packages/sparse/src/csc.ts
@@ -1,7 +1,7 @@
 import { assert } from "@thi.ng/api";
 import { ASparseMatrix } from "./amatrix";
-import { at, compress, diag, setAt } from "./compressed";
 import type { NzEntry } from "./api";
+import { at, compress, diag, setAt } from "./compressed";
 
 export class CSC extends ASparseMatrix {
     /**

diff --git a/packages/sparse/src/csr.ts b/packages/sparse/src/csr.ts
@@ -1,7 +1,7 @@
 import { assert } from "@thi.ng/api";
 import { ASparseMatrix } from "./amatrix";
-import { at, compress, diag, remove, setAt } from "./compressed";
 import type { NzEntry } from "./api";
+import { at, compress, diag, remove, setAt } from "./compressed";
 
 export class CSR extends ASparseMatrix {
     /**

diff --git a/packages/sparse/src/diag.ts b/packages/sparse/src/diag.ts
@@ -1,9 +1,9 @@
 import { assert } from "@thi.ng/api";
 import { ASparseMatrix } from "./amatrix";
+import type { NzEntry } from "./api";
 import { CSC } from "./csc";
 import { CSR } from "./csr";
 import { SparseVec } from "./vec";
-import type { NzEntry } from "./api";
 
 export class Diag extends ASparseMatrix {
     static identity(m: number) {

diff --git a/packages/sparse/src/index.ts b/packages/sparse/src/index.ts
@@ -1,6 +1,7 @@
 export * from "./api";
 
 export * from "./amatrix";
+export * from "./compressed";
 export * from "./coo";
 export * from "./csc";
 export * from "./csr";

diff --git a/packages/sparse/src/vec.ts b/packages/sparse/src/vec.ts
@@ -1,12 +1,12 @@
-import { assert } from "@thi.ng/api";
+import { assert, FnN2 } from "@thi.ng/api";
 import type { NzEntry } from "./api";
 
-export type BinOp = (a: number, b: number) => number;
+export type BinOp = FnN2;
 
-const ADD = (a: number, b: number) => a + b;
-const SUB = (a: number, b: number) => a - b;
-const MUL = (a: number, b: number) => a * b;
-const DIV = (a: number, b: number) => a / b;
+const ADD: BinOp = (a, b) => a + b;
+const SUB: BinOp = (a, b) => a - b;
+const MUL: BinOp = (a, b) => a * b;
+const DIV: BinOp = (a, b) => a / b;
 
 export class SparseVec {
     static fromDense(dense: ArrayLike<number>) {