Changeset 636

Timestamp:

01/06/13 20:11:37 (3 years ago)

Author:

mmckerns

Message:

fix: all methods for initial populations produce a nested list of lists;
this is a partial fix of ticket #203

Location:

mystic/mystic

Files:

• abstract_solver.py (modified) (3 diffs)
• differential_evolution.py (modified) (3 diffs)

mystic/mystic/abstract_solver.py

@@ -323 +323 @@
         self.SetRandomInitialPoints(min,max)
         #stick initial values in population[i], i=0
-        self.population[0] = x0 #FIXME: 0 is array, 1: is list
+        self.population[0] = x0.tolist()
     
     def SetRandomInitialPoints(self, min=None, max=None):
@@ -344 +344 @@
         #generate random initial values
         for i in range(len(self.population)):
-            for j in range(self.nDim): #FIXME: 0: are lists
+            for j in range(self.nDim):
                 self.population[i][j] = random.uniform(min[j],max[j])
 
@@ -368 +368 @@
             else:
                 var = var * numpy.eye(self.nDim)
-        for i in range(len(self.population)): #FIXME: 0: are lists
+        for i in range(len(self.population)):
             self.population[i] = multivariate_normal(mean, var).tolist()
         return

mystic/mystic/differential_evolution.py

@@ -145 +145 @@
 from abstract_map_solver import AbstractMapSolver
 
+from numpy import asfarray
+
 class DifferentialEvolutionSolver(AbstractSolver):
     """
@@ -222 +224 @@
         """
         #allow for inputs that don't conform to AbstractSolver interface
+        self.population[0] = asfarray(self.population[0])
         from mystic.strategy import Best1Bin
         strategy=Best1Bin    #mutation strategy (see mystic.strategy)
@@ -402 +405 @@
         """
         #allow for inputs that don't conform to AbstractSolver interface
+        self.population[0] = asfarray(self.population[0])
         from mystic.strategy import Best1Bin
         strategy=Best1Bin    #mutation strategy (see mystic.strategy)