diff options
| author | Benjamin Franzke <benjaminfranzke@googlemail.com> | 2012-05-11 10:31:14 +0200 |
|---|---|---|
| committer | Benjamin Franzke <benjaminfranzke@googlemail.com> | 2012-05-11 10:35:03 +0200 |
| commit | eedab7b3215c750ea8e170ba2714dde9c3bbf896 (patch) | |
| tree | 780816b234dd9cd0da59be786efe976cdb202847 /sevenday_pred.m | |
| parent | 24c763e80a62e4fa73d4a298083db3e3ec0887a2 (diff) | |
| download | dmc-eedab7b3215c750ea8e170ba2714dde9c3bbf896.tar.gz dmc-eedab7b3215c750ea8e170ba2714dde9c3bbf896.tar.bz2 dmc-eedab7b3215c750ea8e170ba2714dde9c3bbf896.zip | |
sevenday_pred: Use same prototype as for other tests
Diffstat (limited to 'sevenday_pred.m')
| -rw-r--r-- | sevenday_pred.m | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/sevenday_pred.m b/sevenday_pred.m index ae21d66..9006c16 100644 --- a/sevenday_pred.m +++ b/sevenday_pred.m @@ -1,11 +1,18 @@ -function pred = sevenday_pred(data, interval) +function pred = sevenday_pred(price, data) - len = size(data)(1) / interval; - pred = zeros(len, size(data)(2)); + assert(mod(size(data, 1), 7) == 0); + assert(mod(size(price, 1), 7) == 0); - for i = 0:(interval-1) + interval_count = size(data, 1) / 7; + pred_weeks = (size(price, 1) - size(data, 1)) / 7; + + len = size(data, 1) / interval_count; + pred = zeros(len, size(data, 2)); + + for i = 0:(interval_count-1) pred += data(1+(len*i) : len+(len*i) , :); end - pred ./= interval; + pred ./= interval_count; + pred = repmat(pred, pred_weeks, 1); end |