Mercurial > hg > absrec
changeset 6:09651b934691
Absapprox.py: Fixed: SNRdb should be divided by 20, not 10. noiselevel should be norm/norm, not power/power
utils.py: Commented out one of the separations
| author | nikcleju |
|---|---|
| date | Fri, 13 Jan 2012 15:56:33 +0000 |
| parents | cf46b35b2ef4 |
| children | b4a0b4dfe206 |
| files | ABSapprox.py utils.py |
| diffstat | 2 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/ABSapprox.py Thu Jan 12 14:00:47 2012 +0000 +++ b/ABSapprox.py Fri Jan 13 15:56:33 2012 +0000 @@ -290,7 +290,7 @@ def generateData(d,sigma,delta,rho,numvects,SNRdb): # Process parameters - noiselevel = 1.0 / (10.0**(SNRdb/10.0)); + noiselevel = 1.0 / (10.0**(SNRdb/20.0)); p = round(sigma*d); m = round(delta*d); l = round(d - rho*m);
--- a/utils.py Thu Jan 12 14:00:47 2012 +0000 +++ b/utils.py Fri Jan 13 15:56:33 2012 +0000 @@ -129,7 +129,7 @@ for j in numpy.arange(cols): bigmatrix[i*N:i*N+N,j*N:j*N+N] = mdict['meanmatrix'][algoname][0,0][i,j] bigmatrix = int_drawseparation(mdict['meanmatrix'][algoname][0,0],bigmatrix,10,0.95,2,0) - bigmatrix = int_drawseparation(mdict['meanmatrix'][algoname][0,0],bigmatrix,10,0.9, 2,0.2) + #bigmatrix = int_drawseparation(mdict['meanmatrix'][algoname][0,0],bigmatrix,10,0.9, 2,0.2) bigmatrix = int_drawseparation(mdict['meanmatrix'][algoname][0,0],bigmatrix,10,0.8, 2,0.4) bigmatrix = int_drawseparation(mdict['meanmatrix'][algoname][0,0],bigmatrix,10,0.5, 2,1) # # Mark 95% border @@ -166,7 +166,7 @@ for j in numpy.arange(cols): bigmatrix[i*N:i*N+N,j*N:j*N+N] = matrix[i,j] bigmatrix = int_drawseparation(matrix,bigmatrix,10,0.95,2,0) - bigmatrix = int_drawseparation(matrix,bigmatrix,10,0.9, 2,0.2) + #bigmatrix = int_drawseparation(matrix,bigmatrix,10,0.9, 2,0.2) bigmatrix = int_drawseparation(matrix,bigmatrix,10,0.8, 2,0.4) bigmatrix = int_drawseparation(matrix,bigmatrix,10,0.5, 2,1) # # Mark 95% border