Add conditional scipy

lsy617004926 · Jun 15, 2019 · aeb346a · aeb346a
1 parent 8375879
commit aeb346a
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -4,7 +4,7 @@ branches:
   only:
     - master
     - develop
-        
+
 matrix:
   include:
     - python: "2.7"
@@ -40,7 +40,7 @@ install:
         NUMPY=$NUMPY"@pypy-4.0.1"
         pip install nose
       fi
-  - pip install $NUMPY
+  - pip install $NUMPY scipy
 # command to run tests
 script:
   - python setup.py nosetests --verbosity=3 --with-doctest

diff --git a/deap/benchmarks/tools.py b/deap/benchmarks/tools.py
@@ -8,7 +8,10 @@
 except ImportError:
     numpy = False
 
-from scipy.spatial import distance
+try:
+    from scipy.spatial import distance
+except ImportError:
+    scipy = False
 
 try:
     # try importing the C version
@@ -305,8 +308,11 @@ def hypervolume(front, ref=None):
         ref = numpy.max(wobj, axis=0) + 1
     return hv.hypervolume(wobj, ref)
 
+
 def igd(A, Z):
     """Inverse generational distance.
     """
+    if not scipy:
+        raise ImportError("idg requires scipy module")
     distances = distance.cdist(A, Z)
     return numpy.average(numpy.min(distances, axis=0))
diff --git a/doc/api/tools.rst b/doc/api/tools.rst
@@ -142,6 +142,8 @@ Selection
 
 .. autofunction:: deap.tools.selNSGA3
 
+.. autofunction:: deap.tools.selNSGA3WithMemory
+
 .. autofunction:: deap.tools.uniform_reference_points
 
 .. autofunction:: deap.tools.selSPEA2