##// END OF EJS Templates
jro_soft » compressed_sensing
RSS
Fixed erros in sfb, idualtree, irls_dn, and irls_dn2
yamaro -
r20:21
parent child
Show More
Show file before | Show file after | Hide comments
@@ -310,30 +310,32
310 310 chi2 = np.sum((es/sigma)**2); No newline at end of file
311 311 No newline at end of file
312 312
313 No newline at end of file
313 # CS inversion using Iteratively Reweighted Least Squares (IRLS)------------- No newline at end of file
314 314 No newline at end of file
315 315 # (Use Nr, thetar, gnz, and Hr from MaxEnt above) No newline at end of file
316 316
317 No newline at end of file
317 Psi = deb4_basis(Nr); ###### REPLACED BY LINEs BELOW (?)
No newline at end of file
318 No newline at end of file
318
No newline at end of file
319 No newline at end of file
319 print 'FINALLY!'
No newline at end of file
320 print Psi.shape
No newline at end of file
321
No newline at end of file
322 # REMOVE THIS?-------------------------------- No newline at end of file
323 320 #wavelet1 = pywt.Wavelet('db4') No newline at end of file
324 321 #Phi, Psi, x = wavelet1.wavefun(level=3) No newline at end of file
325 322 # -------------------------------------------- No newline at end of file
326 323 No newline at end of file
327 324 # add "sum to 1" constraint
325 No newline at end of file
328 # H2 = np.concatenate( (Hr, np.ones(shape=(1,Nr))), axis=0 );
No newline at end of file
326 No newline at end of file
329 # N_temp = np.array([[Nr/Nt]]);
No newline at end of file
327 No newline at end of file
330 # g2 = np.concatenate( (gnz, N_temp), axis=0 );
No newline at end of file
328 No newline at end of file
331 # H2 = H2.T.conj();
No newline at end of file
329 No newline at end of file
332 #
No newline at end of file
330 No newline at end of file
333 # print 'H2 shape', H2.shape
No newline at end of file
331 No newline at end of file
334 # print 'Psi shape', Psi.shape
No newline at end of file
332 No newline at end of file
335 #
No newline at end of file
333 No newline at end of file
336 # s = irls_dn2(np.dot(H2,Psi),g2,0.5,G); No newline at end of file
No newline at end of file
334 #####print 'Psi shape', Psi.shape
No newline at end of file
335
No newline at end of file
336 A = np.dot(H2,Psi);
No newline at end of file
337
No newline at end of file
338 s = irls_dn2(np.dot(H2,Psi),g2,0.5,G); No newline at end of file
337 339 # f_cs = Psi*s; No newline at end of file
338 340 # No newline at end of file
339 341 # # plot No newline at end of file
Show file before | Show file after | Hide comments
@@ -26,8 +26,6
26 26 n = np.arange(N); No newline at end of file
27 27 n = np.mod(n-m, N); No newline at end of file
28 28
No newline at end of file
29 print x.shape
No newline at end of file
30 No newline at end of file
31 29 y = x[0,n]; No newline at end of file
32 30 No newline at end of file
33 31 No newline at end of file
Show file before | Show file after | Hide comments
@@ -13,8 +13,7
13 13 def deb4_basis(N): No newline at end of file
14 14 No newline at end of file
15 15 Psi = np.zeros(shape=(N,2*N+1));
16 No newline at end of file
16 idx = 1;
No newline at end of file
17 No newline at end of file
18 17 J = 4; No newline at end of file
19 18 [Faf, Fsf] = FSfarras(); No newline at end of file
20 19 [af, sf] = dualfilt1(); No newline at end of file
Show file before | Show file after | Hide comments
@@ -36,7 +36,7
36 36 y2 = w[J][1]; No newline at end of file
37 37 No newline at end of file
38 38 for j in range (J-1, 0, -1):
39 No newline at end of file
39 y2 = sfb(y2, w[j][2], sf[0,1]); No newline at end of file
40 40 No newline at end of file
41 41 y2 = sfb(y2, w[0][1], Fsf[0,1]); No newline at end of file
42 42 No newline at end of file
Show file before | Show file after | Hide comments
@@ -22,12 +22,12
22 22 [M,N] = A.shape; No newline at end of file
23 23 # Initialize and precompute: No newline at end of file
24 24 eps = 1e-2; # damping parameter
25 No newline at end of file
25 [Q,R] = linalg.qr(A.T.conj(),0);
No newline at end of file
26 No newline at end of file
26 print A.shape
No newline at end of file
27 No newline at end of file
27 print R.shape
No newline at end of file
28 No newline at end of file
28 print b.shape No newline at end of file
29 29 c = linalg.solve(R.T.conj(),b); # will be used later also
30 No newline at end of file
30 u = Q*c; # minimum 2-norm solution No newline at end of file
31 31 I = sps.eye(M); No newline at end of file
32 32 No newline at end of file
33 33 #---------- not needed, defined above-------------- No newline at end of file
Show file before | Show file after | Hide comments
@@ -6,6 +6,8
6 6 No newline at end of file
7 7 from irls_dn import * No newline at end of file
8 8 from scipy.optimize import fsolve No newline at end of file
9 import numpy as np
No newline at end of file
10 from scipy.optimize import root No newline at end of file
9 11 No newline at end of file
10 12 def irls_dn2(A,b,p,G): No newline at end of file
11 13 No newline at end of file
Show file before | Show file after | Hide comments
@@ -29,21 +29,12
29 29 No newline at end of file
30 30 N = 2*lo.size; No newline at end of file
31 31 L = sf.size/2;
No newline at end of file
32 #print 'N', N
No newline at end of file
33 #print 'sf', sf
No newline at end of file
34
No newline at end of file
35
No newline at end of file
36 #print 'sf[:,0]', sf[:,0].shape
No newline at end of file
37 #print 'sf[:,1]', sf[:,1].shape
No newline at end of file
38 #print 'sbf hi', hi.shape
No newline at end of file
39
No newline at end of file
40 No newline at end of file
41 32 No newline at end of file
42 33 # Need to change format for upfirdn funct: No newline at end of file
43 34 lo = lo.T.conj() No newline at end of file
44 35 lo = lo.reshape(lo.size) No newline at end of file
45 36
37 No newline at end of file
46 print 'sfb hi', hi No newline at end of file
47 38 No newline at end of file
48 39 # Need to change format for upfirdn funct: No newline at end of file
49 40 hi = hi.T.conj() No newline at end of file
General Comments 0
You need to be logged in to leave comments. Login now