Mercurial > hg > absrec
comparison utils.py @ 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 |
comparison
equal
deleted
inserted
replaced
5:cf46b35b2ef4 | 6:09651b934691 |
---|---|
127 bigmatrix = numpy.zeros((N*rows,N*cols)) | 127 bigmatrix = numpy.zeros((N*rows,N*cols)) |
128 for i in numpy.arange(rows): | 128 for i in numpy.arange(rows): |
129 for j in numpy.arange(cols): | 129 for j in numpy.arange(cols): |
130 bigmatrix[i*N:i*N+N,j*N:j*N+N] = mdict['meanmatrix'][algoname][0,0][i,j] | 130 bigmatrix[i*N:i*N+N,j*N:j*N+N] = mdict['meanmatrix'][algoname][0,0][i,j] |
131 bigmatrix = int_drawseparation(mdict['meanmatrix'][algoname][0,0],bigmatrix,10,0.95,2,0) | 131 bigmatrix = int_drawseparation(mdict['meanmatrix'][algoname][0,0],bigmatrix,10,0.95,2,0) |
132 bigmatrix = int_drawseparation(mdict['meanmatrix'][algoname][0,0],bigmatrix,10,0.9, 2,0.2) | 132 #bigmatrix = int_drawseparation(mdict['meanmatrix'][algoname][0,0],bigmatrix,10,0.9, 2,0.2) |
133 bigmatrix = int_drawseparation(mdict['meanmatrix'][algoname][0,0],bigmatrix,10,0.8, 2,0.4) | 133 bigmatrix = int_drawseparation(mdict['meanmatrix'][algoname][0,0],bigmatrix,10,0.8, 2,0.4) |
134 bigmatrix = int_drawseparation(mdict['meanmatrix'][algoname][0,0],bigmatrix,10,0.5, 2,1) | 134 bigmatrix = int_drawseparation(mdict['meanmatrix'][algoname][0,0],bigmatrix,10,0.5, 2,1) |
135 # # Mark 95% border | 135 # # Mark 95% border |
136 # if mdict['meanmatrix'][algoname][0,0][i,j] > thresh: | 136 # if mdict['meanmatrix'][algoname][0,0][i,j] > thresh: |
137 # # Top border | 137 # # Top border |
164 bigmatrix = numpy.zeros((N*rows,N*cols)) | 164 bigmatrix = numpy.zeros((N*rows,N*cols)) |
165 for i in numpy.arange(rows): | 165 for i in numpy.arange(rows): |
166 for j in numpy.arange(cols): | 166 for j in numpy.arange(cols): |
167 bigmatrix[i*N:i*N+N,j*N:j*N+N] = matrix[i,j] | 167 bigmatrix[i*N:i*N+N,j*N:j*N+N] = matrix[i,j] |
168 bigmatrix = int_drawseparation(matrix,bigmatrix,10,0.95,2,0) | 168 bigmatrix = int_drawseparation(matrix,bigmatrix,10,0.95,2,0) |
169 bigmatrix = int_drawseparation(matrix,bigmatrix,10,0.9, 2,0.2) | 169 #bigmatrix = int_drawseparation(matrix,bigmatrix,10,0.9, 2,0.2) |
170 bigmatrix = int_drawseparation(matrix,bigmatrix,10,0.8, 2,0.4) | 170 bigmatrix = int_drawseparation(matrix,bigmatrix,10,0.8, 2,0.4) |
171 bigmatrix = int_drawseparation(matrix,bigmatrix,10,0.5, 2,1) | 171 bigmatrix = int_drawseparation(matrix,bigmatrix,10,0.5, 2,1) |
172 # # Mark 95% border | 172 # # Mark 95% border |
173 # if matrix[i,j] > thresh: | 173 # if matrix[i,j] > thresh: |
174 # # Top border | 174 # # Top border |