[or-cvs] r20647: {torflow} Add a couple more datapoints to study. (torflow/trunk/CircuitAnalysis/BuildTimes)

[mikeperry@xxxxxxxx]

Author: mikeperry
Date: 2009-09-22 17:32:34 -0400 (Tue, 22 Sep 2009)
New Revision: 20647

Modified:
   torflow/trunk/CircuitAnalysis/BuildTimes/binomial.py
Log:

Add a couple more datapoints to study.



Modified: torflow/trunk/CircuitAnalysis/BuildTimes/binomial.py
===================================================================
--- torflow/trunk/CircuitAnalysis/BuildTimes/binomial.py	2009-09-22 09:49:29 UTC (rev 20646)
+++ torflow/trunk/CircuitAnalysis/BuildTimes/binomial.py	2009-09-22 21:32:34 UTC (rev 20647)
@@ -1,7 +1,7 @@
 #!/usr/bin/python
 #
 # Uses the binomial distribution to estimate the expected number of
-# circuit trials before a false positive that discards all of our
+# circuit circuits before a false positive that discards all of our
 # circuits for a few different parameters.
 
 
@@ -20,25 +20,37 @@
   return F
 
 twenty_pct = BinomialF(.2, 20, 15)
+thirty_pct = BinomialF(.35, 20, 15)
+fourty_pct = BinomialF(.4, 20, 15)
 fifty_pct = BinomialF(.5, 20, 15)
 
 print "15 out of 20:"
-print "20% circ timeout rate expects: "+str(1.0/twenty_pct)+" trials"
-print "50% circ timeout rate expects: "+str(1.0/fifty_pct)+" trials"
+print "20% circ timeout rate expects "+str(1.0/twenty_pct)+" circuits"
+print "30% circ timeout rate expects "+str(1.0/thirty_pct) +" circuits"
+print "40% circ timeout rate expects "+str(1.0/fourty_pct) +" circuits"
+print "50% circ timeout rate expects "+str(1.0/fifty_pct)+" circuits"
 print
 
 twenty_pct = BinomialF(.2, 20, 16)
+thirty_pct = BinomialF(.3, 20, 16)
+fourty_pct = BinomialF(.4, 20, 16)
 fifty_pct = BinomialF(.5, 20, 16)
 
 print "16 out of 20:"
-print "20% circ timeout rate expects: "+str(1.0/twenty_pct) +" trials"
-print "50% circ timeout rate expects: "+str(1.0/fifty_pct)+" trials"
+print "20% circ timeout rate expects "+str(1.0/twenty_pct) +" circuits"
+print "30% circ timeout rate expects "+str(1.0/thirty_pct) +" circuits"
+print "40% circ timeout rate expects "+str(1.0/thirty_pct) +" circuits"
+print "50% circ timeout rate expects "+str(1.0/fifty_pct)+" circuits"
 print
 
 twenty_pct = BinomialF(.2, 20, 18)
+thirty_pct = BinomialF(.30, 20, 17)
+fourty_pct = BinomialF(.40, 20, 17)
 fifty_pct = BinomialF(.5, 20, 18)
 
 print "18 out of 20:"
-print "20% circ timeout rate expects: "+str(1.0/twenty_pct)+" trials"
-print "50% circ timeout rate expects: "+str(1.0/fifty_pct)+" trials"
+print "20% circ timeout rate expects "+str(1.0/twenty_pct)+" circuits"
+print "30% circ timeout rate expects "+str(1.0/thirty_pct) +" circuits"
+print "40% circ timeout rate expects "+str(1.0/fourty_pct) +" circuits"
+print "50% circ timeout rate expects "+str(1.0/fifty_pct)+" circuits"
 print