From 77d13ee46c340a0060b806cb5c002e7b99a76f1a Mon Sep 17 00:00:00 2001 From: Mikayla Dobson <93477693+innocuous-symmetry@users.noreply.github.com> Date: Thu, 12 May 2022 20:03:56 -0500 Subject: [PATCH] function in helper.js returns correct values after recursive call --- src/vector_logic/helper.js | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/src/vector_logic/helper.js b/src/vector_logic/helper.js index 363b419..d46f349 100644 --- a/src/vector_logic/helper.js +++ b/src/vector_logic/helper.js @@ -31,24 +31,35 @@ const iteratePitchsets = () => { console.log(pitchNames); console.log(pitchNums); + let isDissonant = false; + for (let i = 0; i < pitchNums.length; i++) { - console.log("___FIRST NEST___") for (let j = i; j < pitchNums.length; j++) { let interval = Math.abs(pitchNums[i] - pitchNums[j]); if (interval > 6) { - console.log('wrap'); interval = 12 - interval; } - let isDissonant = ((interval === 1) || (interval === 6)); - console.log(`pitches: ${[pitches[i], pitches[j]]} interval: ${interval}, dissonant: ${isDissonant}, positions: [${i}, ${j}]: ${[pitchNums[i], pitchNums[j]]}`); + let intervalIsDissonant = ((interval === 1) || (interval === 6)); + // console.log(`pitches: ${[pitches[i], pitches[j]]} interval: ${interval}, dissonant: ${isDissonant}, positions: [${i}, ${j}]: ${[pitchNums[i], pitchNums[j]]}`); - if (isDissonant) iteratePitchsets(); + if (!intervalIsDissonant) { + continue; + } else { + isDissonant = true; + } } } - console.log(''); - - return pitches; + + if (isDissonant) { + console.log('bad'); + let newValues = iteratePitchsets(); + return newValues; + } else { + console.log('good'); + console.log(pitches); + return pitches; + } } let final = iteratePitchsets();