changeset 35:d4f9c906dc78

Save algo names as cell array now works ok (tested)
author nikcleju
date Tue, 15 Nov 2011 15:10:53 +0000
parents e8c4672e9de4
children 539b21849166
files scripts/ABSapprox.py
diffstat 1 files changed, 8 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/scripts/ABSapprox.py	Tue Nov 15 14:50:58 2011 +0000
+++ b/scripts/ABSapprox.py	Tue Nov 15 15:10:53 2011 +0000
@@ -157,7 +157,7 @@
   sigma = 2.0
   deltas = np.array([0.05, 0.45, 0.95])
   rhos = np.array([0.05, 0.45, 0.95])
-  numvects = 100; # Number of vectors to generate
+  numvects = 10; # Number of vectors to generate
   SNRdb = 20.;    # This is norm(signal)/norm(noise), so power, not energy
   # Values for lambda
   #lambdas = [0 10.^linspace(-5, 4, 10)];
@@ -307,7 +307,13 @@
     tosave['numvects'] = numvects
     tosave['SNRdb'] = SNRdb
     tosave['lambdas'] = lambdas
-    tosave['algonames'] = [algotuple[1] for algotuple in algosN+algosL]
+    # Save algo names as cell array
+    obj_arr = np.zeros((len(algosN)+len(algosL),), dtype=np.object)
+    idx = 0
+    for algotuple in algosN+algosL:
+      obj_arr[idx] = algotuple[1]
+      idx = idx+1
+    tosave['algonames'] = obj_arr
     try:
       scipy.io.savemat(savedataname, tosave)
     except: