vector cross dot fix

Author: gunnarmein-ts

nerdamer.core.js

@@ -8869,12 +8869,26 @@ var nerdamer = (function (imports) {
         }
 
         function dot(vec1, vec2) {
+            if (isMatrix(vec1)) {
+                vec1 = new Vector(vec1);
+            }
+            if (isMatrix(vec2)) {
+                vec2 = new Vector(vec2);
+            }
+            
             if(isVector(vec1) && isVector(vec2))
                 return vec1.dot(vec2);
             err('function dot expects 2 vectors');
         }
 
         function cross(vec1, vec2) {
+            if (isMatrix(vec1)) {
+                vec1 = new Vector(vec1);
+            }
+            if (isMatrix(vec2)) {
+                vec2 = new Vector(vec2);
+            }
+            
             if(isVector(vec1) && isVector(vec2))
                 return vec1.cross(vec2);
             err('function cross expects 2 vectors');
@@ -11190,6 +11204,13 @@ var nerdamer = (function (imports) {
             this.elements = v.items.slice(0);
         else if(isArray(v))
             this.elements = v.slice(0);
+        else if(isMatrix(v)) {
+            if (v.elements.length === 1) {
+                this.elements = [...v.elements[0]];
+            } else if (v.elements.length > 1 && Array.isArray(v.elements[0]) && v.elements[0].length === 1) {
+                this.elements = v.elements.map((row)=>row[0]);
+            }
+        }
         else
             this.elements = [].slice.call(arguments);
     }

spec/core.spec.js

@@ -1791,6 +1791,7 @@ describe('Nerdamer core', function () {
         expect(nerdamer('1+[a,b]').toString()).toEqual('[1+a,1+b]');
         expect(nerdamer('[a,b]+1').toString()).toEqual('[1+a,1+b]');
         expect(nerdamer('[a,b]+[a,b]').toString()).toEqual('[2*a,2*b]');
+        expect(nerdamer('[a,b]+[c,d]').expand().toString()).toEqual('[a+c,b+d]');
     });
     it('should subtract vectors correctly', function() {
         expect(nerdamer('1-[a,b]').toString()).toEqual('[-a+1,-b+1]');
@@ -1810,18 +1811,9 @@ describe('Nerdamer core', function () {
     it('should expand vectors correctly', function() {
         expect(nerdamer('[a*(b+c),4]').expand().toString()).toEqual('[a*b+a*c,4]');
     });
-    it('should add vectors correctly', function() {
-        expect(nerdamer('[a,b]+[c,d]').expand().toString()).toEqual('[a+c,b+d]');
-    });
     it('should expand collections correctly', function() {
         expect(nerdamer('(a*(b+c),4)').expand().toString()).toEqual('(a*b+a*c, 4)');
     });
-    // it('should get slices correctly', function() {
-    //     expect(nerdamer('[1,2,3][0:2]').toString()).toEqual('[1,2]');
-    // });
-    // it('should get elements correctly', function() {
-    //     expect(nerdamer('[1,2,3][1]').toString()).toEqual('2');
-    // });
     it('should remove near duplicates from vectors', function() {
         expect(nerdamer('vectrim([cos(0), 1, 1.000000000000001])').toString()).toEqual('[1]');
         expect(nerdamer('vectrim([cos(0), 1, 1.000000000000001], 0)').text()).toEqual('[1,1.000000000000001]');

spec/test.js

@@ -44,7 +44,7 @@ try {
     // console.log(x.text());
     // return;
     // x= nerdamer("-sqrt(8/12)")
-    x= nerdamer("[4,5]+[3,4]")
+    x= nerdamer("cross(matrix([4,5,4]),matrix([3,4,4]))")
     console.log(x.text());
 } catch (error) {
     console.log("error "+error)