From 869541d88e9a6331377931654be2b453b75c9ce3 Mon Sep 17 00:00:00 2001 From: Mikayla Dobson <93477693+innocuous-symmetry@users.noreply.github.com> Date: Sun, 15 May 2022 13:45:35 -0500 Subject: [PATCH] cleanup, project/directory management --- .gitignore | 3 +-- package.json | 8 +------- src/audioUtil.js | 2 +- .../extractPitchset.js => dataConversions.js} | 10 +++++++--- src/data_conversions/extractOctave.js | 1 - src/data_conversions/extractPitchName.js | 1 - src/pitch_generation/getProceduralPitches.js | 3 +-- src/pitch_generation/getRandomPitches.js | 5 +---- src/pitch_generation/helper.js | 11 ----------- src/pitch_generation/melodicGeneration.js | 3 +-- src/vector_logic/evaluateVector.js | 2 +- src/vector_logic/numbersToPitches.js | 0 12 files changed, 14 insertions(+), 35 deletions(-) rename src/{data_conversions/extractPitchset.js => dataConversions.js} (65%) delete mode 100644 src/data_conversions/extractOctave.js delete mode 100644 src/data_conversions/extractPitchName.js delete mode 100644 src/pitch_generation/helper.js delete mode 100644 src/vector_logic/numbersToPitches.js diff --git a/.gitignore b/.gitignore index 273e392..30bc162 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1 @@ -/node_modules -/built \ No newline at end of file +/node_modules \ No newline at end of file diff --git a/package.json b/package.json index e56ccc5..1cc1843 100644 --- a/package.json +++ b/package.json @@ -12,12 +12,6 @@ "author": "", "license": "ISC", "dependencies": { - "tone": "^14.7.77", - "typescript": "^4.6.4" - }, - "devDependencies": { - "@types/node": "^17.0.32", - "tone": "^14.7.77", - "typescript": "^4.6.4" + "tone": "^14.7.77" } } diff --git a/src/audioUtil.js b/src/audioUtil.js index 61f4728..d933128 100644 --- a/src/audioUtil.js +++ b/src/audioUtil.js @@ -1,7 +1,7 @@ import { soundChord } from "../app.js"; +import { extractPitchset } from "./dataConversions.js"; import { getRandomPitches } from "./pitch_generation/getRandomPitches.js"; import { getProceduralPitches } from "./pitch_generation/getProceduralPitches.js"; -import { extractPitchset } from "./data_conversions/extractPitchset.js"; // initial test: generate a single, random chord export const fullRandomChord = () => { diff --git a/src/data_conversions/extractPitchset.js b/src/dataConversions.js similarity index 65% rename from src/data_conversions/extractPitchset.js rename to src/dataConversions.js index 62c9b1e..8f29aef 100644 --- a/src/data_conversions/extractPitchset.js +++ b/src/dataConversions.js @@ -1,5 +1,9 @@ -import { musicalPitches } from '../harmonyUtil.js'; -import { extractPitchName } from './extractPitchName.js'; +import { musicalPitches } from './harmonyUtil.js'; + +// inline functions for converting between data types +export const extractPitchName = (tonePitchName) => tonePitchName.match(/[A-Gb#]/g).join(''); +export const extractOctave = (pitchName) => pitchName.match(/[0-9]/g).join(''); +export const getRandomIndex = (voice) => Math.floor(Math.random() * 100) % voice.length; // converts pitches in Tone.js string format to base-12 number pitchsets export const extractPitchset = (pitches) => { @@ -19,4 +23,4 @@ export const extractPitchset = (pitches) => { // these are sorted from lowest to highest index (something like an interval vector) pitchset.sort((a,b) => a < b); return pitchset; -} \ No newline at end of file +} diff --git a/src/data_conversions/extractOctave.js b/src/data_conversions/extractOctave.js deleted file mode 100644 index 6731ddb..0000000 --- a/src/data_conversions/extractOctave.js +++ /dev/null @@ -1 +0,0 @@ -export const extractOctave = (pitchName) => pitchName.match(/[0-9]/g).join(''); diff --git a/src/data_conversions/extractPitchName.js b/src/data_conversions/extractPitchName.js deleted file mode 100644 index 99dbce3..0000000 --- a/src/data_conversions/extractPitchName.js +++ /dev/null @@ -1 +0,0 @@ -export const extractPitchName = (tonePitchName) => tonePitchName.match(/[A-Gb#]/g).join(''); diff --git a/src/pitch_generation/getProceduralPitches.js b/src/pitch_generation/getProceduralPitches.js index 2cfdaad..23ecc69 100644 --- a/src/pitch_generation/getProceduralPitches.js +++ b/src/pitch_generation/getProceduralPitches.js @@ -1,6 +1,5 @@ import { pitchsets, musicalPitches } from "../harmonyUtil.js"; -import { extractPitchName } from "../data_conversions/extractPitchName.js"; -import { getRandomIndex } from "./getRandomPitches.js"; +import { extractPitchName, getRandomIndex } from "../dataConversions.js"; import { melodicGeneration } from './melodicGeneration.js'; import { sonorityList } from "./sonorityList.js"; diff --git a/src/pitch_generation/getRandomPitches.js b/src/pitch_generation/getRandomPitches.js index 8b87c10..f061120 100644 --- a/src/pitch_generation/getRandomPitches.js +++ b/src/pitch_generation/getRandomPitches.js @@ -1,8 +1,5 @@ import { pitchsets } from "../harmonyUtil.js"; -import { extractPitchName } from "../data_conversions/extractPitchName.js"; - -// helper function for assigning a random index for a given voice's pitchset -export const getRandomIndex = (voice) => Math.floor(Math.random() * 100) % voice.length; +import { extractPitchName, getRandomIndex } from "../dataConversions.js"; export const getRandomPitches = () => { // pitches stored in Tone.js string format diff --git a/src/pitch_generation/helper.js b/src/pitch_generation/helper.js deleted file mode 100644 index 0c50648..0000000 --- a/src/pitch_generation/helper.js +++ /dev/null @@ -1,11 +0,0 @@ -import { melodicGeneration } from "./melodicGeneration.js"; - -// let result = melodicGeneration(['C3', 'G3', 'A3', 'G5']); -// console.log(result); - -let myArray = [[1,2], [3,4], [5,6]]; - -let shifted = myArray.shift(); - -console.log(shifted); -console.log(myArray); diff --git a/src/pitch_generation/melodicGeneration.js b/src/pitch_generation/melodicGeneration.js index cd7ccc3..043cee7 100644 --- a/src/pitch_generation/melodicGeneration.js +++ b/src/pitch_generation/melodicGeneration.js @@ -1,6 +1,5 @@ import { getRandomPitches } from './getRandomPitches.js'; -import { extractPitchName } from '../data_conversions/extractPitchName.js'; -import { extractOctave } from '../data_conversions/extractOctave.js'; +import { extractOctave, extractPitchName } from '../dataConversions.js'; import { musicalPitches, pitchsets } from '../harmonyUtil.js'; // reads the pitch of the previous sonority and determines appropriate melodic movement for the soprano diff --git a/src/vector_logic/evaluateVector.js b/src/vector_logic/evaluateVector.js index 808476c..142cfeb 100644 --- a/src/vector_logic/evaluateVector.js +++ b/src/vector_logic/evaluateVector.js @@ -1,5 +1,5 @@ import { getRandomPitches } from '../pitch_generation/getRandomPitches.js'; -import { extractPitchset } from "../data_conversions/extractPitchset.js"; +import { extractPitchset } from "../dataConversions.js"; import { findVector } from "./findVector.js"; export const evaluateVector = (vector) => { diff --git a/src/vector_logic/numbersToPitches.js b/src/vector_logic/numbersToPitches.js deleted file mode 100644 index e69de29..0000000