run_tests: calculate global min. error.

1 files changed, 19 insertions, 1 deletions

diff --git a/run_tests.m b/run_tests.m
index c9f65ef..8df5f11 100644
--- a/run_tests.m
+++ b/run_tests.m
@@ -10,6 +10,7 @@ mean_data	= mean_pred(train_data, 14);
 regress_data	= regress_pred(p, train_data);
 quad_data	= quad_regress_pred(p, train_data);
 log_data	= log_regress_pred(p, train_data);
+lq_data		= [log_data(:,1:334) quad_data(:,335) log_data(:,336:570)];
 sevenday_data	= repmat(sevenday_pred(train_data, 4), 2, 1);
 random_data	= rand_pred(train_data, 14);
 
@@ -19,10 +20,27 @@ random_data	= rand_pred(train_data, 14);
 % quadratic just for reference, it sucks more than mean-predicition
 [quqerr, quterr] = calc_error('quad reg.',real_data, quad_data);
 [loqerr, loterr] = calc_error('log reg.', real_data, log_data);
-[loqerr, loterr] = calc_error('l&q reg.', real_data, [ log_data(:,1:334) quad_data(:,335) log_data(:,336:570) ]);
+[lqqerr, lqterr] = calc_error('l&q reg.', real_data, lq_data);
 [seqerr, seterr] = calc_error('sevenday', real_data, sevenday_data);
 [raqerr, raterr] = calc_error('random',	  real_data, random_data);
 
+qerr = [meqerr reqerr quqerr loqerr lqqerr seqerr raqerr];
+terr = [meterr reterr quterr loterr lqterr seterr raterr];
+bar(qerr);
+bar(terr);
+
+mean_err	= sum(abs(real_data - mean_data))';
+regress_err	= sum(abs(real_data - regress_data))';
+quad_err	= sum(abs(real_data - quad_data))';
+log_err		= sum(abs(real_data - log_data))';
+lq_err		= sum(abs(real_data - lq_data))';
+sevenday_err	= sum(abs(real_data - sevenday_data))';
+random_err	= sum(abs(real_data - random_data))';
+
+err = [mean_err regress_err quad_err log_err lq_err sevenday_err random_err];
+min_err = sum(min(err'));
+printf('global min. error: %d\n', min_err);
+
 [q2, removed] = remove_sevenday_frequency(q(1:14, :));
 tmp = regress_pred(p([1:14 29:42],:), q2);
 tmp = fft(tmp);