Ei muokkausyhteenvetoa |
Ei muokkausyhteenvetoa |
||
| Rivi 684: | Rivi 684: | ||
} | } | ||
} | } | ||
// make running average of week averages | // make running average of week averages | ||
| Rivi 705: | Rivi 706: | ||
memo.avgSmooth = smooth( vals, 3 ); | memo.avgSmooth = smooth( vals, 3 ); | ||
console.log( memo.avgSmooth ); | console.log( memo.avgSmooth ); | ||
for ( var w=2; w<(c.length-2); w++ ) { | |||
memo.avgWA[ w ].smoothed = vals[ w-2 ]; | |||
} | |||
memo.seriesA.push( { 'type': 'scatter', 'title': 'Keskiarvo', 'color': colors.trend, 'size': 0, 'line': 2.33, 'legend': true, 'trendline': 'none', obses: [] } ); | memo.seriesA.push( { 'type': 'scatter', 'title': 'Keskiarvo', 'color': colors.trend, 'size': 0, 'line': 2.33, 'legend': true, 'trendline': 'none', obses: [] } ); | ||
| Rivi 729: | Rivi 733: | ||
} | } | ||
memo.seriesA.push( { 'type': 'scatter', 'title': 'Smoothed', 'color': green, 'size': 0, 'line': 2.33, 'legend': true, 'trendline': 'none', obses: [] } ); | |||
for ( var w in memo.avgWA ) { | |||
if ( typeof memo.avgWA[ w ].smoothed != 'undefined' ) { | |||
memo.seriesA[ memo.seriesA.length - 1 ].obses.push( { | |||
'x': memo.avgWA[ w ].cDate, | |||
'y': memo.avgWA[ w ].smoothed, | |||
'style': null, | |||
'tooltip': null, | |||
'annotation': null | |||
}); | |||
} | |||
} | |||
// add columns | // add columns | ||


