Merge pull request twitter#55 from terrytangyuan/issue39

caniszczyk · caniszczyk · commit fb5a64a832ef · 2015-08-20T17:35:20.000-07:00
Consistent output when no anomalies detected - fixed Issue39
diff --git a/R/ts_anom_detection.R b/R/ts_anom_detection.R
@@ -279,7 +279,7 @@ AnomalyDetectionTs <- function(x, max_anoms = 0.10, direction = 'pos',
   # If there are no anoms, then let's exit
   if(anom_pct == 0){
     if(verbose) message("No anomalies detected.")
-    return (list("anoms"=NULL, "plot"=NULL))
+    return (list("anoms"=data.frame(), "plot"=plot.new()))
   }
 
   if(plot){
@@ -341,6 +341,6 @@ AnomalyDetectionTs <- function(x, max_anoms = 0.10, direction = 'pos',
   if(plot){
     return (list(anoms = anoms, plot = xgraph))
   } else {
-    return (list(anoms = anoms, plot = NULL))
+    return (list(anoms = anoms, plot = plot.new()))
   }
 }
diff --git a/R/vec_anom_detection.R b/R/vec_anom_detection.R
@@ -224,7 +224,7 @@ AnomalyDetectionVec = function(x, max_anoms=0.10, direction='pos',
   # If there are no anoms, then let's exit
   if(anom_pct == 0){
     if(verbose) message("No anomalies detected.")
-    return (list("anoms"=NULL, "plot"=NULL))
+    return (list("anoms"=data.frame(), "plot"=plot.new()))
   }
   
   if(plot){
@@ -287,6 +287,6 @@ AnomalyDetectionVec = function(x, max_anoms=0.10, direction='pos',
   if(plot){
     return (list(anoms = anoms, plot = xgraph))
   } else {
-    return (list(anoms = anoms, plot = NULL))
+    return (list(anoms = anoms, plot = plot.new()))
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -279,7 +279,7 @@ AnomalyDetectionTs <- function(x, max_anoms = 0.10, direction = 'pos',`
`279`	`279`	`# If there are no anoms, then let's exit`
`280`	`280`	`if(anom_pct == 0){`
`281`	`281`	`if(verbose) message("No anomalies detected.")`
`282`		`- return (list("anoms"=NULL, "plot"=NULL))`
	`282`	`+ return (list("anoms"=data.frame(), "plot"=plot.new()))`
`283`	`283`	`}`
`284`	`284`
`285`	`285`	`if(plot){`
`@@ -341,6 +341,6 @@ AnomalyDetectionTs <- function(x, max_anoms = 0.10, direction = 'pos',`
`341`	`341`	`if(plot){`
`342`	`342`	`return (list(anoms = anoms, plot = xgraph))`
`343`	`343`	`} else {`
`344`		`- return (list(anoms = anoms, plot = NULL))`
	`344`	`+ return (list(anoms = anoms, plot = plot.new()))`
`345`	`345`	`}`
`346`	`346`	`}`
Original file line number	Diff line number	Diff line change
`@@ -224,7 +224,7 @@ AnomalyDetectionVec = function(x, max_anoms=0.10, direction='pos',`
`224`	`224`	`# If there are no anoms, then let's exit`
`225`	`225`	`if(anom_pct == 0){`
`226`	`226`	`if(verbose) message("No anomalies detected.")`
`227`		`- return (list("anoms"=NULL, "plot"=NULL))`
	`227`	`+ return (list("anoms"=data.frame(), "plot"=plot.new()))`
`228`	`228`	`}`
`229`	`229`
`230`	`230`	`if(plot){`
`@@ -287,6 +287,6 @@ AnomalyDetectionVec = function(x, max_anoms=0.10, direction='pos',`
`287`	`287`	`if(plot){`
`288`	`288`	`return (list(anoms = anoms, plot = xgraph))`
`289`	`289`	`} else {`
`290`		`- return (list(anoms = anoms, plot = NULL))`
	`290`	`+ return (list(anoms = anoms, plot = plot.new()))`
`291`	`291`	`}`
`292`	`292`	`}`