* Bug 14734 fixed: [simulated_annealing] merged in [optimization] 90/21190/4
Samuel GOUGEON [Fri, 27 Dec 2019 19:18:57 +0000 (20:18 +0100)]
  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

index c2319cb..ec2f8c2 100644 (file)
@@ -259,7 +259,6 @@ Bug Fixes
 ---------
 
 ### Bugs fixed in 6.1.0:
-<<<<<<< HEAD
 * [#2694](https://bugzilla.scilab.org/2694): `bitget` did not accept positive integers of types int8, int16 or int32.
 * [#5824](https://bugzilla.scilab.org/5824): The `datafit` algorithm was not documented.
 * [#6070](https://bugzilla.scilab.org/6070): How to make multiscaled plots was not documented.
@@ -309,6 +308,7 @@ Bug Fixes
 * [#14610](https://bugzilla.scilab.org/14610): `x = ric_desc(H,E)` always yielded an error. [x1,x2,residual] = ric_desc(..) returned a wrong `residual` value.
 * [#14642](https://bugzilla.scilab.org/14642): No more "\r" carriage return with printf.
 * [#14655](https://bugzilla.scilab.org/14655): `bitset` worked only element-wise, without accepting mixed scalar and array inputs.
+* [#14734](https://bugzilla.scilab.org/14734): The `simulated_annealing` module was out of the `optimization` one.
 * [#14735](https://bugzilla.scilab.org/14735): The `genetic_algorithms` module was out of the `optimization` one.
 * [#14738](https://bugzilla.scilab.org14738): `hist3d` was not actually an histogram function. It is renamed `bar3d`.
 * [#14741](https://bugzilla.scilab.org/14741): The syntax `[m,e]=log2(x)` was not documented. As public function `frexp` was in duplicate with `[m,e]=log2(x)`.
index f9f9d6b..162a3f1 100755 (executable)
@@ -50750,7 +50750,7 @@ SCI_LDFLAGS=$(echo                                            \
 
 
 
-ac_config_files="$ac_config_files contrib/Makefile desktop/images/icons/Makefile desktop/Makefile modules/threads/Makefile modules/ast/Makefile modules/functions_manager/Makefile modules/helptools/Makefile modules/data_structures/Makefile modules/differential_equations/Makefile modules/optimization/Makefile modules/elementary_functions/Makefile modules/special_functions/Makefile modules/io/Makefile modules/completion/Makefile modules/history_manager/Makefile modules/jvm/Makefile modules/commons/Makefile modules/sound/Makefile modules/statistics/Makefile modules/mexlib/Makefile modules/sparse/Makefile modules/linear_algebra/Makefile modules/polynomials/Makefile modules/signal_processing/Makefile modules/arnoldi/Makefile modules/interpolation/Makefile modules/localization/Makefile modules/cacsd/Makefile modules/boolean/Makefile modules/integer/Makefile modules/fileio/Makefile modules/spreadsheet/Makefile modules/string/Makefile modules/time/Makefile modules/graphics/Makefile modules/graphic_export/Makefile modules/graphic_objects/Makefile modules/renderer/Makefile modules/action_binding/Makefile modules/gui/Makefile modules/mpi/Makefile modules/randlib/Makefile modules/tclsci/Makefile modules/windows_tools/Makefile modules/core/Makefile modules/prebuildjava/Makefile modules/api_scilab/Makefile modules/call_scilab/Makefile modules/types/Makefile modules/hdf5/Makefile modules/fftw/Makefile modules/umfpack/Makefile modules/scicos/Makefile modules/scicos_blocks/Makefile modules/functions/Makefile modules/dynamic_link/Makefile modules/overloading/Makefile modules/javasci/Makefile modules/m2sci/Makefile modules/development_tools/Makefile modules/output_stream/Makefile modules/console/Makefile modules/demo_tools/Makefile modules/simulated_annealing/Makefile modules/parameters/Makefile modules/matio/Makefile modules/atoms/Makefile modules/xcos/Makefile modules/scinotes/Makefile modules/ui_data/Makefile modules/graph/Makefile modules/parallel/Makefile modules/modules_manager/Makefile modules/history_browser/Makefile modules/preferences/Makefile modules/xml/Makefile modules/external_objects/Makefile modules/external_objects_java/Makefile modules/slint/Makefile modules/coverage/Makefile modules/webtools/Makefile modules/Makefile Makefile scilab.pc etc/modules.xml etc/classpath.xml etc/Info.plist etc/logging.properties scilab.properties scilab-lib.properties scilab-lib-doc.properties modules/helptools/etc/SciDocConf.xml modules/core/includes/version.h modules/atoms/etc/repositories modules/atoms/tests/unit_tests/repositories.orig"
+ac_config_files="$ac_config_files contrib/Makefile desktop/images/icons/Makefile desktop/Makefile modules/threads/Makefile modules/ast/Makefile modules/functions_manager/Makefile modules/helptools/Makefile modules/data_structures/Makefile modules/differential_equations/Makefile modules/optimization/Makefile modules/elementary_functions/Makefile modules/special_functions/Makefile modules/io/Makefile modules/completion/Makefile modules/history_manager/Makefile modules/jvm/Makefile modules/commons/Makefile modules/sound/Makefile modules/statistics/Makefile modules/mexlib/Makefile modules/sparse/Makefile modules/linear_algebra/Makefile modules/polynomials/Makefile modules/signal_processing/Makefile modules/arnoldi/Makefile modules/interpolation/Makefile modules/localization/Makefile modules/cacsd/Makefile modules/boolean/Makefile modules/integer/Makefile modules/fileio/Makefile modules/spreadsheet/Makefile modules/string/Makefile modules/time/Makefile modules/graphics/Makefile modules/graphic_export/Makefile modules/graphic_objects/Makefile modules/renderer/Makefile modules/action_binding/Makefile modules/gui/Makefile modules/mpi/Makefile modules/randlib/Makefile modules/tclsci/Makefile modules/windows_tools/Makefile modules/core/Makefile modules/prebuildjava/Makefile modules/api_scilab/Makefile modules/call_scilab/Makefile modules/types/Makefile modules/hdf5/Makefile modules/fftw/Makefile modules/umfpack/Makefile modules/scicos/Makefile modules/scicos_blocks/Makefile modules/functions/Makefile modules/dynamic_link/Makefile modules/overloading/Makefile modules/javasci/Makefile modules/m2sci/Makefile modules/development_tools/Makefile modules/output_stream/Makefile modules/console/Makefile modules/demo_tools/Makefile modules/parameters/Makefile modules/matio/Makefile modules/atoms/Makefile modules/xcos/Makefile modules/scinotes/Makefile modules/ui_data/Makefile modules/graph/Makefile modules/parallel/Makefile modules/modules_manager/Makefile modules/history_browser/Makefile modules/preferences/Makefile modules/xml/Makefile modules/external_objects/Makefile modules/external_objects_java/Makefile modules/slint/Makefile modules/coverage/Makefile modules/webtools/Makefile modules/Makefile Makefile scilab.pc etc/modules.xml etc/classpath.xml etc/Info.plist etc/logging.properties scilab.properties scilab-lib.properties scilab-lib-doc.properties modules/helptools/etc/SciDocConf.xml modules/core/includes/version.h modules/atoms/etc/repositories modules/atoms/tests/unit_tests/repositories.orig"
 
 
 # Detection of the module for the future version of Scilab 6
@@ -52174,7 +52174,6 @@ do
     "modules/output_stream/Makefile") CONFIG_FILES="$CONFIG_FILES modules/output_stream/Makefile" ;;
     "modules/console/Makefile") CONFIG_FILES="$CONFIG_FILES modules/console/Makefile" ;;
     "modules/demo_tools/Makefile") CONFIG_FILES="$CONFIG_FILES modules/demo_tools/Makefile" ;;
-    "modules/simulated_annealing/Makefile") CONFIG_FILES="$CONFIG_FILES modules/simulated_annealing/Makefile" ;;
     "modules/parameters/Makefile") CONFIG_FILES="$CONFIG_FILES modules/parameters/Makefile" ;;
     "modules/matio/Makefile") CONFIG_FILES="$CONFIG_FILES modules/matio/Makefile" ;;
     "modules/atoms/Makefile") CONFIG_FILES="$CONFIG_FILES modules/atoms/Makefile" ;;
index 539de20..f601858 100644 (file)
@@ -2095,7 +2095,6 @@ modules/development_tools/Makefile
 modules/output_stream/Makefile
 modules/console/Makefile
 modules/demo_tools/Makefile
-modules/simulated_annealing/Makefile
 modules/parameters/Makefile
 modules/matio/Makefile
 modules/atoms/Makefile
index f5d4fbe..a1e3fe7 100644 (file)
@@ -65,7 +65,6 @@
 <module name="umfpack" activate="@UMFPACK_ENABLE@"/>
 <module name="module_skeleton" activate="no"/>
 <!-- comments -->
-<module name="simulated_annealing" activate="yes"/>
 <module name="parameters" activate="yes"/>
 <module name="atoms" activate="yes"/>
 <module name="matio" activate="@MATIO_ENABLE@"/>
index 7b421a5..605bd60 100644 (file)
@@ -63,7 +63,6 @@
     <module name="fftw" activate="yes"/>
     <module name="umfpack" activate="yes"/>
     <module name="module_skeleton" activate="no"/>
-    <module name="simulated_annealing" activate="yes"/>
     <module name="parameters" activate="yes"/>
     <module name="matio" activate="yes"/>
     <module name="atoms" activate="yes"/>
index 54ee57a..467ff89 100644 (file)
@@ -78,7 +78,6 @@ development_tools \
 helptools \
 umfpack \
 demo_tools \
-simulated_annealing \
 parameters \
 matio \
 atoms \
index 0e70bbc..14bc23c 100644 (file)
@@ -286,10 +286,10 @@ DIST_SUBDIRS = prebuildjava threads output_stream arnoldi \
        commons jvm types action_binding graphic_objects renderer gui \
        graphic_export graphics optimization randlib interpolation \
        sound overloading m2sci development_tools helptools umfpack \
-       demo_tools simulated_annealing matio atoms graph ast scinotes \
-       parallel modules_manager ui_data history_browser preferences \
-       xml external_objects slint coverage webtools \
-       external_objects_java scicos_blocks scicos xcos mpi . javasci
+       demo_tools matio atoms graph ast scinotes parallel \
+       modules_manager ui_data history_browser preferences xml \
+       external_objects slint coverage webtools external_objects_java \
+       scicos_blocks scicos xcos mpi . javasci
 am__DIST_COMMON = $(srcdir)/Makefile.in \
        $(top_srcdir)/config/mkinstalldirs
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -621,11 +621,11 @@ SUBDIRS = prebuildjava threads output_stream arnoldi \
        commons jvm types action_binding graphic_objects renderer gui \
        graphic_export graphics optimization randlib interpolation \
        sound overloading m2sci development_tools helptools umfpack \
-       demo_tools simulated_annealing parameters matio atoms hdf5 \
-       graph ast scinotes parallel modules_manager ui_data \
-       history_browser preferences xml external_objects slint \
-       coverage webtools $(am__append_1) $(am__append_2) \
-       $(am__append_3) $(am__append_4) . $(am__append_5)
+       demo_tools parameters matio atoms hdf5 graph ast scinotes \
+       parallel modules_manager ui_data history_browser preferences \
+       xml external_objects slint coverage webtools $(am__append_1) \
+       $(am__append_2) $(am__append_3) $(am__append_4) . \
+       $(am__append_5)
 
 #### Basic files ####
 libscilab_la_rootdir = $(mydatadir)
index 82b00b9..a81446a 100644 (file)
@@ -14,7 +14,6 @@ statistics
 sparse
 umfpack
 optimization
-simulated_annealing
 xml
 hdf5
 fileio
index ef021b4..3a0adee 100644 (file)
@@ -155,7 +155,8 @@ libscioptimization_la_rootdir = $(mydatadir)
 libscioptimization_la_root_DATA =  license.txt
 
 #### optimization : Macros ####
-MACROSDIRSEXT =  macros/genetic \
+MACROSDIRSEXT =  macros/annealing \
+    macros/genetic \
     macros/neldermead \
     macros/optimbase \
     macros/optimsimplex
index c131890..975c7e5 100644 (file)
@@ -795,7 +795,8 @@ libscioptimization_la_rootdir = $(mydatadir)
 libscioptimization_la_root_DATA = license.txt
 
 #### optimization : Macros ####
-MACROSDIRSEXT = macros/genetic \
+MACROSDIRSEXT = macros/annealing \
+    macros/genetic \
     macros/neldermead \
     macros/optimbase \
     macros/optimsimplex
@@ -7,4 +7,4 @@
 subdemolist = [_("Simulated Annealing"),                   "SAdemo.sce"; ..
 _("Simulated Annealing and Ising problem"), "SAIsing2ddemo.sce"];
 
-subdemolist(:,2) = SCI + "/modules/simulated_annealing/demos/" + subdemolist(:,2)
+subdemolist(:,2) = SCI + "/modules/optimization/demos/annealing/" + subdemolist(:,2)
index 8271c62..b42a453 100644 (file)
@@ -22,7 +22,7 @@ function subdemolist = demo_gateway()
 
     if with_module("simulated_annealing") then
         subdemolist = [subdemolist; ..
-        _("Simulated Annealing"), "../../simulated_annealing/demos/simulated_annealing.dem.gateway.sce"];
+        _("Simulated Annealing"), "annealing/simulated_annealing.dem.gateway.sce"];
     end
 
     subdemolist(:,2) = demopath + subdemolist(:,2);
index d88033b..db69156 100644 (file)
@@ -14,7 +14,9 @@
 // Load  functions libraries
 // =============================================================================
 load('SCI/modules/optimization/macros/lib');
+load('SCI/modules/optimization/macros/annealing/lib');
+load('SCI/modules/optimization/macros/genetic/lib');
 load('SCI/modules/optimization/macros/neldermead/lib');
 load('SCI/modules/optimization/macros/optimbase/lib');
 load('SCI/modules/optimization/macros/optimsimplex/lib');
-load('SCI/modules/optimization/macros/genetic/lib');
+
diff --git a/scilab/modules/optimization/help/en_US/annealing/CHAPTER b/scilab/modules/optimization/help/en_US/annealing/CHAPTER
new file mode 100644 (file)
index 0000000..5e1c397
--- /dev/null
@@ -0,0 +1 @@
+title = Annealing
\ No newline at end of file
diff --git a/scilab/modules/optimization/help/fr_FR/annealing/CHAPTER b/scilab/modules/optimization/help/fr_FR/annealing/CHAPTER
new file mode 100644 (file)
index 0000000..8eb8aa8
--- /dev/null
@@ -0,0 +1 @@
+title = Recuit simulé
diff --git a/scilab/modules/optimization/help/ja_JP/annealing/CHAPTER b/scilab/modules/optimization/help/ja_JP/annealing/CHAPTER
new file mode 100644 (file)
index 0000000..5e1c397
--- /dev/null
@@ -0,0 +1 @@
+title = Annealing
\ No newline at end of file
diff --git a/scilab/modules/optimization/help/pt_BR/annealing/CHAPTER b/scilab/modules/optimization/help/pt_BR/annealing/CHAPTER
new file mode 100644 (file)
index 0000000..4990d28
--- /dev/null
@@ -0,0 +1 @@
+title = Arrefecimento simulado
\ No newline at end of file
diff --git a/scilab/modules/optimization/help/ru_RU/annealing/CHAPTER b/scilab/modules/optimization/help/ru_RU/annealing/CHAPTER
new file mode 100644 (file)
index 0000000..5e1c397
--- /dev/null
@@ -0,0 +1 @@
+title = Annealing
\ No newline at end of file
index 9cc5c45..7c31f23 100644 (file)
@@ -487,6 +487,12 @@ msgstr ""
 msgid "An error occurred while getting OptimizationFunctions object.\n"
 msgstr ""
 
+msgid "Please wait ..."
+msgstr ""
+
+msgid "Simulated Annealing and Ising problem"
+msgstr ""
+
 msgid "Non linear data fitting"
 msgstr ""
 
@@ -836,6 +842,25 @@ msgid "Simulated Annealing"
 msgstr ""
 
 #, c-format
+msgid "%s: cit_f is mandatory"
+msgstr "%s: El cit_f és obligatori"
+
+#, c-format
+msgid "%s: error - wrong accept type"
+msgstr "%s: error - Tipus d'acceptació errònia"
+
+msgid "optim_sa: sa_f is mandatory"
+msgstr "optim_sa: El sa_f és obligatori"
+
+#, c-format
+msgid ""
+"%s: Temperature step %d / %d - T = %f, E(f(T)) = %f var(f(T)) = %f f_best = "
+"%f\n"
+msgstr ""
+"%s: Pas de la temperatura %d / %d - T = %f, E(f(T)) = %f var(f(T)) = %f "
+"f_best = %f\n"
+
+#, c-format
 msgid "%s: More than 20 equations are not allowed"
 msgstr ""
 
index 10c6d5a..9cf3f50 100644 (file)
@@ -497,6 +497,12 @@ msgstr ""
 msgid "An error occurred while getting OptimizationFunctions object.\n"
 msgstr ""
 
+msgid "Please wait ..."
+msgstr ""
+
+msgid "Simulated Annealing and Ising problem"
+msgstr ""
+
 msgid "Non linear data fitting"
 msgstr ""
 
@@ -846,6 +852,24 @@ msgid "Simulated Annealing"
 msgstr ""
 
 #, c-format
+msgid "%s: cit_f is mandatory"
+msgstr "%s: cit_f je povinné"
+
+#, c-format
+msgid "%s: error - wrong accept type"
+msgstr "%s: chyba - špatný typ přístupu"
+
+msgid "optim_sa: sa_f is mandatory"
+msgstr "optim_sa: sa_f je povinné"
+
+#, c-format
+msgid ""
+"%s: Temperature step %d / %d - T = %f, E(f(T)) = %f var(f(T)) = %f f_best = "
+"%f\n"
+msgstr ""
+"%s: Teplota krok %d / %d - T = %f, E(f(T)) = %f var(f(T)) = %f f_best = %f\n"
+
+#, c-format
 msgid "%s: More than 20 equations are not allowed"
 msgstr "%s: Není povoleno více než 20 rovnic."
 
index d299440..a89461d 100644 (file)
@@ -484,6 +484,12 @@ msgstr ""
 msgid "An error occurred while getting OptimizationFunctions object.\n"
 msgstr ""
 
+msgid "Please wait ..."
+msgstr "Bitte warten ..."
+
+msgid "Simulated Annealing and Ising problem"
+msgstr "Simuliertes Glühen und Ising Problem"
+
 msgid "Non linear data fitting"
 msgstr ""
 
@@ -833,6 +839,25 @@ msgid "Simulated Annealing"
 msgstr ""
 
 #, c-format
+msgid "%s: cit_f is mandatory"
+msgstr "%s: cit_f ist verpflichtend"
+
+#, c-format
+msgid "%s: error - wrong accept type"
+msgstr "%s: Fehler - falscher akzeptierter Typ"
+
+msgid "optim_sa: sa_f is mandatory"
+msgstr "optim_sa: sa_f ist verpflichtend"
+
+#, c-format
+msgid ""
+"%s: Temperature step %d / %d - T = %f, E(f(T)) = %f var(f(T)) = %f f_best = "
+"%f\n"
+msgstr ""
+"%s: Temperatur Stufe %d / %d - T = %f, E(f(T)) = %f var(f(T)) = %f f_best = "
+"%f\n"
+
+#, c-format
 msgid "%s: More than 20 equations are not allowed"
 msgstr ""
 
index 9fa214b..44b3afa 100644 (file)
@@ -484,6 +484,12 @@ msgstr ""
 msgid "An error occurred while getting OptimizationFunctions object.\n"
 msgstr ""
 
+msgid "Please wait ..."
+msgstr ""
+
+msgid "Simulated Annealing and Ising problem"
+msgstr ""
+
 msgid "Non linear data fitting"
 msgstr ""
 
@@ -833,6 +839,25 @@ msgid "Simulated Annealing"
 msgstr ""
 
 #, c-format
+msgid "%s: cit_f is mandatory"
+msgstr "%s: cit_f es obligatorio"
+
+#, c-format
+msgid "%s: error - wrong accept type"
+msgstr "%s: error - tipo de aceptación incorrecta"
+
+msgid "optim_sa: sa_f is mandatory"
+msgstr "optim_sa: sa_f es obligatorio"
+
+#, c-format
+msgid ""
+"%s: Temperature step %d / %d - T = %f, E(f(T)) = %f var(f(T)) = %f f_best = "
+"%f\n"
+msgstr ""
+"%s: Paso de temperatura %d / %d - T = %f, E(f(T)) = %f var(f(T)) = %f f_best "
+"= %f\n"
+
+#, c-format
 msgid "%s: More than 20 equations are not allowed"
 msgstr ""
 
index a4a09b2..3a0947e 100644 (file)
@@ -499,6 +499,15 @@ msgstr ""
 msgid "An error occurred while getting OptimizationFunctions object.\n"
 msgstr ""
 
+msgid "Please wait ..."
+msgstr "Veuillez patienter..."
+
+msgid "Simulated Annealing"
+msgstr "Recuit simulé"
+
+msgid "Simulated Annealing and Ising problem"
+msgstr "Recuit simulé et problème d'Ising"
+
 msgid "Non linear data fitting"
 msgstr ""
 
@@ -844,8 +853,24 @@ msgstr ""
 msgid "ICSE"
 msgstr ""
 
-msgid "Simulated Annealing"
+#, c-format
+msgid "%s: cit_f is mandatory"
+msgstr "%s : cit_f est obligatoire"
+
+#, c-format
+msgid "%s: error - wrong accept type"
+msgstr "%s : Erreur - Type d'acceptation erroné"
+
+msgid "optim_sa: sa_f is mandatory"
+msgstr "optim_sa : sa_f est obligatoire"
+
+#, c-format
+msgid ""
+"%s: Temperature step %d / %d - T = %f, E(f(T)) = %f var(f(T)) = %f f_best = "
+"%f\n"
 msgstr ""
+"%s : Pas de température %d / %d - T = %f, E(f(T)) = %f var(f(T)) = %f f_best "
+"= %f\n"
 
 #, c-format
 msgid "%s: More than 20 equations are not allowed"
index 50c1d15..b20c9bb 100644 (file)
@@ -489,6 +489,12 @@ msgstr ""
 msgid "An error occurred while getting OptimizationFunctions object.\n"
 msgstr ""
 
+msgid "Please wait ..."
+msgstr ""
+
+msgid "Simulated Annealing and Ising problem"
+msgstr ""
+
 msgid "Non linear data fitting"
 msgstr ""
 
@@ -838,6 +844,25 @@ msgid "Simulated Annealing"
 msgstr ""
 
 #, c-format
+msgid "%s: cit_f is mandatory"
+msgstr "%s: cit_f è obbligatorio"
+
+#, c-format
+msgid "%s: error - wrong accept type"
+msgstr "%s: errore - tipo sbagliato in accept"
+
+msgid "optim_sa: sa_f is mandatory"
+msgstr "optim_sa: sa_f è obbligatorio"
+
+#, c-format
+msgid ""
+"%s: Temperature step %d / %d - T = %f, E(f(T)) = %f var(f(T)) = %f f_best = "
+"%f\n"
+msgstr ""
+"%s: Grado della temperatura %d / %d - T = %f, E(f(T)) = %f var(f(T)) = %f "
+"f_best = %f\n"
+
+#, c-format
 msgid "%s: More than 20 equations are not allowed"
 msgstr ""
 
index c3103bf..3b2323b 100644 (file)
@@ -581,6 +581,12 @@ msgstr ""
 msgid "An error occurred while getting OptimizationFunctions object.\n"
 msgstr "OptimizationFunctionsオブジェクトを取得中にエラーが発生しました.\n"
 
+msgid "Please wait ..."
+msgstr "お待ちください ..."
+
+msgid "Simulated Annealing and Ising problem"
+msgstr "焼きなまし法とlsing問題"
+
 msgid "Non linear data fitting"
 msgstr "非線形データ調整"
 
@@ -936,6 +942,29 @@ msgstr "ICSE"
 msgid "Simulated Annealing"
 msgstr "焼きなまし法"
 
+# File: macros/compute_initial_temp.sci, line: 20
+#, c-format
+msgid "%s: cit_f is mandatory"
+msgstr "%s: cit_f は必須です"
+
+#
+# File: macros/compute_initial_temp.sci, line: 60
+#, c-format
+msgid "%s: error - wrong accept type"
+msgstr "%s:エラー - 不正な型を受け付けました"
+
+#
+# File: macros/optim_sa.sci, line: 57
+msgid "optim_sa: sa_f is mandatory"
+msgstr "optim_sa: sa_f は必須です"
+
+#, c-format
+msgid ""
+"%s: Temperature step %d / %d - T = %f, E(f(T)) = %f var(f(T)) = %f f_best = "
+"%f\n"
+msgstr ""
+"%s: 温度の増分 %d / %d - T = %f, E(f(T)) = %f var(f(T)) = %f f_best = %f\n"
+
 #, c-format
 msgid "%s: More than 20 equations are not allowed"
 msgstr "%s: 20個より多い方程式は使用できません"
index db39a0c..1547c21 100644 (file)
@@ -805,6 +805,22 @@ msgstr ""
 msgid "An error occurred while getting OptimizationFunctions object.\n"
 msgstr ""
 
+#
+# File: modules/optimization/demos/annealing/SAIsing2ddemo.sce, line: 10
+# File: modules/optimization/demos/annealing/SAdemo.sce, line: 10
+msgid "Please wait ..."
+msgstr ""
+
+#
+# File: modules/optimization/demos/annealing/simulated_annealing.dem.gateway.sce, line: 7
+msgid "Simulated Annealing"
+msgstr ""
+
+#
+# File: modules/optimization/demos/annealing/simulated_annealing.dem.gateway.sce, line: 8
+msgid "Simulated Annealing and Ising problem"
+msgstr ""
+
 # File: modules/optimization/demos/datafit/datafit.dem.gateway.sce, line: 8
 # File: modules/optimization/demos/optimization.dem.gateway.sce, line: 13
 msgid "Non linear data fitting"
@@ -1473,8 +1489,28 @@ msgid "ICSE"
 msgstr ""
 
 #
-# File: modules/optimization/demos/optimization.dem.gateway.sce, line: 23
-msgid "Simulated Annealing"
+# File: modules/optimization/macros/annealing/compute_initial_temp.sci, line: 23
+#, c-format
+msgid "%s: cit_f is mandatory"
+msgstr ""
+
+#
+# File: modules/optimization/macros/annealing/compute_initial_temp.sci, line: 63
+#, c-format
+msgid "%s: error - wrong accept type"
+msgstr ""
+
+#
+# File: modules/optimization/macros/annealing/optim_sa.sci, line: 62
+msgid "optim_sa: sa_f is mandatory"
+msgstr ""
+
+#
+# File: modules/optimization/macros/annealing/optim_sa.sci, line: 131
+#, c-format
+msgid ""
+"%s: Temperature step %d / %d - T = %f, E(f(T)) = %f var(f(T)) = %f f_best = "
+"%f\n"
 msgstr ""
 
 #
index 9351156..d95d46f 100644 (file)
@@ -486,6 +486,12 @@ msgstr ""
 msgid "An error occurred while getting OptimizationFunctions object.\n"
 msgstr ""
 
+msgid "Please wait ..."
+msgstr ""
+
+msgid "Simulated Annealing and Ising problem"
+msgstr ""
+
 msgid "Non linear data fitting"
 msgstr ""
 
@@ -835,6 +841,25 @@ msgid "Simulated Annealing"
 msgstr ""
 
 #, c-format
+msgid "%s: cit_f is mandatory"
+msgstr "%s: cit_f jest obowiązkowy"
+
+#, c-format
+msgid "%s: error - wrong accept type"
+msgstr "%s: błąd - zły typ akceptacji"
+
+msgid "optim_sa: sa_f is mandatory"
+msgstr "optim_sa: sa_f jest obowiązkowy"
+
+#, c-format
+msgid ""
+"%s: Temperature step %d / %d - T = %f, E(f(T)) = %f var(f(T)) = %f f_best = "
+"%f\n"
+msgstr ""
+"%s: Krok temperatury %d / %d - T = %f, E(f(T)) = %f var(f(T)) = %f f_best = "
+"%f\n"
+
+#, c-format
 msgid "%s: More than 20 equations are not allowed"
 msgstr ""
 
index 62c9fd1..e8981ff 100644 (file)
@@ -488,6 +488,12 @@ msgstr ""
 msgid "An error occurred while getting OptimizationFunctions object.\n"
 msgstr ""
 
+msgid "Please wait ..."
+msgstr ""
+
+msgid "Simulated Annealing and Ising problem"
+msgstr ""
+
 msgid "Non linear data fitting"
 msgstr ""
 
@@ -837,6 +843,25 @@ msgid "Simulated Annealing"
 msgstr ""
 
 #, c-format
+msgid "%s: cit_f is mandatory"
+msgstr "%s: cit_f é obrigatório"
+
+#, c-format
+msgid "%s: error - wrong accept type"
+msgstr "%s: erro - tipo errado de aceitação"
+
+msgid "optim_sa: sa_f is mandatory"
+msgstr "optim_sa: sa_f é obrigatório"
+
+#, c-format
+msgid ""
+"%s: Temperature step %d / %d - T = %f, E(f(T)) = %f var(f(T)) = %f f_best = "
+"%f\n"
+msgstr ""
+"%s: Passo de temperatura %d / %d - T = %f, E(f(T)) = %f var(f(T)) = %f "
+"f_best = %f\n"
+
+#, c-format
 msgid "%s: More than 20 equations are not allowed"
 msgstr ""
 
index 98ea83c..050f28a 100644 (file)
@@ -535,6 +535,12 @@ msgstr "%s: Неверный размер выходного аргумента
 msgid "An error occurred while getting OptimizationFunctions object.\n"
 msgstr "Произошла ошибка при получении объекта OptimizationFunctions.\n"
 
+msgid "Please wait ..."
+msgstr "Пожалуйста, подождите..."
+
+msgid "Simulated Annealing and Ising problem"
+msgstr "Алгоритм имитации отжига и проблема Изинга"
+
 msgid "Non linear data fitting"
 msgstr "Аппроксимация нелинейных данных"
 
@@ -888,6 +894,25 @@ msgid "Simulated Annealing"
 msgstr "Алгоритм имитации отжига"
 
 #, c-format
+msgid "%s: cit_f is mandatory"
+msgstr "%s: cit_f является обязательным"
+
+#, c-format
+msgid "%s: error - wrong accept type"
+msgstr "%s: ошибка - неверный принимаемый тип"
+
+msgid "optim_sa: sa_f is mandatory"
+msgstr "optim_sa: sa_f является обязательным"
+
+#, c-format
+msgid ""
+"%s: Temperature step %d / %d - T = %f, E(f(T)) = %f var(f(T)) = %f f_best = "
+"%f\n"
+msgstr ""
+"%s: Шаг температуры %d / %d - T = %f, E(f(T)) = %f var(f(T)) = %f f_best = "
+"%f\n"
+
+#, c-format
 msgid "%s: More than 20 equations are not allowed"
 msgstr "%s: Больше, чем 20 уравнений не разрешается."
 
index daf6839..5683c4c 100644 (file)
@@ -567,6 +567,12 @@ msgid "An error occurred while getting OptimizationFunctions object.\n"
 msgstr ""
 "Під час спроби отримання об’єкта OptimizationFunctions сталася помилка.\n"
 
+msgid "Please wait ..."
+msgstr "Зачекайте, будь ласка…"
+
+msgid "Simulated Annealing and Ising problem"
+msgstr "Імітована нормалізація і задача Ізінґа"
+
 msgid "Non linear data fitting"
 msgstr "Нелінійна апроксимація даних"
 
@@ -932,6 +938,25 @@ msgid "Simulated Annealing"
 msgstr "Імітована нормалізація"
 
 #, c-format
+msgid "%s: cit_f is mandatory"
+msgstr "%s: параметр cit_f є обов’язковим"
+
+#, c-format
+msgid "%s: error - wrong accept type"
+msgstr "%s: помилковий тип прийняття помилкового рішення"
+
+msgid "optim_sa: sa_f is mandatory"
+msgstr "optim_sa: параметр sa_f є обов’язковим"
+
+#, c-format
+msgid ""
+"%s: Temperature step %d / %d - T = %f, E(f(T)) = %f var(f(T)) = %f f_best = "
+"%f\n"
+msgstr ""
+"%s: крок за температурою %d / %d - T = %f, E(f(T)) = %f var(f(T)) = %f "
+"f_best = %f\n"
+
+#, c-format
 msgid "%s: More than 20 equations are not allowed"
 msgstr "%s: не можна задавати понад 20 рівнянь"
 
index a971b93..dc9f710 100644 (file)
@@ -478,6 +478,12 @@ msgstr ""
 msgid "An error occurred while getting OptimizationFunctions object.\n"
 msgstr ""
 
+msgid "Please wait ..."
+msgstr "请等待……"
+
+msgid "Simulated Annealing and Ising problem"
+msgstr "模拟退火和伊辛问题"
+
 msgid "Non linear data fitting"
 msgstr ""
 
@@ -827,6 +833,24 @@ msgid "Simulated Annealing"
 msgstr ""
 
 #, c-format
+msgid "%s: cit_f is mandatory"
+msgstr "%s:cit_f是强制性的"
+
+#, c-format
+msgid "%s: error - wrong accept type"
+msgstr "%s:错误 - 接受类型错误"
+
+msgid "optim_sa: sa_f is mandatory"
+msgstr "optim_sa:sa_f是强制性的"
+
+#, c-format
+msgid ""
+"%s: Temperature step %d / %d - T = %f, E(f(T)) = %f var(f(T)) = %f f_best = "
+"%f\n"
+msgstr ""
+"%s:温度步长 %d / %d - T = %f, E(f(T)) = %f var(f(T)) = %f f_best = %f\n"
+
+#, c-format
 msgid "%s: More than 20 equations are not allowed"
 msgstr ""
 
index 29194d8..6eb0508 100644 (file)
@@ -522,6 +522,12 @@ msgstr ""
 msgid "An error occurred while getting OptimizationFunctions object.\n"
 msgstr ""
 
+msgid "Please wait ..."
+msgstr ""
+
+msgid "Simulated Annealing and Ising problem"
+msgstr ""
+
 msgid "Non linear data fitting"
 msgstr ""
 
@@ -871,6 +877,24 @@ msgid "Simulated Annealing"
 msgstr ""
 
 #, c-format
+msgid "%s: cit_f is mandatory"
+msgstr "%s: cit_f 是強制性的"
+
+#, c-format
+msgid "%s: error - wrong accept type"
+msgstr "%s: 錯誤 - 接受型態錯誤"
+
+msgid "optim_sa: sa_f is mandatory"
+msgstr "optim_sa: sa_f 是強制性的"
+
+#, c-format
+msgid ""
+"%s: Temperature step %d / %d - T = %f, E(f(T)) = %f var(f(T)) = %f f_best = "
+"%f\n"
+msgstr ""
+"%s: 溫度步級 %d /%d - T = %f, E9f(T)) = %f var(f(T)) = %f f_best = %f\n"
+
+#, c-format
 msgid "%s: More than 20 equations are not allowed"
 msgstr ""
 
index 9a73600..fc8c76c 100644 (file)
@@ -5,9 +5,10 @@ if (isdef("genlib") == %f) then
     exec(SCI+"/modules/functions/scripts/buildmacros/loadgenlib.sce");
 end
 //------------------------------------
-genlib("optimizationlib","SCI/modules/optimization/macros",%f,%t);
-genlib("neldermeadlib","SCI/modules/optimization/macros/neldermead",%f,%t);
-genlib("optimbaselib","SCI/modules/optimization/macros/optimbase",%f,%t);
-genlib("optimsimplexlib","SCI/modules/optimization/macros/optimsimplex",%f,%t);
-genlib("genetic_algorithmslib","SCI/modules/optimization/macros/genetic",%f,%t);
+genlib("optimizationlib", "SCI/modules/optimization/macros",              %f,%t);
+genlib("annealinglib",    "SCI/modules/optimization/macros/annealing",    %f,%t);
+genlib("geneticlib",      "SCI/modules/optimization/macros/genetic",      %f,%t);
+genlib("neldermeadlib",   "SCI/modules/optimization/macros/neldermead",   %f,%t);
+genlib("optimbaselib",    "SCI/modules/optimization/macros/optimbase",    %f,%t);
+genlib("optimsimplexlib", "SCI/modules/optimization/macros/optimsimplex", %f,%t);
 //------------------------------------
diff --git a/scilab/modules/simulated_annealing/Makefile.am b/scilab/modules/simulated_annealing/Makefile.am
deleted file mode 100644 (file)
index 33801ec..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-# Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-# Copyright (C) 2008 - INRIA - Pierre MARECHAL
-#
-# Copyright (C) 2012 - 2016 - Scilab Enterprises
-#
-# This file is hereby licensed under the terms of the GNU GPL v2.0,
-# pursuant to article 5.3.4 of the CeCILL v.2.1.
-# This file was originally licensed under the terms of the CeCILL v2.1,
-# and continues to be available under such terms.
-# For more information, see the COPYING file which you should have received
-# along with this program.
-
-#### Target ######
-modulename=simulated_annealing
-
-#### simulated_annealing : Conf files ####
-libsimulated_annealing_la_rootdir = $(mydatadir)
-libsimulated_annealing_la_root_DATA =  license.txt 
-
-#### simulated_annealing : init scripts ####
-libsimulated_annealing_la_etcdir = $(mydatadir)/etc
-libsimulated_annealing_la_etc_DATA = etc/simulated_annealing.quit etc/simulated_annealing.start
-
-include $(top_srcdir)/Makefile.incl.am
diff --git a/scilab/modules/simulated_annealing/Makefile.in b/scilab/modules/simulated_annealing/Makefile.in
deleted file mode 100644 (file)
index f8a85e6..0000000
+++ /dev/null
@@ -1,1053 +0,0 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
-
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-# Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-# Copyright (C) 2008 - INRIA - Pierre MARECHAL
-#
-# Copyright (C) 2012 - 2016 - Scilab Enterprises
-#
-# This file is hereby licensed under the terms of the GNU GPL v2.0,
-# pursuant to article 5.3.4 of the CeCILL v.2.1.
-# This file was originally licensed under the terms of the CeCILL v2.1,
-# and continues to be available under such terms.
-# For more information, see the COPYING file which you should have received
-# along with this program.
-
-# Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-# Copyright (C) 2006-2008 - INRIA - Sylvestre LEDRU <sylvestre.ledru@inria.fr>
-# Copyright (C) 2008      - INRIA - Pierre MARECHAL <pierre.marechal@inria.fr>
-#
-# Copyright (C) 2012 - 2016 - Scilab Enterprises
-#
-# This file is hereby licensed under the terms of the GNU GPL v2.0,
-# pursuant to article 5.3.4 of the CeCILL v.2.1.
-# This file was originally licensed under the terms of the CeCILL v2.1,
-# and continues to be available under such terms.
-# For more information, see the COPYING file which you should have received
-# along with this program.
-#
-
-##########
-### Makefile included stuff
-### Target, variable, suffixes which are supposed to be useful in every makefile.am
-##########
-
-VPATH = @srcdir@
-am__is_gnu_make = { \
-  if test -z '$(MAKELEVEL)'; then \
-    false; \
-  elif test -n '$(MAKE_HOST)'; then \
-    true; \
-  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
-    true; \
-  else \
-    false; \
-  fi; \
-}
-am__make_running_with_option = \
-  case $${target_option-} in \
-      ?) ;; \
-      *) echo "am__make_running_with_option: internal error: invalid" \
-              "target option '$${target_option-}' specified" >&2; \
-         exit 1;; \
-  esac; \
-  has_opt=no; \
-  sane_makeflags=$$MAKEFLAGS; \
-  if $(am__is_gnu_make); then \
-    sane_makeflags=$$MFLAGS; \
-  else \
-    case $$MAKEFLAGS in \
-      *\\[\ \  ]*) \
-        bs=\\; \
-        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
-          | sed "s/$$bs$$bs[$$bs $$bs  ]*//g"`;; \
-    esac; \
-  fi; \
-  skip_next=no; \
-  strip_trailopt () \
-  { \
-    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
-  }; \
-  for flg in $$sane_makeflags; do \
-    test $$skip_next = yes && { skip_next=no; continue; }; \
-    case $$flg in \
-      *=*|--*) continue;; \
-        -*I) strip_trailopt 'I'; skip_next=yes;; \
-      -*I?*) strip_trailopt 'I';; \
-        -*O) strip_trailopt 'O'; skip_next=yes;; \
-      -*O?*) strip_trailopt 'O';; \
-        -*l) strip_trailopt 'l'; skip_next=yes;; \
-      -*l?*) strip_trailopt 'l';; \
-      -[dEDm]) skip_next=yes;; \
-      -[JT]) skip_next=yes;; \
-    esac; \
-    case $$flg in \
-      *$$target_option*) has_opt=yes; break;; \
-    esac; \
-  done; \
-  test $$has_opt = yes
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-@NEED_JAVA_TRUE@am__append_1 = java
-subdir = modules/simulated_annealing
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ax_cxx_compile_stdcxx.m4 \
-       $(top_srcdir)/m4/backtrace.m4 $(top_srcdir)/m4/compiler.m4 \
-       $(top_srcdir)/m4/curl.m4 $(top_srcdir)/m4/docbook.m4 \
-       $(top_srcdir)/m4/doxygen.m4 $(top_srcdir)/m4/eigen.m4 \
-       $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
-       $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
-       $(top_srcdir)/m4/intel_compiler.m4 \
-       $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
-       $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
-       $(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
-       $(top_srcdir)/m4/libxml2.m4 $(top_srcdir)/m4/ltoptions.m4 \
-       $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
-       $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/macosx.m4 \
-       $(top_srcdir)/m4/mpi.m4 $(top_srcdir)/m4/ocaml.m4 \
-       $(top_srcdir)/m4/pcre.m4 $(top_srcdir)/m4/pkg.m4 \
-       $(top_srcdir)/m4/relocatable.m4 $(top_srcdir)/m4/swig.m4 \
-       $(top_srcdir)/m4/symlinks.m4 $(top_srcdir)/m4/tcltk.m4 \
-       $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-       $(ACLOCAL_M4)
-DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
-mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/modules/core/includes/machine.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-AM_V_P = $(am__v_P_@AM_V@)
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-am__v_P_0 = false
-am__v_P_1 = :
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN     " $@;
-am__v_GEN_1 = 
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
-am__v_at_1 = 
-SOURCES =
-DIST_SOURCES =
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__uninstall_files_from_dir = { \
-  test -z "$$files" \
-    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
-    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
-         $(am__cd) "$$dir" && rm -f $$files; }; \
-  }
-am__installdirs = "$(DESTDIR)$(libsimulated_annealing_la_etcdir)" \
-       "$(DESTDIR)$(libsimulated_annealing_la_rootdir)"
-DATA = $(libsimulated_annealing_la_etc_DATA) \
-       $(libsimulated_annealing_la_root_DATA)
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
-am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/Makefile.incl.am \
-       $(top_srcdir)/config/mkinstalldirs
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ALL_LINGUAS = @ALL_LINGUAS@
-ALL_LINGUAS_DOC = @ALL_LINGUAS_DOC@
-AMTAR = @AMTAR@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-ANT = @ANT@
-ANTLR = @ANTLR@
-AR = @AR@
-ARPACK_LIBS = @ARPACK_LIBS@
-ASM3 = @ASM3@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AVALON_FRAMEWORK = @AVALON_FRAMEWORK@
-AWK = @AWK@
-BATIK = @BATIK@
-BLAS_CFLAGS = @BLAS_CFLAGS@
-BLAS_LIBS = @BLAS_LIBS@
-CC = @CC@
-CCACHE = @CCACHE@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CHECKSTYLE = @CHECKSTYLE@
-COBERTURA = @COBERTURA@
-COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
-COMMONS_IO = @COMMONS_IO@
-COMMONS_LOGGING = @COMMONS_LOGGING@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CURL_CFLAGS = @CURL_CFLAGS@
-CURL_CONFIG = @CURL_CONFIG@
-CURL_LIBS = @CURL_LIBS@
-CURL_VERSION = @CURL_VERSION@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEMOTOOLS_ENABLE = @DEMOTOOLS_ENABLE@
-DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
-DOCBOOK_ROOT = @DOCBOOK_ROOT@
-DOXYGEN_BIN = @DOXYGEN_BIN@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-ECJ = @ECJ@
-EGREP = @EGREP@
-EIGEN_CPPFLAGS = @EIGEN_CPPFLAGS@
-EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
-FFTW3_LIB = @FFTW3_LIB@
-FFTW_ENABLE = @FFTW_ENABLE@
-FGREP = @FGREP@
-FLEXDOCK = @FLEXDOCK@
-FLIBS = @FLIBS@
-FOP = @FOP@
-FREEHEP_GRAPHICS2D = @FREEHEP_GRAPHICS2D@
-FREEHEP_GRAPHICSIO = @FREEHEP_GRAPHICSIO@
-FREEHEP_GRAPHICSIO_EMF = @FREEHEP_GRAPHICSIO_EMF@
-FREEHEP_IO = @FREEHEP_IO@
-FREEHEP_UTIL = @FREEHEP_UTIL@
-GENHTML = @GENHTML@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
-GIWS_BIN = @GIWS_BIN@
-GLUEGEN2_RT = @GLUEGEN2_RT@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
-GRAPHICS_ENABLE = @GRAPHICS_ENABLE@
-GREP = @GREP@
-GUI_ENABLE = @GUI_ENABLE@
-HAMCREST = @HAMCREST@
-HAVE_CXX17 = @HAVE_CXX17@
-HDF5_CFLAGS = @HDF5_CFLAGS@
-HDF5_LIBS = @HDF5_LIBS@
-HELP_ENABLE = @HELP_ENABLE@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
-JAR = @JAR@
-JAVA = @JAVA@
-JAVAC = @JAVAC@
-JAVAC_DEBUG = @JAVAC_DEBUG@
-JAVADOC = @JAVADOC@
-JAVAH = @JAVAH@
-JAVASCI_ENABLE = @JAVASCI_ENABLE@
-JAVA_ENABLE = @JAVA_ENABLE@
-JAVA_G = @JAVA_G@
-JAVA_HOME = @JAVA_HOME@
-JAVA_JNI_INCLUDE = @JAVA_JNI_INCLUDE@
-JAVA_JNI_LIBS = @JAVA_JNI_LIBS@
-JDB = @JDB@
-JEUCLID_CORE = @JEUCLID_CORE@
-JGRAPHX = @JGRAPHX@
-JHALL = @JHALL@
-JLATEXMATH = @JLATEXMATH@
-JLATEXMATH_FOP = @JLATEXMATH_FOP@
-JOGL2 = @JOGL2@
-JROSETTA_API = @JROSETTA_API@
-JROSETTA_ENGINE = @JROSETTA_ENGINE@
-JUNIT4 = @JUNIT4@
-LAPACK_LIBS = @LAPACK_LIBS@
-LCOV = @LCOV@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LEX = @LEX@
-LEXLIB = @LEXLIB@
-LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
-LIBM = @LIBM@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LOGGING_LEVEL = @LOGGING_LEVEL@
-LOOKS = @LOOKS@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
-LTLIBOBJS = @LTLIBOBJS@
-LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
-LUCENE = @LUCENE@
-LUCENE_ANALYZER = @LUCENE_ANALYZER@
-LUCENE_PARSER = @LUCENE_PARSER@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
-MATIO_CFLAGS = @MATIO_CFLAGS@
-MATIO_ENABLE = @MATIO_ENABLE@
-MATIO_LIBS = @MATIO_LIBS@
-MKDIR_P = @MKDIR_P@
-MPI_ENABLE = @MPI_ENABLE@
-MSGCAT = @MSGCAT@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OCAMLC = @OCAMLC@
-OCAMLDEP = @OCAMLDEP@
-OCAMLLEX = @OCAMLLEX@
-OCAMLOPT = @OCAMLOPT@
-OCAMLYACC = @OCAMLYACC@
-OPENMPI_CC = @OPENMPI_CC@
-OPENMPI_CFLAGS = @OPENMPI_CFLAGS@
-OPENMPI_CXX = @OPENMPI_CXX@
-OPENMPI_CXXFLAGS = @OPENMPI_CXXFLAGS@
-OPENMPI_LIBS = @OPENMPI_LIBS@
-OPENMP_CFLAGS = @OPENMP_CFLAGS@
-OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
-OPENMP_ENABLE = @OPENMP_ENABLE@
-OPENMP_LIBS = @OPENMP_LIBS@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PCRE_CFLAGS = @PCRE_CFLAGS@
-PCRE_CONFIG = @PCRE_CONFIG@
-PCRE_LIBS = @PCRE_LIBS@
-PCRE_VERSION = @PCRE_VERSION@
-PKG_CONFIG = @PKG_CONFIG@
-POSUB = @POSUB@
-POW_LIB = @POW_LIB@
-PYTHON = @PYTHON@
-RANLIB = @RANLIB@
-RELOCATABLE = @RELOCATABLE@
-RT_LIB = @RT_LIB@
-SAXON = @SAXON@
-SCILAB_BINARY_VERSION = @SCILAB_BINARY_VERSION@
-SCILAB_LIBRARY_VERSION = @SCILAB_LIBRARY_VERSION@
-SCILAB_VERSION_MAINTENANCE = @SCILAB_VERSION_MAINTENANCE@
-SCILAB_VERSION_MAJOR = @SCILAB_VERSION_MAJOR@
-SCILAB_VERSION_MINOR = @SCILAB_VERSION_MINOR@
-SCIRENDERER = @SCIRENDERER@
-SCIRENDERER_CP = @SCIRENDERER_CP@
-SCI_CFLAGS = @SCI_CFLAGS@
-SCI_CXXFLAGS = @SCI_CXXFLAGS@
-SCI_FFLAGS = @SCI_FFLAGS@
-SCI_LDFLAGS = @SCI_LDFLAGS@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SET_RELOCATABLE = @SET_RELOCATABLE@
-SHELL = @SHELL@
-SKINLF = @SKINLF@
-SPLINT = @SPLINT@
-STRIP = @STRIP@
-SWIG_BIN = @SWIG_BIN@
-SWIG_JAVA = @SWIG_JAVA@
-SWIG_RUNTIME_LIBS_DIR = @SWIG_RUNTIME_LIBS_DIR@
-SWIG_SCILAB = @SWIG_SCILAB@
-TCLTK_LIBS = @TCLTK_LIBS@
-TCL_INC_PATH = @TCL_INC_PATH@
-TK_INC_PATH = @TK_INC_PATH@
-UMFPACK_CFLAGS = @UMFPACK_CFLAGS@
-UMFPACK_ENABLE = @UMFPACK_ENABLE@
-UMFPACK_LIB = @UMFPACK_LIB@
-USE_NLS = @USE_NLS@
-VALGRIND_CFLAGS = @VALGRIND_CFLAGS@
-VALGRIND_LIBS = @VALGRIND_LIBS@
-VERSION = @VERSION@
-WITH_OCAML = @WITH_OCAML@
-WITH_TKSCI = @WITH_TKSCI@
-XCOS_ENABLE = @XCOS_ENABLE@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
-XMKMF = @XMKMF@
-XMLGRAPHICS_COMMONS = @XMLGRAPHICS_COMMONS@
-XML_APIS_EXT = @XML_APIS_EXT@
-XML_CONFIG = @XML_CONFIG@
-XML_FLAGS = @XML_FLAGS@
-XML_LIBS = @XML_LIBS@
-XML_VERSION = @XML_VERSION@
-X_CFLAGS = @X_CFLAGS@
-X_EXTRA_LIBS = @X_EXTRA_LIBS@
-X_LIBS = @X_LIBS@
-X_PRE_LIBS = @X_PRE_LIBS@
-YACC = @YACC@
-YFLAGS = @YFLAGS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-ac_ct_F77 = @ac_ct_F77@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-cxx_present = @cxx_present@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-yacc_present = @yacc_present@
-
-#### Target ######
-modulename = simulated_annealing
-
-#### simulated_annealing : Conf files ####
-libsimulated_annealing_la_rootdir = $(mydatadir)
-libsimulated_annealing_la_root_DATA = license.txt 
-
-#### simulated_annealing : init scripts ####
-libsimulated_annealing_la_etcdir = $(mydatadir)/etc
-libsimulated_annealing_la_etc_DATA = etc/simulated_annealing.quit etc/simulated_annealing.start
-
-# Where all the Scilab stuff is installed (macros, help, ...)
-mydatadir = $(pkgdatadir)/modules/$(modulename)
-
-# Set AM_* SCI detected settings
-AM_CPPFLAGS = $(SCI_CPPFLAGS)
-AM_CFLAGS = $(SCI_CFLAGS)
-AM_CXXFLAGS = $(SCI_CXXFLAGS)
-# append includes to AM_FFLAGS to manage fortran includes
-AM_FFLAGS = $(SCI_FFLAGS) -I$(top_srcdir)/modules/core/includes/
-
-# Tag shared libraries with the Scilab version
-AM_LDFLAGS = $(SCI_LDFLAGS) -version-number $(SCILAB_LIBRARY_VERSION)
-
-# splint options
-SPLINT_OPTIONS = -weak -booltype BOOL
-
-########################### JAVA ######################################
-#### We are delegating java compilation to ant... Thanks to that
-#### the procedure will be the same with Microsoft Windows (C)
-#### and Linux/Unix
-#######################################################################
-TARGETS_ALL = $(am__append_1)
-
-################ MACROS ######################
-# Rule to build a macro
-# NOT USED  AT THE MOMENT
-SUFFIXES = .sci 
-
-########### INSTALL DOCUMENTATION ###################
-
-# Install documentation files into the right target
-# We do not use the automake mechanism (libxxxx_la_help_fr_DATA) because
-# automake needs the html files to be present which is not the case when
-# we are building Scilab
-
-# Where it should be installed
-pkgdocdir = $(mydatadir)
-
-# What is the mask of the help source
-DOCMASKXML = *.xml
-
-# What is the mask of the MathML sources
-DOCMASKMML = *.mml
-
-########### INSTALL DATA ###################
-# Install macros, help & demos
-# Where it should be installed
-pkgmacrosdir = $(mydatadir)
-# Which directory we process
-MACRODIRS = macros/
-# Mask of the Scilab sources macros
-MACROMASK = *.sci
-# Mask of the Scilab executable sources macros
-MACROBUILDMASK = *.sce
-# Mask of the Scilab compiled macros
-MACROBINMASK = *.bin
-# List of the standard directory for tests
-TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests tests/java
-# Where the demos should be installed
-pkgdemosdir = $(mydatadir)
-# List of the standard directory for demos
-DEMOS_DIR = demos
-# List of the standard directory for examples
-EXAMPLES_DIR = examples
-# Where to export JAVA archives (.jar)
-JARDIR = jar/
-# JAR files mask
-JARMASK = *.jar
-# Chapter file 
-HELP_CHAPTERDIR = help/
-HELP_CHAPTERFILE = addchapter.sce
-HELP_CHAPTERLANG = en_US fr_FR pt_BR
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .sci .bin
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.incl.am $(am__configure_deps)
-       @for dep in $?; do \
-         case '$(am__configure_deps)' in \
-           *$$dep*) \
-             ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-               && { if test -f $@; then exit 0; else break; fi; }; \
-             exit 1;; \
-         esac; \
-       done; \
-       echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign modules/simulated_annealing/Makefile'; \
-       $(am__cd) $(top_srcdir) && \
-         $(AUTOMAKE) --foreign modules/simulated_annealing/Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-       @case '$?' in \
-         *config.status*) \
-           cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-         *) \
-           echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
-           cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
-       esac;
-$(top_srcdir)/Makefile.incl.am $(am__empty):
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-       cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-       cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-       cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-
-mostlyclean-libtool:
-       -rm -f *.lo
-
-clean-libtool:
-       -rm -rf .libs _libs
-install-libsimulated_annealing_la_etcDATA: $(libsimulated_annealing_la_etc_DATA)
-       @$(NORMAL_INSTALL)
-       @list='$(libsimulated_annealing_la_etc_DATA)'; test -n "$(libsimulated_annealing_la_etcdir)" || list=; \
-       if test -n "$$list"; then \
-         echo " $(MKDIR_P) '$(DESTDIR)$(libsimulated_annealing_la_etcdir)'"; \
-         $(MKDIR_P) "$(DESTDIR)$(libsimulated_annealing_la_etcdir)" || exit 1; \
-       fi; \
-       for p in $$list; do \
-         if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-         echo "$$d$$p"; \
-       done | $(am__base_list) | \
-       while read files; do \
-         echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(libsimulated_annealing_la_etcdir)'"; \
-         $(INSTALL_DATA) $$files "$(DESTDIR)$(libsimulated_annealing_la_etcdir)" || exit $$?; \
-       done
-
-uninstall-libsimulated_annealing_la_etcDATA:
-       @$(NORMAL_UNINSTALL)
-       @list='$(libsimulated_annealing_la_etc_DATA)'; test -n "$(libsimulated_annealing_la_etcdir)" || list=; \
-       files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-       dir='$(DESTDIR)$(libsimulated_annealing_la_etcdir)'; $(am__uninstall_files_from_dir)
-install-libsimulated_annealing_la_rootDATA: $(libsimulated_annealing_la_root_DATA)
-       @$(NORMAL_INSTALL)
-       @list='$(libsimulated_annealing_la_root_DATA)'; test -n "$(libsimulated_annealing_la_rootdir)" || list=; \
-       if test -n "$$list"; then \
-         echo " $(MKDIR_P) '$(DESTDIR)$(libsimulated_annealing_la_rootdir)'"; \
-         $(MKDIR_P) "$(DESTDIR)$(libsimulated_annealing_la_rootdir)" || exit 1; \
-       fi; \
-       for p in $$list; do \
-         if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-         echo "$$d$$p"; \
-       done | $(am__base_list) | \
-       while read files; do \
-         echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(libsimulated_annealing_la_rootdir)'"; \
-         $(INSTALL_DATA) $$files "$(DESTDIR)$(libsimulated_annealing_la_rootdir)" || exit $$?; \
-       done
-
-uninstall-libsimulated_annealing_la_rootDATA:
-       @$(NORMAL_UNINSTALL)
-       @list='$(libsimulated_annealing_la_root_DATA)'; test -n "$(libsimulated_annealing_la_rootdir)" || list=; \
-       files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-       dir='$(DESTDIR)$(libsimulated_annealing_la_rootdir)'; $(am__uninstall_files_from_dir)
-tags TAGS:
-
-ctags CTAGS:
-
-cscope cscopelist:
-
-
-distdir: $(BUILT_SOURCES)
-       $(MAKE) $(AM_MAKEFLAGS) distdir-am
-
-distdir-am: $(DISTFILES)
-       @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-       topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-       list='$(DISTFILES)'; \
-         dist_files=`for file in $$list; do echo $$file; done | \
-         sed -e "s|^$$srcdirstrip/||;t" \
-             -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-       case $$dist_files in \
-         */*) $(MKDIR_P) `echo "$$dist_files" | \
-                          sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-                          sort -u` ;; \
-       esac; \
-       for file in $$dist_files; do \
-         if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-         if test -d $$d/$$file; then \
-           dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-           if test -d "$(distdir)/$$file"; then \
-             find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-           fi; \
-           if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-             cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-             find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-           fi; \
-           cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-         else \
-           test -f "$(distdir)/$$file" \
-           || cp -p $$d/$$file "$(distdir)/$$file" \
-           || exit 1; \
-         fi; \
-       done
-check-am: all-am
-       $(MAKE) $(AM_MAKEFLAGS) check-local
-check: check-am
-all-am: Makefile $(DATA) all-local
-installdirs:
-       for dir in "$(DESTDIR)$(libsimulated_annealing_la_etcdir)" "$(DESTDIR)$(libsimulated_annealing_la_rootdir)"; do \
-         test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-       done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-       @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-       if test -z '$(STRIP)'; then \
-         $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-           install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-             install; \
-       else \
-         $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-           install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-           "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-       fi
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-       -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-       -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-       @echo "This command is intended for maintainers to use"
-       @echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool clean-local mostlyclean-am
-
-distclean: distclean-am
-       -rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-local
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-data-local \
-       install-libsimulated_annealing_la_etcDATA \
-       install-libsimulated_annealing_la_rootDATA
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am: install-html-local
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-       -rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-libsimulated_annealing_la_etcDATA \
-       uninstall-libsimulated_annealing_la_rootDATA
-
-.MAKE: check-am install-am install-strip
-
-.PHONY: all all-am all-local check check-am check-local clean \
-       clean-generic clean-libtool clean-local cscopelist-am ctags-am \
-       distclean distclean-generic distclean-libtool distclean-local \
-       distdir dvi dvi-am html html-am info info-am install \
-       install-am install-data install-data-am install-data-local \
-       install-dvi install-dvi-am install-exec install-exec-am \
-       install-html install-html-am install-html-local install-info \
-       install-info-am install-libsimulated_annealing_la_etcDATA \
-       install-libsimulated_annealing_la_rootDATA install-man \
-       install-pdf install-pdf-am install-ps install-ps-am \
-       install-strip installcheck installcheck-am installdirs \
-       maintainer-clean maintainer-clean-generic mostlyclean \
-       mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-       tags-am uninstall uninstall-am \
-       uninstall-libsimulated_annealing_la_etcDATA \
-       uninstall-libsimulated_annealing_la_rootDATA
-
-.PRECIOUS: Makefile
-
-
-# This target enables tests for Scilab
-check-local: $(top_builddir)/scilab-bin test
-       if test -d $(mydatadir)/tests; then \
-         @COMMAND="try test_run('$(modulename)');catch exit(-1);end;exit(0)"; export LANG=C; $(top_builddir)/bin/scilab -nwni -nb -e "$$COMMAND"; \
-       fi
-check-code:
-       if test -f build.xml; then \
-               $(ANT) checkstyle; \
-       fi
-       if test -x "$(SPLINT)"; then \
-               $(SPLINT) $(SPLINT_OPTIONS) -I$(top_srcdir)/modules/core/includes/ -I$(top_srcdir)/libs/MALLOC/includes/ -I$(top_srcdir)/modules/localization/includes/ $(INCLUDE_FLAGS) $(CHECK_SRC); \
-       fi
-@NEED_JAVA_TRUE@java:
-# Some configurations needs to export JAVA_HOME in the current env
-@NEED_JAVA_TRUE@       @if test "$(JAVA_HOME)"; then export JAVA_HOME=$(JAVA_HOME); fi; \
-@NEED_JAVA_TRUE@       if test -z "$(USEANT)"; then USEANT=0; else USEANT=1; fi; \
-@NEED_JAVA_TRUE@       if test -f build.xml -a $$USEANT -eq 1; then \
-@NEED_JAVA_TRUE@               $(ANT); \
-@NEED_JAVA_TRUE@       fi
-
-@NEED_JAVA_TRUE@clean-java:
-# Some configurations needs to export JAVA_HOME in the current env
-@NEED_JAVA_TRUE@       @if test "$(JAVA_HOME)"; then export JAVA_HOME=$(JAVA_HOME); fi; \
-@NEED_JAVA_TRUE@       if test -z "$(USEANT)"; then USEANT=0; else USEANT=1; fi; \
-@NEED_JAVA_TRUE@       if test -f build.xml -a $$USEANT -eq 1; then \
-@NEED_JAVA_TRUE@               $(ANT) clean; \
-@NEED_JAVA_TRUE@       fi;
-
-# If the user request for the SWIG generation of the wrappers Java => C/C++ 
-# We call the target swig-build on the variable SWIG_WRAPPERS
-
-@SWIG_TRUE@swig: $(SWIG_WRAPPERS)
-@SWIG_TRUE@    @SWIG_PACKAGENAME=org.scilab.modules.$(modulename); \
-@SWIG_TRUE@    SWIG_OUTDIR=src/java/org/scilab/modules/$(modulename)/; \
-@SWIG_TRUE@    if test -n "$(SWIG_WRAPPERS)"; then \
-@SWIG_TRUE@            for file in $(SWIG_WRAPPERS) ; do \
-@SWIG_TRUE@                    echo "Swig process of $$file (Java) ..."; \
-@SWIG_TRUE@                    $(SWIG_BIN) $(SWIG_OPTIONS) $(SWIG_JAVA) -package $$SWIG_PACKAGENAME  -outdir $$SWIG_OUTDIR $$file; \
-@SWIG_TRUE@            done; \
-@SWIG_TRUE@    fi
-
-@SWIG_TRUE@swig-scilab: $(SWIG_SCILAB_WRAPPERS)
-@SWIG_TRUE@    @SWIG_OUTDIR=src/swig/; \
-@SWIG_TRUE@    if test -n "$(SWIG_SCILAB_WRAPPERS)"; then \
-@SWIG_TRUE@            for file in $(SWIG_SCILAB_WRAPPERS) ; do \
-@SWIG_TRUE@                    echo "Swig process of $$file (Scilab) ..."; \
-@SWIG_TRUE@                    $(SWIG_BIN) $(SWIG_OPTIONS) $(SWIG_SCILAB)  -outdir $$SWIG_OUTDIR $$file; \
-@SWIG_TRUE@            done; \
-@SWIG_TRUE@    fi
-
-# If the user request for the SWIG generation of the wrappers Java => C/C++ 
-# We call the target swig-build on the variable SWIG_WRAPPERS
-
-@GIWS_TRUE@giws: $(GIWS_WRAPPERS)
-@GIWS_TRUE@    @GIWS_OUTPUTDIR=src/jni/; \
-@GIWS_TRUE@    MANDATORY_OPTIONS="--throws-exception-on-error --description-file"; \
-@GIWS_TRUE@    if test -n "$(GIWS_WRAPPERS)"; then \
-@GIWS_TRUE@            for file in $(GIWS_WRAPPERS) ; do \
-@GIWS_TRUE@                    echo "GIWS process of $$file ..."; \
-@GIWS_TRUE@                    if test -z "$(GIWS_OPTIONS)"; then \
-@GIWS_TRUE@                            $(GIWS_BIN) --disable-return-size-array --output-dir $$GIWS_OUTPUTDIR $$MANDATORY_OPTIONS $$file; \
-@GIWS_TRUE@                    else \
-@GIWS_TRUE@                            echo "Custom GIWS call with '$$GIWS_OPTIONS'"; \
-@GIWS_TRUE@                            $(GIWS_BIN) $$GIWS_OPTIONS --output-dir $$GIWS_OUTPUTDIR $$MANDATORY_OPTIONS $$file; \
-@GIWS_TRUE@                    fi \
-@GIWS_TRUE@            done; \
-@GIWS_TRUE@    fi
-
-@GIWS_TRUE@giws-exception:
-@GIWS_TRUE@    @GIWS_OUTPUTDIR=src/jni/;\
-@GIWS_TRUE@    echo "GIWS: Generation of exception class ..."; \
-@GIWS_TRUE@    $(GIWS_BIN) --generate-exception-class --output-dir $$GIWS_OUTPUTDIR 
-
-macros:
-       -@( if test ! -x $(top_builddir)/scilab-bin; then \
-               echo "Error : Cannot build $< : Scilab has not been built"; \
-       else \
-               $(top_builddir)/bin/scilab -ns -nwni -e "exec('macros/buildmacros.sce');quit;";\
-       fi)
-
-# Removes the macros
-clean-macros:
-# Removes macros (*.bin generated from .sci)
-       @for dir in $(MACRODIRS) $(MACROSDIRSEXT) ; do \
-               echo "rm -f $(builddir)/$$dir/$(MACROBINMASK)"; \
-               rm -f $(builddir)/$$dir/$(MACROBINMASK); \
-       done
-
-test:
-# More tests could be added here
-       @if test -z "$(USEANT)"; then USEANT=0; else USEANT=1; fi; \
-       if test -f build.xml -a $$USEANT -eq 1; then \
-               $(ANT) test; \
-       fi
-
-all-local: $(TARGETS_ALL)
-
-.sci.bin:
-       -@( if test ! -x $(top_builddir)/scilab-bin; then \
-       echo "Error : Cannot build $< : Scilab has not been build"; \
-       else \
-       echo "Creating $@"; \
-       $(top_builddir)/bin/scilab -ns -nwni -e "exec('$(abs_srcdir)/$<');save('$(abs_srcdir)/$@');exit;"; \
-       fi )
-
-install-html-local:
-
-install-data-local-local:
-# Mainly for javasci
-       @if test -d $(srcdir)/javadoc; then \
-               cp -R $(srcdir)/javadoc $(DESTDIR)/$(mydatadir)/; \
-       fi
-# If the user wants the help sources to be installed
-@INSTALL_HELP_XML_TRUE@        @echo "-------- Install of XML sources of help files --------"; \
-@INSTALL_HELP_XML_TRUE@        for lang in $(ALL_LINGUAS); do \
-@INSTALL_HELP_XML_TRUE@         if test -d $(srcdir)/help/$$lang; then \
-@INSTALL_HELP_XML_TRUE@          $(mkinstalldirs) $(DESTDIR)$(pkgdocdir)/help/$$lang && \
-@INSTALL_HELP_XML_TRUE@                if ls -lLd $(srcdir)/help/$$lang/$(DOCMASKXML) >/dev/null 2>&1; then \
-@INSTALL_HELP_XML_TRUE@                  for file in $(srcdir)/help/$$lang/$(DOCMASKXML) ; do \
-@INSTALL_HELP_XML_TRUE@                    echo "$(INSTALL_DATA) $$file $(DESTDIR)$(pkgdocdir)/help/$$lang" ; \
-@INSTALL_HELP_XML_TRUE@                $(INSTALL_DATA) "$$file" $(DESTDIR)$(pkgdocdir)/help/$$lang ; \
-@INSTALL_HELP_XML_TRUE@                  done ; \
-@INSTALL_HELP_XML_TRUE@                fi; \
-@INSTALL_HELP_XML_TRUE@         fi; \
-@INSTALL_HELP_XML_TRUE@        done; \
-@INSTALL_HELP_XML_TRUE@        @echo "-------- Install of MathML sources --------"; \
-@INSTALL_HELP_XML_TRUE@         if test -d $(srcdir)/help/mml/; then \
-@INSTALL_HELP_XML_TRUE@          $(mkinstalldirs) $(DESTDIR)$(pkgdocdir)/help/mml/ && \
-@INSTALL_HELP_XML_TRUE@                if ls -lLd $(srcdir)/help/mml/$(DOCMASKMML) >/dev/null 2>&1; then \
-@INSTALL_HELP_XML_TRUE@                  for file in $(srcdir)/help/mml/$(DOCMASKMML) ; do \
-@INSTALL_HELP_XML_TRUE@                    echo "$(INSTALL_DATA) $$file $(DESTDIR)$(pkgdocdir)/help/mml" ; \
-@INSTALL_HELP_XML_TRUE@                $(INSTALL_DATA) "$$file" $(DESTDIR)$(pkgdocdir)/help/mml ; \
-@INSTALL_HELP_XML_TRUE@                  done ; \
-@INSTALL_HELP_XML_TRUE@                fi; \
-@INSTALL_HELP_XML_TRUE@        fi
-install-data-local:
-# Install the tests
-       @echo "-------- Install tests (if any) --------"; \
-       for dir in $(TESTS_DIR) $(TESTS_DIREXT) ; do \
-         if test -d $(srcdir)/$$dir/; then \
-           $(mkinstalldirs) $(DESTDIR)$(pkgmacrosdir)/$$dir && \
-                 for file in `find $(srcdir)/$$dir | sed "s|^$(srcdir)/$$dir||" 2>/dev/null`; do \
-                   if test -d "$(srcdir)/$$dir/$$file"; then \
-                         echo $(mkinstalldirs) $(DESTDIR)$(pkgmacrosdir)/$$dir/$$file; \
-                         $(mkinstalldirs) "$(DESTDIR)$(pkgmacrosdir)/$$dir/$$file"; \
-                   else \
-                     echo "$(INSTALL_DATA) $(srcdir)/$$dir/$$file $(DESTDIR)$(pkgmacrosdir)/`dirname $$dir/$$file`" ; \
-                 $(INSTALL_DATA) "$(srcdir)/$$dir/$$file" "$(DESTDIR)$(pkgmacrosdir)/`dirname $$dir/$$file`" ; \
-                   fi \
-                 done; \
-         fi; \
-       done
-# Install the help chapter
-       @echo "-------- Install the help chapter (if any) --------"; \
-       for lang in $(HELP_CHAPTERLANG); do \
-               HELPFILE=$(srcdir)/$(HELP_CHAPTERDIR)$$lang/$(HELP_CHAPTERFILE); \
-               if test -f $$HELPFILE; then \
-                       echo $(mkinstalldirs) $(DESTDIR)$(pkgdocdir)/$(HELP_CHAPTERDIR)/$$lang/; \
-                       $(mkinstalldirs) $(DESTDIR)$(pkgdocdir)/$(HELP_CHAPTERDIR)/$$lang/; \
-                       echo $(INSTALL_DATA) $$HELPFILE $(DESTDIR)$(pkgdocdir)/$$HELPFILE; \
-                       $(INSTALL_DATA) $$HELPFILE $(DESTDIR)$(pkgdocdir)/$$HELPFILE; \
-               fi; \
-       done
-# Install the demos & examples
-       @echo "-------- Install demos & examples (if any) --------"; \
-       for dir in $(DEMOS_DIR) $(DEMOS_DIREXT) $(EXAMPLES_DIR) $(EXAMPLES_DIREXT) ; do \
-         if test -d $(srcdir)/$$dir/; then \
-           $(mkinstalldirs) $(DESTDIR)$(pkgdocdir)/$$dir && \
-                 for file in `find $(srcdir)/$$dir | sed "s|^$(srcdir)/$$dir||" 2>/dev/null`; do \
-                   if test -d "$(srcdir)/$$dir/$$file"; then \
-                         echo $(mkinstalldirs) $(DESTDIR)$(pkgdocdir)/$$dir/$$file; \
-                         $(mkinstalldirs) "$(DESTDIR)$(pkgdocdir)/$$dir/$$file"; \
-                   else \
-                     echo "$(INSTALL_DATA) $(srcdir)/$$dir/$$file $(DESTDIR)$(pkgdocdir)/`dirname $$dir/$$file`" ; \
-                 $(INSTALL_DATA) "$(srcdir)/$$dir/$$file" "$(DESTDIR)$(pkgdocdir)/`dirname $$dir/$$file`" ; \
-                   fi \
-                 done; \
-         fi; \
-       done
-# Install the macros
-       @echo "-------- Install macros (if any) --------"; \
-       for dir in $(MACRODIRS) $(MACROSDIRSEXT) ; do \
-         $(mkinstalldirs) $(DESTDIR)$(pkgmacrosdir)/$$dir && \
-               if test -d $(srcdir)/$$dir/; then \
-                       FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
-                       if test -n "$(MACROSSPECIALEXT)"; then \
-                               specialExtDir=""; \
-                               for specialExt in $(MACROSSPECIALEXT); do \
-                                       specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
-                               done; \
-                               FILELIST="$$FILELIST $$specialExtDir"; \
-                       fi; \
-                 for file in `ls -1 $$FILELIST 2>/dev/null`; do \
-                   echo "$(INSTALL_DATA) $$file $(DESTDIR)$(pkgmacrosdir)/$$dir" ; \
-               $(INSTALL_DATA) "$$file" $(DESTDIR)$(pkgmacrosdir)/$$dir ; \
-                 done; \
-               fi; \
-       done
-# Install java files (.jar)
-       @if ls -lLd $(srcdir)/$(JARDIR)$(JARMASK) >/dev/null 2>&1; then \
-       echo "-------- Install jar files --------"; \
-    $(mkinstalldirs) $(DESTDIR)$(pkgdocdir)/$(JARDIR); \
-         for file in $(srcdir)/$(JARDIR)$(JARMASK); do\
-                   echo "$(INSTALL_DATA) $$file $(DESTDIR)$(pkgdocdir)/$(JARDIR)" ; \
-               $(INSTALL_DATA) "$$file" $(DESTDIR)$(pkgdocdir)/$(JARDIR) ; \
-         done ; \
-       fi
-
-########### CLEAN ###################
-# Clean help (generated automatically by Scilab)
-# It used to clean the macro (clean-macros) but this was causing
-# make clean && make to fail Scilab startup
-@NEED_JAVA_TRUE@clean-local: clean-java
-@NEED_JAVA_FALSE@clean-local:
-
-distclean-local:
-       rm -f $(builddir)/help/*/.last_successful_build_javaHelp $(builddir)/help/*/.list_*
-
-.PHONY: macros java swig giws
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/scilab/modules/simulated_annealing/etc/simulated_annealing.quit b/scilab/modules/simulated_annealing/etc/simulated_annealing.quit
deleted file mode 100644 (file)
index 74a7fd1..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-// Copyright (C) 2007-2008 - INRIA
-// Copyright (C) 2009 - DIGITEO
-//
-// Copyright (C) 2012 - 2016 - Scilab Enterprises
-//
-// This file is hereby licensed under the terms of the GNU GPL v2.0,
-// pursuant to article 5.3.4 of the CeCILL v.2.1.
-// This file was originally licensed under the terms of the CeCILL v2.1,
-// and continues to be available under such terms.
-// For more information, see the COPYING file which you should have received
-// along with this program.
-
-// =============================================================================
diff --git a/scilab/modules/simulated_annealing/etc/simulated_annealing.start b/scilab/modules/simulated_annealing/etc/simulated_annealing.start
deleted file mode 100644 (file)
index e6a4d5b..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-// Copyright (C) 2008 - INRIA
-//
-// Copyright (C) 2012 - 2016 - Scilab Enterprises
-//
-// This file is hereby licensed under the terms of the GNU GPL v2.0,
-// pursuant to article 5.3.4 of the CeCILL v.2.1.
-// This file was originally licensed under the terms of the CeCILL v2.1,
-// and continues to be available under such terms.
-// For more information, see the COPYING file which you should have received
-// along with this program.
-
-// Load  functions libraries
-// =============================================================================
-load("SCI/modules/simulated_annealing/macros/lib");
-
diff --git a/scilab/modules/simulated_annealing/help/en_US/addchapter.sce b/scilab/modules/simulated_annealing/help/en_US/addchapter.sce
deleted file mode 100644 (file)
index 8851c22..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-// Copyright (C) 2009 - DIGITEO
-//
-// Copyright (C) 2012 - 2016 - Scilab Enterprises
-//
-// This file is hereby licensed under the terms of the GNU GPL v2.0,
-// pursuant to article 5.3.4 of the CeCILL v.2.1.
-// This file was originally licensed under the terms of the CeCILL v2.1,
-// and continues to be available under such terms.
-// For more information, see the COPYING file which you should have received
-// along with this program.
-
-add_help_chapter("Optimization: Annealing",SCI+"/modules/simulated_annealing/help/en_US",%T);
-
diff --git a/scilab/modules/simulated_annealing/help/fr_FR/addchapter.sce b/scilab/modules/simulated_annealing/help/fr_FR/addchapter.sce
deleted file mode 100644 (file)
index 6bd5cc2..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-// Copyright (C) 2009 - DIGITEO
-//
-// Copyright (C) 2012 - 2016 - Scilab Enterprises
-//
-// This file is hereby licensed under the terms of the GNU GPL v2.0,
-// pursuant to article 5.3.4 of the CeCILL v.2.1.
-// This file was originally licensed under the terms of the CeCILL v2.1,
-// and continues to be available under such terms.
-// For more information, see the COPYING file which you should have received
-// along with this program.
-
-add_help_chapter("Optimisation : recuit simulé",SCI+"/modules/simulated_annealing/help/fr_FR",%T);
-
diff --git a/scilab/modules/simulated_annealing/help/ja_JP/addchapter.sce b/scilab/modules/simulated_annealing/help/ja_JP/addchapter.sce
deleted file mode 100755 (executable)
index 840b3e6..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-// Copyright (C) 2009 - DIGITEO
-//
-// Copyright (C) 2012 - 2016 - Scilab Enterprises
-//
-// This file is hereby licensed under the terms of the GNU GPL v2.0,
-// pursuant to article 5.3.4 of the CeCILL v.2.1.
-// This file was originally licensed under the terms of the CeCILL v2.1,
-// and continues to be available under such terms.
-// For more information, see the COPYING file which you should have received
-// along with this program.
-
-add_help_chapter("Simulated Annealing",SCI+"/modules/simulated_annealing/help/ja_JP",%T);
-
diff --git a/scilab/modules/simulated_annealing/help/pt_BR/addchapter.sce b/scilab/modules/simulated_annealing/help/pt_BR/addchapter.sce
deleted file mode 100644 (file)
index cf635d2..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-// Copyright (C) 2009 - DIGITEO
-//
-// Copyright (C) 2012 - 2016 - Scilab Enterprises
-//
-// This file is hereby licensed under the terms of the GNU GPL v2.0,
-// pursuant to article 5.3.4 of the CeCILL v.2.1.
-// This file was originally licensed under the terms of the CeCILL v2.1,
-// and continues to be available under such terms.
-// For more information, see the COPYING file which you should have received
-// along with this program.
-
-add_help_chapter("Arrefecimento Simulado",SCI+"/modules/simulated_annealing/help/pt_BR",%T);
-
diff --git a/scilab/modules/simulated_annealing/help/ru_RU/addchapter.sce b/scilab/modules/simulated_annealing/help/ru_RU/addchapter.sce
deleted file mode 100644 (file)
index ad759f9..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-// Copyright (C) 2009 - DIGITEO
-//
-// Copyright (C) 2012 - 2016 - Scilab Enterprises
-//
-// This file is hereby licensed under the terms of the GNU GPL v2.0,
-// pursuant to article 5.3.4 of the CeCILL v.2.1.
-// This file was originally licensed under the terms of the CeCILL v2.1,
-// and continues to be available under such terms.
-// For more information, see the COPYING file which you should have received
-// along with this program.
-
-add_help_chapter("Simulated Annealing",SCI+"/modules/simulated_annealing/help/ru_RU",%T);
-
diff --git a/scilab/modules/simulated_annealing/license.txt b/scilab/modules/simulated_annealing/license.txt
deleted file mode 100644 (file)
index dcc14ec..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-Copyright:
-Copyright (c) 2008 - Yann Collette
-
-License:
-Copyright (C) 2012 - 2016 - Scilab Enterprises
-
-This module is hereby licensed under the terms of the GNU GPL v2.0,
-pursuant to article 5.3.4 of the CeCILL v.2.1.
-This module was originally licensed under the terms of the CeCILL v2.1,
-and continues to be available under such terms.
-For more information, see the COPYING file which you should have received
-along with this program.
diff --git a/scilab/modules/simulated_annealing/locales/ca_ES.po b/scilab/modules/simulated_annealing/locales/ca_ES.po
deleted file mode 100644 (file)
index 463bdc2..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
-# Catalan translation for scilab
-# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
-# This file is distributed under the same license as the scilab package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: scilab\n"
-"Report-Msgid-Bugs-To: <localization@lists.scilab.org>\n"
-"POT-Creation-Date: 2013-04-16 17:44+0100\n"
-"PO-Revision-Date: 2019-02-12 17:58+0000\n"
-"Last-Translator: Marc Coll Carrillo <Unknown>\n"
-"Language-Team: Catalan <ca@li.org>\n"
-"Language: ca\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Launchpad (build 18857)\n"
-
-msgid "Please wait ..."
-msgstr ""
-
-msgid "Simulated Annealing"
-msgstr ""
-
-msgid "Simulated Annealing and Ising problem"
-msgstr ""
-
-#, c-format
-msgid "%s: cit_f is mandatory"
-msgstr "%s: El cit_f és obligatori"
-
-#, c-format
-msgid "%s: error - wrong accept type"
-msgstr "%s: error - Tipus d'acceptació errònia"
-
-msgid "optim_sa: sa_f is mandatory"
-msgstr "optim_sa: El sa_f és obligatori"
-
-#, c-format
-msgid ""
-"%s: Temperature step %d / %d - T = %f, E(f(T)) = %f var(f(T)) = %f f_best = "
-"%f\n"
-msgstr ""
-"%s: Pas de la temperatura %d / %d - T = %f, E(f(T)) = %f var(f(T)) = %f "
-"f_best = %f\n"
diff --git a/scilab/modules/simulated_annealing/locales/cs_CZ.po b/scilab/modules/simulated_annealing/locales/cs_CZ.po
deleted file mode 100644 (file)
index e2146e0..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-# Czech translation for scilab
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the scilab package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: scilab\n"
-"Report-Msgid-Bugs-To: <localization@lists.scilab.org>\n"
-"POT-Creation-Date: 2013-04-16 17:44+0100\n"
-"PO-Revision-Date: 2019-02-12 15:19+0000\n"
-"Last-Translator: davidcl <Unknown>\n"
-"Language-Team: Czech <cs@li.org>\n"
-"Language: cs\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Launchpad (build 18857)\n"
-
-msgid "Please wait ..."
-msgstr ""
-
-msgid "Simulated Annealing"
-msgstr ""
-
-msgid "Simulated Annealing and Ising problem"
-msgstr ""
-
-#, c-format
-msgid "%s: cit_f is mandatory"
-msgstr "%s: cit_f je povinné"
-
-#, c-format
-msgid "%s: error - wrong accept type"
-msgstr "%s: chyba - špatný typ přístupu"
-
-msgid "optim_sa: sa_f is mandatory"
-msgstr "optim_sa: sa_f je povinné"
-
-#, c-format
-msgid ""
-"%s: Temperature step %d / %d - T = %f, E(f(T)) = %f var(f(T)) = %f f_best = "
-"%f\n"
-msgstr ""
-"%s: Teplota krok %d / %d - T = %f, E(f(T)) = %f var(f(T)) = %f f_best = %f\n"
diff --git a/scilab/modules/simulated_annealing/locales/de_DE.po b/scilab/modules/simulated_annealing/locales/de_DE.po
deleted file mode 100644 (file)
index 9038f06..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
-# German translation for scilab
-# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
-# This file is distributed under the same license as the scilab package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: scilab\n"
-"Report-Msgid-Bugs-To: <localization@lists.scilab.org>\n"
-"POT-Creation-Date: 2013-04-16 17:44+0100\n"
-"PO-Revision-Date: 2019-02-12 20:18+0000\n"
-"Last-Translator: Stephan Woidowski <swoidowski@t-online.de>\n"
-"Language-Team: German <de@li.org>\n"
-"Language: de\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Launchpad (build 18857)\n"
-
-msgid "Please wait ..."
-msgstr "Bitte warten ..."
-
-msgid "Simulated Annealing"
-msgstr "Simuliertes Glühen"
-
-msgid "Simulated Annealing and Ising problem"
-msgstr "Simuliertes Glühen und Ising Problem"
-
-#, c-format
-msgid "%s: cit_f is mandatory"
-msgstr "%s: cit_f ist verpflichtend"
-
-#, c-format
-msgid "%s: error - wrong accept type"
-msgstr "%s: Fehler - falscher akzeptierter Typ"
-
-msgid "optim_sa: sa_f is mandatory"
-msgstr "optim_sa: sa_f ist verpflichtend"
-
-#, c-format
-msgid ""
-"%s: Temperature step %d / %d - T = %f, E(f(T)) = %f var(f(T)) = %f f_best = "
-"%f\n"
-msgstr ""
-"%s: Temperatur Stufe %d / %d - T = %f, E(f(T)) = %f var(f(T)) = %f f_best = "
-"%f\n"
diff --git a/scilab/modules/simulated_annealing/locales/es_ES.po b/scilab/modules/simulated_annealing/locales/es_ES.po
deleted file mode 100644 (file)
index acffe49..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
-# Spanish translation for scilab
-# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
-# This file is distributed under the same license as the scilab package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: scilab\n"
-"Report-Msgid-Bugs-To: <localization@lists.scilab.org>\n"
-"POT-Creation-Date: 2013-04-16 17:44+0100\n"
-"PO-Revision-Date: 2019-02-12 15:00+0000\n"
-"Last-Translator: Federico Vera <fede@riddler.com.ar>\n"
-"Language-Team: Spanish <es@li.org>\n"
-"Language: es\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Launchpad (build 18857)\n"
-
-msgid "Please wait ..."
-msgstr ""
-
-msgid "Simulated Annealing"
-msgstr ""
-
-msgid "Simulated Annealing and Ising problem"
-msgstr ""
-
-#, c-format
-msgid "%s: cit_f is mandatory"
-msgstr "%s: cit_f es obligatorio"
-
-#, c-format
-msgid "%s: error - wrong accept type"
-msgstr "%s: error - tipo de aceptación incorrecta"
-
-msgid "optim_sa: sa_f is mandatory"
-msgstr "optim_sa: sa_f es obligatorio"
-
-#, c-format
-msgid ""
-"%s: Temperature step %d / %d - T = %f, E(f(T)) = %f var(f(T)) = %f f_best = "
-"%f\n"
-msgstr ""
-"%s: Paso de temperatura %d / %d - T = %f, E(f(T)) = %f var(f(T)) = %f f_best "
-"= %f\n"
diff --git a/scilab/modules/simulated_annealing/locales/fr_FR.po b/scilab/modules/simulated_annealing/locales/fr_FR.po
deleted file mode 100644 (file)
index d465233..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
-# French translation for scilab
-# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
-# This file is distributed under the same license as the scilab package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: scilab\n"
-"Report-Msgid-Bugs-To: <localization@lists.scilab.org>\n"
-"POT-Creation-Date: 2013-04-16 17:44+0100\n"
-"PO-Revision-Date: 2019-02-12 16:12+0000\n"
-"Last-Translator: Mickael Albertus <Unknown>\n"
-"Language-Team: French <fr@li.org>\n"
-"Language: fr\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Launchpad (build 18857)\n"
-
-msgid "Please wait ..."
-msgstr "Veuillez patienter..."
-
-msgid "Simulated Annealing"
-msgstr "Recuit simulé"
-
-msgid "Simulated Annealing and Ising problem"
-msgstr "Recuit simulé et problème d'Ising"
-
-#, c-format
-msgid "%s: cit_f is mandatory"
-msgstr "%s : cit_f est obligatoire"
-
-#, c-format
-msgid "%s: error - wrong accept type"
-msgstr "%s : Erreur - Type d'acceptation erroné"
-
-msgid "optim_sa: sa_f is mandatory"
-msgstr "optim_sa : sa_f est obligatoire"
-
-#, c-format
-msgid ""
-"%s: Temperature step %d / %d - T = %f, E(f(T)) = %f var(f(T)) = %f f_best = "
-"%f\n"
-msgstr ""
-"%s : Pas de température %d / %d - T = %f, E(f(T)) = %f var(f(T)) = %f f_best "
-"= %f\n"
diff --git a/scilab/modules/simulated_annealing/locales/it_IT.po b/scilab/modules/simulated_annealing/locales/it_IT.po
deleted file mode 100644 (file)
index a6b6c94..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
-# Italian translation for scilab
-# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
-# This file is distributed under the same license as the scilab package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: scilab\n"
-"Report-Msgid-Bugs-To: <localization@lists.scilab.org>\n"
-"POT-Creation-Date: 2013-04-16 17:44+0100\n"
-"PO-Revision-Date: 2019-02-12 08:23+0000\n"
-"Last-Translator: Carml <mighty.carml@gmail.com>\n"
-"Language-Team: Italian <it@li.org>\n"
-"Language: it\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Launchpad (build 18857)\n"
-
-msgid "Please wait ..."
-msgstr ""
-
-msgid "Simulated Annealing"
-msgstr ""
-
-msgid "Simulated Annealing and Ising problem"
-msgstr ""
-
-#, c-format
-msgid "%s: cit_f is mandatory"
-msgstr "%s: cit_f è obbligatorio"
-
-#, c-format
-msgid "%s: error - wrong accept type"
-msgstr "%s: errore - tipo sbagliato in accept"
-
-msgid "optim_sa: sa_f is mandatory"
-msgstr "optim_sa: sa_f è obbligatorio"
-
-#, c-format
-msgid ""
-"%s: Temperature step %d / %d - T = %f, E(f(T)) = %f var(f(T)) = %f f_best = "
-"%f\n"
-msgstr ""
-"%s: Grado della temperatura %d / %d - T = %f, E(f(T)) = %f var(f(T)) = %f "
-"f_best = %f\n"
diff --git a/scilab/modules/simulated_annealing/locales/ja_JP.po b/scilab/modules/simulated_annealing/locales/ja_JP.po
deleted file mode 100644 (file)
index f2082b7..0000000
+++ /dev/null
@@ -1,52 +0,0 @@
-# Japanese translation for scilab
-# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
-# This file is distributed under the same license as the scilab package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: scilab\n"
-"Report-Msgid-Bugs-To: <localization@lists.scilab.org>\n"
-"POT-Creation-Date: 2013-04-16 17:44+0100\n"
-"PO-Revision-Date: 2019-02-12 15:24+0000\n"
-"Last-Translator: Rui Hirokawa <Unknown>\n"
-"Language-Team: Japanese <z-saito@guitar.ocn.ne.jp>\n"
-"Language: ja\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Launchpad (build 18857)\n"
-"X-Poedit-Country: Japan\n"
-"X-Poedit-Language: Japanese\n"
-
-msgid "Please wait ..."
-msgstr "お待ちください ..."
-
-msgid "Simulated Annealing"
-msgstr "焼きなまし法"
-
-msgid "Simulated Annealing and Ising problem"
-msgstr "焼きなまし法とlsing問題"
-
-# File: macros/compute_initial_temp.sci, line: 20
-#, c-format
-msgid "%s: cit_f is mandatory"
-msgstr "%s: cit_f は必須です"
-
-#
-# File: macros/compute_initial_temp.sci, line: 60
-#, c-format
-msgid "%s: error - wrong accept type"
-msgstr "%s:エラー - 不正な型を受け付けました"
-
-#
-# File: macros/optim_sa.sci, line: 57
-msgid "optim_sa: sa_f is mandatory"
-msgstr "optim_sa: sa_f は必須です"
-
-#, c-format
-msgid ""
-"%s: Temperature step %d / %d - T = %f, E(f(T)) = %f var(f(T)) = %f f_best = "
-"%f\n"
-msgstr ""
-"%s: 温度の増分 %d / %d - T = %f, E(f(T)) = %f var(f(T)) = %f f_best = %f\n"
diff --git a/scilab/modules/simulated_annealing/locales/pl_PL.po b/scilab/modules/simulated_annealing/locales/pl_PL.po
deleted file mode 100644 (file)
index 6bf56bc..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
-# Polish translation for scilab
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the scilab package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: scilab\n"
-"Report-Msgid-Bugs-To: <localization@lists.scilab.org>\n"
-"POT-Creation-Date: 2013-04-16 17:44+0100\n"
-"PO-Revision-Date: 2019-02-12 14:10+0000\n"
-"Last-Translator: Grzegorz Szostek <Unknown>\n"
-"Language-Team: Polish <pl@li.org>\n"
-"Language: pl\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Launchpad (build 18857)\n"
-
-msgid "Please wait ..."
-msgstr ""
-
-msgid "Simulated Annealing"
-msgstr ""
-
-msgid "Simulated Annealing and Ising problem"
-msgstr ""
-
-#, c-format
-msgid "%s: cit_f is mandatory"
-msgstr "%s: cit_f jest obowiązkowy"
-
-#, c-format
-msgid "%s: error - wrong accept type"
-msgstr "%s: błąd - zły typ akceptacji"
-
-msgid "optim_sa: sa_f is mandatory"
-msgstr "optim_sa: sa_f jest obowiązkowy"
-
-#, c-format
-msgid ""
-"%s: Temperature step %d / %d - T = %f, E(f(T)) = %f var(f(T)) = %f f_best = "
-"%f\n"
-msgstr ""
-"%s: Krok temperatury %d / %d - T = %f, E(f(T)) = %f var(f(T)) = %f f_best = "
-"%f\n"
diff --git a/scilab/modules/simulated_annealing/locales/pt_BR.po b/scilab/modules/simulated_annealing/locales/pt_BR.po
deleted file mode 100644 (file)
index c0bdcd6..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
-# Brazilian Portuguese translation for scilab
-# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
-# This file is distributed under the same license as the scilab package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: scilab\n"
-"Report-Msgid-Bugs-To: <localization@lists.scilab.org>\n"
-"POT-Creation-Date: 2013-04-16 17:44+0100\n"
-"PO-Revision-Date: 2019-02-12 13:05+0000\n"
-"Last-Translator: RodolfoRG <rodolforg@gmail.com>\n"
-"Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
-"Language: pt_BR\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Launchpad (build 18857)\n"
-
-msgid "Please wait ..."
-msgstr ""
-
-msgid "Simulated Annealing"
-msgstr ""
-
-msgid "Simulated Annealing and Ising problem"
-msgstr ""
-
-#, c-format
-msgid "%s: cit_f is mandatory"
-msgstr "%s: cit_f é obrigatório"
-
-#, c-format
-msgid "%s: error - wrong accept type"
-msgstr "%s: erro - tipo errado de aceitação"
-
-msgid "optim_sa: sa_f is mandatory"
-msgstr "optim_sa: sa_f é obrigatório"
-
-#, c-format
-msgid ""
-"%s: Temperature step %d / %d - T = %f, E(f(T)) = %f var(f(T)) = %f f_best = "
-"%f\n"
-msgstr ""
-"%s: Passo de temperatura %d / %d - T = %f, E(f(T)) = %f var(f(T)) = %f "
-"f_best = %f\n"
diff --git a/scilab/modules/simulated_annealing/locales/ru_RU.po b/scilab/modules/simulated_annealing/locales/ru_RU.po
deleted file mode 100644 (file)
index a3f1c1f..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
-# Russian translation for scilab
-# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
-# This file is distributed under the same license as the scilab package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: scilab\n"
-"Report-Msgid-Bugs-To: <localization@lists.scilab.org>\n"
-"POT-Creation-Date: 2013-04-16 17:44+0100\n"
-"PO-Revision-Date: 2019-02-12 14:09+0000\n"
-"Last-Translator: Nkolay Parukhin <parukhin@gmail.com>\n"
-"Language-Team: Russian <ru@li.org>\n"
-"Language: ru\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Launchpad (build 18857)\n"
-
-msgid "Please wait ..."
-msgstr "Пожалуйста, подождите..."
-
-msgid "Simulated Annealing"
-msgstr "Алгоритм имитации отжига"
-
-msgid "Simulated Annealing and Ising problem"
-msgstr "Алгоритм имитации отжига и проблема Изинга"
-
-#, c-format
-msgid "%s: cit_f is mandatory"
-msgstr "%s: cit_f является обязательным"
-
-#, c-format
-msgid "%s: error - wrong accept type"
-msgstr "%s: ошибка - неверный принимаемый тип"
-
-msgid "optim_sa: sa_f is mandatory"
-msgstr "optim_sa: sa_f является обязательным"
-
-#, c-format
-msgid ""
-"%s: Temperature step %d / %d - T = %f, E(f(T)) = %f var(f(T)) = %f f_best = "
-"%f\n"
-msgstr ""
-"%s: Шаг температуры %d / %d - T = %f, E(f(T)) = %f var(f(T)) = %f f_best = "
-"%f\n"
diff --git a/scilab/modules/simulated_annealing/locales/uk_UA.po b/scilab/modules/simulated_annealing/locales/uk_UA.po
deleted file mode 100644 (file)
index 8cc0c82..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-# Ukrainian translation for scilab
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the scilab package.
-#
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-# Yuri Chornoivan <yurchor@gmail.com>, 2010.
-msgid ""
-msgstr ""
-"Project-Id-Version: scilab\n"
-"Report-Msgid-Bugs-To: <localization@lists.scilab.org>\n"
-"POT-Creation-Date: 2013-04-16 17:44+0100\n"
-"PO-Revision-Date: 2019-02-12 11:09+0000\n"
-"Last-Translator: Yuri Chornoivan <yurchor@gmail.com>\n"
-"Language-Team: Ukrainian <translation@linux.org.ua>\n"
-"Language: uk\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Launchpad (build 18857)\n"
-
-msgid "Please wait ..."
-msgstr "Зачекайте, будь ласка…"
-
-msgid "Simulated Annealing"
-msgstr "Імітована нормалізація"
-
-msgid "Simulated Annealing and Ising problem"
-msgstr "Імітована нормалізація і задача Ізінґа"
-
-#, c-format
-msgid "%s: cit_f is mandatory"
-msgstr "%s: параметр cit_f є обов’язковим"
-
-#, c-format
-msgid "%s: error - wrong accept type"
-msgstr "%s: помилковий тип прийняття помилкового рішення"
-
-msgid "optim_sa: sa_f is mandatory"
-msgstr "optim_sa: параметр sa_f є обов’язковим"
-
-#, c-format
-msgid ""
-"%s: Temperature step %d / %d - T = %f, E(f(T)) = %f var(f(T)) = %f f_best = "
-"%f\n"
-msgstr ""
-"%s: крок за температурою %d / %d - T = %f, E(f(T)) = %f var(f(T)) = %f "
-"f_best = %f\n"
diff --git a/scilab/modules/simulated_annealing/locales/zh_CN.po b/scilab/modules/simulated_annealing/locales/zh_CN.po
deleted file mode 100644 (file)
index 3fce0b3..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-# Chinese (Simplified) translation for scilab
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the scilab package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: scilab\n"
-"Report-Msgid-Bugs-To: <localization@lists.scilab.org>\n"
-"POT-Creation-Date: 2013-04-16 17:44+0100\n"
-"PO-Revision-Date: 2019-02-12 13:04+0000\n"
-"Last-Translator: Webish <Unknown>\n"
-"Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
-"Language: zh_CN\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Launchpad (build 18857)\n"
-
-msgid "Please wait ..."
-msgstr "请等待……"
-
-msgid "Simulated Annealing"
-msgstr "模拟退火"
-
-msgid "Simulated Annealing and Ising problem"
-msgstr "模拟退火和伊辛问题"
-
-#, c-format
-msgid "%s: cit_f is mandatory"
-msgstr "%s:cit_f是强制性的"
-
-#, c-format
-msgid "%s: error - wrong accept type"
-msgstr "%s:错误 - 接受类型错误"
-
-msgid "optim_sa: sa_f is mandatory"
-msgstr "optim_sa:sa_f是强制性的"
-
-#, c-format
-msgid ""
-"%s: Temperature step %d / %d - T = %f, E(f(T)) = %f var(f(T)) = %f f_best = "
-"%f\n"
-msgstr ""
-"%s:温度步长 %d / %d - T = %f, E(f(T)) = %f var(f(T)) = %f f_best = %f\n"
diff --git a/scilab/modules/simulated_annealing/locales/zh_TW.po b/scilab/modules/simulated_annealing/locales/zh_TW.po
deleted file mode 100644 (file)
index 2101dae..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-# Chinese (Traditional) translation for scilab
-# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
-# This file is distributed under the same license as the scilab package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: scilab\n"
-"Report-Msgid-Bugs-To: <localization@lists.scilab.org>\n"
-"POT-Creation-Date: 2013-04-16 17:44+0100\n"
-"PO-Revision-Date: 2019-02-12 04:03+0000\n"
-"Last-Translator: MouetteYang <Unknown>\n"
-"Language-Team: Chinese (Traditional) <zh_TW@li.org>\n"
-"Language: zh_TW\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Launchpad (build 18857)\n"
-
-msgid "Please wait ..."
-msgstr ""
-
-msgid "Simulated Annealing"
-msgstr ""
-
-msgid "Simulated Annealing and Ising problem"
-msgstr ""
-
-#, c-format
-msgid "%s: cit_f is mandatory"
-msgstr "%s: cit_f 是強制性的"
-
-#, c-format
-msgid "%s: error - wrong accept type"
-msgstr "%s: 錯誤 - 接受型態錯誤"
-
-msgid "optim_sa: sa_f is mandatory"
-msgstr "optim_sa: sa_f 是強制性的"
-
-#, c-format
-msgid ""
-"%s: Temperature step %d / %d - T = %f, E(f(T)) = %f var(f(T)) = %f f_best = "
-"%f\n"
-msgstr ""
-"%s: 溫度步級 %d /%d - T = %f, E9f(T)) = %f var(f(T)) = %f f_best = %f\n"
diff --git a/scilab/modules/simulated_annealing/macros/buildmacros.bat b/scilab/modules/simulated_annealing/macros/buildmacros.bat
deleted file mode 100644 (file)
index 0da466a..0000000
+++ /dev/null
@@ -1 +0,0 @@
-@..\..\..\bin\scilab -nwni -ns -e exec('buildmacros.sce');quit;
\ No newline at end of file
diff --git a/scilab/modules/simulated_annealing/macros/buildmacros.sce b/scilab/modules/simulated_annealing/macros/buildmacros.sce
deleted file mode 100644 (file)
index dfa4329..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-// Copyright (C) 2008 - INRIA
-//
-// Copyright (C) 2012 - 2016 - Scilab Enterprises
-//
-// This file is hereby licensed under the terms of the GNU GPL v2.0,
-// pursuant to article 5.3.4 of the CeCILL v.2.1.
-// This file was originally licensed under the terms of the CeCILL v2.1,
-// and continues to be available under such terms.
-// For more information, see the COPYING file which you should have received
-// along with this program.
-
-if (isdef("genlib") == %f) then
-    exec(SCI+"/modules/functions/scripts/buildmacros/loadgenlib.sce");
-end
-
-genlib("simulated_annealinglib","SCI/modules/simulated_annealing/macros",%f,%t);
diff --git a/scilab/modules/simulated_annealing/macros/cleanmacros.bat b/scilab/modules/simulated_annealing/macros/cleanmacros.bat
deleted file mode 100644 (file)
index 5079dfd..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-@del *.bin 2>NUL
-@del lib 2>NUL
-@del names 2>NUL
\ No newline at end of file
diff --git a/scilab/modules/simulated_annealing/simulated_annealing.iss b/scilab/modules/simulated_annealing/simulated_annealing.iss
deleted file mode 100644 (file)
index 9f5e1dd..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-;
-; Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-; Copyright (C) INRIA - Allan CORNET
-; Copyright (C) DIGITEO - 2010 - Allan CORNET
-;
-; Copyright (C) 2012 - 2016 - Scilab Enterprises
-;
-; This file is hereby licensed under the terms of the GNU GPL v2.0,
-; pursuant to article 5.3.4 of the CeCILL v.2.1.
-; This file was originally licensed under the terms of the CeCILL v2.1,
-; and continues to be available under such terms.
-; For more information, see the COPYING file which you should have received
-; along with this program.
-;
-;--------------------------------------------------------------------------------------------------------------
-; Inno Setup Script (5.3 and more) for Scilab (UNICODE version required)
-;
-;--------------------------------------------------------------------------------------------------------------
-; simulated_annealing module
-;--------------------------------------------------------------------------------------------------------------
-;
-#define SIMANNEALING "simulated_annealing"
-;
-Source: modules\{#SIMANNEALING}\license.txt; DestDir: {app}\modules\{#SIMANNEALING}; Components: {#COMPN_SCILAB}
-;
-Source: modules\{#SIMANNEALING}\etc\{#SIMANNEALING}.quit; DestDir: {app}\modules\{#SIMANNEALING}\etc; Components: {#COMPN_SCILAB}
-Source: modules\{#SIMANNEALING}\etc\{#SIMANNEALING}.start; DestDir: {app}\modules\{#SIMANNEALING}\etc; Components: {#COMPN_SCILAB}
-;
-Source: modules\{#SIMANNEALING}\demos\*.*; DestDir: {app}\modules\{#SIMANNEALING}\demos; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
-;
-Source: modules\{#SIMANNEALING}\macros\lib; DestDir: {app}\modules\{#SIMANNEALING}\macros; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
-Source: modules\{#SIMANNEALING}\macros\*.sci; DestDir: {app}\modules\{#SIMANNEALING}\macros; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
-Source: modules\{#SIMANNEALING}\macros\*.bin; DestDir: {app}\modules\{#SIMANNEALING}\macros; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
-Source: modules\{#SIMANNEALING}\macros\buildmacros.sce; DestDir: {app}\modules\{#SIMANNEALING}\macros; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
-Source: modules\{#SIMANNEALING}\macros\buildmacros.bat; DestDir: {app}\modules\{#SIMANNEALING}\macros; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
-Source: modules\{#SIMANNEALING}\macros\cleanmacros.bat; DestDir: {app}\modules\{#SIMANNEALING}\macros; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
-;
-Source: modules\{#SIMANNEALING}\tests\*.*; DestDir: {app}\modules\{#SIMANNEALING}\tests; Flags: recursesubdirs; Components: {#COMPN_SCILAB} and {#COMPN_TESTS}
-;
-;--------------------------------------------------------------------------------------------------------------
index 29701af..6b0e17e 100644 (file)
@@ -87,7 +87,6 @@ begin
     ModulesXmlFileLines[i] := '<module name="spreadsheet" activate="yes"/>'; i := i + 1;
     ModulesXmlFileLines[i] := '<module name="call_scilab" activate="yes"/>'; i := i + 1;
     ModulesXmlFileLines[i] := '<module name="umfpack" activate="yes"/>'; i := i + 1;
-    ModulesXmlFileLines[i] := '<module name="simulated_annealing" activate="yes"/>'; i := i + 1;
     ModulesXmlFileLines[i] := '<module name="parameters" activate="yes"/>'; i := i + 1;
     ModulesXmlFileLines[i] := '<module name="matio" activate="yes"/>'; i := i + 1;
     ModulesXmlFileLines[i] := '<module name="atoms" activate="yes"/>'; i := i + 1;
index 2c10b59..0af004c 100644 (file)
 #include BinariesSourcePath + "\modules\spreadsheet\spreadsheet.iss"
 #include BinariesSourcePath + "\modules\differential_equations\differential_equations.iss"
 #include BinariesSourcePath + "\modules\development_tools\development_tools.iss"
+<<<<<<< HEAD
 #include BinariesSourcePath + "\modules\simulated_annealing\simulated_annealing.iss"
+=======
+#include BinariesSourcePath + "\modules\genetic_algorithms\genetic_algorithms.iss"
+>>>>>>> 3941781e44f... * Bug 14734 fixed: [simulated_annealing] merged in [optimization]
 #include BinariesSourcePath + "\modules\parameters\parameters.iss"
 #include BinariesSourcePath + "\modules\matio\matio.iss"
 #include BinariesSourcePath + "\modules\call_scilab\call_scilab.iss"