|
|
| Rivi 698: |
Rivi 698: |
| | | |
| } | | } |
|
| |
| vals = [];
| |
| for ( var w=0; w<memo.avgWA.length; w++ ) {
| |
| vals.push( memo.avgWA[ w ].avg );
| |
| }
| |
| console.log( vals );
| |
| memo.avgSmooth = smooth( vals, 5 );
| |
| console.log( memo.avgSmooth );
| |
| for ( var w=3; w<(memo.avgWA.length-3); w++ ) {
| |
| memo.avgWA[ w ].smoothed = memo.avgSmooth[ w-3 ];
| |
| }
| |
|
| |
| memo.seriesA.push( { 'type': 'scatter', 'title': 'Keskiarvo', 'color': colors.trend, 'size': 3, 'line': 2.33, 'legend': true, 'trendline': 'none', obses: [] } );
| |
| for ( var w in memo.avgWA ) {
| |
| memo.seriesA[ memo.seriesA.length - 1 ].obses.push( {
| |
| 'x': memo.avgWA[ w ].cDate,
| |
| 'y': memo.avgWA[ w ].avg,
| |
| 'style': null,
| |
| 'tooltip': null,
| |
| 'annotation': null
| |
| });
| |
|
| |
| }
| |
| | | |
| memo.seriesA.push( { 'type': 'area', 'title': 'Running', 'color': colors.average, 'size': 3, 'line': 2.33, 'legend': true, 'trendline': 'none', obses: [] } ); | | memo.seriesA.push( { 'type': 'area', 'title': 'Running', 'color': colors.average, 'size': 3, 'line': 2.33, 'legend': true, 'trendline': 'none', obses: [] } ); |
| Rivi 732: |
Rivi 709: |
| }); | | }); |
| | | |
| } | | } |
| | |
| memo.seriesA.push( { 'type': 'scatter', 'title': 'Smoothed', 'color': 'green', 'size': 3, '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 |