diff --git a/optimizerapi/optimizer.py b/optimizerapi/optimizer.py index 633778e..17e28fe 100644 --- a/optimizerapi/optimizer.py +++ b/optimizerapi/optimizer.py @@ -161,7 +161,7 @@ def __handle_run(body) -> dict: result = optimizer.tell(Xi, Yi) if n_objectives == 1 and len(result.models) > 0: if use_actual_measurement_histogram: - optimizer.add_modelled_noise() + optimizer.add_observational_noise() result = optimizer.get_result() result = [result] else: diff --git a/requirements-freeze.txt b/requirements-freeze.txt index fa661fd..f6c6c57 100644 --- a/requirements-freeze.txt +++ b/requirements-freeze.txt @@ -4,7 +4,7 @@ asgiref==3.6.0 async-timeout==4.0.2 attrs==23.1.0 black==23.3.0 -bokeh==3.1.1 +bokeh==2.4.3 certifi==2022.12.7 cffi==1.15.1 charset-normalizer==3.1.0 @@ -12,10 +12,9 @@ click==8.1.3 clickclick==20.10.2 colorama==0.4.6 connexion==2.14.2 -contourpy==1.1.1 cryptography==3.4.7 cycler==0.11.0 -deap==1.4.1 +deap==1.3.3 deprecation==2.1.0 docopt==0.6.2 ecdsa==0.18.0 @@ -29,7 +28,6 @@ httptools==0.5.0 httpx==0.23.3 idna==3.4 importlib-metadata==6.4.1 -importlib-resources==6.1.0 inflection==0.5.1 iniconfig==2.0.0 itsdangerous==2.1.2 @@ -39,17 +37,16 @@ json-tricks==3.15.5 jsonschema==4.15.0 kiwisolver==1.4.4 MarkupSafe==2.1.2 -matplotlib==3.7.2 +matplotlib==3.5.3 mccabe==0.7.0 mypy-extensions==1.0.0 -numpy==1.24.4 +numpy==1.23.3 packaging==23.1 -pandas==2.1.1 pathspec==0.11.1 Pillow==9.5.0 platformdirs==3.5.0 pluggy==0.13.1 -ProcessOptimizer[browniebee]==0.9.3 +ProcessOptimizer==0.9.5 py==1.11.0 py-swagger-ui==1.1.0 pyasn1==0.4.8 @@ -65,16 +62,15 @@ python-dotenv==1.0.0 python-jose==3.3.0 python-keycloak==2.13.2 python-multipart==0.0.6 -pytz==2023.3.post1 -PyYAML==6.0.1 +PyYAML==6.0 redis==4.5.4 requests==2.28.2 requests-toolbelt==0.10.1 rfc3986==1.5.0 rq==1.10.0 rsa==4.9 -scikit-learn==1.3.0 -scipy==1.10.1 +scikit-learn==1.1.2 +scipy==1.9.1 six==1.16.0 sniffio==1.3.0 starlette==0.25.0 @@ -82,9 +78,8 @@ swagger-ui-bundle==0.0.9 threadpoolctl==3.1.0 toml==0.10.2 tomli==2.0.1 -tornado==6.3.3 +tornado==6.2 typing_extensions==4.5.0 -tzdata==2023.3 urllib3==1.26.15 uvicorn==0.17.6 uvloop==0.17.0 @@ -93,5 +88,4 @@ watchdog==3.0.0 watchgod==0.8.2 websockets==11.0.2 Werkzeug==2.2.3 -xyzservices==2023.10.0 zipp==3.15.0 diff --git a/requirements.txt b/requirements.txt index 866a132..6cfcc5e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,9 +3,18 @@ connexion[swagger-ui] python-keycloak==2.13.2 Flask==2.2.3 Flask-Cors==3.0.10 -ProcessOptimizer[browniebee]==0.9.3 +ProcessOptimizer==0.9.5 json-tricks==3.15.5 jsonschema==4.15.0 cryptography==3.4.7 waitress==2.1.2 rq==1.10.0 +# ProcessOptimizer requirements +numpy==1.23.3 +matplotlib==3.5.3 +scipy==1.9.1 +bokeh==2.4.3 +scikit-learn==1.1.2 +six==1.16.0 +deap==1.3.3 +pyYAML==6.0