fix issue #1368 euclidLegatoRot

.gitignore

@@ -130,3 +130,4 @@ fabric.properties
 
 samples/*
 !samples/README.md
+.idea/

packages/core/euclid.mjs

@@ -10,9 +10,8 @@ https://rohandrape.net/?t=hmt
 This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { Pattern, timeCat, register, silence } from './pattern.mjs';
+import { timeCat, register, silence } from './pattern.mjs';
 import { rotate, flatten, splitAt, zipWith } from './util.mjs';
-import Fraction from './fraction.mjs';
 
 const left = function (n, x) {
   const [ons, offs] = n;
@@ -42,29 +41,26 @@ const _bjork = function (n, x) {
 
 export const bjork = function (ons, steps) {
   const inverted = ons < 0;
-  ons = Math.abs(ons);
+  const absOns = Math.abs(ons);
-  const offs = steps - ons;
+  const offs = steps - absOns;
-  const x = Array(ons).fill([1]);
+  const ones = Array(absOns).fill([1]);
-  const y = Array(offs).fill([0]);
+  const zeros = Array(offs).fill([0]);
-  const result = _bjork([ons, offs], [x, y]);
+  const result = _bjork([absOns, offs], [ones, zeros]);
-  const p = flatten(result[1][0]).concat(flatten(result[1][1]));
+  const pattern = flatten(result[1][0]).concat(flatten(result[1][1]));
-  if (inverted) {
+  return inverted ? pattern.map((x) => 1 - x) : pattern;
-    return p.map((x) => (x === 0 ? 1 : 0));
-  }
-  return p;
 };
 
 /**
- * Changes the structure of the pattern to form an euclidean rhythm.
+ * Changes the structure of the pattern to form an Euclidean rhythm.
- * Euclidian rhythms are rhythms obtained using the greatest common
+ * Euclidean rhythms are rhythms obtained using the greatest common
  * divisor of two numbers.  They were described in 2004 by Godfried
- * Toussaint, a canadian computer scientist.  Euclidian rhythms are
+ * Toussaint, a Canadian computer scientist.  Euclidean rhythms are
  * really useful for computer/algorithmic music because they can
  * describe a large number of rhythms with a couple of numbers.
  *
  * @memberof Pattern
  * @name euclid
- * @param {number} pulses the number of onsets / beats
+ * @param {number} pulses the number of onsets/beats
  * @param {number} steps the number of steps to fill
  * @returns Pattern
  * @example
@@ -76,7 +72,7 @@ export const bjork = function (ons, steps) {
  * Like `euclid`, but has an additional parameter for 'rotating' the resulting sequence.
  * @memberof Pattern
  * @name euclidRot
- * @param {number} pulses the number of onsets / beats
+ * @param {number} pulses the number of onsets/beats
  * @param {number} steps the number of steps to fill
  * @param {number} rotation offset in steps
  * @returns Pattern
@@ -86,13 +82,13 @@ export const bjork = function (ons, steps) {
  */
 
 /**
- * @example // A thirteenth century Persian rhythm called Khafif-e-ramal.
+ * @example // A thirteenth-century Persian rhythm called Khafif-e-ramal.
  * note("c3").euclid(2,5)
  * @example // The archetypal pattern of the Cumbia from Colombia, as well as a Calypso rhythm from Trinidad.
  * note("c3").euclid(3,4)
  * @example // Another thirteenth century Persian rhythm by the name of Khafif-e-ramal, as well as a Rumanian folk-dance rhythm.
  * note("c3").euclidRot(3,5,2)
- * @example // A Ruchenitza rhythm used in a Bulgarian folk-dance.
+ * @example // A Ruchenitza rhythm used in a Bulgarian folk dance.
  * note("c3").euclid(3,7)
  * @example // The Cuban tresillo pattern.
  * note("c3").euclid(3,8)
@@ -151,8 +147,10 @@ export const { euclidrot, euclidRot } = register(['euclidrot', 'euclidRot'], fun
  * so there will be no gaps.
  * @name euclidLegato
  * @memberof Pattern
- * @param {number} pulses the number of onsets / beats
+ * @param {number} pulses the number of onsets/beats
  * @param {number} steps the number of steps to fill
+ * @param rotation offset in steps
+ * @param pat
  * @example
  * note("c3").euclidLegato(3,8)
  */
@@ -161,13 +159,13 @@ const _euclidLegato = function (pulses, steps, rotation, pat) {
   if (pulses < 1) {
     return silence;
   }
-  const bin_pat = _euclidRot(pulses, steps, rotation);
+  const bin_pat = _euclidRot(pulses, steps, 0);
   const gapless = bin_pat
     .join('')
     .split('1')
     .slice(1)
     .map((s) => [s.length + 1, true]);
-  return pat.struct(timeCat(...gapless));
+  return pat.struct(timeCat(...gapless)).late(rotation / steps);
 };
 
 export const euclidLegato = register(['euclidLegato'], function (pulses, steps, pat) {
@@ -180,7 +178,7 @@ export const euclidLegato = register(['euclidLegato'], function (pulses, steps,
  * the resulting sequence
  * @name euclidLegatoRot
  * @memberof Pattern
- * @param {number} pulses the number of onsets / beats
+ * @param {number} pulses the number of onsets/beats
  * @param {number} steps the number of steps to fill
  * @param {number} rotation offset in steps
  * @example

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,
+  isNote,
-  parseFractional,
+  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]);
+  });
+});

packages/core/util.mjs

@@ -162,6 +162,7 @@ export const compose = (...funcs) => pipe(...funcs.reverse());
 // Removes 'None' values from given list
 export const removeUndefineds = (xs) => xs.filter((x) => x != undefined);
 
+// flattens by one level
 export const flatten = (arr) => [].concat(...arr);
 
 export const id = (a) => a;
@@ -237,6 +238,7 @@ export const splitAt = function (index, value) {
   return [value.slice(0, index), value.slice(index)];
 };
 
+// Uses the function f to combine the arrays xs, ys element-wise
 export const zipWith = (f, xs, ys) => xs.map((n, i) => f(n, ys[i]));
 
 export const pairs = function (xs) {

pnpm-workspace.yaml

@@ -1,6 +1,12 @@
 packages:
-  # all packages in direct subdirs of packages/
+  - packages/*
-  - "packages/*"
+  - examples/*
-  - "examples/*"
+  - tools/dbpatch
-  - "tools/dbpatch"
+  - website/
-  - "website/"
+
+onlyBuiltDependencies:
+  - esbuild
+  - nx
+  - sharp
+  - tree-sitter
+  - tree-sitter-haskell

test/__snapshots__/examples.test.mjs.snap

@@ -3145,18 +3145,19 @@ exports[`runs examples > example "euclidLegato" example index 0 1`] = `
 
 exports[`runs examples > example "euclidLegatoRot" example index 0 1`] = `
 [
-  "[ 0/1 → 1/4 | note:c3 ]",
+  "[ -1/5 ⇜ (0/1 → 1/5) | note:c3 ]",
-  "[ 1/4 → 3/4 | note:c3 ]",
+  "[ 1/5 → 2/5 | note:c3 ]",
-  "[ 3/4 → 1/1 | note:c3 ]",
+  "[ 2/5 → 4/5 | note:c3 ]",
-  "[ 1/1 → 5/4 | note:c3 ]",
+  "[ 4/5 → 6/5 | note:c3 ]",
-  "[ 5/4 → 7/4 | note:c3 ]",
+  "[ 6/5 → 7/5 | note:c3 ]",
-  "[ 7/4 → 2/1 | note:c3 ]",
+  "[ 7/5 → 9/5 | note:c3 ]",
-  "[ 2/1 → 9/4 | note:c3 ]",
+  "[ 9/5 → 11/5 | note:c3 ]",
-  "[ 9/4 → 11/4 | note:c3 ]",
+  "[ 11/5 → 12/5 | note:c3 ]",
-  "[ 11/4 → 3/1 | note:c3 ]",
+  "[ 12/5 → 14/5 | note:c3 ]",
-  "[ 3/1 → 13/4 | note:c3 ]",
+  "[ 14/5 → 16/5 | note:c3 ]",
-  "[ 13/4 → 15/4 | note:c3 ]",
+  "[ 16/5 → 17/5 | note:c3 ]",
-  "[ 15/4 → 4/1 | note:c3 ]",
+  "[ 17/5 → 19/5 | note:c3 ]",
+  "[ (19/5 → 4/1) ⇝ 21/5 | note:c3 ]",
 ]
 `;
 

test/__snapshots__/tunes.test.mjs.snap

@@ -7318,12 +7318,12 @@ exports[`renders tunes > tune: randomBells 1`] = `
 [
   "[ -9/8 ⇜ (0/1 → 3/8) | gain:0.6 note:A3 velocity:0.5989903202280402 s:bell delay:0.2 delaytime:0.3333333333333333 delayfeedback:0.8 ]",
   "[ -3/4 ⇜ (0/1 → 3/4) | gain:0.6 note:C5 velocity:0.8369929669424891 s:bell delay:0.2 delaytime:0.3333333333333333 delayfeedback:0.8 ]",
-  "[ 0/1 → 3/2 | note:D2 s:bass clip:1 gain:0.8 ]",
+  "[ 0/1 → 3/2 | note:F2 s:bass clip:1 gain:0.8 ]",
   "[ 0/1 → 9/4 | gain:0.6 note:D3 velocity:0.5 s:bell delay:0.2 delaytime:0.3333333333333333 delayfeedback:0.8 ]",
   "[ 3/8 → 21/8 | gain:0.6 note:F5 velocity:0.9213038925081491 s:bell delay:0.2 delaytime:0.3333333333333333 delayfeedback:0.8 ]",
   "[ 3/4 → 3/1 | gain:0.6 note:C5 velocity:0.8426077850162983 s:bell delay:0.2 delaytime:0.3333333333333333 delayfeedback:0.8 ]",
-  "[ 3/2 → 9/4 | note:D2 s:bass clip:1 gain:0.8 ]",
+  "[ 3/2 → 9/4 | note:F2 s:bass clip:1 gain:0.8 ]",
-  "[ 9/4 → 3/1 | note:D2 s:bass clip:1 gain:0.8 ]",
+  "[ 9/4 → 3/1 | note:F2 s:bass clip:1 gain:0.8 ]",
   "[ 9/4 → 9/2 | gain:0.6 note:D4 velocity:0.7006962578743696 s:bell delay:0.2 delaytime:0.3333333333333333 delayfeedback:0.8 ]",
   "[ 21/8 → 39/8 | gain:0.6 note:C4 velocity:0.6507943943142891 s:bell delay:0.2 delaytime:0.3333333333333333 delayfeedback:0.8 ]",
   "[ 3/1 → 9/2 | note:D2 s:bass clip:1 gain:0.8 ]",
@@ -7335,12 +7335,12 @@ exports[`renders tunes > tune: randomBells 1`] = `
   "[ (21/4 → 6/1) ⇝ 27/4 | gain:0.6 note:D4 velocity:0.6988155404105783 s:bell delay:0.2 delaytime:0.3333333333333333 delayfeedback:0.8 ]",
   "[ 39/8 ⇜ (6/1 → 51/8) | gain:0.6 note:D5 velocity:0.8758113365620375 s:bell delay:0.2 delaytime:0.3333333333333333 delayfeedback:0.8 ]",
   "[ 21/4 ⇜ (6/1 → 27/4) | gain:0.6 note:D4 velocity:0.6988155404105783 s:bell delay:0.2 delaytime:0.3333333333333333 delayfeedback:0.8 ]",
-  "[ 6/1 → 15/2 | note:A2 s:bass clip:1 gain:0.8 ]",
+  "[ 6/1 → 15/2 | note:D2 s:bass clip:1 gain:0.8 ]",
   "[ 6/1 → 33/4 | gain:0.6 note:G4 velocity:0.7597710825502872 s:bell delay:0.2 delaytime:0.3333333333333333 delayfeedback:0.8 ]",
   "[ 51/8 → 69/8 | gain:0.6 note:G4 velocity:0.7743164440616965 s:bell delay:0.2 delaytime:0.3333333333333333 delayfeedback:0.8 ]",
   "[ 27/4 → 9/1 | gain:0.6 note:C5 velocity:0.8362447572872043 s:bell delay:0.2 delaytime:0.3333333333333333 delayfeedback:0.8 ]",
-  "[ 15/2 → 33/4 | note:A2 s:bass clip:1 gain:0.8 ]",
+  "[ 15/2 → 33/4 | note:D2 s:bass clip:1 gain:0.8 ]",
-  "[ 33/4 → 9/1 | note:A2 s:bass clip:1 gain:0.8 ]",
+  "[ 33/4 → 9/1 | note:D2 s:bass clip:1 gain:0.8 ]",
   "[ 33/4 → 21/2 | gain:0.6 note:A3 velocity:0.5914018759503961 s:bell delay:0.2 delaytime:0.3333333333333333 delayfeedback:0.8 ]",
   "[ 69/8 → 87/8 | gain:0.6 note:G4 velocity:0.754063542932272 s:bell delay:0.2 delaytime:0.3333333333333333 delayfeedback:0.8 ]",
   "[ 9/1 → 21/2 | note:A2 s:bass clip:1 gain:0.8 ]",
@@ -7352,12 +7352,12 @@ exports[`renders tunes > tune: randomBells 1`] = `
   "[ (45/4 → 12/1) ⇝ 51/4 | gain:0.6 note:A4 velocity:0.7972785895690322 s:bell delay:0.2 delaytime:0.3333333333333333 delayfeedback:0.8 ]",
   "[ 87/8 ⇜ (12/1 → 99/8) | gain:0.6 note:F4 velocity:0.7347871446982026 s:bell delay:0.2 delaytime:0.3333333333333333 delayfeedback:0.8 ]",
   "[ 45/4 ⇜ (12/1 → 51/4) | gain:0.6 note:A4 velocity:0.7972785895690322 s:bell delay:0.2 delaytime:0.3333333333333333 delayfeedback:0.8 ]",
-  "[ 12/1 → 27/2 | note:G2 s:bass clip:1 gain:0.8 ]",
+  "[ 12/1 → 27/2 | note:A2 s:bass clip:1 gain:0.8 ]",
   "[ 12/1 → 57/4 | gain:0.6 note:G5 velocity:0.9797635599970818 s:bell delay:0.2 delaytime:0.3333333333333333 delayfeedback:0.8 ]",
   "[ 99/8 → 117/8 | gain:0.6 note:C4 velocity:0.6662392104044557 s:bell delay:0.2 delaytime:0.3333333333333333 delayfeedback:0.8 ]",
   "[ 51/4 → 15/1 | gain:0.6 note:F5 velocity:0.9516951469704509 s:bell delay:0.2 delaytime:0.3333333333333333 delayfeedback:0.8 ]",
-  "[ 27/2 → 57/4 | note:G2 s:bass clip:1 gain:0.8 ]",
+  "[ 27/2 → 57/4 | note:A2 s:bass clip:1 gain:0.8 ]",
-  "[ 57/4 → 15/1 | note:G2 s:bass clip:1 gain:0.8 ]",
+  "[ 57/4 → 15/1 | note:A2 s:bass clip:1 gain:0.8 ]",
   "[ 57/4 → 33/2 | gain:0.6 note:F5 velocity:0.9182533202692866 s:bell delay:0.2 delaytime:0.3333333333333333 delayfeedback:0.8 ]",
   "[ 117/8 → 135/8 | gain:0.6 note:G3 velocity:0.5711571052670479 s:bell delay:0.2 delaytime:0.3333333333333333 delayfeedback:0.8 ]",
   "[ 15/1 → 33/2 | note:G2 s:bass clip:1 gain:0.8 ]",
@@ -7369,12 +7369,12 @@ exports[`renders tunes > tune: randomBells 1`] = `
   "[ (69/4 → 18/1) ⇝ 75/4 | gain:0.6 note:F3 velocity:0.5081270858645439 s:bell delay:0.2 delaytime:0.3333333333333333 delayfeedback:0.8 ]",
   "[ 135/8 ⇜ (18/1 → 147/8) | gain:0.6 note:F5 velocity:0.9456470254808664 s:bell delay:0.2 delaytime:0.3333333333333333 delayfeedback:0.8 ]",
   "[ 69/4 ⇜ (18/1 → 75/4) | gain:0.6 note:F3 velocity:0.5081270858645439 s:bell delay:0.2 delaytime:0.3333333333333333 delayfeedback:0.8 ]",
-  "[ 18/1 → 39/2 | note:F2 s:bass clip:1 gain:0.8 ]",
+  "[ 18/1 → 39/2 | note:G2 s:bass clip:1 gain:0.8 ]",
   "[ 18/1 → 81/4 | gain:0.6 note:A3 velocity:0.6086445553228259 s:bell delay:0.2 delaytime:0.3333333333333333 delayfeedback:0.8 ]",
   "[ 147/8 → 165/8 | gain:0.6 note:F3 velocity:0.5062594395130873 s:bell delay:0.2 delaytime:0.3333333333333333 delayfeedback:0.8 ]",
   "[ 75/4 → 21/1 | gain:0.6 note:D4 velocity:0.6716219391673803 s:bell delay:0.2 delaytime:0.3333333333333333 delayfeedback:0.8 ]",
-  "[ 39/2 → 81/4 | note:F2 s:bass clip:1 gain:0.8 ]",
+  "[ 39/2 → 81/4 | note:G2 s:bass clip:1 gain:0.8 ]",
-  "[ 81/4 → 21/1 | note:F2 s:bass clip:1 gain:0.8 ]",
+  "[ 81/4 → 21/1 | note:G2 s:bass clip:1 gain:0.8 ]",
   "[ 81/4 → 45/2 | gain:0.6 note:D4 velocity:0.7043459005653858 s:bell delay:0.2 delaytime:0.3333333333333333 delayfeedback:0.8 ]",
   "[ 165/8 → 183/8 | gain:0.6 note:D5 velocity:0.8878388572484255 s:bell delay:0.2 delaytime:0.3333333333333333 delayfeedback:0.8 ]",
   "[ 21/1 → 45/2 | note:F2 s:bass clip:1 gain:0.8 ]",