Permalink
Browse files

Merge branch 'master' into automation

Conflicts:
	.gitignore
	Makefile
  • Loading branch information...
2 parents 9404227 + dc55d61 commit e668d172aa32c71038acbe9e673c737349277975 @ericmoritz committed Jun 18, 2012
Showing with 68 additions and 4 deletions.
  1. +13 −3 .gitignore
  2. +9 −1 Makefile
  3. +19 −0 stats/Makefile
  4. +27 −0 stats/stats.r
View
@@ -1,8 +1,15 @@
+#*#
+*.beam
+*.class
+*.hi
+*.o
+*.plt
+*~
.*
+*.pyc
data/
-dist/
-results/
deps/
+dist/
ebin/
competition/log/*.log
competition/wsdemo-snap
@@ -13,5 +20,8 @@ competition/wsdemo-snap
*~
#*#
*.class
-*.pyc
node_modules
+results/
+stats/stat_results/
+stats/counts.csv
+stats/*.Rout
View
@@ -1,3 +1,11 @@
+.PHONY: build report stats
+
build:
./rebar get-deps compile
- cd competition; make build
+ $(MAKE) -C competition build
+
+report:
+ ./bin/compile_all_stats.sh
+
+stats:
+ $(MAKE) -C stats stats
View
@@ -0,0 +1,19 @@
+.PHONY = all stats dirs
+
+all: stats
+
+stats: dirs counts.csv
+ R CMD BATCH stats.r
+
+dirs:
+ mkdir -p stat_results
+
+clean:
+ rm -f counts.csv
+ rm -f *.Rout
+ rm -f stat_results/*.pdf
+
+counts.csv:
+ echo "type, clients, handshakes, connection_timeouts, messages_sent, messages_recv, crashes" > counts.csv
+ for k in ../data/*/counts.csv; do tail -n 1 "$$k" >> counts.csv ; done
+
View
@@ -0,0 +1,27 @@
+# R-script for producing statistics output:
+# Before runnning this script, makes sure you have the right packages installed:
+# install.packages("ggplot2")
+
+# Make sure needed libraries are there
+require(ggplot2)
+
+# Set some global variables
+base_size <- 9
+
+# Read in data
+counts <- read.csv("counts.csv", header=TRUE)
+
+# First plot, connection timeouts
+pdf("stat_results/conn_timeouts.pdf")
+conn_timeouts <- ggplot(counts, aes(x = type, y = connection_timeouts))
+(conn_timeouts
+ + geom_bar()
+ + xlab('Framework')
+ + ylab('Connections Lost')
+ + opts(axis.ticks = theme_blank(),
+ axis.text.x = theme_text(size = base_size * 0.8,
+ angle = 330,
+ hjust = 0,
+ colour = "grey50")))
+dev.off()
+

0 comments on commit e668d17

Please sign in to comment.