Mercurial > hg > audiodb
view tests/pointset_test/plotLSHresults.m @ 405:ef4792df8f93 api-inversion
invert audioDB::insert / audiodb_insert().
Start off by removing audioDB::insertDatum, and essentially reusing it
as audiodb_insert. We now ignore the fact that the command-line parsing
code has "helpfully" opened a std::ifstream for the times file and an fd
for the power file, and simply go ahead and do our own dirty work.
We can delete audioDB::insertDatum entirely, but unfortunately we can't
delete audioDB::insertPowerData and audioDB::insertTimestamps, because
the index and query code respectively use them. Instead, move the two
methods closer to their single uses.
audiodb_insert() is perhaps not as short and simple as it might have
been hoped given the existence of audiodb_insert_datum(); some of that
is C and its terribly way of making you pay every time you use dynamic
memory; some of it is the fact that the three different files (feature,
times, power) each requires slightly different treatment. Hey ho.
We can implement audiodb_batchinsert() in terms of audiodb_insert(); the
function is pleasingly small. We can't quite use it for
audioDB::batchinsert yet, as we have to deal with the O2_FLAG_LARGE_ADB
case (which codepath is untested in libtests/).
This means that we can delete whole swathes of hideous code from
audioDB.cpp, including not just the versions of audiodb_insert() and
audiodb_batchinsert() but also an entire audioDB constructor. Yay.
(audioDB::unitNormAndInsertL2 has also died a deserved death).
author | mas01cr |
---|---|
date | Fri, 05 Dec 2008 22:32:49 +0000 |
parents | 63ae0dfc1767 |
children | 397e94f6db44 |
line wrap: on
line source
function plotLSHresults(filename, w, kk, useLog) if nargin<4, useLog=0;end if nargin<3, kk=1;end R = load(filename,'ascii'); % Assume 10 radii queries x 10 radii result summaries for k=1:10 RR(k,:)=mean(R(k:10:end,:))./100; % Convert to Probability end c=['r' 'g' 'b' 'c' 'm' 'y' 'k']; if(useLog) logSym=' Log_{10} '; else logSym=''; end figure subplot(211) hold on radii=[0.1 0.2 0.4 0.5 0.7 0.9 1 2 5 10]; for k=1:10 if(useLog) semilogx(radii, kk*log10(lshP(w,radii./radii(k))),[num2str(c(mod(k,length(c))+1)) '-+'],'lineWidth',2) else plot(radii,lshP(w,radii./radii(k)).^kk,[num2str(c(mod(k,length(c))+1)) '-+'],'lineWidth',2) end end if(useLog) axis([radii(1) radii(end) -kk 0]) else axis([0 10 0 1]) end grid on legend([{"r=.1"},{"r=.2"},{"r=.4"},{"r=.5"},{"r=.7"},{"r=.9"},{"r=1"},{"r=2"},{"r=5"},{"r=10"}]) title(['Estimated Probability for 10 LSH radii searches: w=' num2str(w) ' , k=' num2str(kk)]) xlabel('Radius') ylabel([logSym 'Probability']) subplot(212) hold on for k=1:10 if(useLog) semilogx(radii,kk*log(RR(k,:)),[num2str(c(mod(k,length(c))+1)) '-+'],'lineWidth',2) else plot(radii,RR(k,:).^kk,[num2str(c(mod(k,length(c))+1)) '-+'],'lineWidth',2) end end if(useLog) axis([radii(1) radii(end) -kk 0]) else axis([0 10 0 1]) endif grid on legend([{"r=.1"},{"r=.2"},{"r=.4"},{"r=.5"},{"r=.7"},{"r=.9"},{"r=1"},{"r=2"},{"r=5"},{"r=10"}]) title(['Observed Probability for 10 LSH radii searches: w=' num2str(w) ' , k=' num2str(kk)]) xlabel('Radius') ylabel([logSym 'Probability'])