Fix Map and Matrix initialization

alaa-eddine · alaa-eddine · commit a0442356a023 · 2025-12-15T02:39:39.000+01:00
diff --git a/scripts/generate-map-index.js b/scripts/generate-map-index.js
@@ -42,9 +42,7 @@ async function generateIndex() {
 
         const objectPrivateProps = objectMethods.map((m) => `    private _${m.classProp}: any;`).join('\n');
 
-        const objectInitProps = objectMethods
-            .map((m) => `        this._${m.classProp} = ${m.export}_factory(this.context);`)
-            .join('\n');
+        const objectInitProps = objectMethods.map((m) => `        this._${m.classProp} = ${m.export}_factory(this.context);`).join('\n');
 
         const objectMethodDefs = objectMethods
             .map((m) => {
@@ -64,17 +62,13 @@ export class PineMapObject {
     public map: Map<any, any>;
 ${objectPrivateProps}
 
-    constructor(
-        public keyType: string,
-        public valueType: string,
-        public context: any
-    ) {
+    constructor(public context: any) {
         this.map = new Map();
 ${objectInitProps}
     }
 
     toString(): string {
-        return \`PineMapObject<\${this.keyType}, \${this.valueType}>(\${this.map.size})\`;
+        return \`PineMapObject(\${this.map.size})\`;
     }
 
 ${objectMethodDefs}
@@ -156,4 +150,3 @@ export default PineMap;
 }
 
 generateIndex();
-
diff --git a/scripts/generate-matrix-index.js b/scripts/generate-matrix-index.js
@@ -63,7 +63,6 @@ export class PineMatrixObject {
 ${objectPrivateProps}
 
     constructor(
-        public type: string,
         rows: number = 0,
         cols: number = 0,
         initialValue: any = NaN,
diff --git a/src/namespaces/map/PineMapObject.ts b/src/namespaces/map/PineMapObject.ts
@@ -26,11 +26,7 @@ export class PineMapObject {
     private _size: any;
     private _values: any;
 
-    constructor(
-        public keyType: string,
-        public valueType: string,
-        public context: any
-    ) {
+    constructor(public context: any) {
         this.map = new Map();
         this._clear = clear_factory(this.context);
         this._contains = contains_factory(this.context);
@@ -45,7 +41,7 @@ export class PineMapObject {
     }
 
     toString(): string {
-        return `PineMapObject<${this.keyType}, ${this.valueType}>(${this.map.size})`;
+        return `PineMapObject(${this.map.size})`;
     }
 
     clear(...args: any[]) {
diff --git a/src/namespaces/map/methods/copy.ts b/src/namespaces/map/methods/copy.ts
@@ -5,9 +5,8 @@ import { Context } from '../../../Context.class';
 
 export function copy(context: Context) {
     return (id: PineMapObject) => {
-        const newMap = new PineMapObject(id.keyType, id.valueType, context);
+        const newMap = new PineMapObject(context);
         newMap.map = new Map(id.map);
         return newMap;
     };
 }
-
diff --git a/src/namespaces/map/methods/new.ts b/src/namespaces/map/methods/new.ts
@@ -4,8 +4,7 @@ import { PineMapObject } from '../PineMapObject';
 import { Context } from '../../../Context.class';
 
 export function new_fn(context: Context) {
-    return (keyType: string, valueType: string): PineMapObject => {
-        return new PineMapObject(keyType, valueType, context);
+    return (): PineMapObject => {
+        return new PineMapObject(context);
     };
 }
-
diff --git a/src/namespaces/matrix/PineMatrixObject.ts b/src/namespaces/matrix/PineMatrixObject.ts
@@ -103,7 +103,6 @@ export class PineMatrixObject {
     private _transpose: any;
 
     constructor(
-        public type: string,
         rows: number = 0,
         cols: number = 0,
         initialValue: any = NaN,
diff --git a/src/namespaces/matrix/methods/copy.ts b/src/namespaces/matrix/methods/copy.ts
@@ -7,7 +7,7 @@ export function copy(context: Context) {
     return (id: PineMatrixObject) => {
         const rows = id.matrix.length;
         const cols = rows > 0 ? id.matrix[0].length : 0;
-        const newMatrix = new PineMatrixObject(id.type, rows, cols, NaN, context);
+        const newMatrix = new PineMatrixObject(rows, cols, NaN, context);
 
         // Deep copy the array of arrays structure
         newMatrix.matrix = id.matrix.map((row) => [...row]);
diff --git a/src/namespaces/matrix/methods/diff.ts b/src/namespaces/matrix/methods/diff.ts
@@ -6,11 +6,11 @@ import { Context } from '../../../Context.class';
 export function diff(context: Context) {
     return (id: PineMatrixObject, id2: PineMatrixObject | number) => {
         const rows = id.matrix.length;
-        if (rows === 0) return new PineMatrixObject(id.type, 0, 0, NaN, context);
+        if (rows === 0) return new PineMatrixObject(0, 0, NaN, context);
         const cols = id.matrix[0].length;
-        
-        const newMatrix = new PineMatrixObject(id.type, rows, cols, NaN, context);
-        
+
+        const newMatrix = new PineMatrixObject(rows, cols, NaN, context);
+
         if (id2 instanceof PineMatrixObject) {
             for (let i = 0; i < rows; i++) {
                 for (let j = 0; j < cols; j++) {
@@ -27,8 +27,7 @@ export function diff(context: Context) {
                 }
             }
         }
-        
+
         return newMatrix;
     };
 }
-
diff --git a/src/namespaces/matrix/methods/eigenvectors.ts b/src/namespaces/matrix/methods/eigenvectors.ts
@@ -8,12 +8,11 @@ export function eigenvectors(context: Context) {
     return (id: PineMatrixObject) => {
         const rows = id.matrix.length;
         const cols = rows > 0 ? id.matrix[0].length : 0;
-        if (rows !== cols) return new PineMatrixObject(id.type, 0, 0, NaN, context);
-        
+        if (rows !== cols) return new PineMatrixObject(0, 0, NaN, context);
+
         // Return identity for now as placeholder or simple 2x2 logic
-        const newMatrix = new PineMatrixObject(id.type, rows, cols, 0, context);
-        for(let i=0; i<rows; i++) newMatrix.matrix[i][i] = 1;
+        const newMatrix = new PineMatrixObject(rows, cols, 0, context);
+        for (let i = 0; i < rows; i++) newMatrix.matrix[i][i] = 1;
         return newMatrix;
     };
 }
-
diff --git a/src/namespaces/matrix/methods/inv.ts b/src/namespaces/matrix/methods/inv.ts
@@ -25,10 +25,10 @@ export function inv(context: Context) {
     return (id: PineMatrixObject) => {
         const rows = id.matrix.length;
         const cols = rows > 0 ? id.matrix[0].length : 0;
-        if (rows !== cols) return new PineMatrixObject(id.type, rows, cols, NaN, context);
+        if (rows !== cols) return new PineMatrixObject(rows, cols, NaN, context);
 
         const invMat = inverse(id.matrix);
-        const newMatrix = new PineMatrixObject(id.type, rows, cols, NaN, context);
+        const newMatrix = new PineMatrixObject(rows, cols, NaN, context);
         newMatrix.matrix = invMat;
         return newMatrix;
     };
diff --git a/src/namespaces/matrix/methods/kron.ts b/src/namespaces/matrix/methods/kron.ts
@@ -9,12 +9,12 @@ export function kron(context: Context) {
         const c1 = r1 > 0 ? id.matrix[0].length : 0;
         const r2 = id2.matrix.length;
         const c2 = r2 > 0 ? id2.matrix[0].length : 0;
-        
+
         const rows = r1 * r2;
         const cols = c1 * c2;
-        
-        const newMatrix = new PineMatrixObject(id.type, rows, cols, NaN, context);
-        
+
+        const newMatrix = new PineMatrixObject(rows, cols, NaN, context);
+
         for (let i = 0; i < r1; i++) {
             for (let j = 0; j < c1; j++) {
                 const val1 = id.matrix[i][j];
@@ -26,8 +26,7 @@ export function kron(context: Context) {
                 }
             }
         }
-        
+
         return newMatrix;
     };
 }
-
diff --git a/src/namespaces/matrix/methods/mult.ts b/src/namespaces/matrix/methods/mult.ts
@@ -8,18 +8,18 @@ export function mult(context: Context) {
     return (id: PineMatrixObject, id2: PineMatrixObject | number | PineArrayObject) => {
         const rows1 = id.matrix.length;
         const cols1 = rows1 > 0 ? id.matrix[0].length : 0;
-        
+
         if (id2 instanceof PineMatrixObject) {
             const rows2 = id2.matrix.length;
             const cols2 = rows2 > 0 ? id2.matrix[0].length : 0;
-            
+
             if (cols1 !== rows2) {
                 // Dimensions incompatible for matrix multiplication
-                return new PineMatrixObject(id.type, 0, 0, NaN, context);
+                return new PineMatrixObject(0, 0, NaN, context);
             }
-            
-            const newMatrix = new PineMatrixObject(id.type, rows1, cols2, 0, context);
-            
+
+            const newMatrix = new PineMatrixObject(rows1, cols2, 0, context);
+
             for (let i = 0; i < rows1; i++) {
                 for (let j = 0; j < cols2; j++) {
                     let sum = 0;
@@ -31,25 +31,25 @@ export function mult(context: Context) {
             }
             return newMatrix;
         } else if (id2 instanceof PineArrayObject || Array.isArray((id2 as any).array || id2)) {
-             // Vector multiplication
-             const vec = (id2 as any).array || (id2 as any);
-             if (cols1 !== vec.length) {
-                 return new PineMatrixObject(id.type, 0, 0, NaN, context);
-             }
-             
-             const newMatrix = new PineMatrixObject(id.type, rows1, 1, 0, context);
-             for (let i = 0; i < rows1; i++) {
-                 let sum = 0;
-                 for (let j = 0; j < cols1; j++) {
-                     sum += id.matrix[i][j] * vec[j];
-                 }
-                 newMatrix.matrix[i][0] = sum;
-             }
-             return newMatrix;
+            // Vector multiplication
+            const vec = (id2 as any).array || (id2 as any);
+            if (cols1 !== vec.length) {
+                return new PineMatrixObject(0, 0, NaN, context);
+            }
+
+            const newMatrix = new PineMatrixObject(rows1, 1, 0, context);
+            for (let i = 0; i < rows1; i++) {
+                let sum = 0;
+                for (let j = 0; j < cols1; j++) {
+                    sum += id.matrix[i][j] * vec[j];
+                }
+                newMatrix.matrix[i][0] = sum;
+            }
+            return newMatrix;
         } else {
             // Scalar multiplication
             const scalar = id2 as number;
-            const newMatrix = new PineMatrixObject(id.type, rows1, cols1, NaN, context);
+            const newMatrix = new PineMatrixObject(rows1, cols1, NaN, context);
             for (let i = 0; i < rows1; i++) {
                 for (let j = 0; j < cols1; j++) {
                     newMatrix.matrix[i][j] = id.matrix[i][j] * scalar;
@@ -59,4 +59,3 @@ export function mult(context: Context) {
         }
     };
 }
-
diff --git a/src/namespaces/matrix/methods/new.ts b/src/namespaces/matrix/methods/new.ts
@@ -4,8 +4,7 @@ import { PineMatrixObject } from '../PineMatrixObject';
 import { Context } from '../../../Context.class';
 
 export function new_fn(context: Context) {
-    return (type: string, rows: number, cols: number, initial_value: any): PineMatrixObject => {
-        return new PineMatrixObject(type, rows, cols, initial_value, context);
+    return (rows: number, cols: number, initial_value: any): PineMatrixObject => {
+        return new PineMatrixObject(rows, cols, initial_value, context);
     };
 }
-
diff --git a/src/namespaces/matrix/methods/pinv.ts b/src/namespaces/matrix/methods/pinv.ts
@@ -8,14 +8,13 @@ export function pinv(context: Context) {
         // Pseudoinverse placeholder (uses inv if square/nonsingular, else NaN for now)
         const rows = id.matrix.length;
         const cols = rows > 0 ? id.matrix[0].length : 0;
-        
+
         if (rows === cols) {
-             // Try normal inverse
-             // We need to import inv implementation or duplicate logic. 
-             // Since we don't have shared math lib yet, let's return NaN for complex cases.
-             return new PineMatrixObject(id.type, rows, cols, NaN, context);
+            // Try normal inverse
+            // We need to import inv implementation or duplicate logic.
+            // Since we don't have shared math lib yet, let's return NaN for complex cases.
+            return new PineMatrixObject(rows, cols, NaN, context);
         }
-        return new PineMatrixObject(id.type, cols, rows, NaN, context);
+        return new PineMatrixObject(cols, rows, NaN, context);
     };
 }
-
diff --git a/src/namespaces/matrix/methods/pow.ts b/src/namespaces/matrix/methods/pow.ts
@@ -7,27 +7,27 @@ export function pow(context: Context) {
     return (id: PineMatrixObject, power: number) => {
         const rows = id.matrix.length;
         const cols = rows > 0 ? id.matrix[0].length : 0;
-        
+
         if (rows !== cols) {
             // Must be square
-            return new PineMatrixObject(id.type, 0, 0, NaN, context);
+            return new PineMatrixObject(0, 0, NaN, context);
         }
-        
+
         // Identity matrix for power 0
-        let result = new PineMatrixObject(id.type, rows, cols, 0, context);
+        let result = new PineMatrixObject(rows, cols, 0, context);
         for (let i = 0; i < rows; i++) result.matrix[i][i] = 1;
-        
-        let base = new PineMatrixObject(id.type, rows, cols, NaN, context);
+
+        let base = new PineMatrixObject(rows, cols, NaN, context);
         // Deep copy base
-        for(let i=0; i<rows; i++) base.matrix[i] = [...id.matrix[i]];
+        for (let i = 0; i < rows; i++) base.matrix[i] = [...id.matrix[i]];
 
         let p = Math.floor(power);
-        if (p < 0) return new PineMatrixObject(id.type, rows, cols, NaN, context); // Or inverse? Pine usually doesn't do matrix power inversion automatically here
+        if (p < 0) return new PineMatrixObject(rows, cols, NaN, context); // Or inverse? Pine usually doesn't do matrix power inversion automatically here
 
         while (p > 0) {
             if (p % 2 === 1) {
                 // result = result * base
-                const temp = new PineMatrixObject(id.type, rows, cols, 0, context);
+                const temp = new PineMatrixObject(rows, cols, 0, context);
                 for (let i = 0; i < rows; i++) {
                     for (let j = 0; j < cols; j++) {
                         let sum = 0;
@@ -40,7 +40,7 @@ export function pow(context: Context) {
                 result = temp;
             }
             // base = base * base
-            const tempBase = new PineMatrixObject(id.type, rows, cols, 0, context);
+            const tempBase = new PineMatrixObject(rows, cols, 0, context);
             for (let i = 0; i < rows; i++) {
                 for (let j = 0; j < cols; j++) {
                     let sum = 0;
@@ -53,8 +53,7 @@ export function pow(context: Context) {
             base = tempBase;
             p = Math.floor(p / 2);
         }
-        
+
         return result;
     };
 }
-
diff --git a/src/namespaces/matrix/methods/submatrix.ts b/src/namespaces/matrix/methods/submatrix.ts
@@ -7,22 +7,21 @@ export function submatrix(context: Context) {
     return (id: PineMatrixObject, from_row: number, to_row: number, from_col: number, to_col: number) => {
         const rows = to_row - from_row;
         const cols = to_col - from_col;
-        
-        const newMatrix = new PineMatrixObject(id.type, rows, cols, NaN, context);
-        
+
+        const newMatrix = new PineMatrixObject(rows, cols, NaN, context);
+
         for (let i = 0; i < rows; i++) {
             const sourceRow = from_row + i;
             if (sourceRow >= id.matrix.length) break;
-            
+
             for (let j = 0; j < cols; j++) {
                 const sourceCol = from_col + j;
                 if (sourceCol >= id.matrix[sourceRow].length) break;
-                
+
                 newMatrix.matrix[i][j] = id.matrix[sourceRow][sourceCol];
             }
         }
-        
+
         return newMatrix;
     };
 }
-
diff --git a/src/namespaces/matrix/methods/sum.ts b/src/namespaces/matrix/methods/sum.ts
diff --git a/src/namespaces/matrix/methods/transpose.ts b/src/namespaces/matrix/methods/transpose.ts
diff --git a/tests/namespaces/map/map.test.ts b/tests/namespaces/map/map.test.ts
diff --git a/tests/namespaces/matrix/matrix.test.ts b/tests/namespaces/matrix/matrix.test.ts
