summaryrefslogtreecommitdiff
path: root/genFeatureVec.m
diff options
context:
space:
mode:
authorJoe Zhao <ztuowen@gmail.com>2015-06-27 20:09:12 +0800
committerJoe Zhao <ztuowen@gmail.com>2015-06-27 20:09:12 +0800
commitac7a813ca3fa0d7b8ddb61499fa50eca1336101c (patch)
treedf724ba3b9b9c5e4f27726502ef758303ad9b6fa /genFeatureVec.m
parent81d9c2360fd88422fcf7c8bd176f0ae07af2a9bf (diff)
downloadfeatext-ac7a813ca3fa0d7b8ddb61499fa50eca1336101c.tar.gz
featext-ac7a813ca3fa0d7b8ddb61499fa50eca1336101c.tar.bz2
featext-ac7a813ca3fa0d7b8ddb61499fa50eca1336101c.zip
upload all
Diffstat (limited to 'genFeatureVec.m')
-rw-r--r--genFeatureVec.m67
1 files changed, 40 insertions, 27 deletions
diff --git a/genFeatureVec.m b/genFeatureVec.m
index 0b227fa..d3ee056 100644
--- a/genFeatureVec.m
+++ b/genFeatureVec.m
@@ -7,9 +7,9 @@ function vec = genFeatureVec(img,minc,maxc)
cnls(:,:,4:6) = rgb2ycbcr(img);
hsv = rgb2hsv(img);
cnls(:,:,7:8) = hsv(:,:,1:2);
- for i=1:ncnls
- cnls(:,:,i) = histeq(cnls(:,:,i));
- end
+ %for i=1:ncnls
+ % cnls(:,:,i) = histeq(cnls(:,:,i));
+ %end
% Schmid
scVec=[
1,2;
@@ -29,41 +29,54 @@ function vec = genFeatureVec(img,minc,maxc)
0.3,0,4,2;
0.3,0,8,2;
0.4,0,4,1;
- 0.4,0,8,2;
+ 0.4,0,8,1;
0.3,pi/2,4,2;
0.3,pi/2,8,2;
0.4,pi/2,4,1;
- 0.4,pi/2,8,2;];
+ 0.4,pi/2,8,1;];
gb = length(gbVec);
sc = length(scVec);
vec=[];
nn=1;
+ % Avg
+ for cnl = 1:ncnls
+ for sec = 1:secs
+ pos = maxc(nn);
+ neg = minc(nn);
+ nn=nn+1;
+ ss = (pos-neg)/bins;
+ section = getSection(cnls(:,:,cnl),sec,secs);
+ v = histcounts(section,(0:bins)*ss+neg);
+ v=v/sum(v);
+ vec=cat(2,vec,v);
+ end
+ end
+ % Schmid
for i = 1:sc
- for cnl = 1:ncnls
- for sec = 1:secs
- filt = schmidFilter(scVec(i,1),scVec(i,2));
- pos = maxc(nn);
- neg = minc(nn);
- nn=nn+1;
- ss = (pos-neg)/bins;
- section = getSection(cnls(:,:,cnl),sec,secs);
- v = histcounts(imfilter(section, filt, 'symmetric'),(0:bins)*ss+neg);
- vec=cat(2,vec,v);
- end
+ filt = schmidFilter(scVec(i,1),scVec(i,2));
+ for sec = 1:secs
+ pos = maxc(nn);
+ neg = minc(nn);
+ nn=nn+1;
+ ss = (pos-neg)/bins;
+ section = getSection(hsv(:,:,3),sec,secs);
+ v = histcounts(imfilter(section, filt, 'symmetric'),(0:bins)*ss+neg);
+ v=v/sum(v);
+ vec=cat(2,vec,v);
end
end
+ % Gabor
for i = 1:gb
- for cnl = 1:ncnls
- for sec = 1:secs
- filt = gaborFilter(gbVec(i,1),gbVec(i,2),gbVec(i,3),gbVec(i,4));
- pos = maxc(nn);
- neg = minc(nn);
- nn=nn+1;
- ss = (pos-neg)/bins;
- section = getSection(cnls(:,:,cnl),sec,secs);
- v = histcounts(imfilter(section, filt, 'symmetric'),(0:bins)*ss+neg);
- vec=cat(2,vec,v);
- end
+ filt = gaborFilter(gbVec(i,1),gbVec(i,2),gbVec(i,3),gbVec(i,4));
+ for sec = 1:secs
+ pos = maxc(nn);
+ neg = minc(nn);
+ nn=nn+1;
+ ss = (pos-neg)/bins;
+ section = getSection(hsv(:,:,3),sec,secs);
+ v = histcounts(imfilter(section, filt, 'symmetric'),(0:bins)*ss+neg);
+ v=v/sum(v);
+ vec=cat(2,vec,v);
end
end
end