Changeset 858

Timestamp:

03/29/16 14:18:53 (7 weeks ago)

Author:

mmckerns

Message:

enable solver to use scipy.stats instance to generate initial population

Location:

mystic

Files:

• examples/test_peaks.py (modified) (3 diffs)
• mystic/abstract_solver.py (modified) (3 diffs)

mystic/examples/test_peaks.py

@@ -16 +16 @@
 nd = 2
 npop = 20
+tol = 0.05
 lb = [-3.]*nd
 ub = [3.]*nd
@@ -28 +29 @@
 solver.SetRandomInitialPoints(lb, ub)
 solver.SetStrictRanges(lb, ub)
-term = VTR() 
+term = VTR(tol) 
 #term = COG()
 solver.Solve(peaks, term, disp=True)
@@ -34 +35 @@
 print 'solution = ', sol
 print 'expected = [0.23, -1.63]'
+
+try:
+    from scipy.stats import uniform
+except ImportError:
+    exit()
+
+print '-'*60
+print 'using a uniform distribution...'
+solver = DifferentialEvolutionSolver(nd, npop)
+solver.SetDistributionInitialPoints(uniform(lb[0],ub[0]))
+solver.SetStrictRanges(lb, ub)
+term = VTR(tol) 
+#term = COG()
+solver.Solve(peaks, term, disp=True)
+sol = solver.Solution()
+print 'solution = ', sol
+print 'expected = [0.23, -1.63]'
+
+
+

mystic/mystic/abstract_solver.py

@@ -400 +400 @@
                 self.population[i][j] = random.uniform(min[j],max[j])
 
-    def SetMultinormalInitialPoints(self, mean, var = None):
+    def SetMultinormalInitialPoints(self, mean, var=None):
         """Generate Initial Points from Multivariate Normal.
 
@@ -424 +424 @@
         for i in range(len(self.population)):
             self.population[i] = prng.multivariate_normal(mean, var).tolist()
+        return
+
+    def SetDistributionInitialPoints(self, dist):
+        """Generate Random Initial Points from Distribution (dist)
+
+input::
+    - dist: a scipy.stats distribution instance"""
+        from mystic.tools import random_state
+        prng = random_state(module='numpy.random')
+        for i in range(self.nPop):
+            self.population[i] = dist.rvs(self.nDim, random_state=prng).tolist()
         return
 
@@ -840 +851 @@
             continue
 
+        # keep stepping if collapse
+#       while collapse and cc.collapse(self, verbose=False):
+#           while not self.Step(**settings):
+#               continue
+
         # restore default handler for signal interrupts
         if self._handle_sigint: