Changeset 245

Timestamp:

05/26/10 08:23:10 (6 years ago)

Author:

mmckerns

Message:

bugfix for ticket #110

Location:

mystic

Files:

• examples/test_mogi.py (modified) (1 diff)
• mystic/tools.py (modified) (5 diffs)
• tests/test_SOW.py (added)

mystic/examples/test_mogi.py

@@ -115 +115 @@
     desol, dstepmon = de_solve()
     print "desol: ", desol
-    print "dstepmon 10: ", dstepmon.x[50]
-    print "dstepmon 20: ", dstepmon.x[100]
+    print "dstepmon 50: ", dstepmon.x[50]
+    print "dstepmon 100: ", dstepmon.x[100]
     #
     # this will try to use nelder_mean from a relatively "near by" point (very sensitive)

mystic/mystic/tools.py

@@ -133 +133 @@
 
     def __call__(self, x, y):
+        from numpy import ndarray
+        if isinstance(x,ndarray): x = list(x)
         self._x.append(x)
         self._y.append(y)
@@ -154 +156 @@
     import numpy
     def __init__(self, interval = 10, xinterval = numpy.inf):
-        Sow.__init__(self)
+       #Sow.__init__(self)
+        super(VerboseSow,self).__init__()
         self._step = 0
         self._yinterval = interval
@@ -161 +164 @@
     def __call__(self, x, y):
         from numpy import ndarray
-        Sow.__call__(self, x, y)
+       #Sow.__call__(self, x, y)
+        super(VerboseSow,self).__call__(x, y)
         if isinstance(y,(list,ndarray)):
             y = y[0] #XXX: get the "best" fit... which should be in y[0]
@@ -183 +187 @@
     def __init__(self, interval=1, filename='log.txt', new=False):
         import datetime
-        Sow.__init__(self)
+       #Sow.__init__(self)
+        super(LoggingSow,self).__init__()
         self._filename = filename
         self._step = 0
@@ -198 +203 @@
         self._file = open(self._filename,'a')
         from numpy import ndarray
-        Sow.__call__(self, x, y)
+       #Sow.__call__(self, x, y)
+        super(LoggingSow,self).__call__(x, y)
         if isinstance(y,(list,ndarray)):
             y = y[0] #XXX: get the "best" fit... which should be in y[0]