-
Notifications
You must be signed in to change notification settings - Fork 24
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 #190
Mco #190
Conversation
* 1. Добавлены интерфейсы классов для многокритериальной оптимизации * rename classes
* 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>
* 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>
* 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>
* 1. Добавлены интерфейсы классов для многокритериальной оптимизации * rename classes
* 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>
* 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>
* 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>
# Conflicts: # iOpt/method/method.py # setup.py
examples/MCO_Test1_example.py
Outdated
cfol = ConsoleOutputListener(mode='full') | ||
solver.add_listener(cfol) | ||
|
||
# Решение задачи |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Решаем задачу
examples/MCO_Test1_example.py
Outdated
# Решение задачи | ||
sol = solver.solve() | ||
|
||
# вывод множества Парето (координаты - значения функций) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Выводим множество Парето
examples/MCO_Test1_example.py
Outdated
for fvar, fval in zip(var, val): | ||
print(fvar, fval) | ||
|
||
# Точки для постороения графика множества Парето x[0]-x[1] |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Точки для построения
problems/mco_test1_1.py
Outdated
Вычисление значения выбранной функции в заданной точке. | ||
|
||
:param point: координаты точки испытания, в которой будет вычислено значение функции | ||
:param function_value: объект определяющий номер функции в задаче и хранящий значение функции |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
объект, определяющий
problems/mco_test3.py
Outdated
Вычисление значения выбранной функции в заданной точке. | ||
|
||
:param point: координаты точки испытания, в которой будет вычислено значение функции | ||
:param function_value: объект определяющий номер функции в задаче и хранящий значение функции |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
объект, определяющий
problems/mco_test5.py
Outdated
Вычисление значения выбранной функции в заданной точке. | ||
|
||
:param point: координаты точки испытания, в которой будет вычислено значение функции | ||
:param function_value: объект определяющий номер функции в задаче и хранящий значение функции |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
объект, определяющий
problems/mco_test6.py
Outdated
Вычисление значения выбранной функции в заданной точке. | ||
|
||
:param point: координаты точки испытания, в которой будет вычислено значение функции | ||
:param function_value: объект определяющий номер функции в задаче и хранящий значение функции |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
объект, определяющий
problems/mco_test7.py
Outdated
Вычисление значения выбранной функции в заданной точке. | ||
|
||
:param point: координаты точки испытания, в которой будет вычислено значение функции | ||
:param function_value: объект определяющий номер функции в задаче и хранящий значение функции |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
объект, определяющий
No description provided.