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.

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

Рабочая начальная версия mco #179

Merged
merged 18 commits into from
Feb 20, 2024
Merged

Conversation

YaniKolt
Copy link
Contributor

No description provided.

from problems.mco_test1 import mco_test1
from problems.mco_test3 import mco_test3
from problems.mco_test5 import mco_test5
from problems.mco_test6 import mco_test6
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Лишние импорты надо везде убрать

@@ -0,0 +1,92 @@
from problems.mco_test1 import mco_test1
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  1. Лишние импорты надо везде убрать
  2. В чем отличие от mco_example?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Мне кажется это лучше в тесты переместить


super().__init__(parameters, task, evolvent, search_data, method, listeners)

self.number_of_lambdas = parameters.number_of_lambdas # int
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

int убрать

else:
self.start_lambdas = []
# else:
# self.start_lambdas = [[1.0 / task.problem.number_of_objectives] * task.problem.number_of_objectives]
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Почему комментарий?

self.method.min_delta = 1
self.current_num_lambda += 1
if self.current_num_lambda < self.number_of_lambdas:
self.current_lambdas = self.lambdas_list[self.current_num_lambda] # вообще излишне знать текущую, если знаем номер
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

комментарий о чем?


for i in range(self.task.problem.number_of_objectives):
point.function_values[number_of_constraints+i] = FunctionValue(FunctionType.OBJECTIV,
number_of_constraints+i)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Мы критерие не с 0 считали в индексном методе?
Если нет, то нужен рефакторинг

@@ -16,6 +18,26 @@ def calculate_functionals(self, point: SearchDataItem) -> SearchDataItem:
# Вычисляются ВСЕ критерии
# Добавить вычисление свертки

pass
number_of_constraints = self.task.problem.number_of_constraints
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Нужно этот калькулятор использовать в методе

:return: созданный метод
"""
if problem.number_of_objectives > 1:
# create_method вызывается до create_process... Временное решение: перезатирать task из MCOProcess
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Это вроде решили?

if parameters.number_of_parallel_points == 1:
if task.problem.number_of_objectives > 1:
# А если parameters.number_of_parallel_points > 1???
return MCOProcess(parameters=parameters, task=task, evolvent=evolvent,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Это следующий шаг

result: np.double = 0
x = point.float_variables

if function_value.functionID == 0: # OBJECTIV 1
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Видно что индекси с 0, я думмаю в методе ошибка

@kozinove
Copy link
Contributor

И еще момент
mco_example.py -> MCO_example.py

В файле убрать лишние импорты
Параметры задачи
# Формируем параметры решателя
params = SolverParameters(r=2.5, eps=0.01, iters_limit=16000, number_of_lambdas=50, start_lambdas=[[0, 1]], is_scaling=False)

В вашем примере было number_of_lambdas=1. Так мы границу не увидем. При желании iters_limit=16000 можно не увеличивать

@alvls alvls merged commit f0ffb22 into aimclub:mco Feb 20, 2024
alvls added a commit that referenced this pull request Mar 5, 2024
* Benchmarks (#165)

* add benchmarks

* fix readme

* fix readme

* bolt font for arguments

* Перевод комментариев в разделе iOpt на английский для документации (#164)

* Перевод комментариев в разделе iOpt на английский для документации

* Перевод комментариев в разделе iOpt на английский для документации (с исправлениями)

* Исправление замечаний по переводу комментов iOpt

* Исправление замечаний по переводу комментов iOpt (2)

* Перевод комментариев из раздела problems

* Update .readthedocs.yml for current requirements of Read the Docs

* Update .readthedocs.yml

* Update .readthedocs.yml

* Update conf.py for English language

* I supplemented the documentation with a paragraph about the work of the framework with the optimal selection of two real and one discrete parameters. Corrected the problem code for finding real and discrete parameters. (#167)

* Fixed a bug in the calculator destructor (#168)

* Fixed a bug in the calculator destructor

* Fixed problem with process pool destruction

* The design of the example is brought to a single sample

* Correct target score (#170)

* I supplemented the documentation with a paragraph about the work of the framework with the optimal selection of two real and one discrete parameters. Corrected the problem code for finding real and discrete parameters.

* correct target score

* Grid search (#169)

* Fixed a bug in the calculator destructor

* Fixed problem with process pool destruction

* The design of the example is brought to a single sample

* Added grid search

* Fixed search

* Corrected comments

* Fix problem with pool

* Removed unnecessary field

* Corrected comments

* Построение по сеткам известных точек + исправление багов (#172)

* add graph by points

* fix double axes bug

* add lines layers by points

---------

Co-authored-by: Marina Usova <usova@itmm.unn.com>

* Асинхронная параллельная схема (#166)

* async initial

* async up

* async second

* pep8

* pep8

* switch multiprocessing to multiprocess (part of pathos)

* revert gkls example

* revert requirements.txt

* move async implementation from async_parallel_process to async_calculator

* pep8

* redundant code removed

* test for async parallel process

* gkls async example
add multiprocess to requirements

* gkls async example

* async initial

* async up

* async second

* pep8

* pep8

* switch multiprocessing to multiprocess (part of pathos)

* revert gkls example

* revert requirements.txt

* move async implementation from async_parallel_process to async_calculator

* pep8

* redundant code removed

* test for async parallel process

* gkls async example
add multiprocess to requirements

* gkls async example

* semi-fix for iter-tasks

* Fixed test for asynchronous parallel circuit (#173)

* Fixed a bug in the calculator destructor

* Fixed problem with process pool destruction

* The design of the example is brought to a single sample

* Fixed test for asynchronous parallel circuit

* add characteristic in save progress (#176)

* add characteristic in save progress

* add sol time&accuracy

* Дополнение для сохранения в JSON (#177)

* add characteristic in save progress

* add sol time&accuracy

* add Task, Parameters and creation_time for sd_item in save_progress

* change save&load

* Update method.py

* meaningless change

* add _init_ in loadProgress

* The output of the optimal solution in problems with restrictions has … (#180)

* The output of the optimal solution in problems with restrictions has been corrected
Parallel index calculator is working properly

* Update Stronginc3_example.py

* Fix bug with original optimum using (#181)

* fix bug with original optimum using

* add var for number of constraints and fix objective function value

---------

Co-authored-by: Marina Usova <usova@itmm.unn.com>

* Corrected documentation of examples (#182)

* I supplemented the documentation with a paragraph about the work of the framework with the optimal selection of two real and one discrete parameters. Corrected the problem code for finding real and discrete parameters.

* correct target score

* Append new examples. Correct documentation

* Corrected documentation of examples

* The calculator is used in trial calculation

* Added work with the calculator

* Реализация решения задач MCO (#163)

* 1. Добавлены интерфейсы классов для многокритериальной оптимизации

* rename classes

* Рабочая начальная версия mco (#179)

* mco test problem & optim task

* mco test problem & optim task 2

* added mco_process, fixed convolution and added to mco to solverFactory

* mco test problem & optim task 3

* reverted optim task. shouldn't have touched in first place

* fixed bug

* mco test problem & optim task 4

* mco test problem & optim task 5

* mco test problem & optim task 6

* new problem&test, update method

* working ver

* mb work

* delete comment, add task, evolvent for init lambdas, other refac

* delete comment, add start_lambdas&is_scaling, add init_lambdas

* fix with comments

* fix with comments 1

---------

Co-authored-by: MADZEROPIE <ask_ii1@mail.ru>

* The calculator is used in trial calculation

* Added work with the calculator

* Corrected to match the updated interface

* Added example with MCO Test1

* Fixed calculator factory

---------

Co-authored-by: dyonichhh <36537172+RodionovDenis@users.noreply.github.com>
Co-authored-by: Anton A. Shtanyuk <ashtanyuk@gmail.com>
Co-authored-by: Alexander Sysoyev <sysoyev@vmk.unn.ru>
Co-authored-by: Karchkov Denis <karchkov.denis@mail.ru>
Co-authored-by: UsovaMA <oppabang@mail.ru>
Co-authored-by: Marina Usova <usova@itmm.unn.com>
Co-authored-by: oleg-w570 <73493289+oleg-w570@users.noreply.github.com>
Co-authored-by: Yanina Kolt <43132462+YaniKolt@users.noreply.github.com>
Co-authored-by: kozinove <evgeniy.kozinov@gmail.com>
Co-authored-by: MADZEROPIE <ask_ii1@mail.ru>
alvls added a commit that referenced this pull request Apr 11, 2024
* Benchmarks (#165)

* add benchmarks

* fix readme

* fix readme

* bolt font for arguments

* Перевод комментариев в разделе iOpt на английский для документации (#164)

* Перевод комментариев в разделе iOpt на английский для документации

* Перевод комментариев в разделе iOpt на английский для документации (с исправлениями)

* Исправление замечаний по переводу комментов iOpt

* Исправление замечаний по переводу комментов iOpt (2)

* Перевод комментариев из раздела problems

* Update .readthedocs.yml for current requirements of Read the Docs

* Update .readthedocs.yml

* Update .readthedocs.yml

* Update conf.py for English language

* I supplemented the documentation with a paragraph about the work of the framework with the optimal selection of two real and one discrete parameters. Corrected the problem code for finding real and discrete parameters. (#167)

* Fixed a bug in the calculator destructor (#168)

* Fixed a bug in the calculator destructor

* Fixed problem with process pool destruction

* The design of the example is brought to a single sample

* Correct target score (#170)

* I supplemented the documentation with a paragraph about the work of the framework with the optimal selection of two real and one discrete parameters. Corrected the problem code for finding real and discrete parameters.

* correct target score

* Grid search (#169)

* Fixed a bug in the calculator destructor

* Fixed problem with process pool destruction

* The design of the example is brought to a single sample

* Added grid search

* Fixed search

* Corrected comments

* Fix problem with pool

* Removed unnecessary field

* Corrected comments

* Построение по сеткам известных точек + исправление багов (#172)

* add graph by points

* fix double axes bug

* add lines layers by points

---------

Co-authored-by: Marina Usova <usova@itmm.unn.com>

* Асинхронная параллельная схема (#166)

* async initial

* async up

* async second

* pep8

* pep8

* switch multiprocessing to multiprocess (part of pathos)

* revert gkls example

* revert requirements.txt

* move async implementation from async_parallel_process to async_calculator

* pep8

* redundant code removed

* test for async parallel process

* gkls async example
add multiprocess to requirements

* gkls async example

* async initial

* async up

* async second

* pep8

* pep8

* switch multiprocessing to multiprocess (part of pathos)

* revert gkls example

* revert requirements.txt

* move async implementation from async_parallel_process to async_calculator

* pep8

* redundant code removed

* test for async parallel process

* gkls async example
add multiprocess to requirements

* gkls async example

* semi-fix for iter-tasks

* Fixed test for asynchronous parallel circuit (#173)

* Fixed a bug in the calculator destructor

* Fixed problem with process pool destruction

* The design of the example is brought to a single sample

* Fixed test for asynchronous parallel circuit

* add characteristic in save progress (#176)

* add characteristic in save progress

* add sol time&accuracy

* Дополнение для сохранения в JSON (#177)

* add characteristic in save progress

* add sol time&accuracy

* add Task, Parameters and creation_time for sd_item in save_progress

* change save&load

* Update method.py

* meaningless change

* add _init_ in loadProgress

* The output of the optimal solution in problems with restrictions has … (#180)

* The output of the optimal solution in problems with restrictions has been corrected
Parallel index calculator is working properly

* Update Stronginc3_example.py

* Fix bug with original optimum using (#181)

* fix bug with original optimum using

* add var for number of constraints and fix objective function value

---------

Co-authored-by: Marina Usova <usova@itmm.unn.com>

* Corrected documentation of examples (#182)

* I supplemented the documentation with a paragraph about the work of the framework with the optimal selection of two real and one discrete parameters. Corrected the problem code for finding real and discrete parameters.

* correct target score

* Append new examples. Correct documentation

* Corrected documentation of examples

* The calculator is used in trial calculation

* Added work with the calculator

* Реализация решения задач MCO (#163)

* 1. Добавлены интерфейсы классов для многокритериальной оптимизации

* rename classes

* Рабочая начальная версия mco (#179)

* mco test problem & optim task

* mco test problem & optim task 2

* added mco_process, fixed convolution and added to mco to solverFactory

* mco test problem & optim task 3

* reverted optim task. shouldn't have touched in first place

* fixed bug

* mco test problem & optim task 4

* mco test problem & optim task 5

* mco test problem & optim task 6

* new problem&test, update method

* working ver

* mb work

* delete comment, add task, evolvent for init lambdas, other refac

* delete comment, add start_lambdas&is_scaling, add init_lambdas

* fix with comments

* fix with comments 1

---------

Co-authored-by: MADZEROPIE <ask_ii1@mail.ru>

* The calculator is used in trial calculation

* Added work with the calculator

* Corrected to match the updated interface

* Added example with MCO Test1

* Fixed calculator factory

* Add mco breast cancer problem

* line end character changed

* Files moved

* Corrected comments

---------

Co-authored-by: dyonichhh <36537172+RodionovDenis@users.noreply.github.com>
Co-authored-by: Anton A. Shtanyuk <ashtanyuk@gmail.com>
Co-authored-by: Alexander Sysoyev <sysoyev@vmk.unn.ru>
Co-authored-by: Karchkov Denis <karchkov.denis@mail.ru>
Co-authored-by: UsovaMA <oppabang@mail.ru>
Co-authored-by: Marina Usova <usova@itmm.unn.com>
Co-authored-by: oleg-w570 <73493289+oleg-w570@users.noreply.github.com>
Co-authored-by: Yanina Kolt <43132462+YaniKolt@users.noreply.github.com>
Co-authored-by: kozinove <evgeniy.kozinov@gmail.com>
Co-authored-by: MADZEROPIE <ask_ii1@mail.ru>
alvls added a commit that referenced this pull request May 8, 2024
* Реализация решения задач MCO (#163)

* 1. Добавлены интерфейсы классов для многокритериальной оптимизации

* rename classes

* Рабочая начальная версия mco (#179)

* mco test problem & optim task

* mco test problem & optim task 2

* added mco_process, fixed convolution and added to mco to solverFactory

* mco test problem & optim task 3

* reverted optim task. shouldn't have touched in first place

* fixed bug

* mco test problem & optim task 4

* mco test problem & optim task 5

* mco test problem & optim task 6

* new problem&test, update method

* working ver

* mb work

* delete comment, add task, evolvent for init lambdas, other refac

* delete comment, add start_lambdas&is_scaling, add init_lambdas

* fix with comments

* fix with comments 1

---------

Co-authored-by: MADZEROPIE <ask_ii1@mail.ru>

* MCO rebase to main (#183)

* Benchmarks (#165)

* add benchmarks

* fix readme

* fix readme

* bolt font for arguments

* Перевод комментариев в разделе iOpt на английский для документации (#164)

* Перевод комментариев в разделе iOpt на английский для документации

* Перевод комментариев в разделе iOpt на английский для документации (с исправлениями)

* Исправление замечаний по переводу комментов iOpt

* Исправление замечаний по переводу комментов iOpt (2)

* Перевод комментариев из раздела problems

* Update .readthedocs.yml for current requirements of Read the Docs

* Update .readthedocs.yml

* Update .readthedocs.yml

* Update conf.py for English language

* I supplemented the documentation with a paragraph about the work of the framework with the optimal selection of two real and one discrete parameters. Corrected the problem code for finding real and discrete parameters. (#167)

* Fixed a bug in the calculator destructor (#168)

* Fixed a bug in the calculator destructor

* Fixed problem with process pool destruction

* The design of the example is brought to a single sample

* Correct target score (#170)

* I supplemented the documentation with a paragraph about the work of the framework with the optimal selection of two real and one discrete parameters. Corrected the problem code for finding real and discrete parameters.

* correct target score

* Grid search (#169)

* Fixed a bug in the calculator destructor

* Fixed problem with process pool destruction

* The design of the example is brought to a single sample

* Added grid search

* Fixed search

* Corrected comments

* Fix problem with pool

* Removed unnecessary field

* Corrected comments

* Построение по сеткам известных точек + исправление багов (#172)

* add graph by points

* fix double axes bug

* add lines layers by points

---------

Co-authored-by: Marina Usova <usova@itmm.unn.com>

* Асинхронная параллельная схема (#166)

* async initial

* async up

* async second

* pep8

* pep8

* switch multiprocessing to multiprocess (part of pathos)

* revert gkls example

* revert requirements.txt

* move async implementation from async_parallel_process to async_calculator

* pep8

* redundant code removed

* test for async parallel process

* gkls async example
add multiprocess to requirements

* gkls async example

* async initial

* async up

* async second

* pep8

* pep8

* switch multiprocessing to multiprocess (part of pathos)

* revert gkls example

* revert requirements.txt

* move async implementation from async_parallel_process to async_calculator

* pep8

* redundant code removed

* test for async parallel process

* gkls async example
add multiprocess to requirements

* gkls async example

* semi-fix for iter-tasks

* Fixed test for asynchronous parallel circuit (#173)

* Fixed a bug in the calculator destructor

* Fixed problem with process pool destruction

* The design of the example is brought to a single sample

* Fixed test for asynchronous parallel circuit

* add characteristic in save progress (#176)

* add characteristic in save progress

* add sol time&accuracy

* Дополнение для сохранения в JSON (#177)

* add characteristic in save progress

* add sol time&accuracy

* add Task, Parameters and creation_time for sd_item in save_progress

* change save&load

* Update method.py

* meaningless change

* add _init_ in loadProgress

* The output of the optimal solution in problems with restrictions has … (#180)

* The output of the optimal solution in problems with restrictions has been corrected
Parallel index calculator is working properly

* Update Stronginc3_example.py

* Fix bug with original optimum using (#181)

* fix bug with original optimum using

* add var for number of constraints and fix objective function value

---------

Co-authored-by: Marina Usova <usova@itmm.unn.com>

* Corrected documentation of examples (#182)

* I supplemented the documentation with a paragraph about the work of the framework with the optimal selection of two real and one discrete parameters. Corrected the problem code for finding real and discrete parameters.

* correct target score

* Append new examples. Correct documentation

* Corrected documentation of examples

* The calculator is used in trial calculation

* Added work with the calculator

* Реализация решения задач MCO (#163)

* 1. Добавлены интерфейсы классов для многокритериальной оптимизации

* rename classes

* Рабочая начальная версия mco (#179)

* mco test problem & optim task

* mco test problem & optim task 2

* added mco_process, fixed convolution and added to mco to solverFactory

* mco test problem & optim task 3

* reverted optim task. shouldn't have touched in first place

* fixed bug

* mco test problem & optim task 4

* mco test problem & optim task 5

* mco test problem & optim task 6

* new problem&test, update method

* working ver

* mb work

* delete comment, add task, evolvent for init lambdas, other refac

* delete comment, add start_lambdas&is_scaling, add init_lambdas

* fix with comments

* fix with comments 1

---------

Co-authored-by: MADZEROPIE <ask_ii1@mail.ru>

* The calculator is used in trial calculation

* Added work with the calculator

* Corrected to match the updated interface

* Added example with MCO Test1

* Fixed calculator factory

---------

Co-authored-by: dyonichhh <36537172+RodionovDenis@users.noreply.github.com>
Co-authored-by: Anton A. Shtanyuk <ashtanyuk@gmail.com>
Co-authored-by: Alexander Sysoyev <sysoyev@vmk.unn.ru>
Co-authored-by: Karchkov Denis <karchkov.denis@mail.ru>
Co-authored-by: UsovaMA <oppabang@mail.ru>
Co-authored-by: Marina Usova <usova@itmm.unn.com>
Co-authored-by: oleg-w570 <73493289+oleg-w570@users.noreply.github.com>
Co-authored-by: Yanina Kolt <43132462+YaniKolt@users.noreply.github.com>
Co-authored-by: kozinove <evgeniy.kozinov@gmail.com>
Co-authored-by: MADZEROPIE <ask_ii1@mail.ru>

* Mco (#186)

* Added support for parallel computing
mco_process.py -> mco_method_many_lambdas.py

* fix tests

* Исправлена асинхронная схема

* fix comments

* fix comment

* fix comment

* Add mco breast cancer problem (#187)

* Benchmarks (#165)

* add benchmarks

* fix readme

* fix readme

* bolt font for arguments

* Перевод комментариев в разделе iOpt на английский для документации (#164)

* Перевод комментариев в разделе iOpt на английский для документации

* Перевод комментариев в разделе iOpt на английский для документации (с исправлениями)

* Исправление замечаний по переводу комментов iOpt

* Исправление замечаний по переводу комментов iOpt (2)

* Перевод комментариев из раздела problems

* Update .readthedocs.yml for current requirements of Read the Docs

* Update .readthedocs.yml

* Update .readthedocs.yml

* Update conf.py for English language

* I supplemented the documentation with a paragraph about the work of the framework with the optimal selection of two real and one discrete parameters. Corrected the problem code for finding real and discrete parameters. (#167)

* Fixed a bug in the calculator destructor (#168)

* Fixed a bug in the calculator destructor

* Fixed problem with process pool destruction

* The design of the example is brought to a single sample

* Correct target score (#170)

* I supplemented the documentation with a paragraph about the work of the framework with the optimal selection of two real and one discrete parameters. Corrected the problem code for finding real and discrete parameters.

* correct target score

* Grid search (#169)

* Fixed a bug in the calculator destructor

* Fixed problem with process pool destruction

* The design of the example is brought to a single sample

* Added grid search

* Fixed search

* Corrected comments

* Fix problem with pool

* Removed unnecessary field

* Corrected comments

* Построение по сеткам известных точек + исправление багов (#172)

* add graph by points

* fix double axes bug

* add lines layers by points

---------

Co-authored-by: Marina Usova <usova@itmm.unn.com>

* Асинхронная параллельная схема (#166)

* async initial

* async up

* async second

* pep8

* pep8

* switch multiprocessing to multiprocess (part of pathos)

* revert gkls example

* revert requirements.txt

* move async implementation from async_parallel_process to async_calculator

* pep8

* redundant code removed

* test for async parallel process

* gkls async example
add multiprocess to requirements

* gkls async example

* async initial

* async up

* async second

* pep8

* pep8

* switch multiprocessing to multiprocess (part of pathos)

* revert gkls example

* revert requirements.txt

* move async implementation from async_parallel_process to async_calculator

* pep8

* redundant code removed

* test for async parallel process

* gkls async example
add multiprocess to requirements

* gkls async example

* semi-fix for iter-tasks

* Fixed test for asynchronous parallel circuit (#173)

* Fixed a bug in the calculator destructor

* Fixed problem with process pool destruction

* The design of the example is brought to a single sample

* Fixed test for asynchronous parallel circuit

* add characteristic in save progress (#176)

* add characteristic in save progress

* add sol time&accuracy

* Дополнение для сохранения в JSON (#177)

* add characteristic in save progress

* add sol time&accuracy

* add Task, Parameters and creation_time for sd_item in save_progress

* change save&load

* Update method.py

* meaningless change

* add _init_ in loadProgress

* The output of the optimal solution in problems with restrictions has … (#180)

* The output of the optimal solution in problems with restrictions has been corrected
Parallel index calculator is working properly

* Update Stronginc3_example.py

* Fix bug with original optimum using (#181)

* fix bug with original optimum using

* add var for number of constraints and fix objective function value

---------

Co-authored-by: Marina Usova <usova@itmm.unn.com>

* Corrected documentation of examples (#182)

* I supplemented the documentation with a paragraph about the work of the framework with the optimal selection of two real and one discrete parameters. Corrected the problem code for finding real and discrete parameters.

* correct target score

* Append new examples. Correct documentation

* Corrected documentation of examples

* The calculator is used in trial calculation

* Added work with the calculator

* Реализация решения задач MCO (#163)

* 1. Добавлены интерфейсы классов для многокритериальной оптимизации

* rename classes

* Рабочая начальная версия mco (#179)

* mco test problem & optim task

* mco test problem & optim task 2

* added mco_process, fixed convolution and added to mco to solverFactory

* mco test problem & optim task 3

* reverted optim task. shouldn't have touched in first place

* fixed bug

* mco test problem & optim task 4

* mco test problem & optim task 5

* mco test problem & optim task 6

* new problem&test, update method

* working ver

* mb work

* delete comment, add task, evolvent for init lambdas, other refac

* delete comment, add start_lambdas&is_scaling, add init_lambdas

* fix with comments

* fix with comments 1

---------

Co-authored-by: MADZEROPIE <ask_ii1@mail.ru>

* The calculator is used in trial calculation

* Added work with the calculator

* Corrected to match the updated interface

* Added example with MCO Test1

* Fixed calculator factory

* Add mco breast cancer problem

* line end character changed

* Files moved

* Corrected comments

---------

Co-authored-by: dyonichhh <36537172+RodionovDenis@users.noreply.github.com>
Co-authored-by: Anton A. Shtanyuk <ashtanyuk@gmail.com>
Co-authored-by: Alexander Sysoyev <sysoyev@vmk.unn.ru>
Co-authored-by: Karchkov Denis <karchkov.denis@mail.ru>
Co-authored-by: UsovaMA <oppabang@mail.ru>
Co-authored-by: Marina Usova <usova@itmm.unn.com>
Co-authored-by: oleg-w570 <73493289+oleg-w570@users.noreply.github.com>
Co-authored-by: Yanina Kolt <43132462+YaniKolt@users.noreply.github.com>
Co-authored-by: kozinove <evgeniy.kozinov@gmail.com>
Co-authored-by: MADZEROPIE <ask_ii1@mail.ru>

* Реализация решения задач MCO (#163)

* 1. Добавлены интерфейсы классов для многокритериальной оптимизации

* rename classes

* Рабочая начальная версия mco (#179)

* mco test problem & optim task

* mco test problem & optim task 2

* added mco_process, fixed convolution and added to mco to solverFactory

* mco test problem & optim task 3

* reverted optim task. shouldn't have touched in first place

* fixed bug

* mco test problem & optim task 4

* mco test problem & optim task 5

* mco test problem & optim task 6

* new problem&test, update method

* working ver

* mb work

* delete comment, add task, evolvent for init lambdas, other refac

* delete comment, add start_lambdas&is_scaling, add init_lambdas

* fix with comments

* fix with comments 1

---------

Co-authored-by: MADZEROPIE <ask_ii1@mail.ru>

* MCO rebase to main (#183)

* Benchmarks (#165)

* add benchmarks

* fix readme

* fix readme

* bolt font for arguments

* Перевод комментариев в разделе iOpt на английский для документации (#164)

* Перевод комментариев в разделе iOpt на английский для документации

* Перевод комментариев в разделе iOpt на английский для документации (с исправлениями)

* Исправление замечаний по переводу комментов iOpt

* Исправление замечаний по переводу комментов iOpt (2)

* Перевод комментариев из раздела problems

* Update .readthedocs.yml for current requirements of Read the Docs

* Update .readthedocs.yml

* Update .readthedocs.yml

* Update conf.py for English language

* I supplemented the documentation with a paragraph about the work of the framework with the optimal selection of two real and one discrete parameters. Corrected the problem code for finding real and discrete parameters. (#167)

* Fixed a bug in the calculator destructor (#168)

* Fixed a bug in the calculator destructor

* Fixed problem with process pool destruction

* The design of the example is brought to a single sample

* Correct target score (#170)

* I supplemented the documentation with a paragraph about the work of the framework with the optimal selection of two real and one discrete parameters. Corrected the problem code for finding real and discrete parameters.

* correct target score

* Grid search (#169)

* Fixed a bug in the calculator destructor

* Fixed problem with process pool destruction

* The design of the example is brought to a single sample

* Added grid search

* Fixed search

* Corrected comments

* Fix problem with pool

* Removed unnecessary field

* Corrected comments

* Построение по сеткам известных точек + исправление багов (#172)

* add graph by points

* fix double axes bug

* add lines layers by points

---------

Co-authored-by: Marina Usova <usova@itmm.unn.com>

* Асинхронная параллельная схема (#166)

* async initial

* async up

* async second

* pep8

* pep8

* switch multiprocessing to multiprocess (part of pathos)

* revert gkls example

* revert requirements.txt

* move async implementation from async_parallel_process to async_calculator

* pep8

* redundant code removed

* test for async parallel process

* gkls async example
add multiprocess to requirements

* gkls async example

* async initial

* async up

* async second

* pep8

* pep8

* switch multiprocessing to multiprocess (part of pathos)

* revert gkls example

* revert requirements.txt

* move async implementation from async_parallel_process to async_calculator

* pep8

* redundant code removed

* test for async parallel process

* gkls async example
add multiprocess to requirements

* gkls async example

* semi-fix for iter-tasks

* Fixed test for asynchronous parallel circuit (#173)

* Fixed a bug in the calculator destructor

* Fixed problem with process pool destruction

* The design of the example is brought to a single sample

* Fixed test for asynchronous parallel circuit

* add characteristic in save progress (#176)

* add characteristic in save progress

* add sol time&accuracy

* Дополнение для сохранения в JSON (#177)

* add characteristic in save progress

* add sol time&accuracy

* add Task, Parameters and creation_time for sd_item in save_progress

* change save&load

* Update method.py

* meaningless change

* add _init_ in loadProgress

* The output of the optimal solution in problems with restrictions has … (#180)

* The output of the optimal solution in problems with restrictions has been corrected
Parallel index calculator is working properly

* Update Stronginc3_example.py

* Fix bug with original optimum using (#181)

* fix bug with original optimum using

* add var for number of constraints and fix objective function value

---------

Co-authored-by: Marina Usova <usova@itmm.unn.com>

* Corrected documentation of examples (#182)

* I supplemented the documentation with a paragraph about the work of the framework with the optimal selection of two real and one discrete parameters. Corrected the problem code for finding real and discrete parameters.

* correct target score

* Append new examples. Correct documentation

* Corrected documentation of examples

* The calculator is used in trial calculation

* Added work with the calculator

* Реализация решения задач MCO (#163)

* 1. Добавлены интерфейсы классов для многокритериальной оптимизации

* rename classes

* Рабочая начальная версия mco (#179)

* mco test problem & optim task

* mco test problem & optim task 2

* added mco_process, fixed convolution and added to mco to solverFactory

* mco test problem & optim task 3

* reverted optim task. shouldn't have touched in first place

* fixed bug

* mco test problem & optim task 4

* mco test problem & optim task 5

* mco test problem & optim task 6

* new problem&test, update method

* working ver

* mb work

* delete comment, add task, evolvent for init lambdas, other refac

* delete comment, add start_lambdas&is_scaling, add init_lambdas

* fix with comments

* fix with comments 1

---------

Co-authored-by: MADZEROPIE <ask_ii1@mail.ru>

* The calculator is used in trial calculation

* Added work with the calculator

* Corrected to match the updated interface

* Added example with MCO Test1

* Fixed calculator factory

---------

Co-authored-by: dyonichhh <36537172+RodionovDenis@users.noreply.github.com>
Co-authored-by: Anton A. Shtanyuk <ashtanyuk@gmail.com>
Co-authored-by: Alexander Sysoyev <sysoyev@vmk.unn.ru>
Co-authored-by: Karchkov Denis <karchkov.denis@mail.ru>
Co-authored-by: UsovaMA <oppabang@mail.ru>
Co-authored-by: Marina Usova <usova@itmm.unn.com>
Co-authored-by: oleg-w570 <73493289+oleg-w570@users.noreply.github.com>
Co-authored-by: Yanina Kolt <43132462+YaniKolt@users.noreply.github.com>
Co-authored-by: kozinove <evgeniy.kozinov@gmail.com>
Co-authored-by: MADZEROPIE <ask_ii1@mail.ru>

* Mco (#186)

* Added support for parallel computing
mco_process.py -> mco_method_many_lambdas.py

* fix tests

* Исправлена асинхронная схема

* fix comments

* fix comment

* fix comment

* Add mco breast cancer problem (#187)

* Benchmarks (#165)

* add benchmarks

* fix readme

* fix readme

* bolt font for arguments

* Перевод комментариев в разделе iOpt на английский для документации (#164)

* Перевод комментариев в разделе iOpt на английский для документации

* Перевод комментариев в разделе iOpt на английский для документации (с исправлениями)

* Исправление замечаний по переводу комментов iOpt

* Исправление замечаний по переводу комментов iOpt (2)

* Перевод комментариев из раздела problems

* Update .readthedocs.yml for current requirements of Read the Docs

* Update .readthedocs.yml

* Update .readthedocs.yml

* Update conf.py for English language

* I supplemented the documentation with a paragraph about the work of the framework with the optimal selection of two real and one discrete parameters. Corrected the problem code for finding real and discrete parameters. (#167)

* Fixed a bug in the calculator destructor (#168)

* Fixed a bug in the calculator destructor

* Fixed problem with process pool destruction

* The design of the example is brought to a single sample

* Correct target score (#170)

* I supplemented the documentation with a paragraph about the work of the framework with the optimal selection of two real and one discrete parameters. Corrected the problem code for finding real and discrete parameters.

* correct target score

* Grid search (#169)

* Fixed a bug in the calculator destructor

* Fixed problem with process pool destruction

* The design of the example is brought to a single sample

* Added grid search

* Fixed search

* Corrected comments

* Fix problem with pool

* Removed unnecessary field

* Corrected comments

* Построение по сеткам известных точек + исправление багов (#172)

* add graph by points

* fix double axes bug

* add lines layers by points

---------

Co-authored-by: Marina Usova <usova@itmm.unn.com>

* Асинхронная параллельная схема (#166)

* async initial

* async up

* async second

* pep8

* pep8

* switch multiprocessing to multiprocess (part of pathos)

* revert gkls example

* revert requirements.txt

* move async implementation from async_parallel_process to async_calculator

* pep8

* redundant code removed

* test for async parallel process

* gkls async example
add multiprocess to requirements

* gkls async example

* async initial

* async up

* async second

* pep8

* pep8

* switch multiprocessing to multiprocess (part of pathos)

* revert gkls example

* revert requirements.txt

* move async implementation from async_parallel_process to async_calculator

* pep8

* redundant code removed

* test for async parallel process

* gkls async example
add multiprocess to requirements

* gkls async example

* semi-fix for iter-tasks

* Fixed test for asynchronous parallel circuit (#173)

* Fixed a bug in the calculator destructor

* Fixed problem with process pool destruction

* The design of the example is brought to a single sample

* Fixed test for asynchronous parallel circuit

* add characteristic in save progress (#176)

* add characteristic in save progress

* add sol time&accuracy

* Дополнение для сохранения в JSON (#177)

* add characteristic in save progress

* add sol time&accuracy

* add Task, Parameters and creation_time for sd_item in save_progress

* change save&load

* Update method.py

* meaningless change

* add _init_ in loadProgress

* The output of the optimal solution in problems with restrictions has … (#180)

* The output of the optimal solution in problems with restrictions has been corrected
Parallel index calculator is working properly

* Update Stronginc3_example.py

* Fix bug with original optimum using (#181)

* fix bug with original optimum using

* add var for number of constraints and fix objective function value

---------

Co-authored-by: Marina Usova <usova@itmm.unn.com>

* Corrected documentation of examples (#182)

* I supplemented the documentation with a paragraph about the work of the framework with the optimal selection of two real and one discrete parameters. Corrected the problem code for finding real and discrete parameters.

* correct target score

* Append new examples. Correct documentation

* Corrected documentation of examples

* The calculator is used in trial calculation

* Added work with the calculator

* Реализация решения задач MCO (#163)

* 1. Добавлены интерфейсы классов для многокритериальной оптимизации

* rename classes

* Рабочая начальная версия mco (#179)

* mco test problem & optim task

* mco test problem & optim task 2

* added mco_process, fixed convolution and added to mco to solverFactory

* mco test problem & optim task 3

* reverted optim task. shouldn't have touched in first place

* fixed bug

* mco test problem & optim task 4

* mco test problem & optim task 5

* mco test problem & optim task 6

* new problem&test, update method

* working ver

* mb work

* delete comment, add task, evolvent for init lambdas, other refac

* delete comment, add start_lambdas&is_scaling, add init_lambdas

* fix with comments

* fix with comments 1

---------

Co-authored-by: MADZEROPIE <ask_ii1@mail.ru>

* The calculator is used in trial calculation

* Added work with the calculator

* Corrected to match the updated interface

* Added example with MCO Test1

* Fixed calculator factory

* Add mco breast cancer problem

* line end character changed

* Files moved

* Corrected comments

---------

Co-authored-by: dyonichhh <36537172+RodionovDenis@users.noreply.github.com>
Co-authored-by: Anton A. Shtanyuk <ashtanyuk@gmail.com>
Co-authored-by: Alexander Sysoyev <sysoyev@vmk.unn.ru>
Co-authored-by: Karchkov Denis <karchkov.denis@mail.ru>
Co-authored-by: UsovaMA <oppabang@mail.ru>
Co-authored-by: Marina Usova <usova@itmm.unn.com>
Co-authored-by: oleg-w570 <73493289+oleg-w570@users.noreply.github.com>
Co-authored-by: Yanina Kolt <43132462+YaniKolt@users.noreply.github.com>
Co-authored-by: kozinove <evgeniy.kozinov@gmail.com>
Co-authored-by: MADZEROPIE <ask_ii1@mail.ru>

* Corrected design

* Fixed a bug in task connection

* Fixed examples of optimizing the launch of a genetic algorithm

* Corrected comments

* Corrected design

* Corrected comments

---------

Co-authored-by: kozinove <evgeniy.kozinov@gmail.com>
Co-authored-by: Yanina Kolt <43132462+YaniKolt@users.noreply.github.com>
Co-authored-by: MADZEROPIE <ask_ii1@mail.ru>
Co-authored-by: dyonichhh <36537172+RodionovDenis@users.noreply.github.com>
Co-authored-by: Anton A. Shtanyuk <ashtanyuk@gmail.com>
Co-authored-by: Alexander Sysoyev <sysoyev@vmk.unn.ru>
Co-authored-by: Karchkov Denis <karchkov.denis@mail.ru>
Co-authored-by: UsovaMA <oppabang@mail.ru>
Co-authored-by: Marina Usova <usova@itmm.unn.com>
Co-authored-by: oleg-w570 <73493289+oleg-w570@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants