Print out imaginary part of logdet also.

klho · Jun 26, 2020 · 37d91de · 37d91de
1 parent c2b73cd
commit 37d91de
Show file tree

Hide file tree

Showing 34 changed files with 129 additions and 109 deletions.
diff --git a/hifde/test/fd_cube1.m b/hifde/test/fd_cube1.m
@@ -107,10 +107,10 @@ function fd_cube1(n,occ,rank_or_tol,Tmax,skip,symm,doiter,diagmode)
   fprintf('  precon/unprecon iter: %d / %d\n',piter,iter)
 
   % compute log-determinant
-  tic
-  ld = hifde_logdet(F);
-  t = toc;
-  fprintf('hifde_logdet: %22.16e / %10.4e (s)\n',ld,t)
+  tic; ld = hifde_logdet(F); t = toc;
+  fprintf('hifde_logdet:\n')
+  fprintf('  real/imag: %22.16e / %22.16e\n',real(ld),imag(ld))
+  fprintf('  time: %10.4e (s)\n',t)
 
   if diagmode > 0
     % prepare for diagonal extraction

diff --git a/hifde/test/fd_cube1x.m b/hifde/test/fd_cube1x.m
@@ -109,10 +109,10 @@ function fd_cube1x(n,occ,rank_or_tol,Tmax,skip,symm,doiter,diagmode)
   fprintf('  precon/unprecon iter: %d / %d\n',piter,iter)
 
   % compute log-determinant
-  tic
-  ld = hifde_logdet(F);
-  t = toc;
-  fprintf('hifde_logdet: %22.16e / %10.4e (s)\n',ld,t)
+  tic; ld = hifde_logdet(F); t = toc;
+  fprintf('hifde_logdet:\n')
+  fprintf('  real/imag: %22.16e / %22.16e\n',real(ld),imag(ld))
+  fprintf('  time: %10.4e (s)\n',t)
 
   if diagmode > 0
     % prepare for diagonal extraction

diff --git a/hifde/test/fd_cube2.m b/hifde/test/fd_cube2.m
@@ -135,10 +135,10 @@ function fd_cube2(n,occ,rank_or_tol,Tmax,skip,symm,doiter,diagmode)
   fprintf('  precon/unprecon iter: %d / %d\n',piter,iter)
 
   % compute log-determinant
-  tic
-  ld = hifde_logdet(F);
-  t = toc;
-  fprintf('hifde_logdet: %22.16e / %10.4e (s)\n',ld,t)
+  tic; ld = hifde_logdet(F); t = toc;
+  fprintf('hifde_logdet:\n')
+  fprintf('  real/imag: %22.16e / %22.16e\n',real(ld),imag(ld))
+  fprintf('  time: %10.4e (s)\n',t)
 
   if diagmode > 0
     % prepare for diagonal extraction

diff --git a/hifde/test/fd_cube2x.m b/hifde/test/fd_cube2x.m
@@ -137,10 +137,10 @@ function fd_cube2x(n,occ,rank_or_tol,Tmax,skip,symm,doiter,diagmode)
   fprintf('  precon/unprecon iter: %d / %d\n',piter,iter)
 
   % compute log-determinant
-  tic
-  ld = hifde_logdet(F);
-  t = toc;
-  fprintf('hifde_logdet: %22.16e / %10.4e (s)\n',ld,t)
+  tic; ld = hifde_logdet(F); t = toc;
+  fprintf('hifde_logdet:\n')
+  fprintf('  real/imag: %22.16e / %22.16e\n',real(ld),imag(ld))
+  fprintf('  time: %10.4e (s)\n',t)
 
   if diagmode > 0
     % prepare for diagonal extraction

diff --git a/hifde/test/fd_cube3.m b/hifde/test/fd_cube3.m
@@ -102,7 +102,7 @@ function fd_cube3(n,k,occ,rank_or_tol,Tmax,skip,symm,doiter,diagmode)
   if doiter, [~,~,~,iter] = gmres(@(x)(A*x),B,32,1e-12,32); end
 
   % run preconditioned GMRES
-  tic;
+  tic
   [Y,~,~,piter] = gmres(@(x)(A*x),B,32,1e-12,32,@(x)hifde_sv(F,x));
   t = toc;
   err1 = norm(X - Y)/norm(X);
@@ -113,10 +113,10 @@ function fd_cube3(n,k,occ,rank_or_tol,Tmax,skip,symm,doiter,diagmode)
           (iter(1)+1)*iter(2))
 
   % compute log-determinant
-  tic
-  ld = hifde_logdet(F);
-  t = toc;
-  fprintf('hifde_logdet: %22.16e / %10.4e (s)\n',ld,t)
+  tic; ld = hifde_logdet(F); t = toc;
+  fprintf('hifde_logdet:\n')
+  fprintf('  real/imag: %22.16e / %22.16e\n',real(ld),imag(ld))
+  fprintf('  time: %10.4e (s)\n',t)
 
   if diagmode > 0
     % prepare for diagonal extraction

diff --git a/hifde/test/fd_cube3x.m b/hifde/test/fd_cube3x.m
@@ -104,7 +104,7 @@ function fd_cube3x(n,k,occ,rank_or_tol,Tmax,skip,symm,doiter,diagmode)
   if doiter, [~,~,~,iter] = gmres(@(x)(A*x),B,32,1e-12,32); end
 
   % run preconditioned GMRES
-  tic;
+  tic
   [Y,~,~,piter] = gmres(@(x)(A*x),B,32,1e-12,32,@(x)hifde_sv(F,x));
   t = toc;
   err1 = norm(X - Y)/norm(X);
@@ -115,10 +115,10 @@ function fd_cube3x(n,k,occ,rank_or_tol,Tmax,skip,symm,doiter,diagmode)
           (iter(1)+1)*iter(2))
 
   % compute log-determinant
-  tic
-  ld = hifde_logdet(F);
-  t = toc;
-  fprintf('hifde_logdet: %22.16e / %10.4e (s)\n',ld,t)
+  tic; ld = hifde_logdet(F); t = toc;
+  fprintf('hifde_logdet:\n')
+  fprintf('  real/imag: %22.16e / %22.16e\n',real(ld),imag(ld))
+  fprintf('  time: %10.4e (s)\n',t)
 
   if diagmode > 0
     % prepare for diagonal extraction

diff --git a/hifde/test/fd_square1.m b/hifde/test/fd_square1.m
@@ -116,10 +116,10 @@ function fd_square1(n,occ,rank_or_tol,Tmax,skip,symm,doiter,diagmode)
   fprintf('  precon/unprecon iter: %d / %d\n',piter,iter)
 
   % compute log-determinant
-  tic
-  ld = hifde_logdet(F);
-  t = toc;
-  fprintf('hifde_logdet: %22.16e / %10.4e (s)\n',ld,t)
+  tic; ld = hifde_logdet(F); t = toc;
+  fprintf('hifde_logdet:\n')
+  fprintf('  real/imag: %22.16e / %22.16e\n',real(ld),imag(ld))
+  fprintf('  time: %10.4e (s)\n',t)
 
   if diagmode > 0
     % prepare for diagonal extraction

diff --git a/hifde/test/fd_square1x.m b/hifde/test/fd_square1x.m
@@ -106,10 +106,10 @@ function fd_square1x(n,occ,rank_or_tol,Tmax,skip,symm,doiter,diagmode)
   fprintf('  precon/unprecon iter: %d / %d\n',piter,iter)
 
   % compute log-determinant
-  tic
-  ld = hifde_logdet(F);
-  t = toc;
-  fprintf('hifde_logdet: %22.16e / %10.4e (s)\n',ld,t)
+  tic; ld = hifde_logdet(F); t = toc;
+  fprintf('hifde_logdet:\n')
+  fprintf('  real/imag: %22.16e / %22.16e\n',real(ld),imag(ld))
+  fprintf('  time: %10.4e (s)\n',t)
 
   if diagmode > 0
     % prepare for diagonal extraction

diff --git a/hifde/test/fd_square2.m b/hifde/test/fd_square2.m
@@ -129,10 +129,10 @@ function fd_square2(n,occ,rank_or_tol,Tmax,skip,symm,doiter,diagmode)
   fprintf('  precon/unprecon iter: %d / %d\n',piter,iter)
 
   % compute log-determinant
-  tic
-  ld = hifde_logdet(F);
-  t = toc;
-  fprintf('hifde_logdet: %22.16e / %10.4e (s)\n',ld,t)
+  tic; ld = hifde_logdet(F); t = toc;
+  fprintf('hifde_logdet:\n')
+  fprintf('  real/imag: %22.16e / %22.16e\n',real(ld),imag(ld))
+  fprintf('  time: %10.4e (s)\n',t)
 
   if diagmode > 0
     % prepare for diagonal extraction

diff --git a/hifde/test/fd_square3.m b/hifde/test/fd_square3.m
@@ -83,7 +83,7 @@ function fd_square3(n,k,occ,rank_or_tol,Tmax,skip,symm,doiter,diagmode)
   if doiter, [~,~,~,iter] = gmres(@(x)(A*x),B,32,1e-12,32); end
 
   % run preconditioned GMRES
-  tic;
+  tic
   [Y,~,~,piter] = gmres(@(x)(A*x),B,32,1e-12,32,@(x)hifde_sv(F,x));
   t = toc;
   err1 = norm(X - Y)/norm(X);
@@ -94,10 +94,10 @@ function fd_square3(n,k,occ,rank_or_tol,Tmax,skip,symm,doiter,diagmode)
           (iter(1)+1)*iter(2))
 
   % compute log-determinant
-  tic
-  ld = hifde_logdet(F);
-  t = toc;
-  fprintf('hifde_logdet: %22.16e / %10.4e (s)\n',ld,t)
+  tic; ld = hifde_logdet(F); t = toc;
+  fprintf('hifde_logdet:\n')
+  fprintf('  real/imag: %22.16e / %22.16e\n',real(ld),imag(ld))
+  fprintf('  time: %10.4e (s)\n',t)
 
   if diagmode > 0
     % prepare for diagonal extraction

diff --git a/hifde/test/fd_square4x.m b/hifde/test/fd_square4x.m
@@ -117,10 +117,10 @@ function fd_square4x(n,occ,rank_or_tol,Tmax,skip,symm,doiter,diagmode)
   fprintf('  precon/unprecon iter: %d / %d\n',piter,iter)
 
   % compute log-determinant
-  tic
-  ld = hifde_logdet(F);
-  t = toc;
-  fprintf('hifde_logdet: %22.16e / %10.4e (s)\n',ld,t)
+  tic; ld = hifde_logdet(F); t = toc;
+  fprintf('hifde_logdet:\n')
+  fprintf('  real/imag: %22.16e / %22.16e\n',real(ld),imag(ld))
+  fprintf('  time: %10.4e (s)\n',t)
 
   if diagmode > 0
     % prepare for diagonal extraction

diff --git a/hifde/test/fd_square5.m b/hifde/test/fd_square5.m
@@ -128,10 +128,10 @@ function fd_square5(n,occ,rank_or_tol,Tmax,skip,symm,doiter,diagmode)
   fprintf('  precon/unprecon iter: %d / %d\n',piter,iter)
 
   % compute log-determinant
-  tic
-  ld = hifde_logdet(F);
-  t = toc;
-  fprintf('hifde_logdet: %22.16e / %10.4e (s)\n',ld,t)
+  tic; ld = hifde_logdet(F); t = toc;
+  fprintf('hifde_logdet:\n')
+  fprintf('  real/imag: %22.16e / %22.16e\n',real(ld),imag(ld))
+  fprintf('  time: %10.4e (s)\n',t)
 
   if diagmode > 0
     % prepare for diagonal extraction

diff --git a/hifie/test/cov_cube1.m b/hifie/test/cov_cube1.m
@@ -99,7 +99,9 @@ function cov_cube1(n,occ,p,rank_or_tol,Tmax,skip,symm,noise,scale,diagmode)
 
   % compute log-determinant
   tic; ld = hifie_logdet(F); t = toc;
-  fprintf('hifie_logdet: %22.16e / %10.4e (s)\n',ld,t)
+  fprintf('hifie_logdet:\n')
+  fprintf('  real/imag: %22.16e / %22.16e\n',real(ld),imag(ld))
+  fprintf('  time: %10.4e (s)\n',t)
 
   if diagmode > 0
     % prepare for diagonal extraction

diff --git a/hifie/test/cov_cube2.m b/hifie/test/cov_cube2.m
@@ -99,7 +99,9 @@ function cov_cube2(n,occ,p,rank_or_tol,Tmax,skip,symm,noise,scale,diagmode)
 
   % compute log-determinant
   tic; ld = hifie_logdet(F); t = toc;
-  fprintf('hifie_logdet: %22.16e / %10.4e (s)\n',ld,t)
+  fprintf('hifie_logdet:\n')
+  fprintf('  real/imag: %22.16e / %22.16e\n',real(ld),imag(ld))
+  fprintf('  time: %10.4e (s)\n',t)
 
   if diagmode > 0
     % prepare for diagonal extraction

diff --git a/hifie/test/cov_square1.m b/hifie/test/cov_square1.m
@@ -113,7 +113,9 @@ function cov_square1(n,occ,p,rank_or_tol,Tmax,skip,symm,noise,scale,diagmode)
 
   % compute log-determinant
   tic; ld = hifie_logdet(F); t = toc;
-  fprintf('hifie_logdet: %22.16e / %10.4e (s)\n',ld,t)
+  fprintf('hifie_logdet:\n')
+  fprintf('  real/imag: %22.16e / %22.16e\n',real(ld),imag(ld))
+  fprintf('  time: %10.4e (s)\n',t)
 
   if diagmode > 0
     % prepare for diagonal extraction

diff --git a/hifie/test/cov_square2.m b/hifie/test/cov_square2.m
@@ -93,7 +93,9 @@ function cov_square2(n,occ,p,rank_or_tol,Tmax,skip,symm,noise,scale,diagmode)
 
   % compute log-determinant
   tic; ld = hifie_logdet(F); t = toc;
-  fprintf('hifie_logdet: %22.16e / %10.4e (s)\n',ld,t)
+  fprintf('hifie_logdet:\n')
+  fprintf('  real/imag: %22.16e / %22.16e\n',real(ld),imag(ld))
+  fprintf('  time: %10.4e (s)\n',t)
 
   if diagmode > 0
     % prepare for diagonal extraction

diff --git a/mf/test/fd_cube1.m b/mf/test/fd_cube1.m
@@ -99,10 +99,10 @@ function fd_cube1(n,occ,symm,doiter,diagmode)
   fprintf('  precon/unprecon iter: %d / %d\n',piter,iter)
 
   % compute log-determinant
-  tic
-  ld = mf_logdet(F);
-  t = toc;
-  fprintf('mf_logdet: %22.16e / %10.4e (s)\n',ld,t)
+  tic; ld = mf_logdet(F); t = toc;
+  fprintf('mf_logdet:\n')
+  fprintf('  real/imag: %22.16e / %22.16e\n',real(ld),imag(ld))
+  fprintf('  time: %10.4e (s)\n',t)
 
   if diagmode > 0
     % prepare for diagonal extraction

diff --git a/mf/test/fd_cube1x.m b/mf/test/fd_cube1x.m
@@ -101,10 +101,10 @@ function fd_cube1x(n,occ,symm,doiter,diagmode)
   fprintf('  precon/unprecon iter: %d / %d\n',piter,iter)
 
   % compute log-determinant
-  tic
-  ld = mf_logdet(F);
-  t = toc;
-  fprintf('mf_logdet: %22.16e / %10.4e (s)\n',ld,t)
+  tic; ld = mf_logdet(F); t = toc;
+  fprintf('mf_logdet:\n')
+  fprintf('  real/imag: %22.16e / %22.16e\n',real(ld),imag(ld))
+  fprintf('  time: %10.4e (s)\n',t)
 
   if diagmode > 0
     % prepare for diagonal extraction

diff --git a/mf/test/fd_cube2.m b/mf/test/fd_cube2.m
@@ -127,10 +127,10 @@ function fd_cube2(n,occ,symm,doiter,diagmode)
   fprintf('  precon/unprecon iter: %d / %d\n',piter,iter)
 
   % compute log-determinant
-  tic
-  ld = mf_logdet(F);
-  t = toc;
-  fprintf('mf_logdet: %22.16e / %10.4e (s)\n',ld,t)
+  tic; ld = mf_logdet(F); t = toc;
+  fprintf('mf_logdet:\n')
+  fprintf('  real/imag: %22.16e / %22.16e\n',real(ld),imag(ld))
+  fprintf('  time: %10.4e (s)\n',t)
 
   if diagmode > 0
     % prepare for diagonal extraction

diff --git a/mf/test/fd_cube3.m b/mf/test/fd_cube3.m
@@ -103,10 +103,10 @@ function fd_cube3(n,k,occ,symm,doiter,diagmode)
           (iter(1)+1)*iter(2))
 
   % compute log-determinant
-  tic
-  ld = mf_logdet(F);
-  t = toc;
-  fprintf('mf_logdet: %22.16e / %10.4e (s)\n',ld,t)
+  tic; ld = mf_logdet(F); t = toc;
+  fprintf('mf_logdet:\n')
+  fprintf('  real/imag: %22.16e / %22.16e\n',real(ld),imag(ld))
+  fprintf('  time: %10.4e (s)\n',t)
 
   if diagmode > 0
     % prepare for diagonal extraction

diff --git a/mf/test/fd_line1x.m b/mf/test/fd_line1x.m
@@ -96,10 +96,10 @@ function fd_line1x(n,occ,symm,doiter,diagmode)
   fprintf('  precon/unprecon iter: %d / %d\n',piter,iter)
 
   % compute log-determinant
-  tic
-  ld = mf_logdet(F);
-  t = toc;
-  fprintf('mf_logdet: %22.16e / %10.4e (s)\n',ld,t)
+  tic; ld = mf_logdet(F); t = toc;
+  fprintf('mf_logdet:\n')
+  fprintf('  real/imag: %22.16e / %22.16e\n',real(ld),imag(ld))
+  fprintf('  time: %10.4e (s)\n',t)
 
   if diagmode > 0
     % prepare for diagonal extraction

diff --git a/mf/test/fd_line2x.m b/mf/test/fd_line2x.m
@@ -101,10 +101,10 @@ function fd_line2x(n,occ,symm,doiter,diagmode)
   fprintf('  precon/unprecon iter: %d / %d\n',piter,iter)
 
   % compute log-determinant
-  tic
-  ld = mf_logdet(F);
-  t = toc;
-  fprintf('mf_logdet: %22.16e / %10.4e (s)\n',ld,t)
+  tic; ld = mf_logdet(F); t = toc;
+  fprintf('mf_logdet:\n')
+  fprintf('  real/imag: %22.16e / %22.16e\n',real(ld),imag(ld))
+  fprintf('  time: %10.4e (s)\n',t)
 
   if diagmode > 0
     % prepare for diagonal extraction

diff --git a/mf/test/fd_square1.m b/mf/test/fd_square1.m
@@ -108,10 +108,10 @@ function fd_square1(n,occ,symm,doiter,diagmode)
   fprintf('  precon/unprecon iter: %d / %d\n',piter,iter)
 
   % compute log-determinant
-  tic
-  ld = mf_logdet(F);
-  t = toc;
-  fprintf('mf_logdet: %22.16e / %10.4e (s)\n',ld,t)
+  tic; ld = mf_logdet(F); t = toc;
+  fprintf('mf_logdet:\n')
+  fprintf('  real/imag: %22.16e / %22.16e\n',real(ld),imag(ld))
+  fprintf('  time: %10.4e (s)\n',t)
 
   if diagmode > 0
     % prepare for diagonal extraction

diff --git a/mf/test/fd_square1x.m b/mf/test/fd_square1x.m
@@ -98,10 +98,10 @@ function fd_square1x(n,occ,symm,doiter,diagmode)
   fprintf('  precon/unprecon iter: %d / %d\n',piter,iter)
 
   % compute log-determinant
-  tic
-  ld = mf_logdet(F);
-  t = toc;
-  fprintf('mf_logdet: %22.16e / %10.4e (s)\n',ld,t)
+  tic; ld = mf_logdet(F); t = toc;
+  fprintf('mf_logdet:\n')
+  fprintf('  real/imag: %22.16e / %22.16e\n',real(ld),imag(ld))
+  fprintf('  time: %10.4e (s)\n',t)
 
   if diagmode > 0
     % prepare for diagonal extraction

diff --git a/mf/test/fd_square2.m b/mf/test/fd_square2.m
@@ -121,10 +121,10 @@ function fd_square2(n,occ,symm,doiter,diagmode)
   fprintf('  precon/unprecon iter: %d / %d\n',piter,iter)
 
   % compute log-determinant
-  tic
-  ld = mf_logdet(F);
-  t = toc;
-  fprintf('mf_logdet: %22.16e / %10.4e (s)\n',ld,t)
+  tic; ld = mf_logdet(F); t = toc;
+  fprintf('mf_logdet:\n')
+  fprintf('  real/imag: %22.16e / %22.16e\n',real(ld),imag(ld))
+  fprintf('  time: %10.4e (s)\n',t)
 
   if diagmode > 0
     % prepare for diagonal extraction