Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix display issue #20

Merged
merged 1 commit into from
Jun 21, 2024
Merged

Fix display issue #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Fix display issue
  • Loading branch information
@Ahmed-Bayoumy
Ahmed-Bayoumy committed Jun 21, 2024
commit 02d620bb1fec22b0119b22e3d25c87ca1c4420e1
2 changes: 1 addition & 1 deletion .github/workflows/win-build-and-pytest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
pip install flake8 pytest pytest-cov
pip install wheel
python setup.py sdist bdist_wheel
pip install dist/OMADS-2404.1-py3-none-any.whl
pip install dist/OMADS-2404.2-py3-none-any.whl
- name: Lint with flake8
run: |
# stop the build if there are Python syntax errors or undefined names
Expand Down
Binary file removed dist/OMADS-2404.1-py3-none-any.whl
View file
Open in desktop
Binary file not shown.
Binary file added dist/OMADS-2404.2-py3-none-any.whl
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[metadata]
name = OMADS
version = 2404.1
version = 2404.2
author = Ahmed H. Bayoumy
author_email = [email protected]
description = "Python package for DFO; an implementation of the mesh adaptive direct search (MADS)."
Expand Down
13 changes: 7 additions & 6 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,18 @@
name="OMADS",
author="Ahmed H. Bayoumy",
author_email="[email protected]",
version='2404.1',
version='2404.2',
packages=find_packages(include=['OMADS', 'OMADS.*']),
description="Mesh Adaptive Direct Search (MADS)",
install_requires=[
'samplersLib>=24.1.3',
'cocopp==2.6.3',
'NOBM==2404.1',
'numpy==1.23.2',
'pandas>=2.2.2',
'NOBM',
'numpy',
'pandas',
'setuptools>=58.1.0',
'pyDOE2==1.3.0',
'scipy==1.13.0'
'pyDOE2',
'scipy'

],
extras_require={
Expand All @@ -27,6 +27,7 @@
'Programming Language :: Python :: 3 :: Only',
'Programming Language :: Python :: 3.8',
'Programming Language :: Python :: 3.9',
'Programming Language :: Python :: 3.11',
'License :: OSI Approved :: GNU Lesser General Public License v3 (LGPLv3)',
'Intended Audience :: Developers',
"Operating System :: OS Independent",
Expand Down
23 changes: 23 additions & 0 deletions src/OMADS/Barriers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,26 @@
# ------------------------------------------------------------------------------------#
# Mesh Adaptive Direct Search - ORTHO-MADS (MADS) #
# #
# Author: Ahmed H. Bayoumy #
# email: [email protected] #
# #
# This program is free software: you can redistribute it and/or modify it under the #
# terms of the GNU Lesser General Public License as published by the Free Software #
# Foundation, either version 3 of the License, or (at your option) any later #
# version. #
# #
# This program is distributed in the hope that it will be useful, but WITHOUT ANY #
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A #
# PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. #
# #
# You should have received a copy of the GNU Lesser General Public License along #
# with this program. If not, see <https://www.gnu.org/licenses/>. #
# #
# You can find information on OMADS at #
# https://github.com/Ahmed-Bayoumy/OMADS #
# Copyright (C) 2022 Ahmed H. Bayoumy #
# ------------------------------------------------------------------------------------#

import copy
from dataclasses import dataclass, field
from typing import List
Expand Down
23 changes: 23 additions & 0 deletions src/OMADS/Directions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,26 @@
# ------------------------------------------------------------------------------------#
# Mesh Adaptive Direct Search - ORTHO-MADS (MADS) #
# #
# Author: Ahmed H. Bayoumy #
# email: [email protected] #
# #
# This program is free software: you can redistribute it and/or modify it under the #
# terms of the GNU Lesser General Public License as published by the Free Software #
# Foundation, either version 3 of the License, or (at your option) any later #
# version. #
# #
# This program is distributed in the hope that it will be useful, but WITHOUT ANY #
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A #
# PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. #
# #
# You should have received a copy of the GNU Lesser General Public License along #
# with this program. If not, see <https://www.gnu.org/licenses/>. #
# #
# You can find information on OMADS at #
# https://github.com/Ahmed-Bayoumy/OMADS #
# Copyright (C) 2022 Ahmed H. Bayoumy #
# ------------------------------------------------------------------------------------#

from .Point import Point
from .Barriers import *
from ._common import *
Expand Down
22 changes: 22 additions & 0 deletions src/OMADS/Exploration.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,25 @@
# ------------------------------------------------------------------------------------#
# Mesh Adaptive Direct Search - ORTHO-MADS (MADS) #
# #
# Author: Ahmed H. Bayoumy #
# email: [email protected] #
# #
# This program is free software: you can redistribute it and/or modify it under the #
# terms of the GNU Lesser General Public License as published by the Free Software #
# Foundation, either version 3 of the License, or (at your option) any later #
# version. #
# #
# This program is distributed in the hope that it will be useful, but WITHOUT ANY #
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A #
# PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. #
# #
# You should have received a copy of the GNU Lesser General Public License along #
# with this program. If not, see <https://www.gnu.org/licenses/>. #
# #
# You can find information on OMADS at #
# https://github.com/Ahmed-Bayoumy/OMADS #
# Copyright (C) 2022 Ahmed H. Bayoumy #
# ------------------------------------------------------------------------------------#

from .Point import Point
from .Barriers import Barrier
Expand Down
7 changes: 5 additions & 2 deletions src/OMADS/POLL.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,10 +232,13 @@ def main(*args) -> Dict[str, Any]:
if options.display:
print(" end of orthogonal MADS ")
if log is not None:
log.log_msg(msg=" end of orthogonal MADS " + args[1] + " in the internal BM suite.", msg_type=MSG_TYPE.INFO)
log.log_msg(msg=" end of orthogonal MADS ")
print(" Final objective value: " + str(poll.xmin.f) + ", hmin= " + str(poll.xmin.h))
if log is not None:
log.log_msg(msg=" Final objective value: " + args[1] + " in the internal BM suite.", msg_type=MSG_TYPE.INFO)
log.log_msg(msg=" Final objective value: " + str(poll.xmin.f) + ", hmin= " + str(poll.xmin.h), msg_type=MSG_TYPE.INFO)
if log is not None and isinstance(args[1], str):
log.log_msg(msg=" end of orthogonal MADS running" + args[1] + " in the internal BM suite.", msg_type=MSG_TYPE.INFO)


if options.save_coordinates:
post.output_coordinates(out)
Expand Down
23 changes: 23 additions & 0 deletions src/OMADS/Point.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,26 @@
# ------------------------------------------------------------------------------------#
# Mesh Adaptive Direct Search - ORTHO-MADS (MADS) #
# #
# Author: Ahmed H. Bayoumy #
# email: [email protected] #
# #
# This program is free software: you can redistribute it and/or modify it under the #
# terms of the GNU Lesser General Public License as published by the Free Software #
# Foundation, either version 3 of the License, or (at your option) any later #
# version. #
# #
# This program is distributed in the hope that it will be useful, but WITHOUT ANY #
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A #
# PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. #
# #
# You should have received a copy of the GNU Lesser General Public License along #
# with this program. If not, see <https://www.gnu.org/licenses/>. #
# #
# You can find information on OMADS at #
# https://github.com/Ahmed-Bayoumy/OMADS #
# Copyright (C) 2022 Ahmed H. Bayoumy #
# ------------------------------------------------------------------------------------#

import copy
from dataclasses import dataclass, field
from typing import List, Dict, Any, Optional
Expand Down
22 changes: 22 additions & 0 deletions src/OMADS/PreExploration.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,25 @@
# ------------------------------------------------------------------------------------#
# Mesh Adaptive Direct Search - ORTHO-MADS (MADS) #
# #
# Author: Ahmed H. Bayoumy #
# email: [email protected] #
# #
# This program is free software: you can redistribute it and/or modify it under the #
# terms of the GNU Lesser General Public License as published by the Free Software #
# Foundation, either version 3 of the License, or (at your option) any later #
# version. #
# #
# This program is distributed in the hope that it will be useful, but WITHOUT ANY #
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A #
# PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. #
# #
# You should have received a copy of the GNU Lesser General Public License along #
# with this program. If not, see <https://www.gnu.org/licenses/>. #
# #
# You can find information on OMADS at #
# https://github.com/Ahmed-Bayoumy/OMADS #
# Copyright (C) 2022 Ahmed H. Bayoumy #
# ------------------------------------------------------------------------------------#
from .Exploration import *
from typing import Callable

Expand Down
22 changes: 22 additions & 0 deletions src/OMADS/PrePoll.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,25 @@
# ------------------------------------------------------------------------------------#
# Mesh Adaptive Direct Search - ORTHO-MADS (MADS) #
# #
# Author: Ahmed H. Bayoumy #
# email: [email protected] #
# #
# This program is free software: you can redistribute it and/or modify it under the #
# terms of the GNU Lesser General Public License as published by the Free Software #
# Foundation, either version 3 of the License, or (at your option) any later #
# version. #
# #
# This program is distributed in the hope that it will be useful, but WITHOUT ANY #
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A #
# PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. #
# #
# You should have received a copy of the GNU Lesser General Public License along #
# with this program. If not, see <https://www.gnu.org/licenses/>. #
# #
# You can find information on OMADS at #
# https://github.com/Ahmed-Bayoumy/OMADS #
# Copyright (C) 2022 Ahmed H. Bayoumy #
# ------------------------------------------------------------------------------------#
from .Point import Point
from .Barriers import *
from ._common import *
Expand Down
28 changes: 22 additions & 6 deletions src/OMADS/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,25 @@
# from .POLL import DType, Options, Parameters, Evaluator, Point,\
# OrthoMesh, Cache, Dirs2n, PreMADS, Output, PostMADS, main

# __all__ = ['DType', 'Options', 'Parameters',
# 'Evaluator', 'Point', 'OrthoMesh', 'Cache',
# 'Dirs2n', 'PreMADS', 'Output', 'PostMADS', 'main']
# ------------------------------------------------------------------------------------#
# Mesh Adaptive Direct Search - ORTHO-MADS (MADS) #
# #
# Author: Ahmed H. Bayoumy #
# email: [email protected] #
# #
# This program is free software: you can redistribute it and/or modify it under the #
# terms of the GNU Lesser General Public License as published by the Free Software #
# Foundation, either version 3 of the License, or (at your option) any later #
# version. #
# #
# This program is distributed in the hope that it will be useful, but WITHOUT ANY #
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A #
# PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. #
# #
# You should have received a copy of the GNU Lesser General Public License along #
# with this program. If not, see <https://www.gnu.org/licenses/>. #
# #
# You can find information on OMADS at #
# https://github.com/Ahmed-Bayoumy/OMADS #
# Copyright (C) 2022 Ahmed H. Bayoumy #
# ------------------------------------------------------------------------------------#

from OMADS import POLL, MADS, SEARCH

Expand Down
23 changes: 23 additions & 0 deletions src/OMADS/_common.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,27 @@

# ------------------------------------------------------------------------------------#
# Mesh Adaptive Direct Search - ORTHO-MADS (MADS) #
# #
# Author: Ahmed H. Bayoumy #
# email: [email protected] #
# #
# This program is free software: you can redistribute it and/or modify it under the #
# terms of the GNU Lesser General Public License as published by the Free Software #
# Foundation, either version 3 of the License, or (at your option) any later #
# version. #
# #
# This program is distributed in the hope that it will be useful, but WITHOUT ANY #
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A #
# PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. #
# #
# You should have received a copy of the GNU Lesser General Public License along #
# with this program. If not, see <https://www.gnu.org/licenses/>. #
# #
# You can find information on OMADS at #
# https://github.com/Ahmed-Bayoumy/OMADS #
# Copyright (C) 2022 Ahmed H. Bayoumy #
# ------------------------------------------------------------------------------------#

from dataclasses import dataclass, field
import logging
import operator
Expand Down
Loading
Loading