nosklo
/
samplebrain
mirror of https://gitlab.com/then-try-this/samplebrain.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: nosklo:c4499ce7c960797726f243c97bcf0d68e0cdabc4
Branches Tags
nosklo:main
nosklo:production
nosklo:development
nosklo:v0.18.5_release
nosklo:0.18.4_release
nosklo:0.18.3_release
nosklo:0.18_release
..
compare: nosklo:385563e64ef1cf0d1b2289126f01d5632a0ba9eb
Branches Tags
nosklo:production
nosklo:development
nosklo:main
nosklo:v0.18.5_release
nosklo:0.18.4_release
nosklo:0.18.3_release
nosklo:0.18_release

No commits in common. "c4499ce7c960797726f243c97bcf0d68e0cdabc4" and "385563e64ef1cf0d1b2289126f01d5632a0ba9eb" have entirely different histories.
c4499ce7c9 ... 385563e64e

4 changed files with 2 additions and 6 deletions
Show Stats Expand all files Collapse all files

1
brain/src/block.cpp
View File

@ -112,7 +112,6 @@ void block::process(const sample &pcm, sample &fft, sample &mfcc, float &freq) {
// calculate fft // calculate fft
std::vector<std::complex<double> > mfspec; std::vector<std::complex<double> > mfspec;
mfspec.reserve(m_block_size);
for (u32 i=0; i<m_block_size; ++i) { for (u32 i=0; i<m_block_size; ++i) {
mfspec.push_back(std::complex<double>(m_fftw->m_spectrum[i][0], mfspec.push_back(std::complex<double>(m_fftw->m_spectrum[i][0],
m_fftw->m_spectrum[i][1])); m_fftw->m_spectrum[i][1]));

1
brain/src/block_stream.cpp
View File

@ -79,7 +79,6 @@ void block_stream::init(u32 block_size, u32 overlap, window::type t, bool ditchp
m_window.set_current_type(t); m_window.set_current_type(t);
m_blocks.clear(); m_blocks.clear();
m_blocks.reserve(MAX_BLOCKS);
sample dummy(block_size); sample dummy(block_size);
for (u32 i=0; i<MAX_BLOCKS; i++) { for (u32 i=0; i<MAX_BLOCKS; i++) {
m_blocks.push_back(block(0,"dummy",dummy,44100,m_window)); m_blocks.push_back(block(0,"dummy",dummy,44100,m_window));

2
brain/src/brain.cpp
View File

@ -228,7 +228,6 @@ u32 brain::rev_search(const block &target, const search_params &params) {
return furthest_index; return furthest_index;
} }
/*
// really slow - every to every comparison of blocks calculating average distance // really slow - every to every comparison of blocks calculating average distance
double brain::calc_average_diff(search_params &params) { double brain::calc_average_diff(search_params &params) {
double diff=0; double diff=0;
@ -262,7 +261,6 @@ void brain::build_synapses_thresh(search_params &params, double thresh) {
++outer_index; ++outer_index;
} }
} }
*/
void brain::build_synapses_fixed(search_params &params) { void brain::build_synapses_fixed(search_params &params) {
//m_average_error = calc_average_diff(params)*thresh; //m_average_error = calc_average_diff(params)*thresh;

4
brain/src/brain.h
View File

@ -62,8 +62,8 @@ public:
u32 rev_search(const block &target, const search_params &params); u32 rev_search(const block &target, const search_params &params);
// synaptic search // synaptic search
// double calc_average_diff(search_params &params); double calc_average_diff(search_params &params);
// void build_synapses_thresh(search_params &params, double threshold); void build_synapses_thresh(search_params &params, double threshold);
void build_synapses_fixed(search_params &params); void build_synapses_fixed(search_params &params);
u32 search_synapses(const block &target, search_params &params); u32 search_synapses(const block &target, search_params &params);
double get_current_error() { return m_current_error; } double get_current_error() { return m_current_error; }