diff options
| -rw-r--r-- | run_tests.m | 14 | ||||
| -rw-r--r-- | sevenday_pred.m | 11 |
2 files changed, 21 insertions, 4 deletions
diff --git a/run_tests.m b/run_tests.m index 52f7f05..4f56094 100644 --- a/run_tests.m +++ b/run_tests.m @@ -1,10 +1,16 @@ [p, q] = get_products(); + quad = quad_error(q(29:42, :), mean_pred(q(1:28, :), 14)); total = total_error(q(29:42, :), mean_pred(q(1:28, :), 14)); -printf('quad mean : %9d\n', quad); -printf('total mean : %9d\n', total); +printf('quad mean : %9d\n', quad); +printf('total mean : %9d\n', total); quad = quad_error(p(29:42, :), regress_pred(p, q(1:28, :))); total = total_error(p(29:42, :), regress_pred(p, q(1:28, :))); -printf('quad regress : %9d\n', quad); -printf('total regress: %9d\n', total); +printf('quad regress : %9d\n', quad); +printf('total regress : %9d\n', total); + +quad = quad_error(q(29:42, :), repmat(sevenday_pred(q(1:28, :), 4), 2, 1)); +total = total_error(q(29:42, :), repmat(sevenday_pred(q(1:28, :), 4), 2, 1)); +printf('quad sevenday : %9d\n', quad); +printf('total sevenday: %9d\n', total); diff --git a/sevenday_pred.m b/sevenday_pred.m new file mode 100644 index 0000000..ae21d66 --- /dev/null +++ b/sevenday_pred.m @@ -0,0 +1,11 @@ +function pred = sevenday_pred(data, interval) + + len = size(data)(1) / interval; + pred = zeros(len, size(data)(2)); + + for i = 0:(interval-1) + pred += data(1+(len*i) : len+(len*i) , :); + end + + pred ./= interval; +end |