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

[scipy-svn at scipy.org]

Author: edschofield
Date: 2006-12-12 06:31:43 -0600 (Tue, 12 Dec 2006)
New Revision: 2398

Modified:
   trunk/Lib/maxentropy/maxentropy.py
Log:
Small cleanups to maxentropy.py


Modified: trunk/Lib/maxentropy/maxentropy.py
===================================================================
--- trunk/Lib/maxentropy/maxentropy.py	2006-12-12 08:21:54 UTC (rev 2397)
+++ trunk/Lib/maxentropy/maxentropy.py	2006-12-12 12:31:43 UTC (rev 2398)
@@ -554,6 +554,7 @@
         
         self.fnevals = 0
         self.gradevals = 0
+        self.iters = 0
         self.callingback = False
         
         # Clear the stored duals and gradient norms 
@@ -1401,12 +1402,10 @@
             #     -log(n-1) + logsumexp(2*log|Z_k - meanZ|)
             
             self.logZapprox = logsumexp(logZs) - math.log(ttrials)
-            self.logZsapprox = logZs
-            #logstdevZ = 0.5*(-math.log(n-1) + logsumexp([2.*logdiffexp(logZ_k, self.logZapprox) for logZ_k in logZs]))
             stdevlogZ = numpy.array(logZs).std()
-            Etemp = numpy.array(mus)
-            self.varE = columnvariances(Etemp)
-            self.mu = columnmeans(Etemp)
+            mus = numpy.array(mus)
+            self.varE = columnvariances(mus)
+            self.mu = columnmeans(mus)
             return