fix issue #1368 euclidLegatoRot

packages/core/test/euclid.test.js

@@ -0,0 +1,89 @@
+import { bjork } from '../euclid.mjs';
+import { describe, expect, it } from 'vitest';
+import { fastcat } from '../pattern.mjs';
+
+describe('bjork', () => {
+  it('should apply bjorklund to ons and steps', () => {
+    expect(bjork(3, 8)).toStrictEqual([1, 0, 0, 1, 0, 0, 1, 0]);
+    expect(bjork(-3, 8)).toStrictEqual([0, 1, 1, 0, 1, 1, 0, 1]);
+    expect(bjork(8, 8)).toStrictEqual([1, 1, 1, 1, 1, 1, 1, 1]);
+    expect(bjork(-8, 8)).toStrictEqual([0, 0, 0, 0, 0, 0, 0, 0]);
+    expect(bjork(5, 8)).toStrictEqual([1, 0, 1, 1, 0, 1, 1, 0]);
+  });
+});
+
+describe('euclid', () => {
+  it('Can create euclid', () => {
+    expect(
+      fastcat('a')
+        .euclid(3, 8)
+        .firstCycle()
+        .sort((a, b) => a.part.begin.sub(b.part.begin))
+        .map((a) => a.showWhole(true)),
+    ).toStrictEqual(['0/1 → 1/8: a', '3/8 → 1/2: a', '3/4 → 7/8: a']);
+    expect(
+      fastcat('a')
+        .euclid(5, 8)
+        .firstCycle()
+        .sort((a, b) => a.part.begin.sub(b.part.begin))
+        .map((a) => a.showWhole(true)),
+    ).toStrictEqual(['0/1 → 1/8: a', '1/4 → 3/8: a', '3/8 → 1/2: a', '5/8 → 3/4: a', '3/4 → 7/8: a']);
+  });
+});
+
+describe('euclidRot', () => {
+  it('Can create euclidRot', () => {
+    expect(
+      fastcat('a')
+        .euclidRot(3, 8, 2)
+        .firstCycle()
+        .sort((a, b) => a.part.begin.sub(b.part.begin))
+        .map((a) => a.showWhole(true)),
+    ).toStrictEqual(['0/1 → 1/8: a', '1/4 → 3/8: a', '5/8 → 3/4: a']);
+    expect(
+      fastcat('a')
+        .euclidRot(5, 8, 2)
+        .firstCycle()
+        .sort((a, b) => a.part.begin.sub(b.part.begin))
+        .map((a) => a.showWhole(true)),
+    ).toStrictEqual(['0/1 → 1/8: a', '1/4 → 3/8: a', '1/2 → 5/8: a', '5/8 → 3/4: a', '7/8 → 1/1: a']);
+  });
+});
+
+describe('euclidLegato', () => {
+  it('Can create euclidLegato', () => {
+    expect(
+      fastcat('a')
+        .euclidLegato(3, 8)
+        .firstCycle()
+        .sort((a, b) => a.part.begin.sub(b.part.begin))
+        .map((a) => a.showWhole(true)),
+    ).toStrictEqual(['0/1 → 3/8: a', '3/8 → 3/4: a', '3/4 → 1/1: a']);
+    expect(
+      fastcat('a')
+        .euclidLegato(5, 8)
+        .firstCycle()
+        .sort((a, b) => a.part.begin.sub(b.part.begin))
+        .map((a) => a.showWhole(true)),
+    ).toStrictEqual(['0/1 → 1/4: a', '1/4 → 3/8: a', '3/8 → 5/8: a', '5/8 → 3/4: a', '3/4 → 1/1: a']);
+  });
+});
+
+describe('euclidLegatoRot', () => {
+  it('Can create euclidLegatoRot', () => {
+    expect(
+      fastcat('a')
+        .euclidLegatoRot(3, 8, 2)
+        .firstCycle()
+        .sort((a, b) => a.part.begin.sub(b.part.begin))
+        .map((a) => a.showWhole(true)),
+    ).toStrictEqual(['0/1 → 1/4: a', '1/4 → 5/8: a', '5/8 → 1/1: a']);
+    expect(
+      fastcat('a')
+        .euclidLegatoRot(5, 8, 2)
+        .firstCycle()
+        .sort((a, b) => a.part.begin.sub(b.part.begin))
+        .map((a) => a.showWhole(true)),
+    ).toStrictEqual(['0/1 → 1/4: a', '1/4 → 1/2: a', '1/2 → 5/8: a', '5/8 → 7/8: a', '7/8 → 1/1: a']);
+  });
+});

packages/core/test/util.test.mjs

@@ -6,21 +6,25 @@ This program is free software: you can redistribute it and/or modify it under th
 
 import { pure } from '../pattern.mjs';
 import {
-  isNote,
-  tokenizeNote,
-  noteToMidi,
-  midiToFreq,
-  freqToMidi,
   _mod,
   compose,
+  flatten,
+  fractionalArgs,
+  freqToMidi,
   getFrequency,
   getPlayableNoteValue,
-  parseNumeral,
-  parseFractional,
+  isNote,
+  midiToFreq,
+  noteToMidi,
   numeralArgs,
-  fractionalArgs,
+  parseFractional,
+  parseNumeral,
+  rotate,
+  splitAt,
+  tokenizeNote,
+  zipWith,
 } from '../util.mjs';
-import { describe, it, expect } from 'vitest';
+import { describe, expect, it } from 'vitest';
 
 describe('isNote', () => {
   it('should recognize notes without accidentals', () => {
@@ -233,3 +237,46 @@ describe('fractionalArgs', () => {
     expect(add('q', 2)).toBe(2.25);
   });
 });
+
+describe('rotate', () => {
+  it('should rotate array to the left', () => {
+    expect(rotate([0, 1, 2, 3], 2)).toStrictEqual([2, 3, 0, 1]);
+    expect(rotate([0, 1, 2, 3], 0)).toStrictEqual([0, 1, 2, 3]);
+    expect(rotate([0, 1, 2, 3], -3)).toStrictEqual([1, 2, 3, 0]);
+    expect(rotate([0, 1, 2, 3], 3)).toStrictEqual([3, 0, 1, 2]);
+    expect(rotate([0], 3)).toStrictEqual([0]);
+    expect(rotate([], 3)).toStrictEqual([]);
+  });
+});
+
+describe('flatten', () => {
+  it('should flatten array by one level', () => {
+    expect(flatten([0, 1, 2, 3])).toStrictEqual([0, 1, 2, 3]);
+    expect(flatten([0, 1, [2, 3]])).toStrictEqual([0, 1, 2, 3]);
+    expect(flatten([0, [1, [2, 3]]])).toStrictEqual([0, 1, [2, 3]]);
+    expect(flatten([0])).toStrictEqual([0]);
+    expect(flatten([])).toStrictEqual([]);
+  });
+});
+
+describe('splitAt', () => {
+  it('should split array into two', () => {
+    expect(splitAt(2, [0, 1, 2, 3])).toStrictEqual([
+      [0, 1],
+      [2, 3],
+    ]);
+    expect(splitAt(0, [0, 1, 2, 3])).toStrictEqual([[], [0, 1, 2, 3]]);
+    expect(splitAt(-3, [0, 1, 2, 3])).toStrictEqual([[0], [1, 2, 3]]);
+    expect(splitAt(3, [0, 1, 2, 3])).toStrictEqual([[0, 1, 2], [3]]);
+  });
+});
+
+describe('zipWith', () => {
+  it('should use the function to combine the two arrays element-wise', () => {
+    expect(zipWith((a, b) => a + b, [0, 1, 2, 3], [0, 1, 2, 3])).toStrictEqual([0, 2, 4, 6]);
+    expect(zipWith((a, b) => a + b, [0, 1, 2, 3], [0, 1, 2])).toStrictEqual([0, 2, 4, NaN]);
+    expect(zipWith((a, b) => a + b, [0, 1, 2], [0, 1, 2, 3])).toStrictEqual([0, 2, 4]);
+    expect(zipWith((a) => a, [0, 1, 2], [1, 2, 3, 0])).toStrictEqual([0, 1, 2]);
+    expect(zipWith((a, b) => b, [0, 1, 2], [1, 2, 3, 0])).toStrictEqual([1, 2, 3]);
+  });
+});