Adding additional matplotlib colormaps (#17)

tdegeus · May 4, 2020 · 3e1f803 · 3e1f803
1 parent 4d22830
commit 3e1f803
Show file tree

Hide file tree

Showing 11 changed files with 1,399 additions and 1,236 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -32,23 +32,32 @@ install:
   - conda config --set always_yes yes --set changeps1 no
   - conda update -q conda
   - conda info -a
-  - conda install python -c conda-forge
-  - conda install numpy -c conda-forge
-  - conda install matplotlib -c conda-forge
-  - conda install cmake -c conda-forge
-  - conda install xtensor -c conda-forge
-  - conda install pyxtensor -c conda-forge
+  - conda install -c conda-forge python
+  - conda install -c conda-forge numpy
+  - conda install -c conda-forge matplotlib
+  - conda install -c conda-forge cmake
+  - conda install -c conda-forge xtensor
+  - conda install -c conda-forge pyxtensor
   # Build/install the library
   - cmake -G "NMake Makefiles" -DCMAKE_INSTALL_PREFIX=%MINICONDA%\\LIBRARY -DCMAKE_BUILD_TYPE=RELEASE .
   - nmake
   - nmake install
   - python -m pip install .
 
 build_script:
+  # Run Python test
+  - python test\python\main.py
+  # Compile and run C++ test
+  - cd test\cpp
+  - cmake -G "NMake Makefiles" .
+  - nmake
+  - .\test
+  - cd ..\..
   # Run Python example
   - python examples\python\match.py
   # Compile and run C++ example
   - cd examples\cpp
   - cmake -G "NMake Makefiles" .
   - nmake
   - .\example
+  - cd ..\..
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,3 @@
-test*
-
 # Prerequisites
 *.d
 

diff --git a/.travis.yml b/.travis.yml
@@ -85,23 +85,32 @@ install:
   - hash -r
   - conda config --set always_yes yes --set changeps1 no
   - conda update -q conda
-  - conda install python -c conda-forge
-  - conda install numpy -c conda-forge
-  - conda install matplotlib -c conda-forge
-  - conda install cmake -c conda-forge
-  - conda install xtensor -c conda-forge
-  - conda install pyxtensor -c conda-forge
+  - conda install -c conda-forge python
+  - conda install -c conda-forge numpy
+  - conda install -c conda-forge matplotlib
+  - conda install -c conda-forge cmake
+  - conda install -c conda-forge xtensor
+  - conda install -c conda-forge pyxtensor
   # Build/install the library
   - cmake .
   - sudo make install
   - python -m pip install .
 
 script:
+  # Run Python example
+  - python test/python/main.py
+  # Compile and run C++ example
+  - cd test/cpp
+  - cmake .
+  - make
+  - ./test
+  - cd ../..
   # Run Python example
   - python examples/python/match.py
   # Compile and run C++ example
   - cd examples/cpp
   - cmake .
   - make
   - ./example
+  - cd ../..
 
diff --git a/examples/overview/matplotlib.png b/examples/overview/matplotlib.png
diff --git a/examples/overview/overview.py b/examples/overview/overview.py
@@ -45,10 +45,23 @@
         "PiYG",
         "PRGn"),
     'matplotlib' : (
+        "spring",
+        "summer",
+        "autumn",
+        "winter",
+        "cool",
+        "hot",
+        "bone",
+        "copper",
+        "afmhot",
+        "terrain",
+        "seismic",
         "magma",
         "inferno",
         "plasma",
         "viridis",
+        "nipy_spectral",
+        "hsv",
         "jet"),
     'monocolor' : (
         "White",
-Original file line number
+Diff line change
@@ -1,5 +1,3 @@
-    test*
     # Prerequisites
     *.d
@@ Expand Down @@