changeset 9138:d468eb871b1d octave-forge

sparsersb: forgot some extra comments in last commit. some extra test line. moved some other lines.
author michelemartone
date Fri, 09 Dec 2011 10:10:50 +0000
parents 056b680a86f2
children be7ea35a6c65
files main/sparsersb/src/sparsersbbench.m
diffstat 1 files changed, 16 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/main/sparsersb/src/sparsersbbench.m	Fri Dec 09 09:17:50 2011 +0000
+++ b/main/sparsersb/src/sparsersbbench.m	Fri Dec 09 10:10:50 2011 +0000
@@ -42,9 +42,6 @@
 	sparsersbbench_("",[finitstr,""],"C=sparsersb(A);clear C;","clear A C","",mint);
 	sparsersbbench_("",[rinitstr,""],"C=A.';        ;clear C;","clear A C","",mint);
 	sparsersbbench_("",[rinitstr,""],"C=transpose(A);clear C;","clear A C","",mint);
-	sparsersbbench_("",[rinitstr,"B=A;"],"C=A*B;clear C","clear A B C","",mint);
-	sparsersbbench_("",[rinitstr,"B=A;"],"C=A.'*B;clear C","clear A B C","",mint);
-	sparsersbbench_("",[rinitstr,"D=ones(size(A)(1),1);"],"D=diag(A);","clear A D","",mint);
 	for nrhs=1:3
 	nrhss=sprintf("%d",nrhs);
 	sparsersbbench_("",[rinitstr,"C=ones(size(A)(1),",nrhss,");B=C;"],"C=A*B;","clear A B C","",mint);
@@ -56,6 +53,9 @@
 	end
 	end
 	clear A;
+	sparsersbbench_("",[rinitstr,"B=A;"],"C=A*B;clear C","clear A B C","",mint);
+	sparsersbbench_("",[rinitstr,"B=A;"],"C=A.'*B;clear C","clear A B C","",mint);
+	sparsersbbench_("",[rinitstr,"D=ones(size(A)(1),1);"],"D=diag(A);","clear A D","",mint);
 	sparsersbbench_("",[rinitstr,""],"A.*=2.0;","clear A","",mint);
 	sparsersbbench_("",[rinitstr,""],"A./=2.0;","clear A","",mint);
 	#sparsersbbench_("",[rinitstr,""],"A.*=0.0;","clear A","",mint);
@@ -77,8 +77,8 @@
 end
 
 #for diml=0:0
-#for diml=1:11
 for diml=1:11
+#for diml=11:11
 #for diml=3:3
 #for cadd=1:1
 #for cadd=0:0
@@ -89,14 +89,19 @@
 	#is=sprintf("ones(%d)",dim);
 
 	cmul=sprintf("(1+i*%d)",cadd);
-	#is=sprintf("ones(%d).*%s",dim,cmul);
-	#sparsersbbench_battery(is,btime)
-	#is=sprintf("tril(ones(%d).*%s)",dim,cmul);
-	#sparsersbbench_battery(is,btime)
-	#is=sprintf("diag(ones(%d,1)).*%s",dim,cmul);
-	#sparsersbbench_battery(is,btime)
-	is=sprintf("(diag(ones(%d,1))+sprand(%d,%d,0.1)).*%s",dim,dim,dim,cmul); # FIXME: non repeatable experiment :)
+	is=sprintf("ones(%d).*%s",dim,cmul);
+	sparsersbbench_battery(is,btime)
+	is=sprintf("tril(ones(%d).*%s)",dim,cmul);
+	sparsersbbench_battery(is,btime)
+	is=sprintf("diag(ones(%d,1)).*%s",dim,cmul);
 	sparsersbbench_battery(is,btime)
+
+       	# FIXME: follow non repeatable experiments :)
+	is=sprintf("(diag(ones(%d,1))+sprand(%d,%d,0.1)).*%s",dim,dim,dim,cmul);
+	sparsersbbench_battery(is,btime)
+	is=sprintf("(diag(ones(%d,1))+sprand(%d,%d,0.4)).*%s",dim,dim,dim,cmul);
+	sparsersbbench_battery(is,btime)
+
 	# FIXME: need a non-square matrices testing-benchmarking snippet
 end
 end