Mercurial > hg > aimc
changeset 662:7e18c84ca2b7
Small cleanup of eigen usage in SAI implementation.
| author | ronw@google.com |
|---|---|
| date | Tue, 16 Jul 2013 19:56:11 +0000 |
| parents | 7a0031c321da |
| children | 4582882ab89f |
| files | carfac/sai.cc carfac/sai_test.cc matlab/bmm/carfac/CARFAC_GenerateTestData.m |
| diffstat | 3 files changed, 3 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/carfac/sai.cc Mon Jul 01 19:02:37 2013 +0000 +++ b/carfac/sai.cc Tue Jul 16 19:56:11 2013 +0000 @@ -52,12 +52,11 @@ "Unexpected input frame size."); // Append new data to the input buffer. - int num_shift = params_.window_width; - int shift_width = input_buffer_.cols() - num_shift; + int shift_width = input_buffer_.cols() - params_.window_width; input_buffer_.leftCols(shift_width).swap( input_buffer_.rightCols(shift_width)); for (int i = 0; i < input.size(); ++i) { - input_buffer_.block(0, shift_width + i, input[i].size(), 1) = input[i]; + input_buffer_.col(shift_width + i) = input[i]; } // Zero-pad the buffer if necessary. if (input.size() < params_.window_width) {
--- a/carfac/sai_test.cc Mon Jul 01 19:02:37 2013 +0000 +++ b/carfac/sai_test.cc Tue Jul 16 19:56:11 2013 +0000 @@ -157,6 +157,7 @@ const int kNumChannels = 71; vector<ArrayX> input_segment = LoadMatrix(kTestName + "-matlab-nap1.txt", kNumSamples, kNumChannels); + const int kWindowWidth = 2000; const int kSAIWidth = 500; SAIParams sai_params = CreateSAIParams(kNumChannels, kWindowWidth, kSAIWidth);
--- a/matlab/bmm/carfac/CARFAC_GenerateTestData.m Mon Jul 01 19:02:37 2013 +0000 +++ b/matlab/bmm/carfac/CARFAC_GenerateTestData.m Tue Jul 16 19:56:11 2013 +0000 @@ -52,7 +52,6 @@ CF_struct = CARFAC_Design(n_ears); WriteTestData(test_data_dir, 'binaural_test', signal, CF_struct, sai_struct); - test_name = 'long_test'; samples_to_read = [80001, 82000]; % Trim for a faster test. [signal, fs] = wavread([test_data_dir test_name '.wav'], samples_to_read);