Add missing test signals for AFE DEMO scripts and fixed a few AFE bugs

TWOEARS · Sep 14, 2015 · 798fb12 · 798fb12
1 parent 753dada
commit 798fb12
Show file tree

Hide file tree

Showing 27 changed files with 46 additions and 34 deletions.
diff --git a/AuditoryFrontEnd/src/Signals/ModulationSignal.m b/AuditoryFrontEnd/src/Signals/ModulationSignal.m
@@ -166,7 +166,7 @@
             % Minimum ratemap floor to limit dynamic range
             minValdB = -(maxDynamicRangedB + (0 - maxValdB));
 
-            rangedB = [quant(minValdB,5) quant(maxValdB,5)];
+            rangedB = [round(minValdB/5)*5 round(maxValdB/5)*5];
 
             rsAMS(end+1,:,:) = NaN;  % insert borders
 

diff --git a/AuditoryFrontEnd/src/Tools/detectOnsetsOffsets.m b/AuditoryFrontEnd/src/Tools/detectOnsetsOffsets.m
@@ -50,7 +50,12 @@
 % 
 % Extract connected onset or offset fronts which spread across at least
 % 'minOnsetSpread' adjacent channels. 
-[L,nFragments] = bwlabel(bActivity,8);
+if ~license('test', 'image_toolbox')
+    error(['Sorry, but the Image Processing Toolbox is required to ',...
+        'extract coherent onsets and offsets.']);
+else
+    [L,nFragments] = bwlabel(bActivity,8);
+end
 
 % Loop over number of connected fragments
 for ii = 1 : nFragments

diff --git a/AuditoryFrontEnd/test/DEMO_AMS.m b/AuditoryFrontEnd/test/DEMO_AMS.m
@@ -7,7 +7,7 @@
 % 
 % 
 % Load a signal
-load('AFE_earSignals_16kHz');
+load('Test_signals/AFE_earSignals_16kHz');
 
 % Create a data object based on the right ear signal
 dObj = dataObject(earSignals(:,2),fsHz);

diff --git a/AuditoryFrontEnd/test/DEMO_Adaptation.m b/AuditoryFrontEnd/test/DEMO_Adaptation.m
@@ -7,7 +7,7 @@
 % 
 % 
 % Load a signal
-load('AFE_earSignals_16kHz');
+load('Test_signals/AFE_earSignals_16kHz');
 
 % Create a data object based on parts of the right ear signal
 dObj = dataObject(earSignals(1:22495,2),fsHz);

diff --git a/AuditoryFrontEnd/test/DEMO_Autocorrelation.m b/AuditoryFrontEnd/test/DEMO_Autocorrelation.m
@@ -7,7 +7,7 @@
 % 
 % 
 % Load a signal
-load('AFE_earSignals_16kHz');
+load('Test_signals/AFE_earSignals_16kHz');
 
 % Create a data object based on parts of the right ear signal
 dObj = dataObject(earSignals(1:20E3,2),fsHz);

diff --git a/AuditoryFrontEnd/test/DEMO_ChunkBased.m b/AuditoryFrontEnd/test/DEMO_ChunkBased.m
@@ -1,12 +1,12 @@
-clear all
-close all
+clear;
+close all;
 
 % This script illustrates the chunk-based compatibility of the AFE framework with 
 % arbitrary chunk size.
 % It goes along the description in section 2.4 of the user manual (Deliverable 2.2)
 
 % Loading a signal
-load('TestBinauralCues');
+load('Test_signals/AFE_earSignals_16kHz');
 sIn = earSignals;
 clear earSignals
 

diff --git a/AuditoryFrontEnd/test/DEMO_Crosscorrelation.m b/AuditoryFrontEnd/test/DEMO_Crosscorrelation.m
@@ -7,7 +7,7 @@
 % 
 % 
 % Load a signal
-load('AFE_earSignals_16kHz');
+load('Test_signals/AFE_earSignals_16kHz');
 
 % Create a data object based on parts of the ear signals
 dObj = dataObject(earSignals(1:20E3,:),fsHz);

diff --git a/AuditoryFrontEnd/test/DEMO_DRNL.m b/AuditoryFrontEnd/test/DEMO_DRNL.m
@@ -7,7 +7,7 @@
 % 
 % 
 % Load a signal
-load('AFE_earSignals_16kHz');
+load('Test_signals/AFE_earSignals_16kHz');
 
 % Take single channel (1- Left or 2 - Right)
 earSignal = earSignals(:,2);

diff --git a/AuditoryFrontEnd/test/DEMO_GaborFeatures.m b/AuditoryFrontEnd/test/DEMO_GaborFeatures.m
@@ -7,7 +7,7 @@
 % 
 % 
 % Load a signal
-load('AFE_earSignals_16kHz');
+load('Test_signals/AFE_earSignals_16kHz');
 
 % Create a data object based on parts of the right ear signal
 dObj = dataObject(earSignals(1:22495,2),fsHz);
@@ -53,10 +53,10 @@
 % Ratemap
 dObj.ratemap{1}.plot;
 set(gca,'YTick',5:5:20,'YTickLabel',num2str((5:5:20)'))
-ylabel('\# channels')
+ylabel('# channels')
 
 
 % Gabor features
 dObj.gabor{1}.plot;
 
-
+
diff --git a/AuditoryFrontEnd/test/DEMO_Gammatone.m b/AuditoryFrontEnd/test/DEMO_Gammatone.m
@@ -7,7 +7,7 @@
 % 
 % 
 % Load a signal
-load('AFE_earSignals_16kHz');
+load('Test_signals/AFE_earSignals_16kHz');
 
 % Create a data object based on parts of the right ear signal
 dObj = dataObject(earSignals(1:22495,2),fsHz);

diff --git a/AuditoryFrontEnd/test/DEMO_IC.m b/AuditoryFrontEnd/test/DEMO_IC.m
@@ -7,13 +7,13 @@
 % 
 % 
 % Load anechoic signal
-load('DEMO_Speech_Anechoic');
+load('Test_signals/DEMO_Speech_Anechoic');
 
 % Create a data object based on the ear signals
 dObj1 = dataObject(earSignals(1:22494,:),fsHz);
 
 % Load erverberant signal
-load('DEMO_Speech_Room_D');
+load('Test_signals/DEMO_Speech_Room_D');
 
 % Create a data object based on the ear signals
 dObj2 = dataObject(earSignals(1:22494,:),fsHz);

diff --git a/AuditoryFrontEnd/test/DEMO_IHC.m b/AuditoryFrontEnd/test/DEMO_IHC.m
@@ -7,7 +7,7 @@
 % 
 % 
 % Load a signal
-load('AFE_earSignals_16kHz');
+load('Test_signals/AFE_earSignals_16kHz');
 
 % Create a data object based on parts of the right ear signal
 dObj = dataObject(earSignals(1:22495,2),fsHz);
@@ -58,4 +58,4 @@
 
 % Plot IHC responses
 dObj.innerhaircell{1}.plot([],p);
-title('IHC signal')
+title('IHC signal')
diff --git a/AuditoryFrontEnd/test/DEMO_ILD.m b/AuditoryFrontEnd/test/DEMO_ILD.m
@@ -7,7 +7,7 @@
 % 
 % 
 % Load a signal
-load('AFE_earSignals_16kHz');
+load('Test_signals/AFE_earSignals_16kHz');
 
 % Create a data object based on the ear signals
 dObj = dataObject(earSignals(1:22494,:),fsHz);

diff --git a/AuditoryFrontEnd/test/DEMO_ITD.m b/AuditoryFrontEnd/test/DEMO_ITD.m
@@ -7,7 +7,7 @@
 % 
 % 
 % Load a signal
-load('AFE_earSignals_16kHz');
+load('Test_signals/AFE_earSignals_16kHz');
 
 % Create a data object based on the ear signals
 dObj = dataObject(earSignals(1:22494,:),fsHz);

diff --git a/AuditoryFrontEnd/test/DEMO_ObjectOriented.m b/AuditoryFrontEnd/test/DEMO_ObjectOriented.m
@@ -18,7 +18,7 @@
 % - Feedback handling
 %
 
-% clear all
+clear
 close all
 clc
 
@@ -28,7 +28,8 @@
 
 
 % Load a signal
-load('TestBinauralCues');
+load('Test_signals/AFE_earSignals_16kHz');
+
 
 %% 1- Basic advantages of object-oriented approach: 
 %     Extraction of inner hair-cell envelope for a single audio channel

diff --git a/AuditoryFrontEnd/test/DEMO_OffsetStrength.m b/AuditoryFrontEnd/test/DEMO_OffsetStrength.m
@@ -7,7 +7,7 @@
 % 
 % 
 % Load a signal
-load('AFE_earSignals_16kHz');
+load('Test_signals/AFE_earSignals_16kHz');
 
 % Create a data object based on parts of the right ear signal
 dObj = dataObject(earSignals(1:22494,2),fsHz);

diff --git a/AuditoryFrontEnd/test/DEMO_OnsetOffsetMaps.m b/AuditoryFrontEnd/test/DEMO_OnsetOffsetMaps.m
@@ -7,7 +7,7 @@
 % 
 % 
 % Load a signal
-load('AFE_earSignals_16kHz');
+load('Test_signals/AFE_earSignals_16kHz');
 
 % Create a data object based on parts of the right ear signal
 dObj = dataObject(earSignals(1:22494,2),fsHz);

diff --git a/AuditoryFrontEnd/test/DEMO_OnsetStrength.m b/AuditoryFrontEnd/test/DEMO_OnsetStrength.m
@@ -7,7 +7,7 @@
 % 
 % 
 % Load a signal
-load('AFE_earSignals_16kHz');
+load('Test_signals/AFE_earSignals_16kHz');
 
 % Create a data object based on parts of the right ear signal
 dObj = dataObject(earSignals(1:22494,2),fsHz);

diff --git a/AuditoryFrontEnd/test/DEMO_Pitch.m b/AuditoryFrontEnd/test/DEMO_Pitch.m
@@ -1,13 +1,13 @@
 clear;
-close all
-clc
+close all;
+clc;
 
 
 %% LOAD SIGNAL
 % 
 % 
 % Load a signal
-load('AFE_earSignals_16kHz');
+load('Test_signals/AFE_earSignals_16kHz');
 
 % Create a data object based on parts of the right ear signal
 dObj = dataObject(earSignals(1:20E3,2),fsHz);

diff --git a/AuditoryFrontEnd/test/DEMO_PreProcessing.m b/AuditoryFrontEnd/test/DEMO_PreProcessing.m
@@ -1,4 +1,4 @@
-% clear;
+clear;
 close all
 clc
 
@@ -7,7 +7,7 @@
 % 
 % 
 % Load a signal
-load('AFE_earSignals_16kHz');
+load('Test_signals/AFE_earSignals_16kHz');
 
 % Replicate signals at a higher level
 earSignals = cat(1,earSignals(1:22495,:),5*earSignals(1:22495,:))/5;

diff --git a/AuditoryFrontEnd/test/DEMO_Ratemap.m b/AuditoryFrontEnd/test/DEMO_Ratemap.m
@@ -7,7 +7,7 @@
 % 
 % 
 % Load a signal
-load('AFE_earSignals_16kHz');
+load('Test_signals/AFE_earSignals_16kHz');
 
 % Create a data object based on parts of the right ear signal
 dObj = dataObject(earSignals(1:22495,2),fsHz);

diff --git a/AuditoryFrontEnd/test/DEMO_SpectralFeatures.m b/AuditoryFrontEnd/test/DEMO_SpectralFeatures.m
@@ -7,7 +7,7 @@
 % 
 % 
 % Load a signal
-load('AFE_earSignals_16kHz');
+load('Test_signals/AFE_earSignals_16kHz');
 
 % Create a data object based on parts of the right ear signal
 dObj = dataObject(earSignals(1:22495,2),fsHz);

diff --git a/AuditoryFrontEnd/test/DEMO_feedback.m b/AuditoryFrontEnd/test/DEMO_feedback.m
@@ -3,8 +3,8 @@
 % This script demonstrates feedback capabilities by computing the ratemap of a pure sine
 % wave with an auditory filterbank of filters of increasing bandwidth 
 
-clear all
-close all
+clear;
+close all;
 
 
 % Request and parameters for feature extraction

diff --git a/AuditoryFrontEnd/test/Test_signals/AFE_earSignals_16kHz.mat b/AuditoryFrontEnd/test/Test_signals/AFE_earSignals_16kHz.mat
diff --git a/AuditoryFrontEnd/test/Test_signals/DEMO_Speech_Anechoic.mat b/AuditoryFrontEnd/test/Test_signals/DEMO_Speech_Anechoic.mat
diff --git a/AuditoryFrontEnd/test/Test_signals/DEMO_Speech_Room_D.mat b/AuditoryFrontEnd/test/Test_signals/DEMO_Speech_Room_D.mat
diff --git a/AuditoryFrontEnd/test/Test_signals/README.md b/AuditoryFrontEnd/test/Test_signals/README.md
@@ -0,0 +1,6 @@
+Two!Ears Auditory Front-End basic test signals
+==============================================
+
+This folder contains a few test signals used in demo
+scripts, where actual signals from other Two!Ears model
+parts are not required.