Ei muokkausyhteenvetoa |
Ei muokkausyhteenvetoa |
||
| Rivi 684: | Rivi 684: | ||
} | } | ||
} | } | ||
// make running average of week averages | |||
for ( var w in memo.avgWA ) { | |||
if ( w == 0 ) { | |||
memo.avgWA[ w ].running = ( memo.avgWA[ w ].sum + memo.avgWA[ w+1 ].sum ) / ( memo.avgWA[ w ].count + memo.avgWA[ w+1 ].count ); | |||
} else if ( w == ( memo.avgWA.length - 1) ) { | |||
memo.avgWA[ w ].running = ( memo.avgWA[ w ].sum + memo.avgWA[ w-1 ].sum ) / ( memo.avgWA[ w ].count + memo.avgWA[ w-1 ].count ); | |||
} else { | |||
memo.avgWA[ w ].running = ( memo.avgWA[ w ].sum + memo.avgWA[ w-1 ].sum + memo.avgWA[ w+1 ].sum ) / ( memo.avgWA[ w ].count + memo.avgWA[ w-1 ].count + memo.avgWA[ w+1 ].count ); | |||
} | |||
} | |||
memo.seriesA.push( { 'type': 'scatter', 'title': 'Keskiarvo ' + memo.obsMinDate.getFullYear() + '-' + memo.obsMaxDate.getFullYear(), 'color': colors.average, 'size': 0, 'line': 2.33, 'legend': true, 'trendline': 'none', obses: [] } ); | memo.seriesA.push( { 'type': 'scatter', 'title': 'Keskiarvo ' + memo.obsMinDate.getFullYear() + '-' + memo.obsMaxDate.getFullYear(), 'color': colors.average, 'size': 0, 'line': 2.33, 'legend': true, 'trendline': 'none', obses: [] } ); | ||
| Rivi 689: | Rivi 702: | ||
memo.seriesA[ memo.seriesA.length - 1 ].obses.push( { | memo.seriesA[ memo.seriesA.length - 1 ].obses.push( { | ||
'x': memo.avgWA[ w ].cDate, | 'x': memo.avgWA[ w ].cDate, | ||
'y': memo.avgWA[ w ]. | 'y': memo.avgWA[ w ].running, | ||
'style': null, | 'style': null, | ||
'tooltip': null, | 'tooltip': null, | ||


