Bumped version number and use newer version of CADET library

cadet · Jul 9, 2020 · 67b9f3f · 67b9f3f
1 parent 673a4eb
commit 67b9f3f
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -347,3 +347,4 @@ __pycache__/
 /Examples/Example1/Dextran/fit_nsga3_shape_single_stat
 /Examples/MCMC/Dextran/nsga3_nodelay
 /Examples/Example1/Dextran/fit_nsga3_shape_single_6
+/Examples/MCMC/Dextran/nsga3_nodelay2
diff --git a/CADETMatch/version.py b/CADETMatch/version.py
@@ -16,5 +16,5 @@
 __email__ = "[email protected]"
 __license__ = "GNU General Public License v3 (GPLv3)"
 __copyright__ = "2020 %s" % __author__
-__version__ = "0.5.51"
+__version__ = "0.5.52"
 __uri__ = "https://github.com/modsim/CADET-Match"
diff --git a/Examples/MCMC/Dextran/MCMC_dextran_nsga3.json b/Examples/MCMC/Dextran/MCMC_dextran_nsga3.json
@@ -1,7 +1,7 @@
 {
   "CADETPath": "C:/Users/kosh_000/cadet_build/CADET/VCPKG_4_single/bin/cadet-cli.exe",
   "baseDir": "C:/Users/kosh_000/Documents/Visual Studio 2017/Projects/CADETMatch/Examples/MCMC/Dextran",
-  "resultsDir": "nsga3_nodelay",
+  "resultsDir": "nsga3_nodelay2",
   "tempDir": "L:/",
   "CSV": "dextran_MCMC.csv",
     "checkpointFile": "check",

diff --git a/setup.py b/setup.py
@@ -29,7 +29,7 @@
           'matplotlib>=3.2.1',
           'pandas>=1.0.5',
           'h5py>=2.10.0',
-          'CADET>=0.4',
+          'CADET>=0.5',
           'seaborn>=0.10.1',
           'sklearn',
           'scikit-learn>=0.23.1',