Added version, checked examples.

xopt-org · Apr 23, 2020 · b3a2221 · b3a2221
1 parent 0cc48f8
commit b3a2221
Show file tree

Hide file tree

Showing 19 changed files with 567 additions and 1,593 deletions.
diff --git a/examples/cnsga/cnsga_tnk.ipynb b/examples/cnsga/cnsga_tnk.ipynb
diff --git a/examples/nsga2_constrained/TNK_test.json → examples/devel/TNK_test.json b/examples/nsga2_constrained/TNK_test.json → examples/devel/TNK_test.json
diff --git a/examples/nsga2_constrained/Untitled.ipynb → examples/devel/Untitled.ipynb b/examples/nsga2_constrained/Untitled.ipynb → examples/devel/Untitled.ipynb
diff --git a/examples/nsga2_constrained/cnsga.py → examples/devel/cnsga.py b/examples/nsga2_constrained/cnsga.py → examples/devel/cnsga.py
diff --git a/examples/nsga2_constrained/cnsga_devel.ipynb → examples/devel/cnsga_devel.ipynb b/examples/nsga2_constrained/cnsga_devel.ipynb → examples/devel/cnsga_devel.ipynb
diff --git a/examples/nsga2_constrained/mnsga_devel.ipynb → examples/devel/mnsga_devel.ipynb b/examples/nsga2_constrained/mnsga_devel.ipynb → examples/devel/mnsga_devel.ipynb
diff --git a/...strained/nsga2_constrained-tutorial.ipynb → ...es/devel/nsga2_constrained-tutorial.ipynb b/...strained/nsga2_constrained-tutorial.ipynb → ...es/devel/nsga2_constrained-tutorial.ipynb
diff --git a/...nsga2_constrained/nsga2_constrained.ipynb → examples/devel/nsga2_constrained.ipynb b/...nsga2_constrained/nsga2_constrained.ipynb → examples/devel/nsga2_constrained.ipynb
diff --git a/examples/nsga2_constrained/run.bash → examples/devel/run.bash b/examples/nsga2_constrained/run.bash → examples/devel/run.bash
diff --git a/...ples/nsga2_constrained/vocs_toolbox.ipynb → examples/devel/vocs_toolbox.ipynb b/...ples/nsga2_constrained/vocs_toolbox.ipynb → examples/devel/vocs_toolbox.ipynb
diff --git a/..._constrained/xopt_nsga2_constrained.ipynb → examples/devel/xopt_nsga2_constrained.ipynb b/..._constrained/xopt_nsga2_constrained.ipynb → examples/devel/xopt_nsga2_constrained.ipynb
diff --git a/examples/sampler/sampler_example.ipynb b/examples/sampler/sampler_example.ipynb
diff --git a/examples/xopt_class/xopt_astra_sampler.ipynb b/examples/xopt_class/xopt_astra_sampler.ipynb
diff --git a/examples/xopt_class/xopt_tnk_example.ipynb b/examples/xopt_class/xopt_tnk_example.ipynb
diff --git a/xopt/__init__.py b/xopt/__init__.py
@@ -1,8 +1,3 @@
 from .xopt import Xopt
 from .tools import xopt_logo
-
-
-#import os
-# Used to access examples directory
-#root, _ = os.path.split(__file__)
-#examples_dir = os.path.join(root, '../examples/')
+from ._version import __version__
diff --git a/xopt/_version.py b/xopt/_version.py
@@ -0,0 +1,3 @@
+
+
+__version__ = '0.4.0'
diff --git a/xopt/cnsga.py b/xopt/cnsga.py
@@ -1,6 +1,6 @@
 from xopt import creator, vocs_tools, fitness_with_constraints
 from xopt.tools import full_path, random_settings_arrays, DummyExecutor, load_config
-
+from ._version import __version__
 from deap import algorithms, base, tools
 
 import numpy as np
@@ -18,7 +18,7 @@
 
 """
 
-cnsga_logo = """
+cnsga_logo = f"""
 
 
  ▄████▄   ███▄    █   ██████   ▄████  ▄▄▄      
@@ -34,7 +34,7 @@
 
 
 Continuous Non-dominated Sorting Genetic Algorithm
-
+Version {__version__}
 """
 
 

diff --git a/xopt/sampler.py b/xopt/sampler.py
@@ -1,11 +1,12 @@
 from .tools import full_path, new_date_filename, random_settings, DummyExecutor
+from ._version import __version__
 from deap.base import Toolbox
 import json
 import time
 import os, sys
 
 
-sampler_logo = """
+sampler_logo = f"""
 
 ███████╗ █████╗ ███╗   ███╗██████╗ ██╗     ███████╗██████╗ 
 ██╔════╝██╔══██╗████╗ ████║██╔══██╗██║     ██╔════╝██╔══██╗
@@ -16,7 +17,7 @@
                                                            
 
 Xopt Random Sampler
-
+Version {__version__}
 """
 
 

diff --git a/xopt/xopt.py b/xopt/xopt.py
@@ -2,6 +2,7 @@
 from .cnsga import cnsga
 from .sampler import random_sampler
 from .configure import configure_algorithm, configure_simulation, configure_vocs, VOCS_DEFAULTS
+from ._version import __version__
 import pprint
 from copy import deepcopy
 import yaml
@@ -274,11 +275,10 @@ def __getitem__(self, config_item):
 
     def __repr__(self):
         s = f"""
-            Xopt
+            Xopt 
 ________________________________           
-
+Version: {__version__}
 Configured: {self.configured}
-
 Config as YAML:
 """
         #return s+pprint.pformat(self.config)