diff options
| author | Benjamin Franzke <benjaminfranzke@googlemail.com> | 2012-05-11 10:35:15 +0200 |
|---|---|---|
| committer | Benjamin Franzke <benjaminfranzke@googlemail.com> | 2012-05-11 10:35:15 +0200 |
| commit | d3da2ff2b58681f57ae83c3937870ebdc8eca71e (patch) | |
| tree | de0435fa3ae389c82172af5897a73b4eb4235283 /run_tests.m | |
| parent | eedab7b3215c750ea8e170ba2714dde9c3bbf896 (diff) | |
| download | dmc-d3da2ff2b58681f57ae83c3937870ebdc8eca71e.tar.gz dmc-d3da2ff2b58681f57ae83c3937870ebdc8eca71e.tar.bz2 dmc-d3da2ff2b58681f57ae83c3937870ebdc8eca71e.zip | |
Remove log+quad algorithm
Its really not needed since wehave optimize
Diffstat (limited to 'run_tests.m')
| -rw-r--r-- | run_tests.m | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/run_tests.m b/run_tests.m index 15ef0d3..7cf92d5 100644 --- a/run_tests.m +++ b/run_tests.m @@ -10,7 +10,6 @@ mean_data = mean_pred(p, train_data); 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 = sevenday_pred(p, train_data); random_data = rand_pred(p, train_data); @@ -21,7 +20,7 @@ regress2_data = fft(regress2_data); regress2_data = regress2_data + removed; regress2_data = real(ifft(regress2_data)); -pred_list = {mean_data regress_data quad_data log_data lq_data sevenday_data random_data regress2_data}; +pred_list = {mean_data regress_data quad_data log_data sevenday_data random_data regress2_data}; opt_data = opt_pred(real_data, pred_list); @@ -31,7 +30,6 @@ opt_data = opt_pred(real_data, pred_list); % 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); -[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); [opqerr, opterr] = calc_error('optimize', real_data, opt_data); @@ -46,7 +44,6 @@ 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)); opt_err = sum(abs(real_data - opt_data)); |