tsEvaRunningMeanTrend: series filling logics moved to tsEvaFillSeries

menta78 · Jun 16, 2016 · 6282602 · 6282602
1 parent 3e7a704
commit 6282602
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 12 deletions.
diff --git a/tsEvaFillSeries.m b/tsEvaFillSeries.m
@@ -0,0 +1,13 @@
+function [ filledTimeStamps, filledSeries, dt ] = tsEvaFillSeries( timeStamps, series )
+  indxs = ~isnan(series);
+  timeStamps = timeStamps(indxs);
+  series = series(indxs);
+
+  mint = min(timeStamps);
+  maxt = max(timeStamps);
+  dt = min(diff(timeStamps));
+  filledTimeStamps = (mint:dt:maxt)';
+  filledSeries = interp1(timeStamps, series, filledTimeStamps, 'nearest');
+  filledSeries = tsRemoveConstantSubseries(filledSeries, 4);
+end
+
diff --git a/tsEvaRunningMeanTrend.m b/tsEvaRunningMeanTrend.m
@@ -1,16 +1,6 @@
 function [ trendSeries, filledTimeStamps, filledSeries, nRunMn ] = tsEvaRunningMeanTrend( timeStamps, series, timeWindow)
-  indxs = ~isnan(series);
-  timeStamps = timeStamps(indxs);
-  series = series(indxs);
-
-  mint = min(timeStamps);
-  maxt = max(timeStamps);
-  mindt = min(diff(timeStamps));
-  filledTimeStamps = (mint:mindt:maxt)';
-  filledSeries = interp1(timeStamps, series, filledTimeStamps, 'nearest');
-  filledSeries = tsRemoveConstantSubseries(filledSeries, 4);
-
-  nRunMn = ceil(timeWindow/mindt);
+[ filledTimeStamps, filledSeries, dt ] = tsEvaFillSeries( timeStamps, series );  
+  nRunMn = ceil(timeWindow/dt);
   trendSeries = tsEvaNanRunningMean(filledSeries, nRunMn);
   trendSeries = tsEvaNanRunningMean(trendSeries, ceil(nRunMn/2));
 end