diff --git a/README.md b/README.md index dad0363..d42c784 100644 --- a/README.md +++ b/README.md @@ -20,4 +20,8 @@ Please, read the [contributing guidelines](CONTRIBUTING.md) before contributing ## License -This project is licensed under the GPL-3.0 License. See the [LICENSE](LICENSE) file for details. \ No newline at end of file +This project is licensed under the GPL-3.0 License. See the [LICENSE](LICENSE) file for details. + +--- + +_NREL Software Record number: SWR-24-57_ \ No newline at end of file diff --git a/blackboxopt/__init__.py b/blackboxopt/__init__.py index 2354a0d..3486224 100644 --- a/blackboxopt/__init__.py +++ b/blackboxopt/__init__.py @@ -16,7 +16,7 @@ # along with this program. If not, see . __all__ = ["acquisition", "optimize", "sampling", "rbf"] -__version__ = "0.3.3" +__version__ = "0.4.0" from . import acquisition from . import optimize diff --git a/blackboxopt/acquisition.py b/blackboxopt/acquisition.py index df1f39f..72eb849 100644 --- a/blackboxopt/acquisition.py +++ b/blackboxopt/acquisition.py @@ -31,7 +31,7 @@ "Haoyu Jia", "Weslley S. Pereira", ] -__version__ = "0.3.3" +__version__ = "0.4.0" __deprecated__ = False import numpy as np diff --git a/blackboxopt/optimize.py b/blackboxopt/optimize.py index 5fda7cc..eda6da2 100644 --- a/blackboxopt/optimize.py +++ b/blackboxopt/optimize.py @@ -31,7 +31,7 @@ "Haoyu Jia", "Weslley S. Pereira", ] -__version__ = "0.3.3" +__version__ = "0.4.0" __deprecated__ = False from typing import Callable, Optional, Union diff --git a/blackboxopt/problem.py b/blackboxopt/problem.py index 7af2c16..1b2bb7a 100644 --- a/blackboxopt/problem.py +++ b/blackboxopt/problem.py @@ -20,7 +20,7 @@ __maintainer__ = "Weslley S. Pereira" __email__ = "weslley.dasilvapereira@nrel.gov" __credits__ = ["Weslley S. Pereira"] -__version__ = "0.3.3" +__version__ = "0.4.0" __deprecated__ = False import numpy as np diff --git a/blackboxopt/rbf.py b/blackboxopt/rbf.py index 3b0c3d3..870e39d 100644 --- a/blackboxopt/rbf.py +++ b/blackboxopt/rbf.py @@ -20,7 +20,7 @@ __maintainer__ = "Weslley S. Pereira" __email__ = "weslley.dasilvapereira@nrel.gov" __credits__ = ["Weslley S. Pereira"] -__version__ = "0.3.3" +__version__ = "0.4.0" __deprecated__ = False from typing import Optional diff --git a/blackboxopt/sampling.py b/blackboxopt/sampling.py index 4cf7088..e0119e5 100644 --- a/blackboxopt/sampling.py +++ b/blackboxopt/sampling.py @@ -31,7 +31,7 @@ "Haoyu Jia", "Weslley S. Pereira", ] -__version__ = "0.3.3" +__version__ = "0.4.0" __deprecated__ = False import numpy as np diff --git a/docs/conf.py b/docs/conf.py index 346e96f..217d431 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -15,9 +15,9 @@ # https://www.sphinx-doc.org/en/master/usage/configuration.html#project-information project = "Black-box Opt" -copyright = "2024, National Renewable Energy Laboratory" +copyright = "2024, Alliance for Sustainable Energy, LLC" author = "Weslley S. Pereira" -release = "0.3.3" +release = "0.4.0" # -- General configuration --------------------------------------------------- # https://www.sphinx-doc.org/en/master/usage/configuration.html#general-configuration diff --git a/examples/multiobj/pareto_front.ipynb b/examples/multiobj/pareto_front.ipynb index 31996ab..2a8cbf0 100644 --- a/examples/multiobj/pareto_front.ipynb +++ b/examples/multiobj/pareto_front.ipynb @@ -29,7 +29,7 @@ "__maintainer__ = \"Weslley S. Pereira\"\n", "__email__ = \"weslley.dasilvapereira@nrel.gov\"\n", "__credits__ = [\"Weslley S. Pereira\"]\n", - "__version__ = \"0.3.3\"\n", + "__version__ = \"0.4.0\"\n", "__deprecated__ = False" ] }, diff --git a/examples/multiobj/socemo.ipynb b/examples/multiobj/socemo.ipynb index 60a7e2a..f474c40 100644 --- a/examples/multiobj/socemo.ipynb +++ b/examples/multiobj/socemo.ipynb @@ -28,7 +28,7 @@ "__maintainer__ = \"Weslley S. Pereira\"\n", "__email__ = \"weslley.dasilvapereira@nrel.gov\"\n", "__credits__ = [\"Weslley S. Pereira\"]\n", - "__version__ = \"0.3.3\"\n", + "__version__ = \"0.4.0\"\n", "__deprecated__ = False" ] }, diff --git a/examples/opt_with_constr/example_gosac_1.py b/examples/opt_with_constr/example_gosac_1.py index 44058cf..6b4d9fc 100644 --- a/examples/opt_with_constr/example_gosac_1.py +++ b/examples/opt_with_constr/example_gosac_1.py @@ -20,7 +20,7 @@ __maintainer__ = "Weslley S. Pereira" __email__ = "weslley.dasilvapereira@nrel.gov" __credits__ = ["Juliane Mueller", "Weslley S. Pereira"] -__version__ = "0.3.3" +__version__ = "0.4.0" __deprecated__ = False from blackboxopt.optimize import gosac diff --git a/examples/opt_with_constr/example_gosac_2.py b/examples/opt_with_constr/example_gosac_2.py index d885af9..22ae1f6 100644 --- a/examples/opt_with_constr/example_gosac_2.py +++ b/examples/opt_with_constr/example_gosac_2.py @@ -20,7 +20,7 @@ __maintainer__ = "Weslley S. Pereira" __email__ = "weslley.dasilvapereira@nrel.gov" __credits__ = ["Juliane Mueller", "Weslley S. Pereira"] -__version__ = "0.3.3" +__version__ = "0.4.0" __deprecated__ = False from blackboxopt.optimize import gosac diff --git a/examples/sampling.ipynb b/examples/sampling.ipynb index ad517c6..f954138 100644 --- a/examples/sampling.ipynb +++ b/examples/sampling.ipynb @@ -8,7 +8,7 @@ "source": [ "\"\"\"Example showing different sampling strategies\"\"\"\n", "\n", - "# Copyright (C) 2024 National Renewable Energy Laboratory\n", + "# Copyright (c) 2024 Alliance for Sustainable Energy, LLC\n", "\n", "# This program is free software: you can redistribute it and/or modify\n", "# it under the terms of the GNU General Public License as published by\n", @@ -28,7 +28,7 @@ "__maintainer__ = \"Weslley S. Pereira\"\n", "__email__ = \"weslley.dasilvapereira@nrel.gov\"\n", "__credits__ = [\"Weslley S. Pereira\"]\n", - "__version__ = \"0.3.3\"\n", + "__version__ = \"0.4.0\"\n", "__deprecated__ = False" ] }, diff --git a/examples/single_obj_rbf/LocalStochRBFstop.py b/examples/single_obj_rbf/LocalStochRBFstop.py index 438914e..d6d3fde 100644 --- a/examples/single_obj_rbf/LocalStochRBFstop.py +++ b/examples/single_obj_rbf/LocalStochRBFstop.py @@ -26,7 +26,7 @@ "Haoyu Jia", "Weslley S. Pereira", ] -__version__ = "0.3.3" +__version__ = "0.4.0" __deprecated__ = False from optprogram1 import read_check_data_file diff --git a/examples/single_obj_rbf/compareLearningStrategies.py b/examples/single_obj_rbf/compareLearningStrategies.py index ad56558..7177b69 100644 --- a/examples/single_obj_rbf/compareLearningStrategies.py +++ b/examples/single_obj_rbf/compareLearningStrategies.py @@ -20,7 +20,7 @@ __maintainer__ = "Weslley S. Pereira" __email__ = "weslley.dasilvapereira@nrel.gov" __credits__ = ["Weslley S. Pereira"] -__version__ = "0.3.3" +__version__ = "0.4.0" __deprecated__ = False diff --git a/examples/single_obj_rbf/data.py b/examples/single_obj_rbf/data.py index a707a82..6da3f00 100644 --- a/examples/single_obj_rbf/data.py +++ b/examples/single_obj_rbf/data.py @@ -26,7 +26,7 @@ "Haoyu Jia", "Weslley S. Pereira", ] -__version__ = "0.3.3" +__version__ = "0.4.0" __deprecated__ = False from dataclasses import dataclass diff --git a/examples/single_obj_rbf/datainput_Branin.py b/examples/single_obj_rbf/datainput_Branin.py index 52465f7..5ad5bf4 100644 --- a/examples/single_obj_rbf/datainput_Branin.py +++ b/examples/single_obj_rbf/datainput_Branin.py @@ -26,7 +26,7 @@ "Haoyu Jia", "Weslley S. Pereira", ] -__version__ = "0.3.3" +__version__ = "0.4.0" __deprecated__ = False import numpy as np diff --git a/examples/single_obj_rbf/datainput_BraninWithInteger.py b/examples/single_obj_rbf/datainput_BraninWithInteger.py index a8e9566..0eec731 100644 --- a/examples/single_obj_rbf/datainput_BraninWithInteger.py +++ b/examples/single_obj_rbf/datainput_BraninWithInteger.py @@ -26,7 +26,7 @@ "Haoyu Jia", "Weslley S. Pereira", ] -__version__ = "0.3.3" +__version__ = "0.4.0" __deprecated__ = False import numpy as np diff --git a/examples/single_obj_rbf/datainput_hartman3.py b/examples/single_obj_rbf/datainput_hartman3.py index bcfbd69..d2c810c 100644 --- a/examples/single_obj_rbf/datainput_hartman3.py +++ b/examples/single_obj_rbf/datainput_hartman3.py @@ -26,7 +26,7 @@ "Haoyu Jia", "Weslley S. Pereira", ] -__version__ = "0.3.3" +__version__ = "0.4.0" __deprecated__ = False import numpy as np diff --git a/examples/single_obj_rbf/datainput_rastrigin.py b/examples/single_obj_rbf/datainput_rastrigin.py index d412a77..2757e68 100644 --- a/examples/single_obj_rbf/datainput_rastrigin.py +++ b/examples/single_obj_rbf/datainput_rastrigin.py @@ -26,7 +26,7 @@ "Haoyu Jia", "Weslley S. Pereira", ] -__version__ = "0.3.3" +__version__ = "0.4.0" __deprecated__ = False import numpy as np diff --git a/examples/single_obj_rbf/optprogram1.py b/examples/single_obj_rbf/optprogram1.py index f4cff76..3bfa7a9 100644 --- a/examples/single_obj_rbf/optprogram1.py +++ b/examples/single_obj_rbf/optprogram1.py @@ -31,7 +31,7 @@ "Haoyu Jia", "Weslley S. Pereira", ] -__version__ = "0.3.3" +__version__ = "0.4.0" __deprecated__ = False diff --git a/examples/vlse_benchmark/vlse_bench.ipynb b/examples/vlse_benchmark/vlse_bench.ipynb index 079a243..5691833 100644 --- a/examples/vlse_benchmark/vlse_bench.ipynb +++ b/examples/vlse_benchmark/vlse_bench.ipynb @@ -28,7 +28,7 @@ "__maintainer__ = \"Weslley S. Pereira\"\n", "__email__ = \"weslley.dasilvapereira@nrel.gov\"\n", "__credits__ = [\"Weslley S. Pereira\"]\n", - "__version__ = \"0.3.3\"\n", + "__version__ = \"0.4.0\"\n", "__deprecated__ = False" ] }, diff --git a/examples/vlse_benchmark/vlse_bench.py b/examples/vlse_benchmark/vlse_bench.py index 4975164..ed5393b 100644 --- a/examples/vlse_benchmark/vlse_bench.py +++ b/examples/vlse_benchmark/vlse_bench.py @@ -20,7 +20,7 @@ __maintainer__ = "Weslley S. Pereira" __email__ = "weslley.dasilvapereira@nrel.gov" __credits__ = ["Weslley S. Pereira"] -__version__ = "0.3.3" +__version__ = "0.4.0" __deprecated__ = False import os diff --git a/pyproject.toml b/pyproject.toml index a1eeebb..e46b238 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "blackboxopt" -version = "0.3.3" +version = "0.4.0" description = "Surrogate models and active learning for scientific applications" authors = [ {name = "Weslley da Silva Pereira", email = "weslley.dasilvapereira@nrel.gov"}, diff --git a/tests/test_optimize.py b/tests/test_optimize.py index 25cf5db..1e44cae 100644 --- a/tests/test_optimize.py +++ b/tests/test_optimize.py @@ -20,7 +20,7 @@ __maintainer__ = "Weslley S. Pereira" __email__ = "weslley.dasilvapereira@nrel.gov" __credits__ = ["Weslley S. Pereira"] -__version__ = "0.3.3" +__version__ = "0.4.0" __deprecated__ = False import numpy as np diff --git a/tests/test_rbf.py b/tests/test_rbf.py index 4a29c7e..1598080 100644 --- a/tests/test_rbf.py +++ b/tests/test_rbf.py @@ -20,7 +20,7 @@ __maintainer__ = "Weslley S. Pereira" __email__ = "weslley.dasilvapereira@nrel.gov" __credits__ = ["Weslley S. Pereira"] -__version__ = "0.3.3" +__version__ = "0.4.0" __deprecated__ = False import numpy as np diff --git a/tests/test_sampling.py b/tests/test_sampling.py index 5396232..dc84d25 100644 --- a/tests/test_sampling.py +++ b/tests/test_sampling.py @@ -20,7 +20,7 @@ __maintainer__ = "Weslley S. Pereira" __email__ = "weslley.dasilvapereira@nrel.gov" __credits__ = ["Weslley S. Pereira"] -__version__ = "0.3.3" +__version__ = "0.4.0" __deprecated__ = False import numpy as np diff --git a/tests/test_vlse_bench.py b/tests/test_vlse_bench.py index e759ba6..0ea3693 100644 --- a/tests/test_vlse_bench.py +++ b/tests/test_vlse_bench.py @@ -20,7 +20,7 @@ __maintainer__ = "Weslley S. Pereira" __email__ = "weslley.dasilvapereira@nrel.gov" __credits__ = ["Weslley S. Pereira"] -__version__ = "0.3.3" +__version__ = "0.4.0" __deprecated__ = False from copy import deepcopy diff --git a/tests/vlse_benchmark/__init__.py b/tests/vlse_benchmark/__init__.py index 733d72c..e7910b1 100644 --- a/tests/vlse_benchmark/__init__.py +++ b/tests/vlse_benchmark/__init__.py @@ -27,7 +27,7 @@ __maintainer__ = "Weslley S. Pereira" __email__ = "weslley.dasilvapereira@nrel.gov" __credits__ = ["Sonja Surjanovic", "Derek Bingham", "Weslley S. Pereira"] -__version__ = "0.3.3" +__version__ = "0.4.0" __deprecated__ = False from rpy2.robjects import r