[Scipy-svn] r2434 - trunk/Lib/maxentropy

[scipy-svn at scipy.org]

Author: edschofield
Date: 2006-12-17 20:47:44 -0600 (Sun, 17 Dec 2006)
New Revision: 2434

Modified:
   trunk/Lib/maxentropy/maxentropy.py
Log:
Removed old unused attributes from maxentropy.py


Modified: trunk/Lib/maxentropy/maxentropy.py
===================================================================
--- trunk/Lib/maxentropy/maxentropy.py	2006-12-18 00:29:08 UTC (rev 2433)
+++ trunk/Lib/maxentropy/maxentropy.py	2006-12-18 02:47:44 UTC (rev 2434)
@@ -1139,32 +1139,6 @@
         # in stochastic approx
         self.testconvergematrices = 10  
         
-        # For comparing sampling methods and opt algorithms -- specifies that
-        # we can compute the exact expectations at any iteration with
-        # self.expectations() as a convergence criterion
-        self.testconvergecheat = False   
-        
-        # Number of stdevs either side of the mean for Z and E confidence
-        # intervals
-        self.z = 3.0         
-        
-        # Desired precision with expectation estimates
-        self.Etol = 5e-5     
-        
-        # Desired precision with logZ estimates
-        self.Ztol = 5e-5        
-        
-        # Using relative precision for the sampling stopping criterion is
-        # disabled by default:
-        self.Ertol = 0.0
-        
-        # Number of samples to compute before tracking the variance
-        self.init_samples = 10000     
-        
-        # Min number of samples to compute the variance of after starting
-        # tracking
-        self.min_samples = 10000      
-        
         # Test for convergence every 'testevery' iterations, using one or
         # more external samples. If None, don't test.
         self.testevery = None