clone()n and expand() for collections and vectors

Author: gunnarmein-ts

all.min.js

@@ -4857,6 +4857,15 @@ var nerdamer = (function (imports) {
                 collection.append(e);
             return collection;
         };
+        Collection.prototype.clone = function (elements) {
+            const c = Collection.create();
+            c.elements = this.elements.map((e)=>e.clone());
+            return c;
+        };
+        Collection.prototype.expand = function (options) {
+            this.elements = this.elements.map((e)=>_.expand(e, options));
+            return this;
+        };
 
         function Token(node, node_type, column) {
             this.type = node_type;
@@ -8525,14 +8534,17 @@ var nerdamer = (function (imports) {
                     return expand(x, opt);
                 });
             }
+            if (symbol.expand) {
+                return symbol.expand(opt);
+            }
             opt = opt || {};
             //deal with parenthesis
             if(symbol.group === FN && symbol.fname === '') {
                 var f = expand(symbol.args[0], opt);
                 var x = expand(_.pow(f, _.parse(symbol.power)), opt);
                 return _.multiply(_.parse(symbol.multiplier), x).distributeMultiplier();
             }
-            // We can expand these groups so no need to waste time. Just return and be done.
+            // We cannot expand these groups so no need to waste time. Just return and be done.
             if([N, P, S].indexOf(symbol.group) !== -1) {
                 return symbol; //nothing to do
             }
@@ -11224,6 +11236,11 @@ var nerdamer = (function (imports) {
             return V;
         },
 
+        expand: function (options) {
+            this.elements = this.elements.map((e)=>_.expand(e, options));
+            return this;
+        },
+
         // Maps the vector to another vector according to the given function
         map: function (fn) {
             var elements = [];

nerdamer.core.js

@@ -6,7 +6,7 @@
     "description": "javascript light-weight symbolic math library",
     "name": "nerdamer-prime",
     "license": "MIT",
-    "version": "1.1.24",
+    "version": "1.1.25",
     "homepage": "https://github.com/together-science/nerdamer-prime",
     "directory": {
         "lib": "./"

package.json

@@ -1807,6 +1807,12 @@ describe('Nerdamer core', function () {
         expect(nerdamer('[21,15]/3').toString()).toEqual('[7,5]');
         expect(nerdamer('[a^2, b^2]/[a,b]').toString()).toEqual('[a,b]');
     });
+    it('should expand vectors correctly', function() {
+        expect(nerdamer('[a*(b+c),4]').expand().toString()).toEqual('[a*b+a*c,4]');
+    });
+    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]');
     });

spec/core.spec.js

@@ -44,7 +44,7 @@ try {
     // console.log(x.text());
     // return;
     // x= nerdamer("-sqrt(8/12)")
-    x= nerdamer("simplify(cos(a+b))");
+    x= nerdamer("[3*(x+4),4]").expand();
     console.log(x.text());
 } catch (error) {
     console.log("error "+error)