Skip to content

Added to time series :) #89

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mtrejo0 wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Added to time series :) #89

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
77b51af
Added to time series :)
mtrejo0 May 17, 2022
5abd1e1
fixed errors
mtrejo0 May 17, 2022
f608e74
one last error plz
mtrejo0 May 17, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 14 additions & 4 deletions backend/app/data_processing/time_series.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,14 +43,24 @@ def time_series_to_music(request):
continue
column_constant = column_constants[j]

multiplier = column_constant["multiplier"]
base_freq = column_constant["base_frequency"]
wave_pattern = column_constant["wave_pattern"]
min_freq = column_mins[j]
max_freq = column_maxes[j]
frequency = base_freq * (1 + (frequency-min_freq)/(max_freq-min_freq))
frequency = (multiplier * (1 + (frequency-min_freq)/(max_freq-min_freq))) + base_freq

new_csv_row += [frequency]

note = synths.generate_sine_wave_with_envelope(
generator = None
if wave_pattern == "sin":
generator = synths.generate_sine_wave_with_envelope
if wave_pattern == "square":
generator = synths.generate_square_wave_with_envelope
if wave_pattern == "sawtooth":
generator = synths.generate_sawtooth_wave_with_envelope

note = generator(
frequency=frequency,
duration=duration,
a_percentage=column_constant["a_percentage"],
Expand All @@ -72,7 +82,7 @@ def time_series_to_music(request):

time_steps = np.arange(0, len(csv_data))
new_csv = np.array(new_csv)
plt.plot(time_steps, new_csv)
plt.plot(time_steps, new_csv, marker='o')

min_f = np.amin(new_csv) - 10
max_f = np.amax(new_csv) + 10
Expand Down Expand Up @@ -117,7 +127,7 @@ def time_series_to_samples(request):
for j, frequency in enumerate(csv_row_av):
column_constant = column_constants[j]
freq_to_generate = column_constant["base_frequency"] + (
float(frequency) + column_constant["offset"]) * column_constant[
float(frequency)) * column_constant[
"multiplier"]
note = synths.generate_sine_wave_with_envelope(
frequency=freq_to_generate,
Expand Down
68 changes: 54 additions & 14 deletions frontend/components/inputs/UploadTimeSeriesFileInput.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,17 @@ import React, {useEffect, useState} from "react";
import {fetchPost} from "../../common";
import PropTypes from "prop-types";
import FileInput from "./FileInput";
import ReactTooltip from 'react-tooltip';


const DEFAULT_COLUMN_CONSTANTS = {
"base_frequency": 220,
"multiplier": 4,
"offset": 0,
"multiplier": 220,
"a_percentage": .2,
"d_percentage": .1,
"s_percentage": .5,
"r_percentage": .2,
"wave_pattern": "sin",
};

const INITIAL_EVERY_N = 1;
Expand All @@ -22,7 +23,7 @@ const UploadTimeSeriesFileInput = ({
}) => {
const [parsedCSV, setParsedCSV] = useState(null);
const [duration, setDuration] = useState(INITIAL_DURATION);
const [everyN] = useState(INITIAL_EVERY_N);
const [everyN, setEveryN] = useState(INITIAL_EVERY_N);
const [constants, setConstants] = useState([]);
const [activeColumn, setActiveColumn] = useState(0);

Expand All @@ -36,13 +37,19 @@ const UploadTimeSeriesFileInput = ({
}, [parsedCSV, duration, everyN, constants]);

const constantsDefaults = {
"base_frequency": {"label": "Base Frequency", "min": null, "max": null, "step": null},
"multiplier": {"label": "Multiplier", "min": null, "max": null, "step": null},
"offset": {"label": "Offset", "min": null, "max": null, "step": null},
"a_percentage": {"label": "A", "min": 0, "max": 1, "step": .1},
"d_percentage": {"label": "D", "min": 0, "max": 1, "step": .1},
"s_percentage": {"label": "S", "min": 0, "max": 1, "step": .1},
"r_percentage": {"label": "R", "min": 0, "max": 1, "step": .1},
"multiplier": {"label": "Multiplier", "min": null, "max": null, "step": null,
"tooltip": (val) => `Each value will be multiplied by ${val} Hz. [A, B, C]
will become [A * ${val}, B * ${val}, C * ${val}] = [A', B', C']`},
"base_frequency": {"label": "Base Frequency", "min": null, "max": null, "step": null,
"tooltip": (val) => `Each value will be transposed by ${val} Hz. [A', B', C'] will
become [A' + ${val}, B' + ${val}, C' + ${val}] = [A'', B'', C'']`},
"a_percentage": {"label": "A", "min": 0, "max": 1, "step": .1, "tooltip": () => null},
"d_percentage": {"label": "D", "min": 0, "max": 1, "step": .1, "tooltip": () => null},
"s_percentage": {"label": "S", "min": 0, "max": 1, "step": .1, "tooltip": () => null},
"r_percentage": {"label": "R", "min": 0, "max": 1, "step": .1, "tooltip": () => null},
"wave_pattern": {"label": "Wave Pattern", "min": null, "max": null, "step": null,
"tooltip": () => "Choose from sin, square, or sawtooth patterns",
"options": ["sin", "square", "sawtooth"]},
};

const setParsedCsvAndUpdateConstants = (parsedData) => {
Expand Down Expand Up @@ -76,18 +83,20 @@ const UploadTimeSeriesFileInput = ({
void fetchPost('/api/time_series_sample_data/', {name}, setParsedCsvAndUpdateConstants);
};

const updateConstant = (colNumber, constantName, val) => {
const updateConstant = (colNumber, constantName, val, isString = false) => {
setConstants(prevState => {
let temp = Object.assign([], prevState);
temp[colNumber][constantName] = parseFloat(val);
temp[colNumber][constantName] = isString ? val : parseFloat(val);
return temp;
});
};

const makeColumnControls = (columnNumber) => {
return (<form className="container">
<div className="row">
<div>
{makeControl(columnNumber, "multiplier")}
{makeControl(columnNumber, "base_frequency")}
{makeDropdownControl(columnNumber, "wave_pattern")}
</div>
</form>);
};
Expand All @@ -96,7 +105,9 @@ const UploadTimeSeriesFileInput = ({
return (
<div className="col">
<div className="form-group col-md-6" key={constantsDefaults[constantName]["label"]}>
<label htmlFor="input">{constantsDefaults[constantName]["label"]}</label>
<label htmlFor="input" data-tip={constantsDefaults[constantName]["tooltip"]
(constants[columnNumber][constantName])}>
<u>{constantsDefaults[constantName]["label"]}</u></label>
<input
className="form-control my-3" type="number" id="input"
min={constantsDefaults[constantName]["min"]}
Expand All @@ -112,6 +123,23 @@ const UploadTimeSeriesFileInput = ({
);
};

const makeDropdownControl = (columnNumber, constantName) => {
return (
<div className="col">
<div className="form-group col-md-6" key={constantsDefaults[constantName]["label"]}>
<label htmlFor="input" data-tip={constantsDefaults[constantName]["tooltip"]
(constants[columnNumber][constantName])}>
<u>{constantsDefaults[constantName]["label"]}</u></label>
<select className="my-3" onChange={e => {updateConstant(
columnNumber, constantName, e.target.value, true);}}>
{constantsDefaults[constantName]["options"].map((each, i) =>
<option value={each} key={i}>{each}</option>)}
</select>
</div>
</div>
);
};

return (
<>
{!parsedCSV && <>
Expand Down Expand Up @@ -187,10 +215,22 @@ const UploadTimeSeriesFileInput = ({
value={duration}
/>
</div>
<div className="form-group col-md-6">
<label htmlFor="duration">Use every Nth data point
where N = {everyN}</label>
<input
className="form-control" type="number" id="step"
min={1}
step={1}
onChange={e => setEveryN(e.target.value)}
value={everyN}
/>
</div>
</div>
</div>
</form>
<hr />
<ReactTooltip />
</>}
</>
);
Expand Down
Loading