Changeset 67

Timestamp:

07/09/13 11:06:30 (11 years ago)

Author:

vcheplygina

Message:

 

Location:

birds

Files:

• birds_20130709.mat (added)
• createmilbirds_19cl.m (modified) (3 diffs)

birds/createmilbirds_19cl.m

@@ -11 +11 @@
 
 % load the 'meta' data like labels and filenames
-dpath = '/data/birds_mlsp2013/mlsp_contest_dataset2/essential_data/';
+dpath = '../birds_mlsp2013/mlsp_contest_dataset/essential_data/';
 [bagid,names] = textread(fullfile(dpath,'rec_id2filename.txt'),'%n%s','headerlines',1);
 [bagid2,labstr] = textread(fullfile(dpath,'rec_labels_test_hidden.txt'),'%n%s','headerlines',1);
-[bagid3,Itst] = textread(fullfile(dpath,'CVfolds_2.txt'),'%n%d','headerlines',1);
+
+
+%[bagid3,Itst] =
+%textread(fullfile(dpath,'CVfolds_2.txt'),'%n%d','headerlines',1); 
+
+%VC: Ik krijg hier foutmeldingen. textread gaat weg, dus ze raden aan om
+%textscan te gebruiken.
+%>Error using dataread
+%>Trouble reading integer from file (row 1, field 2) ==> ,1\n
+%>Error in textread (line 175)
+%>[varargout{1:nlhs}]=dataread('file',varargin{:}); %#ok<REMFF1>
+ 
+
+N = length(bagid2);
+CVfile = fopen(fullfile(dpath,'CVfolds_2.txt'));
+CVdata = textscan(CVfile, '%f,%f', N, 'headerlines',1);
+fclose(CVfile);
+
+bagid3 = CVdata{1};
+Itst = CVdata{2};
 
 
@@ -30 +49 @@
 for i=1:B
         %load the signal;
-        [signal,fs] = wavread(fullfile(dpath,'wavs',names{i}(2:end)));
+        [signal,fs] = wavread(fullfile(dpath,'src_wavs',names{i}(2:end)));
         [S,f,t] = spectrogram(signal,windowlen,windowlen/2,fmax,fs);
         % smooth and threshold the spectrogram:
@@ -49 +68 @@
                 thisx(j,:) = [props(j).Area, props(j).Centroid, props(j).BoundingBox];
                 % don't forget:
-                bagid(end+1) = i;
+                %bagid(end+1) = i;
+        
+        bagid = [bagid i];
+        
         end
         x{i} = thisx;
 
-        % get the labels right for the training bags:
+        %Get the labels right for the training bags:
+    
    if ~Itst(i)
-      eval(['baglab(i,[',labstr{i}(2:end),'])=1;']);
+      %eval(['baglab(i,[',labstr{i}(2:end),'])=1;']);
+      %VC: in the text file, label numbers are 0 to 18, we want 1 to 19?
+      eval(['baglab(i,[',labstr{i}(2:end),']+1)=1;']);
    end
 end