* Bug 14734 fixed: [simulated_annealing] merged in [optimization] 90/21190/4
authorSamuel GOUGEON <sgougeon@free.fr>
Fri, 27 Dec 2019 19:18:57 +0000 (20:18 +0100)
committerClément DAVID <clement.david@esi-group.com>
Thu, 20 Feb 2020 12:51:48 +0000 (13:51 +0100)
commit95540016896cdc3f54c802db6eae6e71c53386ab
treefb500e95bb8a92198091336af1530a23e46bd58e
parent164f17fc9183a64d3ad8f3a468f8c84ce951b60c
* Bug 14734 fixed: [simulated_annealing] merged in [optimization]

  http://bugzilla.scilab.org/14734

Change-Id: I20d13e4db77b6752a045f6690474147ae775382d
123 files changed:
scilab/CHANGES.md
scilab/configure
scilab/configure.ac
scilab/etc/modules.xml.in
scilab/etc/modules.xml.vc
scilab/modules/Makefile.am
scilab/modules/Makefile.in
scilab/modules/helptools/etc/MAIN_CHAPTERS
scilab/modules/optimization/Makefile.am
scilab/modules/optimization/Makefile.in
scilab/modules/optimization/demos/annealing/Ising/init_ising2d.sci [moved from scilab/modules/simulated_annealing/demos/Ising/init_ising2d.sci with 100% similarity]
scilab/modules/optimization/demos/annealing/Ising/init_potts2d.sci [moved from scilab/modules/simulated_annealing/demos/Ising/init_potts2d.sci with 100% similarity]
scilab/modules/optimization/demos/annealing/Ising/ising2d.sci [moved from scilab/modules/simulated_annealing/demos/Ising/ising2d.sci with 100% similarity]
scilab/modules/optimization/demos/annealing/Ising/plot_ising2d.sci [moved from scilab/modules/simulated_annealing/demos/Ising/plot_ising2d.sci with 100% similarity]
scilab/modules/optimization/demos/annealing/Ising/plot_potts2d.sci [moved from scilab/modules/simulated_annealing/demos/Ising/plot_potts2d.sci with 100% similarity]
scilab/modules/optimization/demos/annealing/SAIsing2ddemo.sce [moved from scilab/modules/simulated_annealing/demos/SAIsing2ddemo.sce with 100% similarity]
scilab/modules/optimization/demos/annealing/SAdemo.sce [moved from scilab/modules/simulated_annealing/demos/SAdemo.sce with 100% similarity]
scilab/modules/optimization/demos/annealing/neigh_func_ising2d.sci [moved from scilab/modules/simulated_annealing/demos/neigh_func_ising2d.sci with 100% similarity]
scilab/modules/optimization/demos/annealing/simulated_annealing.dem.gateway.sce [moved from scilab/modules/simulated_annealing/demos/simulated_annealing.dem.gateway.sce with 81% similarity]
scilab/modules/optimization/demos/optimization.dem.gateway.sce
scilab/modules/optimization/etc/optimization.start
scilab/modules/optimization/help/en_US/annealing/CHAPTER [new file with mode: 0644]
scilab/modules/optimization/help/en_US/annealing/optim_sa.xml [moved from scilab/modules/simulated_annealing/help/en_US/optim_sa.xml with 100% similarity]
scilab/modules/optimization/help/en_US/annealing/utilities/CHAPTER [moved from scilab/modules/simulated_annealing/help/en_US/utilities/CHAPTER with 100% similarity]
scilab/modules/optimization/help/en_US/annealing/utilities/accept_func_default.xml [moved from scilab/modules/simulated_annealing/help/en_US/utilities/accept_func_default.xml with 100% similarity]
scilab/modules/optimization/help/en_US/annealing/utilities/accept_func_vfsa.xml [moved from scilab/modules/simulated_annealing/help/en_US/utilities/accept_func_vfsa.xml with 100% similarity]
scilab/modules/optimization/help/en_US/annealing/utilities/compute_initial_temp.xml [moved from scilab/modules/simulated_annealing/help/en_US/utilities/compute_initial_temp.xml with 100% similarity]
scilab/modules/optimization/help/en_US/annealing/utilities/neigh_func_csa.xml [moved from scilab/modules/simulated_annealing/help/en_US/utilities/neigh_func_csa.xml with 100% similarity]
scilab/modules/optimization/help/en_US/annealing/utilities/neigh_func_default.xml [moved from scilab/modules/simulated_annealing/help/en_US/utilities/neigh_func_default.xml with 100% similarity]
scilab/modules/optimization/help/en_US/annealing/utilities/neigh_func_fsa.xml [moved from scilab/modules/simulated_annealing/help/en_US/utilities/neigh_func_fsa.xml with 100% similarity]
scilab/modules/optimization/help/en_US/annealing/utilities/neigh_func_vfsa.xml [moved from scilab/modules/simulated_annealing/help/en_US/utilities/neigh_func_vfsa.xml with 100% similarity]
scilab/modules/optimization/help/en_US/annealing/utilities/temp_law_csa.xml [moved from scilab/modules/simulated_annealing/help/en_US/utilities/temp_law_csa.xml with 100% similarity]
scilab/modules/optimization/help/en_US/annealing/utilities/temp_law_default.xml [moved from scilab/modules/simulated_annealing/help/en_US/utilities/temp_law_default.xml with 100% similarity]
scilab/modules/optimization/help/en_US/annealing/utilities/temp_law_fsa.xml [moved from scilab/modules/simulated_annealing/help/en_US/utilities/temp_law_fsa.xml with 100% similarity]
scilab/modules/optimization/help/en_US/annealing/utilities/temp_law_huang.xml [moved from scilab/modules/simulated_annealing/help/en_US/utilities/temp_law_huang.xml with 100% similarity]
scilab/modules/optimization/help/en_US/annealing/utilities/temp_law_vfsa.xml [moved from scilab/modules/simulated_annealing/help/en_US/utilities/temp_law_vfsa.xml with 100% similarity]
scilab/modules/optimization/help/fr_FR/annealing/CHAPTER [new file with mode: 0644]
scilab/modules/optimization/help/ja_JP/annealing/CHAPTER [new file with mode: 0644]
scilab/modules/optimization/help/pt_BR/annealing/CHAPTER [new file with mode: 0644]
scilab/modules/optimization/help/ru_RU/annealing/CHAPTER [new file with mode: 0644]
scilab/modules/optimization/locales/ca_ES.po
scilab/modules/optimization/locales/cs_CZ.po
scilab/modules/optimization/locales/de_DE.po
scilab/modules/optimization/locales/es_ES.po
scilab/modules/optimization/locales/fr_FR.po
scilab/modules/optimization/locales/it_IT.po
scilab/modules/optimization/locales/ja_JP.po
scilab/modules/optimization/locales/optimization.pot
scilab/modules/optimization/locales/pl_PL.po
scilab/modules/optimization/locales/pt_BR.po
scilab/modules/optimization/locales/ru_RU.po
scilab/modules/optimization/locales/uk_UA.po
scilab/modules/optimization/locales/zh_CN.po
scilab/modules/optimization/locales/zh_TW.po
scilab/modules/optimization/macros/annealing/accept_func_default.sci [moved from scilab/modules/simulated_annealing/macros/accept_func_default.sci with 100% similarity]
scilab/modules/optimization/macros/annealing/accept_func_vfsa.sci [moved from scilab/modules/simulated_annealing/macros/accept_func_vfsa.sci with 100% similarity]
scilab/modules/optimization/macros/annealing/compute_initial_temp.sci [moved from scilab/modules/simulated_annealing/macros/compute_initial_temp.sci with 100% similarity]
scilab/modules/optimization/macros/annealing/neigh_func_csa.sci [moved from scilab/modules/simulated_annealing/macros/neigh_func_csa.sci with 100% similarity]
scilab/modules/optimization/macros/annealing/neigh_func_default.sci [moved from scilab/modules/simulated_annealing/macros/neigh_func_default.sci with 100% similarity]
scilab/modules/optimization/macros/annealing/neigh_func_fsa.sci [moved from scilab/modules/simulated_annealing/macros/neigh_func_fsa.sci with 100% similarity]
scilab/modules/optimization/macros/annealing/neigh_func_vfsa.sci [moved from scilab/modules/simulated_annealing/macros/neigh_func_vfsa.sci with 100% similarity]
scilab/modules/optimization/macros/annealing/optim_sa.sci [moved from scilab/modules/simulated_annealing/macros/optim_sa.sci with 100% similarity]
scilab/modules/optimization/macros/annealing/temp_law_csa.sci [moved from scilab/modules/simulated_annealing/macros/temp_law_csa.sci with 100% similarity]
scilab/modules/optimization/macros/annealing/temp_law_default.sci [moved from scilab/modules/simulated_annealing/macros/temp_law_default.sci with 100% similarity]
scilab/modules/optimization/macros/annealing/temp_law_fsa.sci [moved from scilab/modules/simulated_annealing/macros/temp_law_fsa.sci with 100% similarity]
scilab/modules/optimization/macros/annealing/temp_law_huang.sci [moved from scilab/modules/simulated_annealing/macros/temp_law_huang.sci with 100% similarity]
scilab/modules/optimization/macros/annealing/temp_law_vfsa.sci [moved from scilab/modules/simulated_annealing/macros/temp_law_vfsa.sci with 100% similarity]
scilab/modules/optimization/macros/buildmacros.sce
scilab/modules/optimization/tests/unit_tests/annealing/accept_func_default.dia.ref [moved from scilab/modules/simulated_annealing/tests/unit_tests/accept_func_default.dia.ref with 100% similarity]
scilab/modules/optimization/tests/unit_tests/annealing/accept_func_default.tst [moved from scilab/modules/simulated_annealing/tests/unit_tests/accept_func_default.tst with 100% similarity]
scilab/modules/optimization/tests/unit_tests/annealing/accept_func_vfsa.dia.ref [moved from scilab/modules/simulated_annealing/tests/unit_tests/accept_func_vfsa.dia.ref with 100% similarity]
scilab/modules/optimization/tests/unit_tests/annealing/accept_func_vfsa.tst [moved from scilab/modules/simulated_annealing/tests/unit_tests/accept_func_vfsa.tst with 100% similarity]
scilab/modules/optimization/tests/unit_tests/annealing/compute_initial_temp.dia.ref [moved from scilab/modules/simulated_annealing/tests/unit_tests/compute_initial_temp.dia.ref with 100% similarity]
scilab/modules/optimization/tests/unit_tests/annealing/compute_initial_temp.tst [moved from scilab/modules/simulated_annealing/tests/unit_tests/compute_initial_temp.tst with 100% similarity]
scilab/modules/optimization/tests/unit_tests/annealing/neigh_func_csa.dia.ref [moved from scilab/modules/simulated_annealing/tests/unit_tests/neigh_func_csa.dia.ref with 100% similarity]
scilab/modules/optimization/tests/unit_tests/annealing/neigh_func_csa.tst [moved from scilab/modules/simulated_annealing/tests/unit_tests/neigh_func_csa.tst with 100% similarity]
scilab/modules/optimization/tests/unit_tests/annealing/neigh_func_default.dia.ref [moved from scilab/modules/simulated_annealing/tests/unit_tests/neigh_func_default.dia.ref with 100% similarity]
scilab/modules/optimization/tests/unit_tests/annealing/neigh_func_default.tst [moved from scilab/modules/simulated_annealing/tests/unit_tests/neigh_func_default.tst with 100% similarity]
scilab/modules/optimization/tests/unit_tests/annealing/neigh_func_fsa.dia.ref [moved from scilab/modules/simulated_annealing/tests/unit_tests/neigh_func_fsa.dia.ref with 100% similarity]
scilab/modules/optimization/tests/unit_tests/annealing/neigh_func_fsa.tst [moved from scilab/modules/simulated_annealing/tests/unit_tests/neigh_func_fsa.tst with 100% similarity]
scilab/modules/optimization/tests/unit_tests/annealing/neigh_func_vfsa.dia.ref [moved from scilab/modules/simulated_annealing/tests/unit_tests/neigh_func_vfsa.dia.ref with 100% similarity]
scilab/modules/optimization/tests/unit_tests/annealing/neigh_func_vfsa.tst [moved from scilab/modules/simulated_annealing/tests/unit_tests/neigh_func_vfsa.tst with 100% similarity]
scilab/modules/optimization/tests/unit_tests/annealing/optim_sa.dia.ref [moved from scilab/modules/simulated_annealing/tests/unit_tests/optim_sa.dia.ref with 100% similarity]
scilab/modules/optimization/tests/unit_tests/annealing/optim_sa.tst [moved from scilab/modules/simulated_annealing/tests/unit_tests/optim_sa.tst with 100% similarity]
scilab/modules/optimization/tests/unit_tests/annealing/temp_law_csa.dia.ref [moved from scilab/modules/simulated_annealing/tests/unit_tests/temp_law_csa.dia.ref with 100% similarity]
scilab/modules/optimization/tests/unit_tests/annealing/temp_law_csa.tst [moved from scilab/modules/simulated_annealing/tests/unit_tests/temp_law_csa.tst with 100% similarity]
scilab/modules/optimization/tests/unit_tests/annealing/temp_law_default.dia.ref [moved from scilab/modules/simulated_annealing/tests/unit_tests/temp_law_default.dia.ref with 100% similarity]
scilab/modules/optimization/tests/unit_tests/annealing/temp_law_default.tst [moved from scilab/modules/simulated_annealing/tests/unit_tests/temp_law_default.tst with 100% similarity]
scilab/modules/optimization/tests/unit_tests/annealing/temp_law_fsa.dia.ref [moved from scilab/modules/simulated_annealing/tests/unit_tests/temp_law_fsa.dia.ref with 100% similarity]
scilab/modules/optimization/tests/unit_tests/annealing/temp_law_fsa.tst [moved from scilab/modules/simulated_annealing/tests/unit_tests/temp_law_fsa.tst with 100% similarity]
scilab/modules/optimization/tests/unit_tests/annealing/temp_law_huang.dia.ref [moved from scilab/modules/simulated_annealing/tests/unit_tests/temp_law_huang.dia.ref with 100% similarity]
scilab/modules/optimization/tests/unit_tests/annealing/temp_law_huang.tst [moved from scilab/modules/simulated_annealing/tests/unit_tests/temp_law_huang.tst with 100% similarity]
scilab/modules/optimization/tests/unit_tests/annealing/temp_law_vfsa.dia.ref [moved from scilab/modules/simulated_annealing/tests/unit_tests/temp_law_vfsa.dia.ref with 100% similarity]
scilab/modules/optimization/tests/unit_tests/annealing/temp_law_vfsa.tst [moved from scilab/modules/simulated_annealing/tests/unit_tests/temp_law_vfsa.tst with 100% similarity]
scilab/modules/simulated_annealing/Makefile.am [deleted file]
scilab/modules/simulated_annealing/Makefile.in [deleted file]
scilab/modules/simulated_annealing/etc/simulated_annealing.quit [deleted file]
scilab/modules/simulated_annealing/etc/simulated_annealing.start [deleted file]
scilab/modules/simulated_annealing/help/en_US/addchapter.sce [deleted file]
scilab/modules/simulated_annealing/help/fr_FR/addchapter.sce [deleted file]
scilab/modules/simulated_annealing/help/ja_JP/addchapter.sce [deleted file]
scilab/modules/simulated_annealing/help/pt_BR/addchapter.sce [deleted file]
scilab/modules/simulated_annealing/help/ru_RU/addchapter.sce [deleted file]
scilab/modules/simulated_annealing/license.txt [deleted file]
scilab/modules/simulated_annealing/locales/ca_ES.po [deleted file]
scilab/modules/simulated_annealing/locales/cs_CZ.po [deleted file]
scilab/modules/simulated_annealing/locales/de_DE.po [deleted file]
scilab/modules/simulated_annealing/locales/es_ES.po [deleted file]
scilab/modules/simulated_annealing/locales/fr_FR.po [deleted file]
scilab/modules/simulated_annealing/locales/it_IT.po [deleted file]
scilab/modules/simulated_annealing/locales/ja_JP.po [deleted file]
scilab/modules/simulated_annealing/locales/pl_PL.po [deleted file]
scilab/modules/simulated_annealing/locales/pt_BR.po [deleted file]
scilab/modules/simulated_annealing/locales/ru_RU.po [deleted file]
scilab/modules/simulated_annealing/locales/uk_UA.po [deleted file]
scilab/modules/simulated_annealing/locales/zh_CN.po [deleted file]
scilab/modules/simulated_annealing/locales/zh_TW.po [deleted file]
scilab/modules/simulated_annealing/macros/buildmacros.bat [deleted file]
scilab/modules/simulated_annealing/macros/buildmacros.sce [deleted file]
scilab/modules/simulated_annealing/macros/cleanmacros.bat [deleted file]
scilab/modules/simulated_annealing/simulated_annealing.iss [deleted file]
scilab/tools/innosetup/code_modules.iss
scilab/tools/innosetup/files.iss