Changeset 247

Timestamp:

05/30/10 13:21:08 (6 years ago)

Author:

mmckerns

Message:

DEsolver uses 'best' defaults (see ticket #113);
SOW always prints or logs list for x

Location:

mystic/mystic

Files:

• differential_evolution.py (modified) (4 diffs)
• tools.py (modified) (2 diffs)

mystic/mystic/differential_evolution.py

@@ -216 +216 @@
 
     strategy -- the mutation strategy for generating new trial
-        solutions [default = Best1Exp]
+        solutions [default = Best1Bin]
     CrossProbability -- the probability of cross-parameter mutations
-        [default = 0.5]
+        [default = 0.9]
     ScalingFactor -- multiplier for the impact of mutations on the
-        trial solution [default = 0.7]
+        trial solution [default = 0.8]
     callback -- an optional user-supplied function to call after each
         iteration.  It is called as callback(xk), where xk is
@@ -228 +228 @@
         """
         #allow for inputs that don't conform to AbstractSolver interface
-        from mystic.strategy import Best1Exp
-        strategy=Best1Exp    #mutation strategy (see mystic.strategy)
-        CrossProbability=0.5 #potential for parameter cross-mutation
-        ScalingFactor=0.7    #multiplier for mutation impact
+        from mystic.strategy import Best1Bin
+        strategy=Best1Bin    #mutation strategy (see mystic.strategy)
+        CrossProbability=0.9 #potential for parameter cross-mutation
+        ScalingFactor=0.8    #multiplier for mutation impact
         callback=None        #user-supplied function, called after each step
         disp=0               #non-zero to print convergence messages
@@ -400 +400 @@
 
     strategy -- the mutation strategy for generating new trial
-        solutions [default = Best1Exp]
+        solutions [default = Best1Bin]
     CrossProbability -- the probability of cross-parameter mutations
-        [default = 0.5]
+        [default = 0.9]
     ScalingFactor -- multiplier for the impact of mutations on the
-        trial solution [default = 0.7]
+        trial solution [default = 0.8]
     callback -- an optional user-supplied function to call after each
         iteration.  It is called as callback(xk), where xk is
@@ -416 +416 @@
         """
         #allow for inputs that don't conform to AbstractSolver interface
-        from mystic.strategy import Best1Exp
-        strategy=Best1Exp    #mutation strategy (see mystic.strategy)
-        CrossProbability=0.5 #potential for parameter cross-mutation
-        ScalingFactor=0.7    #multiplier for mutation impact
+        from mystic.strategy import Best1Bin
+        strategy=Best1Bin    #mutation strategy (see mystic.strategy)
+        CrossProbability=0.9 #potential for parameter cross-mutation
+        ScalingFactor=0.8    #multiplier for mutation impact
         callback=None        #user-supplied function, called after each step
         disp=0               #non-zero to print convergence messages

mystic/mystic/tools.py

@@ -174 +174 @@
             print "Generation %d has best Chi-Squared: %f" % (self._step, y)
         if int(self._step % self._xinterval) == 0:
+            if isinstance(x,ndarray): x = list(x)
             print "Generation %d has best fit parameters:\n %s" % (self._step, x)
         self._step += 1
@@ -210 +211 @@
             x = x[0] #XXX: get the "best" fit... which should be in x[0]
         if int(self._step % self._yinterval) == 0:
+            if isinstance(x,ndarray): x = list(x)
             self._file.write(" %d   %f   %s\n" % (self._step, y, x))
         self._step += 1