Skip to content

Commit 5b7383c

Browse files
committed
possible fix for bug in lace/merge
1 parent 443075f commit 5b7383c

File tree

6 files changed

+24
-17
lines changed

6 files changed

+24
-17
lines changed

build/ts.bundle.js

+6-6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

build/ts.es5.js

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

build/ts.es5.min.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "total-serialism",
3-
"version": "2.1.2",
3+
"version": "2.1.3",
44
"description": "A set of methods for the generation and transformation of number sequences useful in algorithmic composition",
55
"main": "index.js",
66
"scripts": {

src/transform.js

+6-6
Original file line numberDiff line numberDiff line change
@@ -212,15 +212,15 @@ exports.invert = invert;
212212
function lace(...args){
213213
if (!args.length){ return [0]; }
214214
var l = 0;
215-
for (let i in args){
215+
for (let i=0; i<args.length; i++){
216216
args[i] = Array.isArray(args[i])? args[i] : [args[i]];
217217
l = Math.max(args[i].length, l);
218218
}
219219
var arr = [];
220220
for (var i=0; i<l; i++){
221-
for (var k in args){
221+
for (var k=0; k<args.length; k++){
222222
let v = args[k][i];
223-
if (v != undefined){ arr.push(v); }
223+
if (v !== undefined){ arr.push(v); }
224224
}
225225
}
226226
return arr;
@@ -265,16 +265,16 @@ exports.lookup = lookup;
265265
function merge(...args){
266266
if (!args.length){ return [0]; }
267267
let l = 0;
268-
for (let i in args){
268+
for (let i=0; i<args.length; i++){
269269
args[i] = Array.isArray(args[i])? args[i] : [args[i]];
270270
l = Math.max(args[i].length, l);
271271
}
272272
let arr = [];
273273
for (let i=0; i<l; i++){
274274
let a = [];
275-
for (let k in args){
275+
for (let k=0; k<args.length; k++){
276276
let v = args[k][i];
277-
if (v != undefined){
277+
if (v !== undefined){
278278
if (Array.isArray(v)) a.push(...v);
279279
else a.push(v);
280280
}

test/serialism.test.js

+8-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ const fs = require('fs');
66
let entryPoint = "../index";
77
// entryPoint = "../build/ts.bundle.js";
88
// entryPoint = "../build/ts.es5.js";
9-
// entryPoint = "../build/ts.es5.min.js";
9+
entryPoint = "../build/ts.es5.min.js";
1010

1111
const Srl = require(entryPoint);
1212
const Gen = Srl.Generative;
@@ -59,6 +59,13 @@ console.log();
5959
// markov.clear();
6060
// console.log(markov.table);
6161

62+
// let arr = Algo.euclid(8, 5);
63+
// let arr2 = Rand.clave(8);
64+
// console.log(arr);
65+
// console.log(arr2);
66+
// console.log(Mod.merge(arr, arr2));
67+
// console.log(Mod.lace(arr, arr2));
68+
6269
fullTest();
6370

6471
function fullTest(){

0 commit comments

Comments
 (0)