fcmaes 1.5.10__tar.gz → 1.5.11__tar.gz

{fcmaes-1.5.10/fcmaes.egg-info → fcmaes-1.5.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fcmaes
-Version: 1.5.10
+Version: 1.5.11
 Summary: A Python 3 gradient-free optimization library.
 Home-page: https://github.com/dietmarwo/fast-cma-es
 Author: Dietmar Wolz

{fcmaes-1.5.10 → fcmaes-1.5.11}/fcmaes/__init__.py

@@ -3,7 +3,7 @@
 # This source code is licensed under the MIT license found in the
 # LICENSE file in the root directory.
 
-__version__ = '1.5.10'
+__version__ = '1.5.11'
 
 __all__ = [
     'cmaes',

{fcmaes-1.5.10 → fcmaes-1.5.11}/fcmaes/diversifier.py

@@ -76,7 +76,8 @@ def minimize(qd_fitness: Callable[[ArrayLike], Tuple[float, np.ndarray]],
     niche_num : int, optional
         Number of niches.
     samples_per_niche : int, optional
-        Number of samples used for niche computation.  
+        Number of samples used for niche computation. 
+        If samples_per_niche > 0 cvt-clustering is used, else grid-clustering is used. 
     max_evals : int, optional
         Number of fitness evaluations.
     workers : int, optional

{fcmaes-1.5.10 → fcmaes-1.5.11}/fcmaes/mapelites.py

@@ -59,6 +59,7 @@ from numpy.random import default_rng
 import ctypes as ct
 from time import perf_counter
 import threadpoolctl
+from numba import njit
 
 import logging
 from typing import Optional, Callable, Tuple, Dict
@@ -186,7 +187,8 @@ def set_KDTree(archive: Archive,
         Bounds on behavior descriptors. Instance of the `scipy.Bounds` class.
         Required if centers is None.
     samples_per_niche : int, optional
-        Number of samples used for niche computation. Required if centers is None.          
+        Number of samples used for niche computation. 
+        If samples_per_niche > 0 cvt-clustering is used, else grid-clustering is used.        
          
     Returns
     -------
@@ -299,8 +301,8 @@ def optimize_cma_(archive, fitness, bounds, rg, cma_params):
         old_ys = np.sort(ys)
         
 def update_archive(archive: Archive, xs: np.ndarray, 
-                   fitness: Callable[[ArrayLike], Tuple[float, np.ndarray]],
-                   yds: Optional(ArrayLike) = None):
+                   fitness: Optional[Callable[[ArrayLike], Tuple[float, np.ndarray]]] = None,
+                   yds: Optional[ArrayLike] = None):
     # evaluate population, update archive and determine ranking
     popsize = len(xs)
     if yds is None: 
@@ -309,6 +311,9 @@ def update_archive(archive: Archive, xs: np.ndarray,
     niches = archive.index_of_niches(descs)
     # real values
     ys = np.fromiter((yd[0] for yd in yds), dtype=float)
+    
+    #print(len(archive.ys), np.amax(niches), np.amin(niches))
+    
     oldys = np.fromiter((archive.get_y(niches[i]) for i in range(popsize)), dtype=float)
     improvement = ys - oldys
     neg = np.argwhere(improvement < 0)
@@ -325,6 +330,20 @@ def update_archive(archive: Archive, xs: np.ndarray,
         improvement[empty] = min_valid + norm_ys
     # return both improvement compared to archive elites  and real fitness
     return improvement, ys
+
+@njit()
+def get_grid_indices(ds, capacity, lb, ub):
+    rdim = capacity ** (1/ds.shape[1])
+    ds_norm = rdim * (ds - lb) / (ub - lb)
+    indices = np.empty(len(ds), dtype=np.int32)   
+    for i, d in enumerate(ds_norm):
+        index = 0
+        f = 1
+        for di in d:
+            index += f*di
+            f *= rdim
+        indices[i] = max(0, min(capacity-1, int(index)))    
+    return indices
         
 class Archive(object):
     """Multi-processing map elites archive. 
@@ -370,10 +389,13 @@ class Archive(object):
                 self.set_stat(i, 3, np.full(self.dim, -np.inf)) # max
          
     def init_niches(self, samples_per_niche: int = 10): 
-        """Computes the niche centers using KMeans and builds the KDTree for niche determination.""" 
-        set_KDTree(self, None, self.capacity, self.qd_bounds, samples_per_niche)
-        self.cs = mp.RawArray(ct.c_double, self.capacity * self.qd_dim)
-        self.set_cs(self.centers)
+        """Computes the niche centers using KMeans and builds the KDTree for niche determination."""
+        # If samples_per_niche > 0 cvt-clustering is used, else grid-clustering is used.   
+        self.cvt_clustering = samples_per_niche > 0
+        if self.cvt_clustering:
+            set_KDTree(self, None, self.capacity, self.qd_bounds, samples_per_niche)
+            self.cs = mp.RawArray(ct.c_double, self.capacity * self.qd_dim)
+            self.set_cs(self.centers)
     
     def get_occupied_data(self):
         ys = self.get_ys()
@@ -398,7 +420,7 @@ class Archive(object):
                             xs=self.get_xs(), 
                             ds=self.get_ds(), 
                             ys=self.get_ys(), 
-                            cs=self.get_cs(),
+                            cs=self.get_cs() if self.cvt_clustering else np.empty(0),
                             stats=self.get_stats(),
                             counts=self.get_counts()
                             )
@@ -407,12 +429,14 @@ class Archive(object):
         """Loads the archive from disc."""   
         self.cs = mp.RawArray(ct.c_double, self.capacity * self.qd_dim)
         with np.load(self.fname(name) + '.npz') as data:
+            self.cvt_clustering = len(data['cs']) > 0
             xs = data['xs']
             ds = data['ds']
             self.set_xs(xs)
             self.set_ds(ds)
             self.set_ys(data['ys'])
-            self.set_cs(data['cs'])
+            if self.cvt_clustering:
+                self.set_cs(data['cs'])
             self.counts[:] = data['counts']
             stats = data['stats']
             if len(stats) == len(self.stats):
@@ -421,10 +445,14 @@ class Archive(object):
         self.dim = xs.shape[1]
         self.qd_dim = ds.shape[1]
         self.capacity = xs.shape[0]
-        set_KDTree(self, self.get_cs(), None, None, None)
-    
+        if self.cvt_clustering:
+            set_KDTree(self, self.get_cs(), None, None, None)
+      
     def index_of_niches(self, ds):
-        return self.kdt.query(self.encode_d(ds), k=1, sort_results=False)[1].T[0] 
+        if hasattr(self, "kdt"): # use k-means clusters
+            return self.kdt.query(self.encode_d(ds), k=1, sort_results=False)[1].T[0] 
+        else: # use grid based clustering
+            return get_grid_indices(ds, self.capacity, self.qd_bounds.lb, self.qd_bounds.ub)
         
     def in_niche_filter(self, 
                         fit: Callable[[ArrayLike], float], 

{fcmaes-1.5.10 → fcmaes-1.5.11}/fcmaes/mode.py

@@ -481,7 +481,7 @@ class MODE(object):
         x[tr] = xp[tr]    
         if not self.modifier is None:
             x = self.modifier(x)   
-        return x
+        return x.clip(self.lower, self.upper)
     
     def _sample(self):
         if self.upper is None:

{fcmaes-1.5.10 → fcmaes-1.5.11}/fcmaes/retry.py

@@ -154,7 +154,8 @@ def minimize_plot(name: str,
 def plot(front: ArrayLike, fname: str, interp: Optional[bool] = True, 
          label: Optional[str] = r'$\chi$', 
          xlabel: Optional[str] = r'$f_1$', ylabel:Optional[str] = r'$f_2$', 
-         zlabel: Optional[str] = r'$f_3$', plot3d: Optional[bool] = False):
+         zlabel: Optional[str] = r'$f_3$', plot3d: Optional[bool] = False, 
+         s = 1, dpi=300):
     if len(front[0]) == 3 and plot3d:
         plot3(front, fname, label, xlabel, ylabel, zlabel)
         return
@@ -181,12 +182,12 @@ def plot(front: ArrayLike, fname: str, interp: Optional[bool] = True,
         tck = interpolate.InterpolatedUnivariateSpline(x,y,k=1)
         x = np.linspace(min(x),max(x),1000)
         y = [tck(xi) for xi in x]
-    ax.scatter(x, y, label=label, s=1)
+    ax.scatter(x, y, label=label, s=s)
     ax.grid()
     ax.set_xlabel(xlabel)
     ax.set_ylabel(ylabel)
     ax.legend()
-    fig.savefig(fname, dpi=300)
+    fig.savefig(fname, dpi=dpi)
     pl.close('all')
 
 def plot3(front: ArrayLike, fname: str, label: Optional[str] =r'$\chi$', 

{fcmaes-1.5.10 → fcmaes-1.5.11/fcmaes.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fcmaes
-Version: 1.5.10
+Version: 1.5.11
 Summary: A Python 3 gradient-free optimization library.
 Home-page: https://github.com/dietmarwo/fast-cma-es
 Author: Dietmar Wolz

{fcmaes-1.5.10 → fcmaes-1.5.11}/fcmaes.egg-info/SOURCES.txt

@@ -38,7 +38,13 @@ fcmaes.egg-info/top_level.txt
 fcmaes/lib/libacmalib.dll
 fcmaes/lib/libacmalib.dylib
 fcmaes/lib/libacmalib.so
+fcmaes/lib/libacmalibRK4.so
 fcmaes/lib/libhbv.so
 fcmaes/lib/liblrgv.so
+fcmaes/lib/libmazda.so
 fcmaes/lib/librw_top_trumps.dll
-fcmaes/lib/librw_top_trumps.so
+fcmaes/lib/librw_top_trumps.so
+fcmaes/lib/libs/libacmalib.so
+fcmaes/lib/libs/libacmalibDOPRI45.so
+fcmaes/lib/libs/libacmalibPC233.so
+fcmaes/lib/libs/libacmalibRK4.so