comparison convergenceTable.m @ 32:ddfb98209aa2

Fixed a bunch of problems regarding convergence and saving solutions
author Jonatan Werpers <jonatan@werpers.com>
date Tue, 29 Sep 2015 09:22:22 +0200
parents ad1a41d135a1
children 6a5e94bb5e13
comparison
equal deleted inserted replaced
31:d1f9dd55a2b0 32:ddfb98209aa2
8 latexTable(methodName, T, orders, m, e, q); 8 latexTable(methodName, T, orders, m, e, q);
9 end 9 end
10 end 10 end
11 11
12 function plainTextTable(methodName, T, orders, m, e, q) 12 function plainTextTable(methodName, T, orders, m, e, q)
13 description = sprintf('method: %s\nT: %d\n');
14 13
15 14
16 eW = 0; 15 eW = 0;
17 qW = 0; 16 qW = 0;
18 for i = 1:length(orders) 17 for i = 1:length(orders)
22 end 21 end
23 22
24 mW = findFieldWidth('%d',m); 23 mW = findFieldWidth('%d',m);
25 orderHeaderWidth = eW + qW + 1; 24 orderHeaderWidth = eW + qW + 1;
26 25
26 fprintf('method: %s\nT: %d\n',methodName, T);
27 27
28 % Print order headers 28 % Print order headers
29 fprintf(' %*s |',mW,'') 29 fprintf(' %*s |',mW,'')
30 for i = 1:length(orders) 30 for i = 1:length(orders)
31 fprintf(' %-*s |', orderHeaderWidth, sprintf('Order %d', orders{i})); 31 fprintf(' %-*s |', orderHeaderWidth, sprintf('Order %d', orders{i}));
54 54
55 % Print each row 55 % Print each row
56 for i = 1:length(m) 56 for i = 1:length(m)
57 fprintf(' %*d |',mW,m(i)); 57 fprintf(' %*d |',mW,m(i));
58 for j = 1:length(orders) 58 for j = 1:length(orders)
59 fprintf(' %*.2f %*.2f |', eW, log_e{j}(i), qW, q{j}(i)); 59 if i == 1
60 fprintf(' %*.2f %*s |', eW, log_e{j}(i), qW, '');
61 else
62 fprintf(' %*.2f %*.2f |', eW, log_e{j}(i), qW, q{j}(i-1));
63 end
60 end 64 end
61 fprintf('\n'); 65 fprintf('\n');
62 end 66 end
67
68 fprintf('\n');
63 69
64 end 70 end
65 71
66 function latexTable(methodName, T, orders, m, e, q) 72 function latexTable(methodName, T, orders, m, e, q)
67 73