elias/strudel-docker
1
0
Fork 0
mirror of https://github.com/eliasstepanik/strudel-docker.git synced 2026-01-22 02:58:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix stepjoin (#1067)

Browse Source 
* sort fractions properly - fixes #1066
This commit is contained in:
Alex McLean 2024-04-23 22:37:21 +01:00 committed by GitHub
parent 6a1fa7e67f
commit a189626e8b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/core/pattern.mjs
View File

@ -43,7 +43,7 @@ export class Pattern {
constructor(query, tactus = undefined) { constructor(query, tactus = undefined) {
this.query = query; this.query = query;
this._Pattern = true; // this property is used to detect if a pattern that fails instanceof Pattern is an instance of another Pattern this._Pattern = true; // this property is used to detect if a pattern that fails instanceof Pattern is an instance of another Pattern
this.__tactus = tactus; // in terms of number of beats per cycle this.__tactus = Fraction(tactus); // in terms of number of steps per cycle
} }
get tactus() { get tactus() {

11
packages/core/test/pattern.test.mjs
View File

@ -1146,7 +1146,7 @@ describe('Pattern', () => {
expect(sameFirst(sequence(0, 1, 2, 3, 4).s_taper(-1, 5), sequence(0, 0, 1, 0, 1, 2, 0, 1, 2, 3, 0, 1, 2, 3, 4))); expect(sameFirst(sequence(0, 1, 2, 3, 4).s_taper(-1, 5), sequence(0, 0, 1, 0, 1, 2, 0, 1, 2, 3, 0, 1, 2, 3, 4)));
}); });
}); });
describe('s_add and s_sub, left', () => { describe('s_add and s_sub', () => {
it('can add from the left', () => { it('can add from the left', () => {
expect(sameFirst(sequence(0, 1, 2, 3, 4).s_add(2), sequence(0, 1))); expect(sameFirst(sequence(0, 1, 2, 3, 4).s_add(2), sequence(0, 1)));
}); });
@ -1159,5 +1159,14 @@ describe('Pattern', () => {
it('can sub to the right', () => { it('can sub to the right', () => {
expect(sameFirst(sequence(0, 1, 2, 3, 4).s_sub(-2), sequence(2, 3, 4))); expect(sameFirst(sequence(0, 1, 2, 3, 4).s_sub(-2), sequence(2, 3, 4)));
}); });
it('can subtract nothing', () => {
expect(sameFirst(pure('a').s_sub(0), pure('a')));
});
it('can subtract nothing, repeatedly', () => {
expect(sameFirst(pure('a').s_sub(0, 0), fastcat('a', 'a')));
for (var i = 0; i < 100; ++i) {
expect(sameFirst(pure('a').s_sub(...Array(i).fill(0)), fastcat(...Array(i).fill('a'))));
}
});
}); });
}); });

8
packages/core/util.mjs
View File

@ -319,9 +319,11 @@ export function uniqsort(a) {
// rational version // rational version
export function uniqsortr(a) { export function uniqsortr(a) {
return a.sort().filter(function (item, pos, ary) { return a
return !pos || item.ne(ary[pos - 1]); .sort((x, y) => x.compare(y))
}); .filter(function (item, pos, ary) {
return !pos || item.ne(ary[pos - 1]);
});
} }
// code hashing helpers // code hashing helpers