summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenjamin Franzke <benjaminfranzke@googlemail.com>2012-05-11 09:52:15 +0200
committerBenjamin Franzke <benjaminfranzke@googlemail.com>2012-05-11 09:54:56 +0200
commit0ddbe493b93d244b7f350d40ffeed2d230ac3317 (patch)
treee346f996ba8bdd00421a5154c3b74cbf1851768d
parentd6204de3b8c1cf709adc57cf2ab73f96364406f8 (diff)
downloaddmc-0ddbe493b93d244b7f350d40ffeed2d230ac3317.tar.gz
dmc-0ddbe493b93d244b7f350d40ffeed2d230ac3317.tar.bz2
dmc-0ddbe493b93d244b7f350d40ffeed2d230ac3317.zip
Remove logarithmic + quad from optimized prediction
..since optimized prediction does the same but more.
-rw-r--r--run_tests.m6
1 files changed, 3 insertions, 3 deletions
diff --git a/run_tests.m b/run_tests.m
index bee4fd0..8ad4abf 100644
--- a/run_tests.m
+++ b/run_tests.m
@@ -37,8 +37,8 @@ opt_data = opt_pred(real_data, pred_list);
[opqerr, opterr] = calc_error('optimize', real_data, opt_data);
[re2qerr, re2terr] = calc_error('regress2', real_data, regress2_data);
-qerr = [meqerr reqerr quqerr loqerr lqqerr seqerr raqerr opqerr re2qerr];
-terr = [meterr reterr quterr loterr lqterr seterr raterr opterr re2terr];
+qerr = [meqerr reqerr quqerr loqerr seqerr raqerr opqerr re2qerr];
+terr = [meterr reterr quterr loterr seterr raterr opterr re2terr];
bar(qerr);
bar(terr);
@@ -52,6 +52,6 @@ random_err = sum(abs(real_data - random_data));
opt_err = sum(abs(real_data - opt_data));
regress2_err = sum(abs(real_data - regress2_data));
-err = [mean_err;regress_err;quad_err;log_err;lq_err;sevenday_err;random_err;regress2_err];
+err = [mean_err;regress_err;quad_err;log_err;sevenday_err;random_err;regress2_err];
min_err = sum(min(err));
printf('global min. error: %d\n', min_err);