# HG changeset patch
# User nikcleju
# Date 1326470193 0
# Node ID 09651b934691de6e64a5eb7989c25b272cab872c
# Parent  cf46b35b2ef408ced108e8fcbda05e908cf6d743
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

diff -r cf46b35b2ef4 -r 09651b934691 ABSapprox.py
--- 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);
diff -r cf46b35b2ef4 -r 09651b934691 utils.py
--- 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