autocommit

cboettig · Jan 6, 2011 · 80f4272 · 80f4272
1 parent 49203ed
commit 80f4272
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/R/branching_time.R b/R/branching_time.R
@@ -86,8 +86,8 @@ plot_waitingtimes <- function(ensemble, differences=FALSE, max_time=NULL, HISTOG
 	if(is.null(max_time)) max_time <- max( unlist( pts[[1]][1,]),  unlist( pts[[2]][1,]), unlist( pts[[3]][1,]),  unlist( pts[[4]][1,]) )
 
 	if(!HISTOGRAM){
-		plot(density(unlist( pts[[1]][1,] )), xlab='Time', lwd=3, lty=1, col='black', xlim=c(0,max_time), main="Waiting Time Distributions")
-		lines(density(unlist( pts[[2]][1,] )), lwd=3, lty=2, col='purple')
+	#	plot(density(unlist( pts[[1]][1,] )), xlab='Time', lwd=3, lty=1, col='black', xlim=c(0,max_time), main="Waiting Time Distributions")
+		plot(density(unlist( pts[[2]][1,] )), lwd=3, lty=2, col='purple')
 		lines(density(unlist( pts[[3]][1,] )), lwd=3, lty=3, col='blue')
 		lines(density(unlist( pts[[4]][1,] )), lwd=3, lty=4, col='green')
 		legend(	'topright', 

diff --git a/demos/step_limited.R b/demos/step_limited.R
@@ -13,5 +13,6 @@ cpu <- 16
 
 #save(list=ls(), file="step_limited.Rdat")
 load("step_limited.Rdat")
+source("../R/branching_time.R")
 social_plot(plot_waitingtimes(a), file="step_limited.png", tags=tags)
 social_plot(plot_waitingtimes(b), file="step_limited.png", tags=tags)