Set svn:eol-style to native
Pierre Marechal [Wed, 7 Mar 2007 07:39:52 +0000 (07:39 +0000)]
436 files changed:
scilab/modules/arnoldi/languages/en_US/errors.xml
scilab/modules/arnoldi/languages/en_US/menus.xml
scilab/modules/arnoldi/languages/en_US/messages.xml
scilab/modules/arnoldi/languages/fr_FR/errors.xml
scilab/modules/arnoldi/languages/fr_FR/menus.xml
scilab/modules/arnoldi/languages/fr_FR/messages.xml
scilab/modules/boolean/languages/en_US/errors.xml
scilab/modules/boolean/languages/en_US/menus.xml
scilab/modules/boolean/languages/en_US/messages.xml
scilab/modules/boolean/languages/fr_FR/errors.xml
scilab/modules/boolean/languages/fr_FR/menus.xml
scilab/modules/boolean/languages/fr_FR/messages.xml
scilab/modules/cacsd/languages/en_US/errors.xml
scilab/modules/cacsd/languages/en_US/menus.xml
scilab/modules/cacsd/languages/en_US/messages.xml
scilab/modules/cacsd/languages/fr_FR/errors.xml
scilab/modules/cacsd/languages/fr_FR/menus.xml
scilab/modules/cacsd/languages/fr_FR/messages.xml
scilab/modules/compatibility_functions/compatibility_functions.iss
scilab/modules/compatibility_functions/languages/en_US/errors.xml
scilab/modules/compatibility_functions/languages/en_US/menus.xml
scilab/modules/compatibility_functions/languages/en_US/messages.xml
scilab/modules/compatibility_functions/languages/fr_FR/errors.xml
scilab/modules/compatibility_functions/languages/fr_FR/menus.xml
scilab/modules/compatibility_functions/languages/fr_FR/messages.xml
scilab/modules/core/examples/call_scilab/c/common/makefile.mak
scilab/modules/core/examples/call_scilab/c/common/myprog.c
scilab/modules/core/examples/call_scilab/c/visual_studio/CallSciVC.sln
scilab/modules/core/examples/call_scilab/c/visual_studio/CallSciVC.vcproj
scilab/modules/core/examples/call_scilab/c/visual_studio/CallsciC.c
scilab/modules/core/examples/call_scilab/cpp/borlandcpp/readme.txt
scilab/modules/core/examples/call_scilab/cpp/common/Makefile.mak
scilab/modules/core/examples/call_scilab/cpp/common/ccmatrix.h
scilab/modules/core/examples/call_scilab/cpp/common/ccmatrix1.cc
scilab/modules/core/examples/call_scilab/cpp/common/ccmatrix1.cpp
scilab/modules/core/examples/call_scilab/cpp/common/my_ode.c
scilab/modules/core/examples/call_scilab/cpp/common/myprog.c
scilab/modules/core/examples/call_scilab/cpp/common/readme.txt
scilab/modules/core/examples/call_scilab/fortran/callsci.f
scilab/modules/core/examples/call_scilab/fortran/example.sln
scilab/modules/core/examples/call_scilab/fortran/example.vfproj
scilab/modules/core/examples/call_scilab/fortran/readme.txt
scilab/modules/core/examples/readme.txt
scilab/modules/core/includes/error_scilab.h
scilab/modules/core/includes/message_scilab.h
scilab/modules/core/languages/en_US/errors.xml
scilab/modules/core/languages/en_US/menus.xml
scilab/modules/core/languages/en_US/messages.xml
scilab/modules/core/languages/fr_FR/errors.xml
scilab/modules/core/languages/fr_FR/menus.xml
scilab/modules/core/languages/fr_FR/messages.xml
scilab/modules/core/src/c/TerminateCore.c
scilab/modules/core/src/c/TerminateCore.h
scilab/modules/core/src/c/error_scilab.c
scilab/modules/core/src/c/message_scilab.c
scilab/modules/data_structures/languages/en_US/errors.xml
scilab/modules/data_structures/languages/en_US/menus.xml
scilab/modules/data_structures/languages/en_US/messages.xml
scilab/modules/data_structures/languages/fr_FR/errors.xml
scilab/modules/data_structures/languages/fr_FR/menus.xml
scilab/modules/data_structures/languages/fr_FR/messages.xml
scilab/modules/development_tools/examples/cleantests.bat
scilab/modules/development_tools/examples/maketests.bat
scilab/modules/development_tools/languages/en_US/errors.xml
scilab/modules/development_tools/languages/en_US/menus.xml
scilab/modules/development_tools/languages/en_US/messages.xml
scilab/modules/development_tools/languages/fr_FR/errors.xml
scilab/modules/development_tools/languages/fr_FR/menus.xml
scilab/modules/development_tools/languages/fr_FR/messages.xml
scilab/modules/differential_equations/examples/Makefile.mak
scilab/modules/differential_equations/examples/odedc.dia.ref
scilab/modules/differential_equations/examples/odedc.sce
scilab/modules/differential_equations/examples/odeoptions.dia.ref
scilab/modules/differential_equations/examples/odeoptions.sce
scilab/modules/differential_equations/examples/readme.txt
scilab/modules/differential_equations/languages/en_US/errors.xml
scilab/modules/differential_equations/languages/en_US/menus.xml
scilab/modules/differential_equations/languages/en_US/messages.xml
scilab/modules/differential_equations/languages/fr_FR/errors.xml
scilab/modules/differential_equations/languages/fr_FR/menus.xml
scilab/modules/differential_equations/languages/fr_FR/messages.xml
scilab/modules/double/languages/en_US/errors.xml
scilab/modules/double/languages/en_US/menus.xml
scilab/modules/double/languages/en_US/messages.xml
scilab/modules/double/languages/fr_FR/errors.xml
scilab/modules/double/languages/fr_FR/menus.xml
scilab/modules/double/languages/fr_FR/messages.xml
scilab/modules/elementaries_functions/languages/en_US/errors.xml
scilab/modules/elementaries_functions/languages/en_US/menus.xml
scilab/modules/elementaries_functions/languages/en_US/messages.xml
scilab/modules/elementaries_functions/languages/fr_FR/errors.xml
scilab/modules/elementaries_functions/languages/fr_FR/menus.xml
scilab/modules/elementaries_functions/languages/fr_FR/messages.xml
scilab/modules/fftw/languages/en_US/errors.xml
scilab/modules/fftw/languages/en_US/menus.xml
scilab/modules/fftw/languages/en_US/messages.xml
scilab/modules/fftw/languages/fr_FR/errors.xml
scilab/modules/fftw/languages/fr_FR/menus.xml
scilab/modules/fftw/languages/fr_FR/messages.xml
scilab/modules/fileio/languages/en_US/errors.xml
scilab/modules/fileio/languages/en_US/menus.xml
scilab/modules/fileio/languages/en_US/messages.xml
scilab/modules/fileio/languages/fr_FR/errors.xml
scilab/modules/fileio/languages/fr_FR/menus.xml
scilab/modules/fileio/languages/fr_FR/messages.xml
scilab/modules/functions/languages/en_US/errors.xml
scilab/modules/functions/languages/en_US/menus.xml
scilab/modules/functions/languages/en_US/messages.xml
scilab/modules/functions/languages/fr_FR/errors.xml
scilab/modules/functions/languages/fr_FR/menus.xml
scilab/modules/functions/languages/fr_FR/messages.xml
scilab/modules/graphics/includes/TerminateGraphics.h
scilab/modules/graphics/languages/en_US/errors.xml
scilab/modules/graphics/languages/en_US/menus.xml
scilab/modules/graphics/languages/en_US/messages.xml
scilab/modules/graphics/languages/fr_FR/errors.xml
scilab/modules/graphics/languages/fr_FR/menus.xml
scilab/modules/graphics/languages/fr_FR/messages.xml
scilab/modules/graphics/src/c/TerminateGraphics.c
scilab/modules/gui/includes/TerminateGui.h
scilab/modules/gui/languages/en_US/errors.xml
scilab/modules/gui/languages/en_US/menus.xml
scilab/modules/gui/languages/en_US/messages.xml
scilab/modules/gui/languages/fr_FR/errors.xml
scilab/modules/gui/languages/fr_FR/menus.xml
scilab/modules/gui/languages/fr_FR/messages.xml
scilab/modules/gui/src/c/TerminateGui.c
scilab/modules/helptools/languages/en_US/errors.xml
scilab/modules/helptools/languages/en_US/menus.xml
scilab/modules/helptools/languages/en_US/messages.xml
scilab/modules/helptools/languages/fr_FR/errors.xml
scilab/modules/helptools/languages/fr_FR/menus.xml
scilab/modules/helptools/languages/fr_FR/messages.xml
scilab/modules/incremental_link/examples/interfaces/c/Makefile.mak
scilab/modules/incremental_link/examples/interfaces/c/as2osc.c
scilab/modules/incremental_link/examples/interfaces/c/crestrc.c
scilab/modules/incremental_link/examples/interfaces/c/ex10c.dia.ref
scilab/modules/incremental_link/examples/interfaces/c/ex10c.sce
scilab/modules/incremental_link/examples/interfaces/c/ex11c.dia.ref
scilab/modules/incremental_link/examples/interfaces/c/ex11c.sce
scilab/modules/incremental_link/examples/interfaces/c/ex12c.dia.ref
scilab/modules/incremental_link/examples/interfaces/c/ex12c.sce
scilab/modules/incremental_link/examples/interfaces/c/ex13c.dia.ref
scilab/modules/incremental_link/examples/interfaces/c/ex13c.sce
scilab/modules/incremental_link/examples/interfaces/c/ex14c.dia.ref
scilab/modules/incremental_link/examples/interfaces/c/ex14c.sce
scilab/modules/incremental_link/examples/interfaces/c/ex15c.dia.ref
scilab/modules/incremental_link/examples/interfaces/c/ex15c.sce
scilab/modules/incremental_link/examples/interfaces/c/ex1c.dia.ref
scilab/modules/incremental_link/examples/interfaces/c/ex1c.sce
scilab/modules/incremental_link/examples/interfaces/c/ex2c.dia.ref
scilab/modules/incremental_link/examples/interfaces/c/ex2c.sce
scilab/modules/incremental_link/examples/interfaces/c/ex3c.dia.ref
scilab/modules/incremental_link/examples/interfaces/c/ex3c.sce
scilab/modules/incremental_link/examples/interfaces/c/ex4c.dia.ref
scilab/modules/incremental_link/examples/interfaces/c/ex4c.sce
scilab/modules/incremental_link/examples/interfaces/c/ex5c.dia.ref
scilab/modules/incremental_link/examples/interfaces/c/ex5c.sce
scilab/modules/incremental_link/examples/interfaces/c/ex6c.dia.ref
scilab/modules/incremental_link/examples/interfaces/c/ex6c.sce
scilab/modules/incremental_link/examples/interfaces/c/ex7c.dia.ref
scilab/modules/incremental_link/examples/interfaces/c/ex7c.sce
scilab/modules/incremental_link/examples/interfaces/c/ex8c.dia.ref
scilab/modules/incremental_link/examples/interfaces/c/ex8c.sce
scilab/modules/incremental_link/examples/interfaces/c/ex9c.dia.ref
scilab/modules/incremental_link/examples/interfaces/c/ex9c.sce
scilab/modules/incremental_link/examples/interfaces/c/intex10c.c
scilab/modules/incremental_link/examples/interfaces/c/intex11c.c
scilab/modules/incremental_link/examples/interfaces/c/intex12c.c
scilab/modules/incremental_link/examples/interfaces/c/intex13c.c
scilab/modules/incremental_link/examples/interfaces/c/intex14c.c
scilab/modules/incremental_link/examples/interfaces/c/intex15c.c
scilab/modules/incremental_link/examples/interfaces/c/intex16c.c
scilab/modules/incremental_link/examples/interfaces/c/intex17c.c
scilab/modules/incremental_link/examples/interfaces/c/intex1c.c
scilab/modules/incremental_link/examples/interfaces/c/intex2c.c
scilab/modules/incremental_link/examples/interfaces/c/intex3c.c
scilab/modules/incremental_link/examples/interfaces/c/intex4c.c
scilab/modules/incremental_link/examples/interfaces/c/intex5c.c
scilab/modules/incremental_link/examples/interfaces/c/intex6c.c
scilab/modules/incremental_link/examples/interfaces/c/intex7c.c
scilab/modules/incremental_link/examples/interfaces/c/intex8c.c
scilab/modules/incremental_link/examples/interfaces/c/intex9c.c
scilab/modules/incremental_link/examples/interfaces/fortran/Makefile.mak
scilab/modules/incremental_link/examples/interfaces/fortran/ex1f.dia.ref
scilab/modules/incremental_link/examples/interfaces/fortran/ex1f.sce
scilab/modules/incremental_link/examples/interfaces/fortran/ex2f.dia.ref
scilab/modules/incremental_link/examples/interfaces/fortran/ex2f.sce
scilab/modules/incremental_link/examples/interfaces/fortran/ex3f.dia.ref
scilab/modules/incremental_link/examples/interfaces/fortran/ex3f.sce
scilab/modules/incremental_link/examples/interfaces/fortran/ex4f.dia.ref
scilab/modules/incremental_link/examples/interfaces/fortran/ex4f.sce
scilab/modules/incremental_link/examples/interfaces/fortran/intex1f.f
scilab/modules/incremental_link/examples/interfaces/fortran/intex2f.f
scilab/modules/incremental_link/examples/interfaces/fortran/intex3f.f
scilab/modules/incremental_link/examples/interfaces/fortran/intex4f.f
scilab/modules/incremental_link/examples/readme.txt
scilab/modules/incremental_link/help/en_US/configure_lcc.xml
scilab/modules/incremental_link/help/en_US/findlcccompiler.xml
scilab/modules/incremental_link/languages/en_US/errors.xml
scilab/modules/incremental_link/languages/en_US/menus.xml
scilab/modules/incremental_link/languages/en_US/messages.xml
scilab/modules/incremental_link/languages/fr_FR/errors.xml
scilab/modules/incremental_link/languages/fr_FR/menus.xml
scilab/modules/incremental_link/languages/fr_FR/messages.xml
scilab/modules/incremental_link/macros/chooselcccompiler.sci
scilab/modules/incremental_link/macros/configure_lcc.sci
scilab/modules/incremental_link/macros/findlcccompiler.sci
scilab/modules/integer/languages/en_US/errors.xml
scilab/modules/integer/languages/en_US/menus.xml
scilab/modules/integer/languages/en_US/messages.xml
scilab/modules/integer/languages/fr_FR/errors.xml
scilab/modules/integer/languages/fr_FR/menus.xml
scilab/modules/integer/languages/fr_FR/messages.xml
scilab/modules/interpolation/languages/en_US/errors.xml
scilab/modules/interpolation/languages/en_US/menus.xml
scilab/modules/interpolation/languages/en_US/messages.xml
scilab/modules/interpolation/languages/fr_FR/errors.xml
scilab/modules/interpolation/languages/fr_FR/menus.xml
scilab/modules/interpolation/languages/fr_FR/messages.xml
scilab/modules/intersci/languages/en_US/errors.xml
scilab/modules/intersci/languages/en_US/menus.xml
scilab/modules/intersci/languages/en_US/messages.xml
scilab/modules/intersci/languages/fr_FR/errors.xml
scilab/modules/intersci/languages/fr_FR/menus.xml
scilab/modules/intersci/languages/fr_FR/messages.xml
scilab/modules/intersci/src/lib/LibScilab_Import.def
scilab/modules/intersci/src/lib/intersci_header.def
scilab/modules/intersci/src/lib/resource.h
scilab/modules/io/languages/en_US/errors.xml
scilab/modules/io/languages/en_US/menus.xml
scilab/modules/io/languages/en_US/messages.xml
scilab/modules/io/languages/fr_FR/errors.xml
scilab/modules/io/languages/fr_FR/menus.xml
scilab/modules/io/languages/fr_FR/messages.xml
scilab/modules/javasci/examples/readme.txt
scilab/modules/javasci/languages/en_US/errors.xml
scilab/modules/javasci/languages/en_US/menus.xml
scilab/modules/javasci/languages/en_US/messages.xml
scilab/modules/javasci/languages/fr_FR/errors.xml
scilab/modules/javasci/languages/fr_FR/menus.xml
scilab/modules/javasci/languages/fr_FR/messages.xml
scilab/modules/jvm/languages/en_US/errors.xml
scilab/modules/jvm/languages/en_US/menus.xml
scilab/modules/jvm/languages/en_US/messages.xml
scilab/modules/jvm/languages/fr_FR/errors.xml
scilab/modules/jvm/languages/fr_FR/menus.xml
scilab/modules/jvm/languages/fr_FR/messages.xml
scilab/modules/linear_algebra/languages/en_US/errors.xml
scilab/modules/linear_algebra/languages/en_US/menus.xml
scilab/modules/linear_algebra/languages/en_US/messages.xml
scilab/modules/linear_algebra/languages/fr_FR/errors.xml
scilab/modules/linear_algebra/languages/fr_FR/menus.xml
scilab/modules/linear_algebra/languages/fr_FR/messages.xml
scilab/modules/localization/includes/QueryStringError.h
scilab/modules/localization/includes/QueryStringMenu.h
scilab/modules/localization/includes/QueryStringMessage.h
scilab/modules/localization/includes/TerminateLocalization.h
scilab/modules/localization/languages/en_US/errors.xml
scilab/modules/localization/languages/en_US/menus.xml
scilab/modules/localization/languages/en_US/messages.xml
scilab/modules/localization/languages/fr_FR/errors.xml
scilab/modules/localization/languages/fr_FR/menus.xml
scilab/modules/localization/languages/fr_FR/messages.xml
scilab/modules/localization/macros/check_localization.sci
scilab/modules/localization/sci_gateway/c/sci_addtext.c
scilab/modules/localization/sci_gateway/c/sci_gettext.c
scilab/modules/localization/sci_gateway/c/sci_removetext.c
scilab/modules/localization/src/c/TerminateLocalization.c
scilab/modules/localization/src/c/getentrieshashtable.c
scilab/modules/localization/src/c/getentrieshashtable.h
scilab/modules/localization/src/c/loadhashtableslocalization.c
scilab/modules/localization/src/c/loadhashtableslocalization.h
scilab/modules/localization/xml/localization.dtd
scilab/modules/m2sci/languages/en_US/errors.xml
scilab/modules/m2sci/languages/en_US/menus.xml
scilab/modules/m2sci/languages/en_US/messages.xml
scilab/modules/m2sci/languages/fr_FR/errors.xml
scilab/modules/m2sci/languages/fr_FR/menus.xml
scilab/modules/m2sci/languages/fr_FR/messages.xml
scilab/modules/maple2scilab/languages/en_US/errors.xml
scilab/modules/maple2scilab/languages/en_US/menus.xml
scilab/modules/maple2scilab/languages/en_US/messages.xml
scilab/modules/maple2scilab/languages/fr_FR/errors.xml
scilab/modules/maple2scilab/languages/fr_FR/menus.xml
scilab/modules/maple2scilab/languages/fr_FR/messages.xml
scilab/modules/metanet/languages/en_US/errors.xml
scilab/modules/metanet/languages/en_US/menus.xml
scilab/modules/metanet/languages/en_US/messages.xml
scilab/modules/metanet/languages/fr_FR/errors.xml
scilab/modules/metanet/languages/fr_FR/menus.xml
scilab/modules/metanet/languages/fr_FR/messages.xml
scilab/modules/mexlib/languages/en_US/errors.xml
scilab/modules/mexlib/languages/en_US/menus.xml
scilab/modules/mexlib/languages/en_US/messages.xml
scilab/modules/mexlib/languages/fr_FR/errors.xml
scilab/modules/mexlib/languages/fr_FR/menus.xml
scilab/modules/mexlib/languages/fr_FR/messages.xml
scilab/modules/optimization/languages/en_US/errors.xml
scilab/modules/optimization/languages/en_US/menus.xml
scilab/modules/optimization/languages/en_US/messages.xml
scilab/modules/optimization/languages/fr_FR/errors.xml
scilab/modules/optimization/languages/fr_FR/menus.xml
scilab/modules/optimization/languages/fr_FR/messages.xml
scilab/modules/others/languages/en_US/errors.xml
scilab/modules/others/languages/en_US/menus.xml
scilab/modules/others/languages/en_US/messages.xml
scilab/modules/others/languages/fr_FR/errors.xml
scilab/modules/others/languages/fr_FR/menus.xml
scilab/modules/others/languages/fr_FR/messages.xml
scilab/modules/overloading/languages/en_US/errors.xml
scilab/modules/overloading/languages/en_US/menus.xml
scilab/modules/overloading/languages/en_US/messages.xml
scilab/modules/overloading/languages/fr_FR/errors.xml
scilab/modules/overloading/languages/fr_FR/menus.xml
scilab/modules/overloading/languages/fr_FR/messages.xml
scilab/modules/polynomials/languages/en_US/errors.xml
scilab/modules/polynomials/languages/en_US/menus.xml
scilab/modules/polynomials/languages/en_US/messages.xml
scilab/modules/polynomials/languages/fr_FR/errors.xml
scilab/modules/polynomials/languages/fr_FR/menus.xml
scilab/modules/polynomials/languages/fr_FR/messages.xml
scilab/modules/pvm/languages/en_US/errors.xml
scilab/modules/pvm/languages/en_US/menus.xml
scilab/modules/pvm/languages/en_US/messages.xml
scilab/modules/pvm/languages/fr_FR/errors.xml
scilab/modules/pvm/languages/fr_FR/menus.xml
scilab/modules/pvm/languages/fr_FR/messages.xml
scilab/modules/randlib/languages/en_US/errors.xml
scilab/modules/randlib/languages/en_US/menus.xml
scilab/modules/randlib/languages/en_US/messages.xml
scilab/modules/randlib/languages/fr_FR/errors.xml
scilab/modules/randlib/languages/fr_FR/menus.xml
scilab/modules/randlib/languages/fr_FR/messages.xml
scilab/modules/sci2c/languages/en_US/errors.xml
scilab/modules/sci2c/languages/en_US/menus.xml
scilab/modules/sci2c/languages/en_US/messages.xml
scilab/modules/sci2c/languages/fr_FR/errors.xml
scilab/modules/sci2c/languages/fr_FR/menus.xml
scilab/modules/sci2c/languages/fr_FR/messages.xml
scilab/modules/sci2c/sci2c.iss
scilab/modules/scicos/languages/en_US/errors.xml
scilab/modules/scicos/languages/en_US/menus.xml
scilab/modules/scicos/languages/en_US/messages.xml
scilab/modules/scicos/languages/fr_FR/errors.xml
scilab/modules/scicos/languages/fr_FR/menus.xml
scilab/modules/scicos/languages/fr_FR/messages.xml
scilab/modules/scilab2fortran/languages/en_US/errors.xml
scilab/modules/scilab2fortran/languages/en_US/menus.xml
scilab/modules/scilab2fortran/languages/en_US/messages.xml
scilab/modules/scilab2fortran/languages/fr_FR/errors.xml
scilab/modules/scilab2fortran/languages/fr_FR/menus.xml
scilab/modules/scilab2fortran/languages/fr_FR/messages.xml
scilab/modules/scipad/languages/en_US/errors.xml
scilab/modules/scipad/languages/en_US/menus.xml
scilab/modules/scipad/languages/en_US/messages.xml
scilab/modules/scipad/languages/fr_FR/errors.xml
scilab/modules/scipad/languages/fr_FR/menus.xml
scilab/modules/scipad/languages/fr_FR/messages.xml
scilab/modules/signal_processing/languages/en_US/errors.xml
scilab/modules/signal_processing/languages/en_US/menus.xml
scilab/modules/signal_processing/languages/en_US/messages.xml
scilab/modules/signal_processing/languages/fr_FR/errors.xml
scilab/modules/signal_processing/languages/fr_FR/menus.xml
scilab/modules/signal_processing/languages/fr_FR/messages.xml
scilab/modules/sound/languages/en_US/errors.xml
scilab/modules/sound/languages/en_US/menus.xml
scilab/modules/sound/languages/en_US/messages.xml
scilab/modules/sound/languages/fr_FR/errors.xml
scilab/modules/sound/languages/fr_FR/menus.xml
scilab/modules/sound/languages/fr_FR/messages.xml
scilab/modules/sparse/languages/en_US/errors.xml
scilab/modules/sparse/languages/en_US/menus.xml
scilab/modules/sparse/languages/en_US/messages.xml
scilab/modules/sparse/languages/fr_FR/errors.xml
scilab/modules/sparse/languages/fr_FR/menus.xml
scilab/modules/sparse/languages/fr_FR/messages.xml
scilab/modules/special_functions/languages/en_US/errors.xml
scilab/modules/special_functions/languages/en_US/menus.xml
scilab/modules/special_functions/languages/en_US/messages.xml
scilab/modules/special_functions/languages/fr_FR/errors.xml
scilab/modules/special_functions/languages/fr_FR/menus.xml
scilab/modules/special_functions/languages/fr_FR/messages.xml
scilab/modules/statistics/languages/en_US/errors.xml
scilab/modules/statistics/languages/en_US/menus.xml
scilab/modules/statistics/languages/en_US/messages.xml
scilab/modules/statistics/languages/fr_FR/errors.xml
scilab/modules/statistics/languages/fr_FR/menus.xml
scilab/modules/statistics/languages/fr_FR/messages.xml
scilab/modules/string/languages/en_US/errors.xml
scilab/modules/string/languages/en_US/menus.xml
scilab/modules/string/languages/en_US/messages.xml
scilab/modules/string/languages/fr_FR/errors.xml
scilab/modules/string/languages/fr_FR/menus.xml
scilab/modules/string/languages/fr_FR/messages.xml
scilab/modules/symbolic/languages/en_US/errors.xml
scilab/modules/symbolic/languages/en_US/menus.xml
scilab/modules/symbolic/languages/en_US/messages.xml
scilab/modules/symbolic/languages/fr_FR/errors.xml
scilab/modules/symbolic/languages/fr_FR/menus.xml
scilab/modules/symbolic/languages/fr_FR/messages.xml
scilab/modules/tclsci/includes/TerminateTclTk.h
scilab/modules/tclsci/languages/en_US/errors.xml
scilab/modules/tclsci/languages/en_US/menus.xml
scilab/modules/tclsci/languages/en_US/messages.xml
scilab/modules/tclsci/languages/fr_FR/errors.xml
scilab/modules/tclsci/languages/fr_FR/menus.xml
scilab/modules/tclsci/languages/fr_FR/messages.xml
scilab/modules/tclsci/src/c/TerminateTclTk.c
scilab/modules/texmacs/languages/en_US/errors.xml
scilab/modules/texmacs/languages/en_US/menus.xml
scilab/modules/texmacs/languages/en_US/messages.xml
scilab/modules/texmacs/languages/fr_FR/errors.xml
scilab/modules/texmacs/languages/fr_FR/menus.xml
scilab/modules/texmacs/languages/fr_FR/messages.xml
scilab/modules/tfds/languages/en_US/errors.xml
scilab/modules/tfds/languages/en_US/menus.xml
scilab/modules/tfds/languages/en_US/messages.xml
scilab/modules/tfds/languages/fr_FR/errors.xml
scilab/modules/tfds/languages/fr_FR/menus.xml
scilab/modules/tfds/languages/fr_FR/messages.xml
scilab/modules/time/languages/en_US/errors.xml
scilab/modules/time/languages/en_US/menus.xml
scilab/modules/time/languages/en_US/messages.xml
scilab/modules/time/languages/fr_FR/errors.xml
scilab/modules/time/languages/fr_FR/menus.xml
scilab/modules/time/languages/fr_FR/messages.xml
scilab/modules/wintools/languages/en_US/errors.xml
scilab/modules/wintools/languages/en_US/menus.xml
scilab/modules/wintools/languages/en_US/messages.xml
scilab/modules/wintools/languages/fr_FR/errors.xml
scilab/modules/wintools/languages/fr_FR/menus.xml
scilab/modules/wintools/languages/fr_FR/messages.xml
scilab/modules/wintools/sci_gateway/c/sci_findfileassociation.c
scilab/modules/wintools/src/c/FindFileAssociation.c
scilab/modules/wintools/src/c/FindFileAssociation.h

index 21c50a7..77da987 100644 (file)
@@ -1,20 +1,20 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
-<!DOCTYPE LOCALIZATION SYSTEM "../../../localization/xml/localization.dtd">\r
-<LOCALIZATION>\r
-\r
-<entry>\r
-       <tag></tag>\r
-       <string></string>\r
-</entry>       \r
-\r
-<entry>\r
-       <tag></tag>\r
-       <string></string>\r
-</entry>       \r
-               \r
-<entry>\r
-       <tag></tag>\r
-       <string></string>\r
-</entry>       \r
-\r
-</LOCALIZATION>\r
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE LOCALIZATION SYSTEM "../../../localization/xml/localization.dtd">
+<LOCALIZATION>
+
+<entry>
+       <tag></tag>
+       <string></string>
+</entry>       
+
+<entry>
+       <tag></tag>
+       <string></string>
+</entry>       
+               
+<entry>
+       <tag></tag>
+       <string></string>
+</entry>       
+
+</LOCALIZATION>
index 21c50a7..77da987 100644 (file)
@@ -1,20 +1,20 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
-<!DOCTYPE LOCALIZATION SYSTEM "../../../localization/xml/localization.dtd">\r
-<LOCALIZATION>\r
-\r
-<entry>\r
-       <tag></tag>\r
-       <string></string>\r
-</entry>       \r
-\r
-<entry>\r
-       <tag></tag>\r
-       <string></string>\r
-</entry>       \r
-               \r
-<entry>\r
-       <tag></tag>\r
-       <string></string>\r
-</entry>       \r
-\r
-</LOCALIZATION>\r
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE LOCALIZATION SYSTEM "../../../localization/xml/localization.dtd">
+<LOCALIZATION>
+
+<entry>
+       <tag></tag>
+       <string></string>
+</entry>       
+
+<entry>
+       <tag></tag>
+       <string></string>
+</entry>       
+               
+<entry>
+       <tag></tag>
+       <string></string>
+</entry>       
+
+</LOCALIZATION>
index 21c50a7..77da987 100644 (file)
@@ -1,20 +1,20 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
-<!DOCTYPE LOCALIZATION SYSTEM "../../../localization/xml/localization.dtd">\r
-<LOCALIZATION>\r
-\r
-<entry>\r
-       <tag></tag>\r
-       <string></string>\r
-</entry>       \r
-\r
-<entry>\r
-       <tag></tag>\r
-       <string></string>\r
-</entry>       \r
-               \r
-<entry>\r
-       <tag></tag>\r
-       <string></string>\r
-</entry>       \r
-\r
-</LOCALIZATION>\r
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE LOCALIZATION SYSTEM "../../../localization/xml/localization.dtd">
+<LOCALIZATION>
+
+<entry>
+       <tag></tag>
+       <string></string>
+</entry>       
+
+<entry>
+       <tag></tag>
+       <string></string>
+</entry>       
+               
+<entry>
+       <tag></tag>
+       <string></string>
+</entry>       
+
+</LOCALIZATION>
index 21c50a7..77da987 100644 (file)
@@ -1,20 +1,20 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
-<!DOCTYPE LOCALIZATION SYSTEM "../../../localization/xml/localization.dtd">\r
-<LOCALIZATION>\r
-\r
-<entry>\r
-       <tag></tag>\r
-       <string></string>\r
-</entry>       \r
-\r
-<entry>\r
-       <tag></tag>\r
-       <string></string>\r
-</entry>       \r
-               \r
-<entry>\r
-       <tag></tag>\r
-       <string></string>\r
-</entry>       \r
-\r
-</LOCALIZATION>\r
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE LOCALIZATION SYSTEM "../../../localization/xml/localization.dtd">
+<LOCALIZATION>
+
+<entry>
+       <tag></tag>
+       <string></string>
+</entry>       
+
+<entry>
+       <tag></tag>
+       <string></string>
+</entry>       
+               
+<entry>
+       <tag></tag>
+       <string></string>
+</entry>       
+
+</LOCALIZATION>
index 21c50a7..77da987 100644 (file)
@@ -1,20 +1,20 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
-<!DOCTYPE LOCALIZATION SYSTEM "../../../localization/xml/localization.dtd">\r
-<LOCALIZATION>\r
-\r
-<entry>\r
-       <tag></tag>\r
-       <string></string>\r
-</entry>       \r
-\r
-<entry>\r
-       <tag></tag>\r
-       <string></string>\r
-</entry>       \r
-               \r
-<entry>\r
-       <tag></tag>\r
-       <string></string>\r
-</entry>       \r
-\r
-</LOCALIZATION>\r
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE LOCALIZATION SYSTEM "../../../localization/xml/localization.dtd">
+<LOCALIZATION>
+
+<entry>
+       <tag></tag>
+       <string></string>
+</entry>       
+
+<entry>
+       <tag></tag>
+       <string></string>
+</entry>       
+               
+<entry>
+       <tag></tag>
+       <string></string>
+</entry>       
+
+</LOCALIZATION>
index 21c50a7..77da987 100644 (file)
@@ -1,20 +1,20 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
-<!DOCTYPE LOCALIZATION SYSTEM "../../../localization/xml/localization.dtd">\r
-<LOCALIZATION>\r
-\r
-<entry>\r
-       <tag></tag>\r
-       <string></string>\r
-</entry>       \r
-\r
-<entry>\r
-       <tag></tag>\r
-       <string></string>\r
-</entry>       \r
-               \r
-<entry>\r
-       <tag></tag>\r
-       <string></string>\r
-</entry>       \r
-\r
-</LOCALIZATION>\r
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE LOCALIZATION SYSTEM "../../../localization/xml/localization.dtd">
+<LOCALIZATION>
+
+<entry>
+       <tag></tag>
+       <string></string>
+</entry>       
+
+<entry>
+       <tag></tag>
+       <string></string>
+</entry>       
+               
+<entry>
+       <tag></tag>
+       <string></string>
+</entry>       
+
+</LOCALIZATION>
index 21c50a7..77da987 100644 (file)
@@ -1,20 +1,20 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
-<!DOCTYPE LOCALIZATION SYSTEM "../../../localization/xml/localization.dtd">\r
-<LOCALIZATION>\r
-\r
-<entry>\r
-       <tag></tag>\r
-       <string></string>\r
-</entry>       \r
-\r
-<entry>\r
-       <tag></tag>\r
-       <string></string>\r
-</entry>       \r
-               \r
-<entry>\r
-       <tag></tag>\r
-       <string></string>\r
-</entry>       \r
-\r
-</LOCALIZATION>\r
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE LOCALIZATION SYSTEM "../../../localization/xml/localization.dtd">
+<LOCALIZATION>
+
+<entry>
+       <tag></tag>
+       <string></string>
+</entry>       
+
+<entry>
+       <tag></tag>
+       <string></string>
+</entry>       
+               
+<entry>
+       <tag></tag>
+       <string></string>
+</entry>       
+
+</LOCALIZATION>
index 21c50a7..77da987 100644 (file)
@@ -1,20 +1,20 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
-<!DOCTYPE LOCALIZATION SYSTEM "../../../localization/xml/localization.dtd">\r
-<LOCALIZATION>\r
-\r
-<entry>\r
-       <tag></tag>\r
-       <string></string>\r
-</entry>       \r
-\r
-<entry>\r
-       <tag></tag>\r
-       <string></string>\r
-</entry>       \r
-               \r
-<entry>\r
-       <tag></tag>\r
-       <string></string>\r
-</entry>       \r
-\r
-</LOCALIZATION>\r
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE LOCALIZATION SYSTEM "../../../localization/xml/localization.dtd">
+<LOCALIZATION>
+
+<entry>
+       <tag></tag>
+       <string></string>
+</entry>       
+
+<entry>
+       <tag></tag>
+       <string></string>
+</entry>       
+               
+<entry>
+       <tag></tag>
+       <string></string>
+</entry>       
+
+</LOCALIZATION>
index 21c50a7..77da987 100644 (file)
@@ -1,20 +1,20 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
-<!DOCTYPE LOCALIZATION SYSTEM "../../../localization/xml/localization.dtd">\r
-<LOCALIZATION>\r
-\r
-<entry>\r
-       <tag></tag>\r
-       <string></string>\r
-</entry>       \r
-\r
-<entry>\r
-       <tag></tag>\r
-       <string></string>\r
-</entry>       \r
-               \r
-<entry>\r
-       <tag></tag>\r
-       <string></string>\r
-</entry>       \r
-\r
-</LOCALIZATION>\r
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE LOCALIZATION SYSTEM "../../../localization/xml/localization.dtd">
+<LOCALIZATION>
+
+<entry>
+       <tag></tag>
+       <string></string>
+</entry>       
+
+<entry>
+       <tag></tag>
+       <string></string>
+</entry>       
+               
+<entry>
+       <tag></tag>
+       <string></string>
+</entry>       
+
+</LOCALIZATION>
index 21c50a7..77da987 100644 (file)
@@ -1,20 +1,20 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
-<!DOCTYPE LOCALIZATION SYSTEM "../../../localization/xml/localization.dtd">\r
-<LOCALIZATION>\r
-\r
-<entry>\r
-       <tag></tag>\r
-       <string></string>\r
-</entry>       \r
-\r
-<entry>\r
-       <tag></tag>\r
-       <string></string>\r
-</entry>       \r
-               \r
-<entry>\r
-       <tag></tag>\r
-       <string></string>\r
-</entry>       \r
-\r
-</LOCALIZATION>\r
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE LOCALIZATION SYSTEM "../../../localization/xml/localization.dtd">
+<LOCALIZATION>
+
+<entry>
+       <tag></tag>
+       <string></string>
+</entry>       
+
+<entry>
+       <tag></tag>
+       <string></string>
+</entry>       
+               
+<entry>
+       <tag></tag>
+       <string></string>
+</entry>       
+
+</LOCALIZATION>
index 21c50a7..77da987 100644 (file)
@@ -1,20 +1,20 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
-<!DOCTYPE LOCALIZATION SYSTEM "../../../localization/xml/localization.dtd">\r
-<LOCALIZATION>\r
-\r
-<entry>\r
-       <tag></tag>\r
-       <string></string>\r
-</entry>       \r
-\r
-<entry>\r
-       <tag></tag>\r
-       <string></string>\r
-</entry>       \r
-               \r
-<entry>\r
-       <tag></tag>\r
-       <string></string>\r
-</entry>       \r
-\r
-</LOCALIZATION>\r
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE LOCALIZATION SYSTEM "../../../localization/xml/localization.dtd">
+<LOCALIZATION>
+
+<entry>
+       <tag></tag>
+       <string></string>
+</entry>       
+
+<entry>
+       <tag></tag>
+       <string></string>
+</entry>       
+               
+<entry>
+       <tag></tag>
+       <string></string>
+</entry>       
+
+</LOCALIZATION>
index 21c50a7..77da987 100644 (file)
@@ -1,20 +1,20 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
-<!DOCTYPE LOCALIZATION SYSTEM "../../../localization/xml/localization.dtd">\r
-<LOCALIZATION>\r
-\r
-<entry>\r
-       <tag></tag>\r
-       <string></string>\r
-</entry>       \r
-\r
-<entry>\r
-       <tag></tag>\r
-       <string></string>\r
-</entry>       \r
-               \r
-<entry>\r
-       <tag></tag>\r
-       <string></string>\r
-</entry>       \r
-\r
-</LOCALIZATION>\r
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE LOCALIZATION SYSTEM "../../../localization/xml/localization.dtd">
+<LOCALIZATION>
+
+<entry>
+       <tag></tag>
+       <string></string>
+</entry>       
+
+<entry>
+       <tag></tag>
+       <string></string>
+</entry>       
+               
+<entry>
+       <tag></tag>
+       <string></string>
+</entry>       
+
+</LOCALIZATION>
index 21c50a7..77da987 100644 (file)
@@ -1,20 +1,20 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
-<!DOCTYPE LOCALIZATION SYSTEM "../../../localization/xml/localization.dtd">\r
-<LOCALIZATION>\r
-\r
-<entry>\r
-       <tag></tag>\r
-       <string></string>\r
-</entry>       \r
-\r
-<entry>\r
-       <tag></tag>\r
-       <string></string>\r
-</entry>       \r
-               \r
-<entry>\r
-       <tag></tag>\r
-       <string></string>\r
-</entry>       \r
-\r
-</LOCALIZATION>\r
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE LOCALIZATION SYSTEM "../../../localization/xml/localization.dtd">
+<LOCALIZATION>
+
+<entry>
+       <tag></tag>
+       <string></string>
+</entry>       
+
+<entry>
+       <tag></tag>
+       <string></string>
+</entry>       
+               
+<entry>
+       <tag></tag>
+       <string></string>
+</entry>       
+
+</LOCALIZATION>
index 21c50a7..77da987 100644 (file)
@@ -1,20 +1,20 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
-<!DOCTYPE LOCALIZATION SYSTEM "../../../localization/xml/localization.dtd">\r
-<LOCALIZATION>\r
-\r
-<entry>\r
-       <tag></tag>\r
-       <string></string>\r
-</entry>       \r
-\r
-<entry>\r
-       <tag></tag>\r
-       <string></string>\r
-</entry>       \r
-               \r
-<entry>\r
-       <tag></tag>\r
-       <string></string>\r
-</entry>       \r
-\r
-</LOCALIZATION>\r
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE LOCALIZATION SYSTEM "../../../localization/xml/localization.dtd">
+<LOCALIZATION>
+
+<entry>
+       <tag></tag>
+       <string></string>
+</entry>       
+
+<entry>
+       <tag></tag>
+       <string></string>
+</entry>       
+               
+<entry>
+       <tag></tag>
+       <string></string>
+</entry>       
+
+</LOCALIZATION>
index 21c50a7..77da987 100644 (file)
@@ -1,20 +1,20 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
-<!DOCTYPE LOCALIZATION SYSTEM "../../../localization/xml/localization.dtd">\r
-<LOCALIZATION>\r
-\r
-<entry>\r
-       <tag></tag>\r
-       <string></string>\r
-</entry>       \r
-\r
-<entry>\r
-       <tag></tag>\r
-       <string></string>\r
-</entry>       \r
-               \r
-<entry>\r
-       <tag></tag>\r
-       <string></string>\r
-</entry>       \r
-\r
-</LOCALIZATION>\r
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE LOCALIZATION SYSTEM "../../../localization/xml/localization.dtd">
+<LOCALIZATION>
+
+<entry>
+       <tag></tag>
+       <string></string>
+</entry>       
+
+<entry>
+       <tag></tag>
+       <string></string>
+</entry>       
+               
+<entry>
+       <tag></tag>
+       <string></string>
+</entry>       
+
+</LOCALIZATION>
index 21c50a7..77da987 100644 (file)
@@ -1,20 +1,20 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
-<!DOCTYPE LOCALIZATION SYSTEM "../../../localization/xml/localization.dtd">\r
-<LOCALIZATION>\r
-\r
-<entry>\r
-       <tag></tag>\r
-       <string></string>\r
-</entry>       \r
-\r
-<entry>\r
-       <tag></tag>\r
-       <string></string>\r
-</entry>       \r
-               \r
-<entry>\r
-       <tag></tag>\r
-       <string></string>\r
-</entry>       \r
-\r
-</LOCALIZATION>\r
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE LOCALIZATION SYSTEM "../../../localization/xml/localization.dtd">
+<LOCALIZATION>
+
+<entry>
+       <tag></tag>
+       <string></string>
+</entry>       
+
+<entry>
+       <tag></tag>
+       <string></string>
+</entry>       
+               
+<entry>
+       <tag></tag>
+       <string></string>
+</entry>       
+
+</LOCALIZATION>
index 21c50a7..77da987 100644 (file)
@@ -1,20 +1,20 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
-<!DOCTYPE LOCALIZATION SYSTEM "../../../localization/xml/localization.dtd">\r
-<LOCALIZATION>\r
-\r
-<entry>\r
-       <tag></tag>\r
-       <string></string>\r
-</entry>       \r
-\r
-<entry>\r
-       <tag></tag>\r
-       <string></string>\r
-</entry>       \r
-               \r
-<entry>\r
-       <tag></tag>\r
-       <string></string>\r
-</entry>       \r
-\r
-</LOCALIZATION>\r
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE LOCALIZATION SYSTEM "../../../localization/xml/localization.dtd">
+<LOCALIZATION>
+
+<entry>
+       <tag></tag>
+       <string></string>
+</entry>       
+
+<entry>
+       <tag></tag>
+       <string></string>
+</entry>       
+               
+<entry>
+       <tag></tag>
+       <string></string>
+</entry>       
+
+</LOCALIZATION>
index 21c50a7..77da987 100644 (file)
@@ -1,20 +1,20 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
-<!DOCTYPE LOCALIZATION SYSTEM "../../../localization/xml/localization.dtd">\r
-<LOCALIZATION>\r
-\r
-<entry>\r
-       <tag></tag>\r
-       <string></string>\r
-</entry>       \r
-\r
-<entry>\r
-       <tag></tag>\r
-       <string></string>\r
-</entry>       \r
-               \r
-<entry>\r
-       <tag></tag>\r
-       <string></string>\r
-</entry>       \r
-\r
-</LOCALIZATION>\r
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE LOCALIZATION SYSTEM "../../../localization/xml/localization.dtd">
+<LOCALIZATION>
+
+<entry>
+       <tag></tag>
+       <string></string>
+</entry>       
+
+<entry>
+       <tag></tag>
+       <string></string>
+</entry>       
+               
+<entry>
+       <tag></tag>
+       <string></string>
+</entry>       
+
+</LOCALIZATION>
index deecb6a..c55a1bf 100644 (file)
@@ -1,43 +1,43 @@
-;##############################################################################################################\r
-; Script d'installation Inno Setup (5.1.7) pour scilab\r
-; Allan CORNET\r
-; Version TRUNK\r
-; Copyright INRIA 2007\r
-;##############################################################################################################\r
-;--------------------------------------------------------------------------------------------------------------\r
-; compatibility_functions module\r
-;--------------------------------------------------------------------------------------------------------------\r
-;\r
-#define COMPATFUNCTIONS "compatibility_functions"\r
-;\r
-Source: modules\{#COMPATFUNCTIONS}\VERSION; DestDir: {app}\modules\{#COMPATFUNCTIONS}; Components: {#COMPN_COMPATFUNCTIONS}; Check: set_with_compatibility_functions\r
-Source: modules\{#COMPATFUNCTIONS}\readme.txt; DestDir: {app}\modules\{#COMPATFUNCTIONS}; Components: {#COMPN_COMPATFUNCTIONS}\r
-Source: modules\{#COMPATFUNCTIONS}\licence.txt; DestDir: {app}\modules\{#COMPATFUNCTIONS}; Components: {#COMPN_COMPATFUNCTIONS}\r
-Source: modules\{#COMPATFUNCTIONS}\changelog.txt; DestDir: {app}\modules\{#COMPATFUNCTIONS}; Components: {#COMPN_COMPATFUNCTIONS}\r
-;\r
-Source: modules\{#COMPATFUNCTIONS}\etc\{#COMPATFUNCTIONS}.quit; DestDir: {app}\modules\{#COMPATFUNCTIONS}\etc; Components: {#COMPN_COMPATFUNCTIONS}\r
-Source: modules\{#COMPATFUNCTIONS}\etc\{#COMPATFUNCTIONS}.start; DestDir: {app}\modules\{#COMPATFUNCTIONS}\etc; Components: {#COMPN_COMPATFUNCTIONS}\r
-;\r
-Source: modules\{#COMPATFUNCTIONS}\help\en_US\addchapter.sce; DestDir: {app}\modules\{#COMPATFUNCTIONS}\help\en_US; Components:  {#COMPN_COMPATFUNCTIONS}\r
-Source: modules\{#COMPATFUNCTIONS}\help\en_US\removechapter.sce; DestDir: {app}\modules\{#COMPATFUNCTIONS}\help\en_US; Components: {#COMPN_COMPATFUNCTIONS}\r
-;\r
-Source: modules\{#COMPATFUNCTIONS}\help\fr_FR\addchapter.sce; DestDir: {app}\modules\{#COMPATFUNCTIONS}\help\fr_FR; Components:  {#COMPN_COMPATFUNCTIONS}\r
-Source: modules\{#COMPATFUNCTIONS}\help\fr_FR\removechapter.sce; DestDir: {app}\modules\{#COMPATFUNCTIONS}\help\fr_FR; Components: {#COMPN_COMPATFUNCTIONS}\r
-;\r
-Source: modules\{#COMPATFUNCTIONS}\help\en_US\*.htm; DestDir: {app}\modules\{#COMPATFUNCTIONS}\help\en_US; Components: {#COMPN_COMPATFUNCTIONS}\r
-Source: modules\{#COMPATFUNCTIONS}\help\fr_FR\*.htm; DestDir: {app}\modules\{#COMPATFUNCTIONS}\help\fr_FR; Components: {#COMPN_COMPATFUNCTIONS}\r
-;\r
-Source: modules\{#COMPATFUNCTIONS}\languages\en_US\*.xml; DestDir: {app}\modules\{#COMPATFUNCTIONS}\languages\en_US; Components: {#COMPN_COMPATFUNCTIONS}\r
-Source: modules\{#COMPATFUNCTIONS}\languages\fr_FR\*.xml; DestDir: {app}\modules\{#COMPATFUNCTIONS}\languages\fr_FR; Components: {#COMPN_COMPATFUNCTIONS}\r
-;\r
-;Source: modules\{#COMPATFUNCTIONS}\includes\*.h; DestDir: {app}\modules\{#COMPATFUNCTIONS}\includes; Components: {#COMPN_COMPATFUNCTIONS}\r
-;\r
-Source: modules\{#COMPATFUNCTIONS}\macros\lib; DestDir: {app}\modules\{#COMPATFUNCTIONS}\macros; Components: {#COMPN_COMPATFUNCTIONS}\r
-Source: modules\{#COMPATFUNCTIONS}\macros\names; DestDir: {app}\modules\{#COMPATFUNCTIONS}\macros; Components: {#COMPN_COMPATFUNCTIONS}\r
-Source: modules\{#COMPATFUNCTIONS}\macros\*.bin; DestDir: {app}\modules\{#COMPATFUNCTIONS}\macros; Components: {#COMPN_COMPATFUNCTIONS}\r
-Source: modules\{#COMPATFUNCTIONS}\macros\*.sci; DestDir: {app}\modules\{#COMPATFUNCTIONS}\macros; Components: {#COMPN_COMPATFUNCTIONS}\r
-Source: modules\{#COMPATFUNCTIONS}\macros\buildmacros.sce; DestDir: {app}\modules\{#COMPATFUNCTIONS}\macros; Components: {#COMPN_COMPATFUNCTIONS}\r
-;\r
-;Source: modules\{#COMPATFUNCTIONS}\demos\*.*; DestDir: {app}\modules\{#COMPATFUNCTIONS}\demos; Flags: recursesubdirs; Components: {#COMPN_COMPATFUNCTIONS}\r
-;\r
-;--------------------------------------------------------------------------------------------------------------\r
+;##############################################################################################################
+; Script d'installation Inno Setup (5.1.7) pour scilab
+; Allan CORNET
+; Version TRUNK
+; Copyright INRIA 2007
+;##############################################################################################################
+;--------------------------------------------------------------------------------------------------------------
+; compatibility_functions module
+;--------------------------------------------------------------------------------------------------------------
+;
+#define COMPATFUNCTIONS "compatibility_functions"
+;
+Source: modules\{#COMPATFUNCTIONS}\VERSION; DestDir: {app}\modules\{#COMPATFUNCTIONS}; Components: {#COMPN_COMPATFUNCTIONS}; Check: set_with_compatibility_functions
+Source: modules\{#COMPATFUNCTIONS}\readme.txt; DestDir: {app}\modules\{#COMPATFUNCTIONS}; Components: {#COMPN_COMPATFUNCTIONS}
+Source: modules\{#COMPATFUNCTIONS}\licence.txt; DestDir: {app}\modules\{#COMPATFUNCTIONS}; Components: {#COMPN_COMPATFUNCTIONS}
+Source: modules\{#COMPATFUNCTIONS}\changelog.txt; DestDir: {app}\modules\{#COMPATFUNCTIONS}; Components: {#COMPN_COMPATFUNCTIONS}
+;
+Source: modules\{#COMPATFUNCTIONS}\etc\{#COMPATFUNCTIONS}.quit; DestDir: {app}\modules\{#COMPATFUNCTIONS}\etc; Components: {#COMPN_COMPATFUNCTIONS}
+Source: modules\{#COMPATFUNCTIONS}\etc\{#COMPATFUNCTIONS}.start; DestDir: {app}\modules\{#COMPATFUNCTIONS}\etc; Components: {#COMPN_COMPATFUNCTIONS}
+;
+Source: modules\{#COMPATFUNCTIONS}\help\en_US\addchapter.sce; DestDir: {app}\modules\{#COMPATFUNCTIONS}\help\en_US; Components:  {#COMPN_COMPATFUNCTIONS}
+Source: modules\{#COMPATFUNCTIONS}\help\en_US\removechapter.sce; DestDir: {app}\modules\{#COMPATFUNCTIONS}\help\en_US; Components: {#COMPN_COMPATFUNCTIONS}
+;
+Source: modules\{#COMPATFUNCTIONS}\help\fr_FR\addchapter.sce; DestDir: {app}\modules\{#COMPATFUNCTIONS}\help\fr_FR; Components:  {#COMPN_COMPATFUNCTIONS}
+Source: modules\{#COMPATFUNCTIONS}\help\fr_FR\removechapter.sce; DestDir: {app}\modules\{#COMPATFUNCTIONS}\help\fr_FR; Components: {#COMPN_COMPATFUNCTIONS}
+;
+Source: modules\{#COMPATFUNCTIONS}\help\en_US\*.htm; DestDir: {app}\modules\{#COMPATFUNCTIONS}\help\en_US; Components: {#COMPN_COMPATFUNCTIONS}
+Source: modules\{#COMPATFUNCTIONS}\help\fr_FR\*.htm; DestDir: {app}\modules\{#COMPATFUNCTIONS}\help\fr_FR; Components: {#COMPN_COMPATFUNCTIONS}
+;
+Source: modules\{#COMPATFUNCTIONS}\languages\en_US\*.xml; DestDir: {app}\modules\{#COMPATFUNCTIONS}\languages\en_US; Components: {#COMPN_COMPATFUNCTIONS}
+Source: modules\{#COMPATFUNCTIONS}\languages\fr_FR\*.xml; DestDir: {app}\modules\{#COMPATFUNCTIONS}\languages\fr_FR; Components: {#COMPN_COMPATFUNCTIONS}
+;
+;Source: modules\{#COMPATFUNCTIONS}\includes\*.h; DestDir: {app}\modules\{#COMPATFUNCTIONS}\includes; Components: {#COMPN_COMPATFUNCTIONS}
+;
+Source: modules\{#COMPATFUNCTIONS}\macros\lib; DestDir: {app}\modules\{#COMPATFUNCTIONS}\macros; Components: {#COMPN_COMPATFUNCTIONS}
+Source: modules\{#COMPATFUNCTIONS}\macros\names; DestDir: {app}\modules\{#COMPATFUNCTIONS}\macros; Components: {#COMPN_COMPATFUNCTIONS}
+Source: modules\{#COMPATFUNCTIONS}\macros\*.bin; DestDir: {app}\modules\{#COMPATFUNCTIONS}\macros; Components: {#COMPN_COMPATFUNCTIONS}
+Source: modules\{#COMPATFUNCTIONS}\macros\*.sci; DestDir: {app}\modules\{#COMPATFUNCTIONS}\macros; Components: {#COMPN_COMPATFUNCTIONS}
+Source: modules\{#COMPATFUNCTIONS}\macros\buildmacros.sce; DestDir: {app}\modules\{#COMPATFUNCTIONS}\macros; Components: {#COMPN_COMPATFUNCTIONS}
+;
+;Source: modules\{#COMPATFUNCTIONS}\demos\*.*; DestDir: {app}\modules\{#COMPATFUNCTIONS}\demos; Flags: recursesubdirs; Components: {#COMPN_COMPATFUNCTIONS}
+;
+;--------------------------------------------------------------------------------------------------------------
index 21c50a7..77da987 100644 (file)
@@ -1,20 +1,20 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
-<!DOCTYPE LOCALIZATION SYSTEM "../../../localization/xml/localization.dtd">\r
-<LOCALIZATION>\r
-\r
-<entry>\r
-       <tag></tag>\r
-       <string></string>\r
-</entry>       \r
-\r
-<entry>\r
-       <tag></tag>\r
-       <string></string>\r
-</entry>       \r
-               \r
-<entry>\r
-       <tag></tag>\r
-       <string></string>\r
-</entry>       \r
-\r
-</LOCALIZATION>\r
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE LOCALIZATION SYSTEM "../../../localization/xml/localization.dtd">
+<LOCALIZATION>
+
+<entry>
+       <tag></tag>
+       <string></string>
+</entry>       
+
+<entry>
+       <tag></tag>
+       <string></string>
+</entry>       
+               
+<entry>
+       <tag></tag>
+       <string></string>
+</entry>       
+
+</LOCALIZATION>
index 21c50a7..77da987 100644 (file)
@@ -1,20 +1,20 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
-<!DOCTYPE LOCALIZATION SYSTEM "../../../localization/xml/localization.dtd">\r
-<LOCALIZATION>\r
-\r
-<entry>\r
-       <tag></tag>\r
-       <string></string>\r
-</entry>       \r
-\r
-<entry>\r
-       <tag></tag>\r
-       <string></string>\r
-</entry>       \r
-               \r
-<entry>\r
-       <tag></tag>\r
-       <string></string>\r
-</entry>       \r
-\r
-</LOCALIZATION>\r
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE LOCALIZATION SYSTEM "../../../localization/xml/localization.dtd">
+<LOCALIZATION>
+
+<entry>
+       <tag></tag>
+       <string></string>
+</entry>       
+
+<entry>
+       <tag></tag>
+       <string></string>
+</entry>       
+               
+<entry>
+       <tag></tag>
+       <string></string>
+</entry>       
+
+</LOCALIZATION>
index 21c50a7..77da987 100644 (file)
@@ -1,20 +1,20 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
-<!DOCTYPE LOCALIZATION SYSTEM "../../../localization/xml/localization.dtd">\r
-<LOCALIZATION>\r
-\r
-<entry>\r
-       <tag></tag>\r
-       <string></string>\r
-</entry>       \r
-\r
-<entry>\r
-       <tag></tag>\r
-       <string></string>\r
-</entry>       \r
-               \r
-<entry>\r
-       <tag></tag>\r
-       <string></string>\r
-</entry>       \r
-\r
-</LOCALIZATION>\r
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE LOCALIZATION SYSTEM "../../../localization/xml/localization.dtd">
+<LOCALIZATION>
+
+<entry>
+       <tag></tag>
+       <string></string>
+</entry>       
+
+<entry>
+       <tag></tag>
+       <string></string>
+</entry>       
+               
+<entry>
+       <tag></tag>
+       <string></string>
+</entry>       
+
+</LOCALIZATION>
index 21c50a7..77da987 100644 (file)
@@ -1,20 +1,20 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
-<!DOCTYPE LOCALIZATION SYSTEM "../../../localization/xml/localization.dtd">\r
-<LOCALIZATION>\r
-\r
-<entry>\r
-       <tag></tag>\r
-       <string></string>\r
-</entry>       \r
-\r
-<entry>\r
-       <tag></tag>\r
-       <string></string>\r
-</entry>       \r
-               \r
-<entry>\r
-       <tag></tag>\r
-       <string></string>\r
-</entry>       \r
-\r
-</LOCALIZATION>\r
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE LOCALIZATION SYSTEM "../../../localization/xml/localization.dtd">
+<LOCALIZATION>
+
+<entry>
+       <tag></tag>
+       <string></string>
+</entry>       
+
+<entry>
+       <tag></tag>
+       <string></string>
+</entry>       
+               
+<entry>
+       <tag></tag>
+       <string></string>
+</entry>       
+
+</LOCALIZATION>
index 21c50a7..77da987 100644 (file)
@@ -1,20 +1,20 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
-<!DOCTYPE LOCALIZATION SYSTEM "../../../localization/xml/localization.dtd">\r
-<LOCALIZATION>\r
-\r
-<entry>\r
-       <tag></tag>\r
-       <string></string>\r
-</entry>       \r
-\r
-<entry>\r
-       <tag></tag>\r
-       <string></string>\r
-</entry>       \r
-               \r
-<entry>\r
-       <tag></tag>\r
-       <string></string>\r
-</entry>       \r
-\r
-</LOCALIZATION>\r
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE LOCALIZATION SYSTEM "../../../localization/xml/localization.dtd">
+<LOCALIZATION>
+
+<entry>
+       <tag></tag>
+       <string></string>
+</entry>       
+
+<entry>
+       <tag></tag>
+       <string></string>
+</entry>       
+               
+<entry>
+       <tag></tag>
+       <string></string>
+</entry>       
+
+</LOCALIZATION>
index 21c50a7..77da987 100644 (file)
@@ -1,20 +1,20 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
-<!DOCTYPE LOCALIZATION SYSTEM "../../../localization/xml/localization.dtd">\r
-<LOCALIZATION>\r
-\r
-<entry>\r
-       <tag></tag>\r
-       <string></string>\r
-</entry>       \r
-\r
-<entry>\r
-       <tag></tag>\r
-       <string></string>\r
-</entry>       \r
-               \r
-<entry>\r
-       <tag></tag>\r
-       <string></string>\r
-</entry>       \r
-\r
-</LOCALIZATION>\r
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE LOCALIZATION SYSTEM "../../../localization/xml/localization.dtd">
+<LOCALIZATION>
+
+<entry>
+       <tag></tag>
+       <string></string>
+</entry>       
+
+<entry>
+       <tag></tag>
+       <string></string>
+</entry>       
+               
+<entry>
+       <tag></tag>
+       <string></string>
+</entry>       
+
+</LOCALIZATION>
index c0bf83f..785a348 100644 (file)
@@ -1,34 +1,34 @@
-SHELL = /bin/sh\r
-\r
-SCIDIR=../../../../../..\r
-SCIDIR1=..\..\..\..\..\..\r
-\r
-DUMPEXTS="$(SCIDIR1)\bin\dumpexts"\r
-SCIIMPLIB=$(SCIDIR)/bin/LibScilab.lib\r
-\r
-CFLAGS= $(CC_OPTIONS) -DFORDLL -I"$(SCIDIR)/routines"\r
-CPPFLAGS= $(CC_OPTIONS) -DFORDLL -I"$(SCIDIR)/routines"\r
-\r
-!include $(SCIDIR)/Makefile.incl.mak \r
-\r
-\r
-OBJSC= myprog.obj\r
-\r
-all:: $(OBJSC) $(SCIDIR)/bin/prog.exe \r
-\r
-distclean:: clean\r
-\r
-clean  ::\r
-       @del *.obj \r
-\r
-distclean:: clean \r
-       @del $(SCIDIR1)\bin\prog.*\r
-\r
-\r
-RESOURCES= $(SCIDIR)/routines/wsci/Rscilab.res \r
-\r
-$(SCIDIR)/bin/prog.exe : $(OBJSC)\r
-       @echo "Linking" \r
-       $(LINKER) $(LINKER_FLAGS) -OUT:"$*.exe" \\r
-       $(OBJSC) $(SCIDIR)/bin/LibScilab.lib $(XLIBSBIN) \r
-       @echo "done " $(SCIDIR)/bin/prog.exe \r
+SHELL = /bin/sh
+
+SCIDIR=../../../../../..
+SCIDIR1=..\..\..\..\..\..
+
+DUMPEXTS="$(SCIDIR1)\bin\dumpexts"
+SCIIMPLIB=$(SCIDIR)/bin/LibScilab.lib
+
+CFLAGS= $(CC_OPTIONS) -DFORDLL -I"$(SCIDIR)/routines"
+CPPFLAGS= $(CC_OPTIONS) -DFORDLL -I"$(SCIDIR)/routines"
+
+!include $(SCIDIR)/Makefile.incl.mak 
+
+
+OBJSC= myprog.obj
+
+all:: $(OBJSC) $(SCIDIR)/bin/prog.exe 
+
+distclean:: clean
+
+clean  ::
+       @del *.obj 
+
+distclean:: clean 
+       @del $(SCIDIR1)\bin\prog.*
+
+
+RESOURCES= $(SCIDIR)/routines/wsci/Rscilab.res 
+
+$(SCIDIR)/bin/prog.exe : $(OBJSC)
+       @echo "Linking" 
+       $(LINKER) $(LINKER_FLAGS) -OUT:"$*.exe" \
+       $(OBJSC) $(SCIDIR)/bin/LibScilab.lib $(XLIBSBIN) 
+       @echo "done " $(SCIDIR)/bin/prog.exe 
index c546576..382bf17 100644 (file)
-/*------------------------------------------------------------*/\r
-/* Modified by Allan CORNET INRIA Mars 2005 */\r
-/*------------------------------------------------------------*/\r
-#include <math.h>\r
-#include <stdio.h> \r
-#ifdef WIN32\r
-  #include <windows.h> \r
-#endif\r
-\r
-#include <string.h> \r
-\r
-#include "machine.h"\r
-#include "stack-c.h"\r
-#include "CallScilab.h"\r
-\r
-/*------------------------------------------------------------*/\r
-/* \r
- * Initialisation de Scilab \r
- * avec execution de la startup \r
- */\r
-/*------------------------------------------------------------*/\r
-#ifndef SCI \r
-#define SCI "../.."\r
-#endif \r
-/*------------------------------------------------------------*/\r
-#define TRUE 1\r
-#define FALSE 0\r
-/*------------------------------------------------------------*/\r
-/* See SCI/modules/core/includes/CallScilab.h */\r
-/*------------------------------------------------------------*/\r
-static int premier_exemple()\r
-{\r
- static double A[]={1,2,3,4};  int mA=2,nA=2;\r
-       static double b[]={4,5};  int mb=2,nb=1;\r
-\r
-\r
-       /* Create Scilab matrices A and b */\r
-       WriteMatrix("A", &mA, &nA, A);\r
-       WriteMatrix("b", &mb, &nb, b);\r
-\r
-       SendScilabJob("disp('A=');");\r
-       SendScilabJob("disp(A);");\r
-       SendScilabJob("disp('b=');");\r
-       SendScilabJob("disp(b);");\r
-       SendScilabJob("disp('x=A\\b');");\r
-\r
-       if ( SendScilabJob("A,b,x=A\\b;") != 0) \r
-       {\r
-               fprintf(stdout,"Error occured during scilab execution (SendScilabJob)\n");\r
-       }\r
-       else \r
-       {\r
-               double *cxtmp=NULL;\r
-               int m,n,lp,i;\r
-\r
-               /* Get m and n */\r
-               GetMatrixptr("x", &m, &n, &lp);\r
-\r
-               cxtmp=(double*)malloc((m*n)*sizeof(double));\r
-\r
-               ReadMatrix("x", &m, &n, cxtmp);\r
-\r
-               for(i=0;i<m*n;i++)\r
-               {\r
-                       fprintf(stdout,"x[%d] = %5.2f\n",i,cxtmp[i]);\r
-               }\r
-\r
-               if (cxtmp) \r
-               {\r
-                       free(cxtmp);\r
-                       cxtmp=NULL;\r
-               }\r
-       }\r
-  return 0;\r
-} \r
-/*------------------------------------------------------------*/\r
-static int deuxieme_exemple() \r
-{\r
-  SendScilabJob("plot3d();");\r
-       printf("\nClose Graphical Windows to close this example.\n");\r
-       while( ScilabHaveAGraph() )\r
-       {\r
-               ScilabDoOneEvent();\r
-               Sleep(1);\r
-       }\r
-  return 1;\r
-}\r
-/*------------------------------------------------------------*/\r
-int troisieme_exemple() \r
-{\r
-  int code=0;\r
-\r
-       char **JOBS=NULL;\r
-       const int SizeJOBS=6;\r
-       int i=0;\r
-\r
-       JOBS=(char**)malloc(sizeof(char**)*SizeJOBS);\r
-\r
-       for (i=0;i<SizeJOBS;i++)\r
-       {\r
-               JOBS[i]=(char*)malloc(sizeof(char*)*1024);\r
-       }\r
-\r
-       strcpy(JOBS[0],"A=1 ..");\r
-       strcpy(JOBS[1],"+3;");\r
-       strcpy(JOBS[2],"B = 8;");\r
-       /* strcpy(JOBS[2],"b = V_NOT_EXIST;"); */\r
-       strcpy(JOBS[3],"+3;");\r
-       strcpy(JOBS[4],"disp('C=');");\r
-       strcpy(JOBS[5],"C=A+B;disp(C);"); /* C = 12 */\r
-\r
-       code=SendScilabJobs(JOBS,SizeJOBS);\r
-\r
-       if (code)\r
-       {\r
-               char lastjob[4096]; // bsiz in scilab 4096 max\r
-               if (GetLastJob(lastjob,4096))\r
-               {\r
-                       printf("Error %s\n",lastjob);\r
-               }\r
-       }\r
-\r
-       for (i=0;i<SizeJOBS;i++)\r
-       {\r
-               if (JOBS[i]) {free(JOBS[i]);JOBS[i]=NULL;}\r
-       }\r
-  return 0;\r
-}\r
-/*------------------------------------------------------------*/\r
-#ifndef _MSC_VER\r
-int MAIN__(void)\r
-#else\r
-int main(void)\r
-#endif \r
-{\r
-#ifdef WIN32\r
-       if ( StartScilab(NULL,NULL,NULL) == FALSE ) printf("Error : StartScilab \n");\r
-#else\r
-    if ( StartScilab(SCI,NULL,NULL) == FALSE ) printf("Error : StartScilab \n");\r
- #endif\r
-\r
-       printf("\nexample 1\n");  \r
-       premier_exemple();\r
-  \r
-       printf("\nexample 2\n");  \r
-       deuxieme_exemple() ;\r
-       printf("\nexample 3\n");  \r
-       troisieme_exemple() ;\r
-       printf("\n\n");  \r
-  \r
-       if ( TerminateScilab(NULL) == FALSE ) printf("Error : TerminateScilab \n");\r
-       return 0;\r
-}\r
-/*------------------------------------------------------------*/\r
+/*------------------------------------------------------------*/
+/* Modified by Allan CORNET INRIA Mars 2005 */
+/*------------------------------------------------------------*/
+#include <math.h>
+#include <stdio.h> 
+#ifdef WIN32
+  #include <windows.h> 
+#endif
+
+#include <string.h> 
+
+#include "machine.h"
+#include "stack-c.h"
+#include "CallScilab.h"
+
+/*------------------------------------------------------------*/
+/* 
+ * Initialisation de Scilab 
+ * avec execution de la startup 
+ */
+/*------------------------------------------------------------*/
+#ifndef SCI 
+#define SCI "../.."
+#endif 
+/*------------------------------------------------------------*/
+#define TRUE 1
+#define FALSE 0
+/*------------------------------------------------------------*/
+/* See SCI/modules/core/includes/CallScilab.h */
+/*------------------------------------------------------------*/
+static int premier_exemple()
+{
+ static double A[]={1,2,3,4};  int mA=2,nA=2;
+       static double b[]={4,5};  int mb=2,nb=1;
+
+
+       /* Create Scilab matrices A and b */
+       WriteMatrix("A", &mA, &nA, A);
+       WriteMatrix("b", &mb, &nb, b);
+
+       SendScilabJob("disp('A=');");
+       SendScilabJob("disp(A);");
+       SendScilabJob("disp('b=');");
+       SendScilabJob("disp(b);");
+       SendScilabJob("disp('x=A\\b');");
+
+       if ( SendScilabJob("A,b,x=A\\b;") != 0) 
+       {
+               fprintf(stdout,"Error occured during scilab execution (SendScilabJob)\n");
+       }
+       else 
+       {
+               double *cxtmp=NULL;
+               int m,n,lp,i;
+
+               /* Get m and n */
+               GetMatrixptr("x", &m, &n, &lp);
+
+               cxtmp=(double*)malloc((m*n)*sizeof(double));
+
+               ReadMatrix("x", &m, &n, cxtmp);
+
+               for(i=0;i<m*n;i++)
+               {
+                       fprintf(stdout,"x[%d] = %5.2f\n",i,cxtmp[i]);
+               }
+
+               if (cxtmp) 
+               {
+                       free(cxtmp);
+                       cxtmp=NULL;
+               }
+       }
+  return 0;
+} 
+/*------------------------------------------------------------*/
+static int deuxieme_exemple() 
+{
+  SendScilabJob("plot3d();");
+       printf("\nClose Graphical Windows to close this example.\n");
+       while( ScilabHaveAGraph() )
+       {
+               ScilabDoOneEvent();
+               Sleep(1);
+       }
+  return 1;
+}
+/*------------------------------------------------------------*/
+int troisieme_exemple() 
+{
+  int code=0;
+
+       char **JOBS=NULL;
+       const int SizeJOBS=6;
+       int i=0;
+
+       JOBS=(char**)malloc(sizeof(char**)*SizeJOBS);
+
+       for (i=0;i<SizeJOBS;i++)
+       {
+               JOBS[i]=(char*)malloc(sizeof(char*)*1024);
+       }
+
+       strcpy(JOBS[0],"A=1 ..");
+       strcpy(JOBS[1],"+3;");
+       strcpy(JOBS[2],"B = 8;");
+       /* strcpy(JOBS[2],"b = V_NOT_EXIST;"); */
+       strcpy(JOBS[3],"+3;");
+       strcpy(JOBS[4],"disp('C=');");
+       strcpy(JOBS[5],"C=A+B;disp(C);"); /* C = 12 */
+
+       code=SendScilabJobs(JOBS,SizeJOBS);
+
+       if (code)
+       {
+               char lastjob[4096]; // bsiz in scilab 4096 max
+               if (GetLastJob(lastjob,4096))
+               {
+                       printf("Error %s\n",lastjob);
+               }
+       }
+
+       for (i=0;i<SizeJOBS;i++)
+       {
+               if (JOBS[i]) {free(JOBS[i]);JOBS[i]=NULL;}
+       }
+  return 0;
+}
+/*------------------------------------------------------------*/
+#ifndef _MSC_VER
+int MAIN__(void)
+#else
+int main(void)
+#endif 
+{
+#ifdef WIN32
+       if ( StartScilab(NULL,NULL,NULL) == FALSE ) printf("Error : StartScilab \n");
+#else
+    if ( StartScilab(SCI,NULL,NULL) == FALSE ) printf("Error : StartScilab \n");
+ #endif
+
+       printf("\nexample 1\n");  
+       premier_exemple();
+  
+       printf("\nexample 2\n");  
+       deuxieme_exemple() ;
+       printf("\nexample 3\n");  
+       troisieme_exemple() ;
+       printf("\n\n");  
+  
+       if ( TerminateScilab(NULL) == FALSE ) printf("Error : TerminateScilab \n");
+       return 0;
+}
+/*------------------------------------------------------------*/
index c245090..3382af5 100644 (file)
@@ -1,20 +1,20 @@
-\r
-Microsoft Visual Studio Solution File, Format Version 9.00\r
-# Visual Studio 2005\r
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Callsci Example ", "CallSciVC.vcproj", "{0A05EAA1-BB0E-4221-A475-8A4DAD003CCA}"\r
-EndProject\r
-Global\r
-       GlobalSection(SolutionConfigurationPlatforms) = preSolution\r
-               Debug|Win32 = Debug|Win32\r
-               Release|Win32 = Release|Win32\r
-       EndGlobalSection\r
-       GlobalSection(ProjectConfigurationPlatforms) = postSolution\r
-               {0A05EAA1-BB0E-4221-A475-8A4DAD003CCA}.Debug|Win32.ActiveCfg = Debug|Win32\r
-               {0A05EAA1-BB0E-4221-A475-8A4DAD003CCA}.Debug|Win32.Build.0 = Debug|Win32\r
-               {0A05EAA1-BB0E-4221-A475-8A4DAD003CCA}.Release|Win32.ActiveCfg = Release|Win32\r
-               {0A05EAA1-BB0E-4221-A475-8A4DAD003CCA}.Release|Win32.Build.0 = Release|Win32\r
-       EndGlobalSection\r
-       GlobalSection(SolutionProperties) = preSolution\r
-               HideSolutionNode = FALSE\r
-       EndGlobalSection\r
-EndGlobal\r
+
+Microsoft Visual Studio Solution File, Format Version 9.00
+# Visual Studio 2005
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Callsci Example ", "CallSciVC.vcproj", "{0A05EAA1-BB0E-4221-A475-8A4DAD003CCA}"
+EndProject
+Global
+       GlobalSection(SolutionConfigurationPlatforms) = preSolution
+               Debug|Win32 = Debug|Win32
+               Release|Win32 = Release|Win32
+       EndGlobalSection
+       GlobalSection(ProjectConfigurationPlatforms) = postSolution
+               {0A05EAA1-BB0E-4221-A475-8A4DAD003CCA}.Debug|Win32.ActiveCfg = Debug|Win32
+               {0A05EAA1-BB0E-4221-A475-8A4DAD003CCA}.Debug|Win32.Build.0 = Debug|Win32
+               {0A05EAA1-BB0E-4221-A475-8A4DAD003CCA}.Release|Win32.ActiveCfg = Release|Win32
+               {0A05EAA1-BB0E-4221-A475-8A4DAD003CCA}.Release|Win32.Build.0 = Release|Win32
+       EndGlobalSection
+       GlobalSection(SolutionProperties) = preSolution
+               HideSolutionNode = FALSE
+       EndGlobalSection
+EndGlobal
index f9f3942..acb7f1b 100644 (file)
-<?xml version="1.0" encoding="Windows-1252"?>\r
-<VisualStudioProject\r
-       ProjectType="Visual C++"\r
-       Version="8,00"\r
-       Name="Callsci Example "\r
-       ProjectGUID="{0A05EAA1-BB0E-4221-A475-8A4DAD003CCA}"\r
-       Keyword="Win32Proj"\r
-       >\r
-       <Platforms>\r
-               <Platform\r
-                       Name="Win32"\r
-               />\r
-       </Platforms>\r
-       <ToolFiles>\r
-       </ToolFiles>\r
-       <Configurations>\r
-               <Configuration\r
-                       Name="Debug|Win32"\r
-                       OutputDirectory="Debug"\r
-                       IntermediateDirectory="Debug"\r
-                       ConfigurationType="1"\r
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"\r
-                       CharacterSet="2"\r
-                       >\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCMIDLTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCLCompilerTool"\r
-                               Optimization="0"\r
-                               PreprocessorDefinitions="_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS"\r
-                               MinimalRebuild="true"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="1"\r
-                               UsePrecompiledHeader="0"\r
-                               WarningLevel="3"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               DebugInformationFormat="4"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManagedResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCLinkerTool"\r
-                               OutputFile="../../../../../../bin/CallSciVC.exe"\r
-                               LinkIncremental="2"\r
-                               GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="$(OutDir)/CallSciVC.pdb"\r
-                               SubSystem="1"\r
-                               TargetMachine="1"\r
-                       />\r
-                       <Tool\r
-                               Name="VCALinkTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManifestTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXDCMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCBscMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCFxCopTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCAppVerifierTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPostBuildEventTool"\r
-                       />\r
-               </Configuration>\r
-               <Configuration\r
-                       Name="Release|Win32"\r
-                       OutputDirectory="Release"\r
-                       IntermediateDirectory="Release"\r
-                       ConfigurationType="1"\r
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"\r
-                       CharacterSet="2"\r
-                       >\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCMIDLTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCLCompilerTool"\r
-                               PreprocessorDefinitions="NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS"\r
-                               RuntimeLibrary="0"\r
-                               UsePrecompiledHeader="0"\r
-                               WarningLevel="3"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               DebugInformationFormat="3"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManagedResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCLinkerTool"\r
-                               OutputFile="../../../../../../bin/CallSciVC.exe"\r
-                               LinkIncremental="1"\r
-                               GenerateDebugInformation="true"\r
-                               SubSystem="1"\r
-                               OptimizeReferences="2"\r
-                               EnableCOMDATFolding="2"\r
-                               TargetMachine="1"\r
-                       />\r
-                       <Tool\r
-                               Name="VCALinkTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManifestTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXDCMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCBscMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCFxCopTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCAppVerifierTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPostBuildEventTool"\r
-                       />\r
-               </Configuration>\r
-       </Configurations>\r
-       <References>\r
-       </References>\r
-       <Files>\r
-               <Filter\r
-                       Name="Source Files"\r
-                       Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
-                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
-                       >\r
-                       <File\r
-                               RelativePath=".\CallsciC.c"\r
-                               >\r
-                       </File>\r
-               </Filter>\r
-               <Filter\r
-                       Name="Header Files"\r
-                       Filter="h;hpp;hxx;hm;inl;inc;xsd"\r
-                       UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"\r
-                       >\r
-               </Filter>\r
-               <Filter\r
-                       Name="Resource Files"\r
-                       Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"\r
-                       UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
-                       >\r
-               </Filter>\r
-       </Files>\r
-       <Globals>\r
-       </Globals>\r
-</VisualStudioProject>\r
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+       ProjectType="Visual C++"
+       Version="8,00"
+       Name="Callsci Example "
+       ProjectGUID="{0A05EAA1-BB0E-4221-A475-8A4DAD003CCA}"
+       Keyword="Win32Proj"
+       >
+       <Platforms>
+               <Platform
+                       Name="Win32"
+               />
+       </Platforms>
+       <ToolFiles>
+       </ToolFiles>
+       <Configurations>
+               <Configuration
+                       Name="Debug|Win32"
+                       OutputDirectory="Debug"
+                       IntermediateDirectory="Debug"
+                       ConfigurationType="1"
+                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+                       CharacterSet="2"
+                       >
+                       <Tool
+                               Name="VCPreBuildEventTool"
+                       />
+                       <Tool
+                               Name="VCCustomBuildTool"
+                       />
+                       <Tool
+                               Name="VCXMLDataGeneratorTool"
+                       />
+                       <Tool
+                               Name="VCWebServiceProxyGeneratorTool"
+                       />
+                       <Tool
+                               Name="VCMIDLTool"
+                       />
+                       <Tool
+                               Name="VCCLCompilerTool"
+                               Optimization="0"
+                               PreprocessorDefinitions="_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS"
+                               MinimalRebuild="true"
+                               BasicRuntimeChecks="3"
+                               RuntimeLibrary="1"
+                               UsePrecompiledHeader="0"
+                               WarningLevel="3"
+                               Detect64BitPortabilityProblems="true"
+                               DebugInformationFormat="4"
+                       />
+                       <Tool
+                               Name="VCManagedResourceCompilerTool"
+                       />
+                       <Tool
+                               Name="VCResourceCompilerTool"
+                       />
+                       <Tool
+                               Name="VCPreLinkEventTool"
+                       />
+                       <Tool
+                               Name="VCLinkerTool"
+                               OutputFile="../../../../../../bin/CallSciVC.exe"
+                               LinkIncremental="2"
+                               GenerateDebugInformation="true"
+                               ProgramDatabaseFile="$(OutDir)/CallSciVC.pdb"
+                               SubSystem="1"
+                               TargetMachine="1"
+                       />
+                       <Tool
+                               Name="VCALinkTool"
+                       />
+                       <Tool
+                               Name="VCManifestTool"
+                       />
+                       <Tool
+                               Name="VCXDCMakeTool"
+                       />
+                       <Tool
+                               Name="VCBscMakeTool"
+                       />
+                       <Tool
+                               Name="VCFxCopTool"
+                       />
+                       <Tool
+                               Name="VCAppVerifierTool"
+                       />
+                       <Tool
+                               Name="VCWebDeploymentTool"
+                       />
+                       <Tool
+                               Name="VCPostBuildEventTool"
+                       />
+               </Configuration>
+               <Configuration
+                       Name="Release|Win32"
+                       OutputDirectory="Release"
+                       IntermediateDirectory="Release"
+                       ConfigurationType="1"
+                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+                       CharacterSet="2"
+                       >
+                       <Tool
+                               Name="VCPreBuildEventTool"
+                       />
+                       <Tool
+                               Name="VCCustomBuildTool"
+                       />
+                       <Tool
+                               Name="VCXMLDataGeneratorTool"
+                       />
+                       <Tool
+                               Name="VCWebServiceProxyGeneratorTool"
+                       />
+                       <Tool
+                               Name="VCMIDLTool"
+                       />
+                       <Tool
+                               Name="VCCLCompilerTool"
+                               PreprocessorDefinitions="NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS"
+                               RuntimeLibrary="0"
+                               UsePrecompiledHeader="0"
+                               WarningLevel="3"
+                               Detect64BitPortabilityProblems="true"
+                               DebugInformationFormat="3"
+                       />
+                       <Tool
+                               Name="VCManagedResourceCompilerTool"
+                       />
+                       <Tool
+                               Name="VCResourceCompilerTool"
+                       />
+                       <Tool
+                               Name="VCPreLinkEventTool"
+                       />
+                       <Tool
+                               Name="VCLinkerTool"
+                               OutputFile="../../../../../../bin/CallSciVC.exe"
+                               LinkIncremental="1"
+                               GenerateDebugInformation="true"
+                               SubSystem="1"
+                               OptimizeReferences="2"
+                               EnableCOMDATFolding="2"
+                               TargetMachine="1"
+                       />
+                       <Tool
+                               Name="VCALinkTool"
+                       />
+                       <Tool
+                               Name="VCManifestTool"
+                       />
+                       <Tool
+                               Name="VCXDCMakeTool"
+                       />
+                       <Tool
+                               Name="VCBscMakeTool"
+                       />
+                       <Tool
+                               Name="VCFxCopTool"
+                       />
+                       <Tool
+                               Name="VCAppVerifierTool"
+                       />
+                       <Tool
+                               Name="VCWebDeploymentTool"
+                       />
+                       <Tool
+                               Name="VCPostBuildEventTool"
+                       />
+               </Configuration>
+       </Configurations>
+       <References>
+       </References>
+       <Files>
+               <Filter
+                       Name="Source Files"
+                       Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
+                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+                       >
+                       <File
+                               RelativePath=".\CallsciC.c"
+                               >
+                       </File>
+               </Filter>
+               <Filter
+                       Name="Header Files"
+                       Filter="h;hpp;hxx;hm;inl;inc;xsd"
+                       UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+                       >
+               </Filter>
+               <Filter
+                       Name="Resource Files"
+                       Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
+                       UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+                       >
+               </Filter>
+       </Files>
+       <Globals>
+       </Globals>
+</VisualStudioProject>
index ea8e86a..63ac422 100644 (file)
-/* Allan CORNET */\r
-/* Scilab, INRIA 2004 */\r
-/* Only For Windows */\r
-/*-----------------------------------------------------------------------------------*/\r
-#pragma comment(lib, "../../../../../../bin/libScilab.lib")\r
-#pragma comment(lib, "../../../../../../bin/MALLOC.lib")\r
-/*-----------------------------------------------------------------------------------*/\r
-#include <windows.h>\r
-#include <math.h>\r
-#include <stdio.h> \r
-#include <string.h> \r
-#include <conio.h> \r
-\r
-#include "../../../../../../modules/core/includes/machine.h"\r
-#include "../../../../../../modules/core/includes/stack-c.h"\r
-#include "../../../../../../modules/core/includes/CallScilab.h"\r
-#define TRUE 1\r
-#define FALSE 0\r
-/*-----------------------------------------------------------------------------------*/\r
-/* See SCI/modules/core/includes/CallScilab.h */\r
-/*-----------------------------------------------------------------------------------*/\r
-static int example1(void)\r
-{\r
-       static double A[]={1,2,3,4};  int mA=2,nA=2;\r
-       static double b[]={4,5};  int mb=2,nb=1;\r
-\r
-\r
-       /* Create Scilab matrices A and b */\r
-       WriteMatrix("A", &mA, &nA, A);\r
-       WriteMatrix("b", &mb, &nb, b);\r
-\r
-       SendScilabJob("disp('A=');");\r
-       SendScilabJob("disp(A);");\r
-       SendScilabJob("disp('b=');");\r
-       SendScilabJob("disp(b);");\r
-       SendScilabJob("disp('x=A\\b');");\r
-\r
-       if ( SendScilabJob("A,b,x=A\\b;") != 0) \r
-       {\r
-               fprintf(stdout,"Error occured during scilab execution (SendScilabJob)\n");\r
-       }\r
-       else \r
-       {\r
-               double *cxtmp=NULL;\r
-               int m,n,lp,i;\r
-\r
-               /* Get m and n */\r
-               GetMatrixptr("x", &m, &n, &lp);\r
-\r
-               cxtmp=(double*)malloc((m*n)*sizeof(double));\r
-\r
-               ReadMatrix("x", &m, &n, cxtmp);\r
-\r
-               for(i=0;i<m*n;i++)\r
-               {\r
-                       fprintf(stdout,"x[%d] = %5.2f\n",i,cxtmp[i]);\r
-               }\r
-\r
-               if (cxtmp) \r
-               {\r
-                       free(cxtmp);\r
-                       cxtmp=NULL;\r
-               }\r
-       }\r
-       return 0;\r
-}\r
-/*-----------------------------------------------------------------------------------*/\r
-static int example2(void)\r
-{\r
-       SendScilabJob("plot3d();");\r
-       printf("\nClose Graphical Windows to close this example.\n");\r
-       while( ScilabHaveAGraph() )\r
-       {\r
-               ScilabDoOneEvent();\r
-               Sleep(1);\r
-       }\r
-       return 1; \r
-}\r
-/*-----------------------------------------------------------------------------------*/\r
-static int example3(void)\r
-{\r
-       int code=0;\r
-\r
-       char **JOBS=NULL;\r
-       const int SizeJOBS=6;\r
-       int i=0;\r
-\r
-       JOBS=(char**)malloc(sizeof(char**)*SizeJOBS);\r
-\r
-       for (i=0;i<SizeJOBS;i++)\r
-       {\r
-               JOBS[i]=(char*)malloc(sizeof(char*)*1024);\r
-       }\r
-\r
-       strcpy(JOBS[0],"A=1 ..");\r
-       strcpy(JOBS[1],"+3;");\r
-       strcpy(JOBS[2],"B = 8;");\r
-       /* strcpy(JOBS[2],"b = V_NOT_EXIST;"); */\r
-       strcpy(JOBS[3],"+3;");\r
-       strcpy(JOBS[4],"disp('C=');");\r
-       strcpy(JOBS[5],"C=A+B;disp(C);"); /* C = 12 */\r
-\r
-       code=SendScilabJobs(JOBS,SizeJOBS);\r
-\r
-       if (code)\r
-       {\r
-               char lastjob[4096]; // bsiz in scilab 4096 max\r
-               if (GetLastJob(lastjob,4096))\r
-               {\r
-                       printf("Error %s\n",lastjob);\r
-               }\r
-       }\r
-\r
-       for (i=0;i<SizeJOBS;i++)\r
-       {\r
-               if (JOBS[i]) {free(JOBS[i]);JOBS[i]=NULL;}\r
-       }\r
-       return 1;\r
-}\r
-/*-----------------------------------------------------------------------------------*/\r
-int main(void)\r
-/* int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance,LPSTR szCmdLine, int iCmdShow) */\r
-{\r
-       if ( StartScilab(NULL,NULL,NULL) == FALSE ) printf("Error : StartScilab \n");\r
-\r
-       printf("\nexample 1\n");\r
-       example1();\r
-       system("pause");\r
-       printf("\nexample 2\n");\r
-       example2();\r
-       system("pause");\r
-       printf("\nexample 3\n");\r
-       example3();\r
-       system("pause");\r
-       \r
-       if ( TerminateScilab(NULL) == FALSE ) printf("Error : TerminateScilab \n");\r
-       return 0;\r
-}\r
-/*-----------------------------------------------------------------------------------*/\r
+/* Allan CORNET */
+/* Scilab, INRIA 2004 */
+/* Only For Windows */
+/*-----------------------------------------------------------------------------------*/
+#pragma comment(lib, "../../../../../../bin/libScilab.lib")
+#pragma comment(lib, "../../../../../../bin/MALLOC.lib")
+/*-----------------------------------------------------------------------------------*/
+#include <windows.h>
+#include <math.h>
+#include <stdio.h> 
+#include <string.h> 
+#include <conio.h> 
+
+#include "../../../../../../modules/core/includes/machine.h"
+#include "../../../../../../modules/core/includes/stack-c.h"
+#include "../../../../../../modules/core/includes/CallScilab.h"
+#define TRUE 1
+#define FALSE 0
+/*-----------------------------------------------------------------------------------*/
+/* See SCI/modules/core/includes/CallScilab.h */
+/*-----------------------------------------------------------------------------------*/
+static int example1(void)
+{
+       static double A[]={1,2,3,4};  int mA=2,nA=2;
+       static double b[]={4,5};  int mb=2,nb=1;
+
+
+       /* Create Scilab matrices A and b */
+       WriteMatrix("A", &mA, &nA, A);
+       WriteMatrix("b", &mb, &nb, b);
+
+       SendScilabJob("disp('A=');");
+       SendScilabJob("disp(A);");
+       SendScilabJob("disp('b=');");
+       SendScilabJob("disp(b);");
+       SendScilabJob("disp('x=A\\b');");
+
+       if ( SendScilabJob("A,b,x=A\\b;") != 0) 
+       {
+               fprintf(stdout,"Error occured during scilab execution (SendScilabJob)\n");
+       }
+       else 
+       {
+               double *cxtmp=NULL;
+               int m,n,lp,i;
+
+               /* Get m and n */
+               GetMatrixptr("x", &m, &n, &lp);
+
+               cxtmp=(double*)malloc((m*n)*sizeof(double));
+
+               ReadMatrix("x", &m, &n, cxtmp);
+
+               for(i=0;i<m*n;i++)
+               {
+                       fprintf(stdout,"x[%d] = %5.2f\n",i,cxtmp[i]);
+               }
+
+               if (cxtmp) 
+               {
+                       free(cxtmp);
+                       cxtmp=NULL;
+               }
+       }
+       return 0;
+}
+/*-----------------------------------------------------------------------------------*/
+static int example2(void)
+{
+       SendScilabJob("plot3d();");
+       printf("\nClose Graphical Windows to close this example.\n");
+       while( ScilabHaveAGraph() )
+       {
+               ScilabDoOneEvent();
+               Sleep(1);
+       }
+       return 1; 
+}
+/*-----------------------------------------------------------------------------------*/
+static int example3(void)
+{
+       int code=0;
+
+       char **JOBS=NULL;
+       const int SizeJOBS=6;
+       int i=0;
+
+       JOBS=(char**)malloc(sizeof(char**)*SizeJOBS);
+
+       for (i=0;i<SizeJOBS;i++)
+       {
+               JOBS[i]=(char*)malloc(sizeof(char*)*1024);
+       }
+
+       strcpy(JOBS[0],"A=1 ..");
+       strcpy(JOBS[1],"+3;");
+       strcpy(JOBS[2],"B = 8;");
+       /* strcpy(JOBS[2],"b = V_NOT_EXIST;"); */
+       strcpy(JOBS[3],"+3;");
+       strcpy(JOBS[4],"disp('C=');");
+       strcpy(JOBS[5],"C=A+B;disp(C);"); /* C = 12 */
+
+       code=SendScilabJobs(JOBS,SizeJOBS);
+
+       if (code)
+       {
+               char lastjob[4096]; // bsiz in scilab 4096 max
+               if (GetLastJob(lastjob,4096))
+               {
+                       printf("Error %s\n",lastjob);
+               }
+       }
+
+       for (i=0;i<SizeJOBS;i++)
+       {
+               if (JOBS[i]) {free(JOBS[i]);JOBS[i]=NULL;}
+       }
+       return 1;
+}
+/*-----------------------------------------------------------------------------------*/
+int main(void)
+/* int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance,LPSTR szCmdLine, int iCmdShow) */
+{
+       if ( StartScilab(NULL,NULL,NULL) == FALSE ) printf("Error : StartScilab \n");
+
+       printf("\nexample 1\n");
+       example1();
+       system("pause");
+       printf("\nexample 2\n");
+       example2();
+       system("pause");
+       printf("\nexample 3\n");
+       example3();
+       system("pause");
+       
+       if ( TerminateScilab(NULL) == FALSE ) printf("Error : TerminateScilab \n");
+       return 0;
+}
+/*-----------------------------------------------------------------------------------*/
index 4b54642..59ee325 100644 (file)
@@ -1,19 +1,19 @@
-How to make calls to Scilab interpreter from Borland C++ 6\r
-\r
-Import Scilab library (LibScilab.dll) to Borland\r
-\r
-on a Command line\r
-\r
-impdef Libscilab.def Libscilab.dll\r
-implib Libscilab.lib Libscilab.def\r
-\r
-Add Libscilab.lib in your Borland C++ project in "import library"\r
-\r
-\r
-(On Google see 'Borland import library')\r
-\r
-That's all \r
-\r
-Allan CORNET\r
-September 2006\r
-Scilab Team\r
+How to make calls to Scilab interpreter from Borland C++ 6
+
+Import Scilab library (LibScilab.dll) to Borland
+
+on a Command line
+
+impdef Libscilab.def Libscilab.dll
+implib Libscilab.lib Libscilab.def
+
+Add Libscilab.lib in your Borland C++ project in "import library"
+
+
+(On Google see 'Borland import library')
+
+That's all 
+
+Allan CORNET
+September 2006
+Scilab Team
index c9df4e0..9b55345 100644 (file)
@@ -1,39 +1,39 @@
-SHELL = /bin/sh\r
-\r
-SCIDIR=../../../../../..\r
-SCIDIR1=..\..\..\..\..\..\r
-\r
-DUMPEXTS="$(SCIDIR1)\bin\dumpexts"\r
-SCIIMPLIB=$(SCIDIR)/bin/LibScilab.lib\r
-\r
-CFLAGS= $(CC_OPTIONS) -DFORDLL -I"$(SCIDIR)/modules/core/includes" /EHsc\r
-CPPFLAGS= $(CC_OPTIONS) -DFORDLL -I"$(SCIDIR)/modules/core/includes" /EHsc\r
-\r
-!include $(SCIDIR)/Makefile.incl.mak \r
-\r
-OBJSC = myprog.obj ccmatrix1.obj \r
-\r
-all:: $(OBJSC)  $(SCIDIR)/bin/prog.exe \r
-\r
-distclean:: clean\r
-\r
-clean  ::\r
-       @del *.obj \r
-       @del *.lib\r
-       @del *.dll\r
-       @del *.exp\r
-       @del *.def\r
-       @del Makelib.mak\r
-       @del loader.sce\r
-       \r
-\r
-distclean:: clean \r
-       @del $(SCIDIR1)\bin\prog.exe\r
-\r
-\r
-\r
-$(SCIDIR)/bin/prog.exe : $(OBJSC)\r
-       @echo "Linking" \r
-       $(LINKER) $(LINKER_FLAGS) -OUT:"$*.exe"  \\r
-       $(OBJSC) $(SCIDIR)/bin/LibScilab.lib $(TKLIBS) $(PVMLIB) $(GUI)  -NODEFAULTLIB:msvcrt.lib \r
-       @echo "done " $(SCIDIR)/bin/prog.exe \r
+SHELL = /bin/sh
+
+SCIDIR=../../../../../..
+SCIDIR1=..\..\..\..\..\..
+
+DUMPEXTS="$(SCIDIR1)\bin\dumpexts"
+SCIIMPLIB=$(SCIDIR)/bin/LibScilab.lib
+
+CFLAGS= $(CC_OPTIONS) -DFORDLL -I"$(SCIDIR)/modules/core/includes" /EHsc
+CPPFLAGS= $(CC_OPTIONS) -DFORDLL -I"$(SCIDIR)/modules/core/includes" /EHsc
+
+!include $(SCIDIR)/Makefile.incl.mak 
+
+OBJSC = myprog.obj ccmatrix1.obj 
+
+all:: $(OBJSC)  $(SCIDIR)/bin/prog.exe 
+
+distclean:: clean
+
+clean  ::
+       @del *.obj 
+       @del *.lib
+       @del *.dll
+       @del *.exp
+       @del *.def
+       @del Makelib.mak
+       @del loader.sce
+       
+
+distclean:: clean 
+       @del $(SCIDIR1)\bin\prog.exe
+
+
+
+$(SCIDIR)/bin/prog.exe : $(OBJSC)
+       @echo "Linking" 
+       $(LINKER) $(LINKER_FLAGS) -OUT:"$*.exe"  \
+       $(OBJSC) $(SCIDIR)/bin/LibScilab.lib $(TKLIBS) $(PVMLIB) $(GUI)  -NODEFAULTLIB:msvcrt.lib 
+       @echo "done " $(SCIDIR)/bin/prog.exe 
index 34047f8..ba4a113 100644 (file)
@@ -1,23 +1,23 @@
-#ifndef _cc_matrix_H_\r
-#define _cc_matrix_H_\r
-\r
-\r
-class CMatrix \r
-{\r
- private: \r
-  int m,n;\r
-  char *name;\r
-  double *v;\r
-\r
- public:\r
-  CMatrix(char *name1,char *job);\r
-  void scijob(char *jobname);\r
-  CMatrix& plus(CMatrix &B);\r
-  void print();\r
-  void inv();\r
-\r
-};\r
-\r
-#endif\r
-\r
-\r
+#ifndef _cc_matrix_H_
+#define _cc_matrix_H_
+
+
+class CMatrix 
+{
+ private: 
+  int m,n;
+  char *name;
+  double *v;
+
+ public:
+  CMatrix(char *name1,char *job);
+  void scijob(char *jobname);
+  CMatrix& plus(CMatrix &B);
+  void print();
+  void inv();
+
+};
+
+#endif
+
+
index 18ecae6..60f6789 100644 (file)
@@ -1,86 +1,86 @@
-#include <iostream>\r
-#include "ccmatrix.h"\r
-\r
-\r
-class SciError {};\r
-\r
-// CMatrix A(name,job);\r
-\r
-extern "C" {\r
-#include <stdio.h>\r
-#include <string.h>\r
-#undef _PARAMS\r
-#include "stack-c.h"\r
-int SendScilabJob(char *);\r
-void cc_test();\r
-\r
-}\r
-\r
-static char buf[256];\r
-\r
-CMatrix::CMatrix(char *name1,char *job)\r
-{\r
-  sprintf(buf,"%s=%s;",name1,job);\r
-  if ( SendScilabJob(buf) != 0) \r
-    throw SciError();\r
-  else \r
-    {\r
-      int lp;\r
-      C2F(cmatptr)(name1, &m, &n, &lp,strlen(name1));\r
-      v = stk(lp);\r
-    }\r
-  name = new char[strlen(name1)+1];\r
-  strcpy(name,name1);\r
-}\r
-\r
-\r
-void CMatrix::scijob(char *jobname)\r
-{\r
-  sprintf(buf,jobname,name);\r
-  if ( SendScilabJob(buf) != 0) \r
-    throw SciError();\r
-}\r
-\r
-CMatrix& CMatrix::plus(CMatrix &B)\r
-{\r
-  sprintf(buf,"%s=%s+%s",this->name,this->name,B.name);\r
-  if ( SendScilabJob(buf) != 0) \r
-    throw SciError();\r
-  int lp;\r
-  C2F(cmatptr)(name, &m, &n, &lp,strlen(name));\r
-  v = stk(lp);\r
-  return *this;\r
-}\r
-\r
-void CMatrix::print()\r
-{\r
-  fprintf(stdout,"Matrix %s=\n",name);\r
-  scijob("disp(%s)");\r
-}\r
-\r
-void CMatrix::inv()\r
-{\r
-  sprintf(buf,"%s=inv(%s)",name,name);\r
-  if ( SendScilabJob(buf) != 0) \r
-    throw SciError();\r
-  int lp;\r
-  C2F(cmatptr)(name, &m, &n, &lp,strlen(name));\r
-  v = stk(lp);\r
-}\r
-\r
-\r
-void cc_test() \r
-{\r
-  CMatrix A("a","ones(2,2)");\r
-  CMatrix B("b","8");\r
-  A.plus(B);\r
-  A.scijob("disp(%s);");\r
-  A.scijob("%s=rand(2,2)");\r
-  A.print();\r
-  A.inv();\r
-  A.print();\r
-}\r
-\r
-\r
-\r
-\r
+#include <iostream>
+#include "ccmatrix.h"
+
+
+class SciError {};
+
+// CMatrix A(name,job);
+
+extern "C" {
+#include <stdio.h>
+#include <string.h>
+#undef _PARAMS
+#include "stack-c.h"
+int SendScilabJob(char *);
+void cc_test();
+
+}
+
+static char buf[256];
+
+CMatrix::CMatrix(char *name1,char *job)
+{
+  sprintf(buf,"%s=%s;",name1,job);
+  if ( SendScilabJob(buf) != 0) 
+    throw SciError();
+  else 
+    {
+      int lp;
+      C2F(cmatptr)(name1, &m, &n, &lp,strlen(name1));
+      v = stk(lp);
+    }
+  name = new char[strlen(name1)+1];
+  strcpy(name,name1);
+}
+
+
+void CMatrix::scijob(char *jobname)
+{
+  sprintf(buf,jobname,name);
+  if ( SendScilabJob(buf) != 0) 
+    throw SciError();
+}
+
+CMatrix& CMatrix::plus(CMatrix &B)
+{
+  sprintf(buf,"%s=%s+%s",this->name,this->name,B.name);
+  if ( SendScilabJob(buf) != 0) 
+    throw SciError();
+  int lp;
+  C2F(cmatptr)(name, &m, &n, &lp,strlen(name));
+  v = stk(lp);
+  return *this;
+}
+
+void CMatrix::print()
+{
+  fprintf(stdout,"Matrix %s=\n",name);
+  scijob("disp(%s)");
+}
+
+void CMatrix::inv()
+{
+  sprintf(buf,"%s=inv(%s)",name,name);
+  if ( SendScilabJob(buf) != 0) 
+    throw SciError();
+  int lp;
+  C2F(cmatptr)(name, &m, &n, &lp,strlen(name));
+  v = stk(lp);
+}
+
+
+void cc_test() 
+{
+  CMatrix A("a","ones(2,2)");
+  CMatrix B("b","8");
+  A.plus(B);
+  A.scijob("disp(%s);");
+  A.scijob("%s=rand(2,2)");
+  A.print();
+  A.inv();
+  A.print();
+}
+
+
+
+
index 761f9b1..225ddf7 100644 (file)
@@ -1,85 +1,85 @@
-#include <iostream>\r
-#include "ccmatrix.h"\r
-\r
-\r
-class SciError {};\r
-\r
-// CMatrix A(name,job);\r
-\r
-extern "C" {\r
-#include <stdio.h>\r
-#undef _PARAMS\r
-#include "stack-c.h"\r
-int send_scilab_job(char *,long int);\r
-void cc_test();\r
-\r
-}\r
-\r
-static char buf[256];\r
-\r
-CMatrix::CMatrix(char *name1,char *job)\r
-{\r
-  sprintf(buf,"%s=%s;",name1,job);\r
-  if ( send_scilab_job(buf,strlen(buf)) != 0) \r
-    throw SciError();\r
-  else \r
-    {\r
-      int lp;\r
-      C2F(cmatptr)(name1, &m, &n, &lp,strlen(name1));\r
-      v = stk(lp);\r
-    }\r
-  name = new char[strlen(name1)+1];\r
-  strcpy(name,name1);\r
-}\r
-\r
-\r
-void CMatrix::scijob(char *jobname)\r
-{\r
-  sprintf(buf,jobname,name);\r
-  if ( send_scilab_job(buf,strlen(buf)) != 0) \r
-    throw SciError();\r
-}\r
-\r
-CMatrix& CMatrix::plus(CMatrix &B)\r
-{\r
-  sprintf(buf,"%s=%s+%s",this->name,this->name,B.name);\r
-  if ( send_scilab_job(buf,strlen(buf)) != 0) \r
-    throw SciError();\r
-  int lp;\r
-  C2F(cmatptr)(name, &m, &n, &lp,strlen(name));\r
-  v = stk(lp);\r
-  return *this;\r
-}\r
-\r
-void CMatrix::print()\r
-{\r
-  fprintf(stdout,"Matrix %s=\n",name);\r
-  scijob("disp(%s)");\r
-}\r
-\r
-void CMatrix::inv()\r
-{\r
-  sprintf(buf,"%s=inv(%s)",name,name);\r
-  if ( send_scilab_job(buf,strlen(buf)) != 0) \r
-    throw SciError();\r
-  int lp;\r
-  C2F(cmatptr)(name, &m, &n, &lp,strlen(name));\r
-  v = stk(lp);\r
-}\r
-\r
-\r
-void cc_test() \r
-{\r
-  CMatrix A("a","ones(2,2)");\r
-  CMatrix B("b","8");\r
-  A.plus(B);\r
-  A.scijob("disp(%s);");\r
-  A.scijob("%s=rand(2,2)");\r
-  A.print();\r
-  A.inv();\r
-  A.print();\r
-}\r
-\r
-\r
-\r
-\r
+#include <iostream>
+#include "ccmatrix.h"
+
+
+class SciError {};
+
+// CMatrix A(name,job);
+
+extern "C" {
+#include <stdio.h>
+#undef _PARAMS
+#include "stack-c.h"
+int send_scilab_job(char *,long int);
+void cc_test();
+
+}
+
+static char buf[256];
+
+CMatrix::CMatrix(char *name1,char *job)
+{
+  sprintf(buf,"%s=%s;",name1,job);
+  if ( send_scilab_job(buf,strlen(buf)) != 0) 
+    throw SciError();
+  else 
+    {
+      int lp;
+      C2F(cmatptr)(name1, &m, &n, &lp,strlen(name1));
+      v = stk(lp);
+    }
+  name = new char[strlen(name1)+1];
+  strcpy(name,name1);
+}
+
+
+void CMatrix::scijob(char *jobname)
+{
+  sprintf(buf,jobname,name);
+  if ( send_scilab_job(buf,strlen(buf)) != 0) 
+    throw SciError();
+}
+
+CMatrix& CMatrix::plus(CMatrix &B)
+{
+  sprintf(buf,"%s=%s+%s",this->name,this->name,B.name);
+  if ( send_scilab_job(buf,strlen(buf)) != 0) 
+    throw SciError();
+  int lp;
+  C2F(cmatptr)(name, &m, &n, &lp,strlen(name));
+  v = stk(lp);
+  return *this;
+}
+
+void CMatrix::print()
+{
+  fprintf(stdout,"Matrix %s=\n",name);
+  scijob("disp(%s)");
+}
+
+void CMatrix::inv()
+{
+  sprintf(buf,"%s=inv(%s)",name,name);
+  if ( send_scilab_job(buf,strlen(buf)) != 0) 
+    throw SciError();
+  int lp;
+  C2F(cmatptr)(name, &m, &n, &lp,strlen(name));
+  v = stk(lp);
+}
+
+
+void cc_test() 
+{
+  CMatrix A("a","ones(2,2)");
+  CMatrix B("b","8");
+  A.plus(B);
+  A.scijob("disp(%s);");
+  A.scijob("%s=rand(2,2)");
+  A.print();
+  A.inv();
+  A.print();
+}
+
+
+
+
index 24ff8ff..459e484 100644 (file)
@@ -1,6 +1,6 @@
-\r
-int odeex(int *neq,double * t,double *y,double * ydot)\r
-{\r
-  ydot[0] = -y[0] + 2.0;\r
-  return 0;\r
-}\r
+
+int odeex(int *neq,double * t,double *y,double * ydot)
+{
+  ydot[0] = -y[0] + 2.0;
+  return 0;
+}
index 178c72c..24c55a7 100644 (file)
-#include <stdio.h> \r
-#include "machine.h"\r
-#include "stack-c.h"\r
-/*-----------------------------------------------------------------------------------*/ \r
-#ifndef SCI\r
-       #define SCI "SCI=../../.." \r
-#endif \r
-#define TRUE 1\r
-#define FALSE 0\r
\r
-/*-----------------------------------------------------------------------------------*/ \r
-/* See routines/system/CallScilab.h */\r
-extern int StartScilab(char *SCIpath,char *ScilabStartup,int *Stacksize);\r
-extern int TerminateScilab(char *ScilabQuit);\r
-extern int SendScilabJob(char *job); \r
-/*-----------------------------------------------------------------------------------*/ \r
-double f(double x)\r
-{\r
-  return x*x + 1;\r
-}\r
-/*-----------------------------------------------------------------------------------*/ \r
-static int my_plot() \r
-{\r
-  int m,n,lx,ly,i;\r
-  /* Scilab is called to build the abscissae vector and \r
-     to allocate the ordinates */\r
-\r
-  SendScilabJob("x=1:0.1:10;y=x;");\r
-  GetMatrixptr("x", &m, &n, &lx);  \r
-  GetMatrixptr("y", &m, &n, &ly);  \r
-  /* \r
-   * y(i)=f(x(i))\r
-   */\r
-  for ( i=0; i < m*n ; i++) \r
-    *stk(ly+i) = f(*stk(lx+i));\r
-  /* \r
-   * plot(x,y);\r
-   */\r
-  SendScilabJob("plot(y,x);");\r
-}\r
-/*-----------------------------------------------------------------------------------*/ \r
-static int my_job()\r
-{\r
-  static char job[256];\r
-  /* storing a matrix inside scilab */\r
-  static double A[]={1,2,3,4};\r
-  int mA=2,nA=2;\r
-  static double b[]={4,5};\r
-  int mb=2,nb=1;\r
-  int m,n,lp,i;\r
-  WriteMatrix("A", &mA, &nA, A); /* if failed make my_job return O; */\r
-  WriteMatrix("b", &mb, &nb, b);\r
-\r
-  if ( SendScilabJob("A,b,x=0\\b;") == 27) \r
-    fprintf(stdout,"division by zero...\n");\r
-  else \r
-    {\r
-      GetMatrixptr("x", &m, &n, &lp);\r
-      for ( i=0 ; i < m*n ; i++) \r
-       fprintf(stdout,"x[%d] = %5.2f\n",i,*stk(i+lp));\r
-    }\r
-\r
-  if ( SendScilabJob("A,b,x=A\\b;") != 0) \r
-    {\r
-      fprintf(stdout,"Error occured during scilab execution\n");\r
-    }\r
-  else \r
-    {\r
-      GetMatrixptr("x", &m, &n, &lp);\r
-      for ( i=0 ; i < m*n ; i++) \r
-       fprintf(stdout,"x[%d] = %5.2f\n",i,*stk(i+lp));\r
-    }\r
-} \r
-/*-----------------------------------------------------------------------------------*/ \r
-/* I want to integrate the previous equation */\r
-int my_ode_job() \r
-{\r
-  double x[]={1,0,0} ; int mx=3,nx=1;\r
-  double time[]={0.4,4}; int mt=1,nt=2;\r
-  fprintf(stdout,"linking \n");\r
-  SendScilabJob("ilib_for_link('odeex','my_ode.o',[],'c');");\r
-  fprintf(stdout,"link done  \n");\r
-  SendScilabJob("exec('loader.sce');link('show')");\r
-  WriteMatrix("x", &mx, &nx, x);\r
-  WriteMatrix("time", &mt, &nt,time);\r
-  /* scilab is called to solve the ODE */\r
-  SendScilabJob("y=ode(x,0,time,''mon_ode''),");\r
-}\r
-/*-----------------------------------------------------------------------------------*/ \r
-#if _MSC_VER\r
-       int main(void)  \r
-#else\r
-       int MAIN__(void) \r
-#endif\r
-{\r
-       if ( StartScilab(NULL,NULL,NULL) == FALSE ) printf("Error : StartScilab \n");\r
-  my_ode_job();\r
-  my_job();\r
-  my_plot() ;\r
-  cc_test();\r
-  if ( TerminateScilab(NULL) == FALSE ) printf("Error : TerminateScilab \n");\r
-  return 0;\r
-}\r
-/*-----------------------------------------------------------------------------------*/ \r
+#include <stdio.h> 
+#include "machine.h"
+#include "stack-c.h"
+/*-----------------------------------------------------------------------------------*/ 
+#ifndef SCI
+       #define SCI "SCI=../../.." 
+#endif 
+#define TRUE 1
+#define FALSE 0
+/*-----------------------------------------------------------------------------------*/ 
+/* See routines/system/CallScilab.h */
+extern int StartScilab(char *SCIpath,char *ScilabStartup,int *Stacksize);
+extern int TerminateScilab(char *ScilabQuit);
+extern int SendScilabJob(char *job); 
+/*-----------------------------------------------------------------------------------*/ 
+double f(double x)
+{
+  return x*x + 1;
+}
+/*-----------------------------------------------------------------------------------*/ 
+static int my_plot() 
+{
+  int m,n,lx,ly,i;
+  /* Scilab is called to build the abscissae vector and 
+     to allocate the ordinates */
+
+  SendScilabJob("x=1:0.1:10;y=x;");
+  GetMatrixptr("x", &m, &n, &lx);  
+  GetMatrixptr("y", &m, &n, &ly);  
+  /* 
+   * y(i)=f(x(i))
+   */
+  for ( i=0; i < m*n ; i++) 
+    *stk(ly+i) = f(*stk(lx+i));
+  /* 
+   * plot(x,y);
+   */
+  SendScilabJob("plot(y,x);");
+}
+/*-----------------------------------------------------------------------------------*/ 
+static int my_job()
+{
+  static char job[256];
+  /* storing a matrix inside scilab */
+  static double A[]={1,2,3,4};
+  int mA=2,nA=2;
+  static double b[]={4,5};
+  int mb=2,nb=1;
+  int m,n,lp,i;
+  WriteMatrix("A", &mA, &nA, A); /* if failed make my_job return O; */
+  WriteMatrix("b", &mb, &nb, b);
+
+  if ( SendScilabJob("A,b,x=0\\b;") == 27) 
+    fprintf(stdout,"division by zero...\n");
+  else 
+    {
+      GetMatrixptr("x", &m, &n, &lp);
+      for ( i=0 ; i < m*n ; i++) 
+       fprintf(stdout,"x[%d] = %5.2f\n",i,*stk(i+lp));
+    }
+
+  if ( SendScilabJob("A,b,x=A\\b;") != 0) 
+    {
+      fprintf(stdout,"Error occured during scilab execution\n");
+    }
+  else 
+    {
+      GetMatrixptr("x", &m, &n, &lp);
+      for ( i=0 ; i < m*n ; i++) 
+       fprintf(stdout,"x[%d] = %5.2f\n",i,*stk(i+lp));
+    }
+} 
+/*-----------------------------------------------------------------------------------*/ 
+/* I want to integrate the previous equation */
+int my_ode_job() 
+{
+  double x[]={1,0,0} ; int mx=3,nx=1;
+  double time[]={0.4,4}; int mt=1,nt=2;
+  fprintf(stdout,"linking \n");
+  SendScilabJob("ilib_for_link('odeex','my_ode.o',[],'c');");
+  fprintf(stdout,"link done  \n");
+  SendScilabJob("exec('loader.sce');link('show')");
+  WriteMatrix("x", &mx, &nx, x);
+  WriteMatrix("time", &mt, &nt,time);
+  /* scilab is called to solve the ODE */
+  SendScilabJob("y=ode(x,0,time,''mon_ode''),");
+}
+/*-----------------------------------------------------------------------------------*/ 
+#if _MSC_VER
+       int main(void)  
+#else
+       int MAIN__(void) 
+#endif
+{
+       if ( StartScilab(NULL,NULL,NULL) == FALSE ) printf("Error : StartScilab \n");
+  my_ode_job();
+  my_job();
+  my_plot() ;
+  cc_test();
+  if ( TerminateScilab(NULL) == FALSE ) printf("Error : TerminateScilab \n");
+  return 0;
+}
+/*-----------------------------------------------------------------------------------*/ 
index 55779b4..1d19258 100644 (file)
@@ -1,22 +1,22 @@
-       \r
-       How to make calls to Scilab interpreter \r
-       from a C++ program \r
-       \r
-In this directory we provide small examples of C++ calls to the Scilab \r
-interpreter. \r
-\r
-[1] Unix ( soure are myprog.c and ccmatrix1.cc )\r
-To make it run you have to edit the Makefile \r
-and change the SCIDIR variable to fit your local Scilab installation \r
-\r
-Then type \r
-\r
-       make all \r
-       ./myprog \r
-\r
-[2] Windows (sources are myprog.c and ccmatrix1.cpp )\r
-       nmake /f Makefile.mak all /a\r
-       \r
-       ..\..\..\..\..\..\bin\prog.exe\r
-\r
-Update INRIA 2007\r
+       
+       How to make calls to Scilab interpreter 
+       from a C++ program 
+       
+In this directory we provide small examples of C++ calls to the Scilab 
+interpreter. 
+
+[1] Unix ( soure are myprog.c and ccmatrix1.cc )
+To make it run you have to edit the Makefile 
+and change the SCIDIR variable to fit your local Scilab installation 
+
+Then type 
+
+       make all 
+       ./myprog 
+
+[2] Windows (sources are myprog.c and ccmatrix1.cpp )
+       nmake /f Makefile.mak all /a
+       
+       ..\..\..\..\..\..\bin\prog.exe
+
+Update INRIA 2007
index 5d4d56b..eea5d0d 100644 (file)
@@ -1,81 +1,81 @@
-      program callsci\r
-c!Purpose\r
-c     Example of calling scilab from an other C or Fortran program\r
-c!Description\r
-c     This program demonstrate on a simple example to use scilab as a \r
-c     procedure for an other program\r
-c     The computations performed are:\r
-c      -1-  computation of x such that a*x=b  (a and b real matrices)\r
-c      -2-  computation of y=a*x-b\r
-c     All scilab functions and instructions may be used in this context\r
-c     for complex instruction, it may be usefull to defined it in a file \r
-c     and use exec\r
-c!\r
-c     Copyright INRIA\r
-c\r
-      dimension a(2,2),b(2),x(2),y(2)\r
-      double precision a,b,x,y\r
-c\r
-c     a and b definition\r
-c\r
-      a(1,1)=1.d0\r
-      a(2,1)=2.d0\r
-      a(1,2)=3.d0\r
-      a(2,2)=4.d0\r
-      b(1)=1.d0\r
-      b(2)=0.d0\r
-c\r
-c     first call to inisci for Scilab initializations \r
-c     10000 is the initial stack size\r
-c\r
-      call inisci(-1,10000, ierr)\r
-      if(ierr.gt.0) stop\r
-c\r
-c     scilab start-up execution. quit added to leave parser after \r
-c     start-up execution\r
-c\r
-      call scirun('exec(''SCI/etc/scilab.start'',-1);quit')\r
-c     \r
-c     Program's variables  a and b sent to Scilab.\r
-c     .  2nd argument of matz not referenced here.\r
-c     .  3rd argument is the first dimension of the transmitted \r
-c     .  variable (here dimension a(2,.) )\r
-c     .  arguments #3 and 4 represent the number of rows and columns\r
-c     .  respectively\r
-c     .  argument #5 is a character string name of the scilab variable\r
-c     .  argument #6 (here job=1) means direction fortran--->scilab\r
-c     \r
-      call matz(a,a,2,2,2,'a',1)\r
-      call matz(b,b,2,2,1,'b',1)\r
-c     \r
-c     call scirun to solve the problem\r
-c     . \\ needed to enter a \ in fortran string\r
-c\r
-      call scirun('x=a\\b;quit')\r
-c\r
-c     Scilab variable x get in program and displayed\r
-c     .  the numbers m and n (dimensions of x) are here given\r
-c     .  by scilab .Don't give numerical values to arguments\r
-c     .  4 and 5 of matz here.\r
-c     .  last argument (job=0) means:   scilab --->program\r
-\r
-      call matz(x,x,2,m,n,'x',0)\r
-      write(6,100) x(1),x(2)\r
- 100  format('x = [',2x,f10.5,2x,f10.5,']')\r
-c\r
-c     call scilab to check the result\r
-c     .  note  -1- a,x,b are still in the scilab stack\r
-c     .        -2- this computation might be done in the first call to scirun \r
-      call scirun('y=a*x-b;quit')\r
-c\r
-c     Scilab variable y get in program and displayed\r
-c\r
-      call matz(y,y,2,m,n,'y',0)\r
-      write(6,110) y(1),y(2)\r
-110   format('a*x-b = [',2x,f10.5,2x,f10.5,']')\r
-c\r
-c     stop properly\r
-c\r
-      call sciquit\r
-      stop\r
-      end\r
+      program callsci
+c!Purpose
+c     Example of calling scilab from an other C or Fortran program
+c!Description
+c     This program demonstrate on a simple example to use scilab as a 
+c     procedure for an other program
+c     The computations performed are:
+c      -1-  computation of x such that a*x=b  (a and b real matrices)
+c      -2-  computation of y=a*x-b
+c     All scilab functions and instructions may be used in this context
+c     for complex instruction, it may be usefull to defined it in a file 
+c     and use exec
+c!
+c     Copyright INRIA
+c
+      dimension a(2,2),b(2),x(2),y(2)
+      double precision a,b,x,y
+c
+c     a and b definition
+c
+      a(1,1)=1.d0
+      a(2,1)=2.d0
+      a(1,2)=3.d0
+      a(2,2)=4.d0
+      b(1)=1.d0
+      b(2)=0.d0
+c
+c     first call to inisci for Scilab initializations 
+c     10000 is the initial stack size
+c
+      call inisci(-1,10000, ierr)
+      if(ierr.gt.0) stop
+c
+c     scilab start-up execution. quit added to leave parser after 
+c     start-up execution
+c
+      call scirun('exec(''SCI/etc/scilab.start'',-1);quit')
+c     
+c     Program's variables  a and b sent to Scilab.
+c     .  2nd argument of matz not referenced here.
+c     .  3rd argument is the first dimension of the transmitted 
+c     .  variable (here dimension a(2,.) )
+c     .  arguments #3 and 4 represent the number of rows and columns
+c     .  respectively
+c     .  argument #5 is a character string name of the scilab variable
+c     .  argument #6 (here job=1) means direction fortran--->scilab
+c     
+      call matz(a,a,2,2,2,'a',1)
+      call matz(b,b,2,2,1,'b',1)
+c     
+c     call scirun to solve the problem
+c     . \\ needed to enter a \ in fortran string
+c
+      call scirun('x=a\\b;quit')
+c
+c     Scilab variable x get in program and displayed
+c     .  the numbers m and n (dimensions of x) are here given
+c     .  by scilab .Don't give numerical values to arguments
+c     .  4 and 5 of matz here.
+c     .  last argument (job=0) means:   scilab --->program
+
+      call matz(x,x,2,m,n,'x',0)
+      write(6,100) x(1),x(2)
+ 100  format('x = [',2x,f10.5,2x,f10.5,']')
+c
+c     call scilab to check the result
+c     .  note  -1- a,x,b are still in the scilab stack
+c     .        -2- this computation might be done in the first call to scirun 
+      call scirun('y=a*x-b;quit')
+c
+c     Scilab variable y get in program and displayed
+c
+      call matz(y,y,2,m,n,'y',0)
+      write(6,110) y(1),y(2)
+110   format('a*x-b = [',2x,f10.5,2x,f10.5,']')
+c
+c     stop properly
+c
+      call sciquit
+      stop
+      end
index bea5ce6..d44e891 100644 (file)
@@ -1,20 +1,20 @@
-\r
-Microsoft Visual Studio Solution File, Format Version 9.00\r
-# Visual Studio 2005\r
-Project("{6989167D-11E4-40FE-8C1A-2192A86A7E90}") = "example", "example.vfproj", "{B6C96508-D326-4691-A49D-FD9D8A369A44}"\r
-EndProject\r
-Global\r
-       GlobalSection(SolutionConfigurationPlatforms) = preSolution\r
-               Debug|Win32 = Debug|Win32\r
-               Release|Win32 = Release|Win32\r
-       EndGlobalSection\r
-       GlobalSection(ProjectConfigurationPlatforms) = postSolution\r
-               {B6C96508-D326-4691-A49D-FD9D8A369A44}.Debug|Win32.ActiveCfg = Debug|Win32\r
-               {B6C96508-D326-4691-A49D-FD9D8A369A44}.Debug|Win32.Build.0 = Debug|Win32\r
-               {B6C96508-D326-4691-A49D-FD9D8A369A44}.Release|Win32.ActiveCfg = Release|Win32\r
-               {B6C96508-D326-4691-A49D-FD9D8A369A44}.Release|Win32.Build.0 = Release|Win32\r
-       EndGlobalSection\r
-       GlobalSection(SolutionProperties) = preSolution\r
-               HideSolutionNode = FALSE\r
-       EndGlobalSection\r
-EndGlobal\r
+
+Microsoft Visual Studio Solution File, Format Version 9.00
+# Visual Studio 2005
+Project("{6989167D-11E4-40FE-8C1A-2192A86A7E90}") = "example", "example.vfproj", "{B6C96508-D326-4691-A49D-FD9D8A369A44}"
+EndProject
+Global
+       GlobalSection(SolutionConfigurationPlatforms) = preSolution
+               Debug|Win32 = Debug|Win32
+               Release|Win32 = Release|Win32
+       EndGlobalSection
+       GlobalSection(ProjectConfigurationPlatforms) = postSolution
+               {B6C96508-D326-4691-A49D-FD9D8A369A44}.Debug|Win32.ActiveCfg = Debug|Win32
+               {B6C96508-D326-4691-A49D-FD9D8A369A44}.Debug|Win32.Build.0 = Debug|Win32
+               {B6C96508-D326-4691-A49D-FD9D8A369A44}.Release|Win32.ActiveCfg = Release|Win32
+               {B6C96508-D326-4691-A49D-FD9D8A369A44}.Release|Win32.Build.0 = Release|Win32
+       EndGlobalSection
+       GlobalSection(SolutionProperties) = preSolution
+               HideSolutionNode = FALSE
+       EndGlobalSection
+EndGlobal
index bda9032..360761f 100644 (file)
@@ -1,29 +1,29 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<VisualStudioProject ProjectCreator="Intel Fortran" Keyword="Console Application" Version="9.10" ProjectIdGuid="{B6C96508-D326-4691-A49D-FD9D8A369A44}">\r
-       <Platforms>\r
-               <Platform Name="Win32"/></Platforms>\r
-       <Configurations>\r
-               <Configuration Name="Debug|Win32" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)">\r
-                               <Tool Name="VFMidlTool" SuppressStartupBanner="true" HeaderFileName="$(InputName).h" TypeLibraryName="$(IntDir)/$(InputName).tlb"/>\r
-                               <Tool Name="VFPreBuildEventTool"/>\r
-                               <Tool Name="VFPostBuildEventTool"/>\r
-                               <Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" ExternalNameInterpretation="extNameLowerCase" CallingConvention="callConventionCRef" ExternalNameUnderscore="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebug" CompileOnly="true"/>\r
-                               <Tool Name="VFCustomBuildTool"/>\r
-                               <Tool Name="VFLinkerTool" SwitchesHaveChanged="true" OutputFile="../../../../../bin/example.exe" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/example.pdb" SubSystem="subSystemConsole" AdditionalDependencies="../../../../../bin/libscilab.lib"/>\r
-                               <Tool Name="VFPreLinkEventTool"/>\r
-                               <Tool Name="VFResourceCompilerTool" ResourceOutputFileName="$(IntDir)/$(InputName).res"/></Configuration>\r
-               <Configuration Name="Release|Win32" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">\r
-                               <Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" HeaderFileName="$(InputName).h" TypeLibraryName="$(IntDir)/$(InputName).tlb"/>\r
-                               <Tool Name="VFPreBuildEventTool"/>\r
-                               <Tool Name="VFPostBuildEventTool"/>\r
-                               <Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" ExternalNameInterpretation="extNameLowerCase" CallingConvention="callConventionCRef" ExternalNameUnderscore="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" RuntimeLibrary="rtMultiThreaded" CompileOnly="true"/>\r
-                               <Tool Name="VFCustomBuildTool"/>\r
-                               <Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" OutputFile="../../../../../bin/example.exe" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" SubSystem="subSystemConsole" AdditionalDependencies="../../../../../bin/libscilab.lib"/>\r
-                               <Tool Name="VFPreLinkEventTool"/>\r
-                               <Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" ResourceOutputFileName="$(IntDir)/$(InputName).res"/></Configuration></Configurations>\r
-       <Files>\r
-               <Filter Name="Source Files" Filter="f90;for;f;fpp;ftn;def;odl;idl">\r
-               <File RelativePath="callsci.f"/></Filter>\r
-               <Filter Name="Header Files" Filter="fi;fd"/>\r
-               <Filter Name="Resource Files" Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"/></Files>\r
-       <Globals/></VisualStudioProject>\r
+<?xml version="1.0" encoding="UTF-8"?>
+<VisualStudioProject ProjectCreator="Intel Fortran" Keyword="Console Application" Version="9.10" ProjectIdGuid="{B6C96508-D326-4691-A49D-FD9D8A369A44}">
+       <Platforms>
+               <Platform Name="Win32"/></Platforms>
+       <Configurations>
+               <Configuration Name="Debug|Win32" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)">
+                               <Tool Name="VFMidlTool" SuppressStartupBanner="true" HeaderFileName="$(InputName).h" TypeLibraryName="$(IntDir)/$(InputName).tlb"/>
+                               <Tool Name="VFPreBuildEventTool"/>
+                               <Tool Name="VFPostBuildEventTool"/>
+                               <Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" ExternalNameInterpretation="extNameLowerCase" CallingConvention="callConventionCRef" ExternalNameUnderscore="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebug" CompileOnly="true"/>
+                               <Tool Name="VFCustomBuildTool"/>
+                               <Tool Name="VFLinkerTool" SwitchesHaveChanged="true" OutputFile="../../../../../bin/example.exe" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/example.pdb" SubSystem="subSystemConsole" AdditionalDependencies="../../../../../bin/libscilab.lib"/>
+                               <Tool Name="VFPreLinkEventTool"/>
+                               <Tool Name="VFResourceCompilerTool" ResourceOutputFileName="$(IntDir)/$(InputName).res"/></Configuration>
+               <Configuration Name="Release|Win32" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">
+                               <Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" HeaderFileName="$(InputName).h" TypeLibraryName="$(IntDir)/$(InputName).tlb"/>
+                               <Tool Name="VFPreBuildEventTool"/>
+                               <Tool Name="VFPostBuildEventTool"/>
+                               <Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" ExternalNameInterpretation="extNameLowerCase" CallingConvention="callConventionCRef" ExternalNameUnderscore="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" RuntimeLibrary="rtMultiThreaded" CompileOnly="true"/>
+                               <Tool Name="VFCustomBuildTool"/>
+                               <Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" OutputFile="../../../../../bin/example.exe" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" SubSystem="subSystemConsole" AdditionalDependencies="../../../../../bin/libscilab.lib"/>
+                               <Tool Name="VFPreLinkEventTool"/>
+                               <Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" ResourceOutputFileName="$(IntDir)/$(InputName).res"/></Configuration></Configurations>
+       <Files>
+               <Filter Name="Source Files" Filter="f90;for;f;fpp;ftn;def;odl;idl">
+               <File RelativePath="callsci.f"/></Filter>
+               <Filter Name="Header Files" Filter="fi;fd"/>
+               <Filter Name="Resource Files" Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"/></Files>
+       <Globals/></VisualStudioProject>
index 8680176..b414e25 100644 (file)
@@ -1,25 +1,25 @@
-    An example of calling scilab as a subroutine of a user's main program\r
-    \r
-    Requirements Intel Fortran 9.1 and Visual Studio 2005 IDE\r
-\r
-\r
-Useful files\r
-============\r
-\r
-    * callsci.f: Fortran Example of a usermain program. This main program send matrices \r
-                (call matz) and commands (call scirun) to scilab and \r
-                 gets the results back (call matz).\r
-\r
-Usage\r
-=====\r
-       from this directory :\r
-       \r
-       set SCI=<your current scilab path ex: d:/scilab \r
-       set TMPDIR=%TEMP%\r
-       set HOME=%SCI%\r
-       set TCL_LIBRARY=%SCI%\tcl\tcl8.4\r
-       set TK_LIBRARY=%SCI%\tcl\tk8.4\r
-       \r
-       ../../../../bin/example.exe\r
-\r
-INRIA 2006 A.C\r
+    An example of calling scilab as a subroutine of a user's main program
+    
+    Requirements Intel Fortran 9.1 and Visual Studio 2005 IDE
+
+
+Useful files
+============
+
+    * callsci.f: Fortran Example of a usermain program. This main program send matrices 
+                (call matz) and commands (call scirun) to scilab and 
+                 gets the results back (call matz).
+
+Usage
+=====
+       from this directory :
+       
+       set SCI=<your current scilab path ex: d:/scilab 
+       set TMPDIR=%TEMP%
+       set HOME=%SCI%
+       set TCL_LIBRARY=%SCI%\tcl\tcl8.4
+       set TK_LIBRARY=%SCI%\tcl\tk8.4
+       
+       ../../../../bin/example.exe
+
+INRIA 2006 A.C
index ac395eb..10e5c03 100644 (file)
@@ -1,13 +1,13 @@
-\r
-call_scilab/c :\r
-How to call scilab from C\r
-\r
-call_scilab/cpp :\r
-How to call scilab from C++ \r
-\r
-call_scilab/fortran :\r
-How to call scilab from fortran\r
-\r
-\r
-INRIA 2007\r
+
+call_scilab/c :
+How to call scilab from C
+
+call_scilab/cpp :
+How to call scilab from C++ 
+
+call_scilab/fortran :
+How to call scilab from fortran
+
+
+INRIA 2007
 A.C
\ No newline at end of file
index 51d3a67..835ae9e 100644 (file)
@@ -1,13 +1,13 @@
-/*-----------------------------------------------------------------------------------*/\r
-/* INRIA 2007 */\r
-/* Allan CORNET */\r
-/*-----------------------------------------------------------------------------------*/\r
-#ifndef __ERROR_SCILAB_H__ \r
-#define __ERROR_SCILAB_H__\r
-\r
-\r
-int error_scilab();\r
-\r
-\r
-#endif /*__ERROR_SCILAB_H__*/\r
-/*-----------------------------------------------------------------------------------*/\r
+/*-----------------------------------------------------------------------------------*/
+/* INRIA 2007 */
+/* Allan CORNET */
+/*-----------------------------------------------------------------------------------*/
+#ifndef __ERROR_SCILAB_H__ 
+#define __ERROR_SCILAB_H__
+
+
+int error_scilab();
+
+
+#endif /*__ERROR_SCILAB_H__*/
+/*-----------------------------------------------------------------------------------*/
index 2b1b34b..7a1596d 100644 (file)
@@ -1,11 +1,11 @@
-/*-----------------------------------------------------------------------------------*/\r
-/* INRIA 2007 */\r
-/* Allan CORNET */\r
-/*-----------------------------------------------------------------------------------*/\r
-#ifndef __MESSAGE_SCILAB_H__ \r
-#define __MESSAGE_SCILAB_H__\r
-\r
-int message_scilab();\r
-\r
-#endif /*__MESSAGE_SCILAB_H__*/\r
-/*-----------------------------------------------------------------------------------*/\r
+/*-----------------------------------------------------------------------------------*/
+/* INRIA 2007 */
+/* Allan CORNET */
+/*-----------------------------------------------------------------------------------*/
+#ifndef __MESSAGE_SCILAB_H__ 
+#define __MESSAGE_SCILAB_H__
+
+int message_scilab();
+
+#endif /*__MESSAGE_SCILAB_H__*/
+/*-----------------------------------------------------------------------------------*/
index 21c50a7..77da987 100644 (file)
@@ -1,20 +1,20 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
-<!DOCTYPE LOCALIZATION SYSTEM "../../../localization/xml/localization.dtd">\r
-<LOCALIZATION>\r
-\r
-<entry>\r
-       <tag></tag>\r
-       <string></string>\r
-</entry>       \r
-\r
-<entry>\r
-       <tag></tag>\r
-       <string></string>\r
-</entry>       \r
-               \r
-<entry>\r
-       <tag></tag>\r
-       <string></string>\r
-</entry>       \r
-\r
-</LOCALIZATION>\r
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE LOCALIZATION SYSTEM "../../../localization/xml/localization.dtd">
+<LOCALIZATION>
+
+<entry>
+       <tag></tag>
+       <string></string>
+</entry>       
+
+<entry>
+       <tag></tag>
+       <string></string>
+</entry>       
+               
+<entry>
+       <tag></tag>
+       <string></string>
+</entry>       
+
+</LOCALIZATION>
index 21c50a7..77da987 100644 (file)
@@ -1,20 +1,20 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
-<!DOCTYPE LOCALIZATION SYSTEM "../../../localization/xml/localization.dtd">\r
-<LOCALIZATION>\r
-\r
-<entry>\r
-       <tag></tag>\r
-       <string></string>\r
-</entry>       \r
-\r
-<entry>\r
-       <tag></tag>\r
-       <string></string>\r
-</entry>       \r
-               \r
-<entry>\r
-       <tag></tag>\r
-       <string></string>\r
-</entry>       \r
-\r
-</LOCALIZATION>\r
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE LOCALIZATION SYSTEM "../../../localization/xml/localization.dtd">
+<LOCALIZATION>
+
+<entry>
+       <tag></tag>
+       <string></string>
+</entry>       
+
+<entry>
+       <tag></tag>
+       <string></string>
+</entry>       
+               
+<entry>
+       <tag></tag>
+       <string></string>
+</entry>       
+
+</LOCALIZATION>
index 21c50a7..77da987 100644 (file)
@@ -1,20 +1,20 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
-<!DOCTYPE LOCALIZATION SYSTEM "../../../localization/xml/localization.dtd">\r
-<LOCALIZATION>\r
-\r
-<entry>\r
-       <tag></tag>\r
-       <string></string>\r
-</entry>       \r
-\r
-<entry>\r
-       <tag></tag>\r
-       <string></string>\r
-</entry>       \r
-               \r
-<entry>\r
-       <tag></tag>\r
-       <string></string>\r
-</entry>       \r
-\r
-</LOCALIZATION>\r
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE LOCALIZATION SYSTEM "../../../localization/xml/localization.dtd">
+<LOCALIZATION>
+
+<entry>
+       <tag></tag>
+       <string></string>
+</entry>       
+
+<entry>
+       <tag></tag>
+       <string></string>
+</entry>       
+               
+<entry>
+       <tag></tag>
+       <string></string>
+</entry>       
+
+</LOCALIZATION>
index 21c50a7..77da987 100644 (file)
@@ -1,20 +1,20 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
-<!DOCTYPE LOCALIZATION SYSTEM "../../../localization/xml/localization.dtd">\r
-<LOCALIZATION>\r
-\r
-<entry>\r
-       <tag></tag>\r
-       <string></string>\r
-</entry>       \r
-\r
-<entry>\r
-       <tag></tag>\r
-       <string></string>\r
-</entry>       \r
-               \r
-<entry>\r
-       <tag></tag>\r
-       <string></string>\r
-</entry>       \r
-\r
-</LOCALIZATION>\r
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE LOCALIZATION SYSTEM "../../../localization/xml/localization.dtd">
+<LOCALIZATION>
+
+<entry>
+       <tag></tag>
+       <string></string>
+</entry>       
+
+<entry>
+       <tag></tag>
+       <string></string>
+</entry>       
+               
+<entry>
+       <tag></tag>
+       <string></string>
+</entry>       
+
+</LOCALIZATION>
index 21c50a7..77da987 100644 (file)
@@ -1,20 +1,20 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
-<!DOCTYPE LOCALIZATION SYSTEM "../../../localization/xml/localization.dtd">\r
-<LOCALIZATION>\r
-\r
-<entry>\r
-       <tag></tag>\r
-       <string></string>\r
-</entry>       \r
-\r
-<entry>\r
-       <tag></tag>\r
-       <string></string>\r
-</entry>       \r
-               \r
-<entry>\r
-       <tag></tag>\r
-       <string></string>\r
-</entry>       \r
-\r
-</LOCALIZATION>\r
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE LOCALIZATION SYSTEM "../../../localization/xml/localization.dtd">
+<LOCALIZATION>
+
+<entry>
+       <tag></tag>
+       <string></string>
+</entry>       
+
+<entry>
+       <tag></tag>
+       <string></string>
+</entry>       
+               
+<entry>
+       <tag></tag>
+       <string></string>
+</entry>       
+
+</LOCALIZATION>
index 21c50a7..77da987 100644 (file)
@@ -1,20 +1,20 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
-<!DOCTYPE LOCALIZATION SYSTEM "../../../localization/xml/localization.dtd">\r
-<LOCALIZATION>\r
-\r
-<entry>\r
-       <tag></tag>\r
-       <string></string>\r
-</entry>       \r
-\r
-<entry>\r
-       <tag></tag>\r
-       <string></string>\r
-</entry>       \r
-               \r
-<entry>\r
-       <tag></tag>\r
-       <string></string>\r
-</entry>       \r
-\r
-</LOCALIZATION>\r
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE LOCALIZATION SYSTEM "../../../localization/xml/localization.dtd">
+<LOCALIZATION>
+
+<entry>
+       <tag></tag>
+       <string></string>
+</entry>       
+
+<entry>
+       <tag></tag>
+       <string></string>
+</entry>       
+               
+<entry>
+       <tag></tag>
+       <string></string>
+</entry>       
+
+</LOCALIZATION>
index 363ced3..23d04dd 100644 (file)
@@ -1,41 +1,41 @@
-/*-----------------------------------------------------------------------------------*/\r
-/* INRIA 2007 */\r
-/* Allan CORNET */\r
-/*-----------------------------------------------------------------------------------*/ \r
-#include "TerminateCore.h"\r
-/*-----------------------------------------------------------------------------------*/ \r
-#include "realmain.h" /* Get_no_startup_flag */\r
-#include "inffic.h" /* get_sci_data_strings */\r
-#include "scirun.h" /* scirun */\r
-#include "getmodules.h"\r
-#include "scimem.h" /* freegmem */\r
-#include "tmpdir.h" /* tmpdirc */\r
-#include "hashtable_core.h" /* destroy_hashtable_scilab_functions */\r
-/*-----------------------------------------------------------------------------------*/ \r
-BOOL TerminateCorePart1(void)\r
-{\r
-       if ( Get_no_startup_flag() == 0) \r
-       {\r
-               char *quit_script =  get_sci_data_strings(5);\r
-               C2F(scirun)(quit_script,strlen(quit_script));\r
-       }\r
-       return TRUE;\r
-}\r
-/*-----------------------------------------------------------------------------------*/ \r
-BOOL TerminateCorePart2(void)\r
-{\r
-       #ifdef _MSC_VER /* Bug sous Linux lors de la liberation memoire */\r
-               C2F(freegmem)();\r
-               C2F(freemem)();\r
-       #endif\r
-\r
-       DisposeModulesInfo();\r
-\r
-       destroy_hashtable_scilab_functions();\r
-\r
-       /** clean tmpfiles **/\r
-       C2F(tmpdirc)();\r
-\r
-       return TRUE;\r
-}\r
-/*-----------------------------------------------------------------------------------*/ \r
+/*-----------------------------------------------------------------------------------*/
+/* INRIA 2007 */
+/* Allan CORNET */
+/*-----------------------------------------------------------------------------------*/ 
+#include "TerminateCore.h"
+/*-----------------------------------------------------------------------------------*/ 
+#include "realmain.h" /* Get_no_startup_flag */
+#include "inffic.h" /* get_sci_data_strings */
+#include "scirun.h" /* scirun */
+#include "getmodules.h"
+#include "scimem.h" /* freegmem */
+#include "tmpdir.h" /* tmpdirc */
+#include "hashtable_core.h" /* destroy_hashtable_scilab_functions */
+/*-----------------------------------------------------------------------------------*/ 
+BOOL TerminateCorePart1(void)
+{
+       if ( Get_no_startup_flag() == 0) 
+       {
+               char *quit_script =  get_sci_data_strings(5);
+               C2F(scirun)(quit_script,strlen(quit_script));
+       }
+       return TRUE;
+}
+/*-----------------------------------------------------------------------------------*/ 
+BOOL TerminateCorePart2(void)
+{
+       #ifdef _MSC_VER /* Bug sous Linux lors de la liberation memoire */
+               C2F(freegmem)();
+               C2F(freemem)();
+       #endif
+
+       DisposeModulesInfo();
+
+       destroy_hashtable_scilab_functions();
+
+       /** clean tmpfiles **/
+       C2F(tmpdirc)();
+
+       return TRUE;
+}
+/*-----------------------------------------------------------------------------------*/ 
index afbb59d..85e0cc4 100644 (file)
@@ -1,13 +1,13 @@
-/*-----------------------------------------------------------------------------------*/\r
-/* INRIA 2007 */\r
-/* Allan CORNET */\r
-/*-----------------------------------------------------------------------------------*/ \r
-#ifndef _TERMINATECORE_H__\r
-#define _TERMINATECORE_H__\r
-#include "machine.h"\r
-\r
-BOOL TerminateCorePart1(void);\r
-BOOL TerminateCorePart2(void);\r
-\r
-#endif /* _TERMINATECORE_H__ */\r
-/*-----------------------------------------------------------------------------------*/ \r
+/*-----------------------------------------------------------------------------------*/
+/* INRIA 2007 */
+/* Allan CORNET */
+/*-----------------------------------------------------------------------------------*/ 
+#ifndef _TERMINATECORE_H__
+#define _TERMINATECORE_H__
+#include "machine.h"
+
+BOOL TerminateCorePart1(void);
+BOOL TerminateCorePart2(void);
+
+#endif /* _TERMINATECORE_H__ */
+/*-----------------------------------------------------------------------------------*/ 
index b5b03e0..42149fe 100644 (file)
@@ -1,29 +1,29 @@
-/*-----------------------------------------------------------------------------------*/\r
-/* INRIA 2007 */\r
-/* Allan CORNET */\r
-/*-----------------------------------------------------------------------------------*/\r
-#include <stdarg.h>\r
-#include "error_scilab.h"\r
-#include "MALLOC.h"\r
-#include "Scierror.h"\r
-#include "sciprint.h"\r
-#include "../../../localization/includes/QueryStringError.h"\r
-/*-----------------------------------------------------------------------------------*/\r
-int error_scilab(int iv,char *Tag,va_list argptr)\r
-{\r
-       int ret=0;\r
-       char *LocalizedString=QueryStringError(Tag);\r
-\r
-       if (LocalizedString)\r
-       {\r
-               ret=Scierror(iv,LocalizedString, argptr);\r
-       }\r
-       else\r
-       {\r
-               Scierror(iv,"ERROR : localized message not found : %s",Tag);\r
-       }\r
-       sciprint("\n");\r
-       if (LocalizedString) {FREE(LocalizedString);LocalizedString=NULL;}\r
-       return ret;\r
-}\r
-/*-----------------------------------------------------------------------------------*/\r
+/*-----------------------------------------------------------------------------------*/
+/* INRIA 2007 */
+/* Allan CORNET */
+/*-----------------------------------------------------------------------------------*/
+#include <stdarg.h>
+#include "error_scilab.h"
+#include "MALLOC.h"
+#include "Scierror.h"
+#include "sciprint.h"
+#include "../../../localization/includes/QueryStringError.h"
+/*-----------------------------------------------------------------------------------*/
+int error_scilab(int iv,char *Tag,va_list argptr)
+{
+       int ret=0;
+       char *LocalizedString=QueryStringError(Tag);
+
+       if (LocalizedString)
+       {
+               ret=Scierror(iv,LocalizedString, argptr);
+       }
+       else
+       {
+               Scierror(iv,"ERROR : localized message not found : %s",Tag);
+       }
+       sciprint("\n");
+       if (LocalizedString) {FREE(LocalizedString);LocalizedString=NULL;}
+       return ret;
+}
+/*-----------------------------------------------------------------------------------*/
index b3d3752..771fdce 100644 (file)
@@ -1,29 +1,29 @@
-/*-----------------------------------------------------------------------------------*/\r
-/* INRIA 2007 */\r
-/* Allan CORNET */\r
-/*-----------------------------------------------------------------------------------*/\r
-#include <stdarg.h>\r
-#include "message_scilab.h"\r
-#include "MALLOC.h"\r
-#include "sciprint.h"\r
-#include "../../../localization/includes/QueryStringMessage.h"\r
-/*-----------------------------------------------------------------------------------*/\r
-int message_scilab(char *Tag,va_list argptr)\r
-{\r
-       int ret=0;\r
-       char *LocalizedString=QueryStringMessage(Tag);\r
-\r
-       if (LocalizedString)\r
-       {\r
-               sciprint(LocalizedString, argptr);\r
-               ret=1;\r
-       }\r
-       else\r
-       {\r
-               sciprint("ERROR : localized message not found : %s",Tag);\r
-       }\r
-       sciprint("\n");\r
-       if (LocalizedString) {FREE(LocalizedString);LocalizedString=NULL;}\r
-       return ret;\r
-}\r
-/*-----------------------------------------------------------------------------------*/\r
+/*-----------------------------------------------------------------------------------*/
+/* INRIA 2007 */
+/* Allan CORNET */
+/*-----------------------------------------------------------------------------------*/
+#include <stdarg.h>
+#include "message_scilab.h"
+#include "MALLOC.h"
+#include "sciprint.h"
+#include "../../../localization/includes/QueryStringMessage.h"
+/*-----------------------------------------------------------------------------------*/
+int message_scilab(char *Tag,va_list argptr)
+{
+       int ret=0;
+       char *LocalizedString=QueryStringMessage(Tag);
+
+       if (LocalizedString)
+       {
+               sciprint(LocalizedString, argptr);
+               ret=1;
+       }
+       else
+       {
+               sciprint("ERROR : localized message not found : %s",Tag);
+       }
+       sciprint("\n");
+       if (LocalizedString) {FREE(LocalizedString);LocalizedString=NULL;}
+       return ret;
+}
+/*-----------------------------------------------------------------------------------*/
index 21c50a7..77da987 100644 (file)
@@ -1,20 +1,20 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
-<!DOCTYPE LOCALIZATION SYSTEM "../../../localization/xml/localization.dtd">\r
-<LOCALIZATION>\r
-\r
-<entry>\r
-       <tag></tag>\r
-       <string></string>\r
-</entry>       \r
-\r
-<entry>\r
-       <tag></tag>\r
-       <string></string>\r
-</entry>       \r
-               \r
-<entry>\r
-       <tag></tag>\r
-       <string></string>\r
-</entry>       \r
-\r
-</LOCALIZATION>\r
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE LOCALIZATION SYSTEM "../../../localization/xml/localization.dtd">
+<LOCALIZATION>
+
+<entry>
+       <tag></tag>
+       <string></string>
+</entry>       
+
+<entry>
+       <tag></tag>
+       <string></string>
+</entry>       
+               
+<entry>
+       <tag></tag>
+       <string></string>
+</entry>       
+
+</LOCALIZATION>
index 21c50a7..77da987 100644 (file)
@@ -1,20 +1,20 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
-<!DOCTYPE LOCALIZATION SYSTEM "../../../localization/xml/localization.dtd">\r
-<LOCALIZATION>\r
-\r
-<entry>\r
-       <tag></tag>\r
-       <string></string>\r
-</entry>       \r
-\r
-<entry>\r
-       <tag></tag>\r
-       <string></string>\r
-</entry>       \r
-               \r
-<entry>\r
-       <tag></tag>\r
-       <string></string>\r
-</entry>       \r
-\r
-</LOCALIZATION>\r
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE LOCALIZATION SYSTEM "../../../localization/xml/localization.dtd">
+<LOCALIZATION>
+
+<entry>
+       <tag></tag>
+       <string></string>
+</entry>       
+
+<entry>
+       <tag></tag>
+       <string></string>
+</entry>       
+               
+<entry>
+       <tag></tag>
+       <string></string>
+</entry>       
+
+</LOCALIZATION>
index 21c50a7..77da987 100644 (file)
@@ -1,20 +1,20 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
-<!DOCTYPE LOCALIZATION SYSTEM "../../../localization/xml/localization.dtd">\r
-<LOCALIZATION>\r
-\r
-<entry>\r
-       <tag></tag>\r
-       <string></string>\r
-</entry>       \r
-\r
-<entry>\r
-       <tag></tag>\r
-       <string></string>\r
-</entry>       \r
-               \r
-<entry>\r
-       <tag></tag>\r
-       <string></string>\r
-</entry>       \r
-\r
-</LOCALIZATION>\r
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE LOCALIZATION SYSTEM "../../../localization/xml/localization.dtd">
+<LOCALIZATION>
+
+<entry>
+       <tag></tag>
+       <string></string>
+</entry>       
+
+<entry>
+       <tag></tag>
+       <string></string>
+</entry>       
+               
+<entry>
+       <tag></tag>
+       <string></string>
+</entry>       
+
+</LOCALIZATION>
index 21c50a7..77da987 100644 (file)
@@ -1,20 +1,20 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
-<!DOCTYPE LOCALIZATION SYSTEM "../../../localization/xml/localization.dtd">\r
-<LOCALIZATION>\r
-\r
-<entry>\r
-       <tag></tag>\r
-       <string></string>\r
-</entry>       \r
-\r
-<entry>\r
-       <tag></tag>\r
-       <string></string>\r
-</entry>       \r
-               \r
-<entry>\r
-       <tag></tag>\r
-       <string></string>\r
-</entry>       \r
-\r
-</LOCALIZATION>\r
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE LOCALIZATION SYSTEM "../../../localization/xml/localization.dtd">
+<LOCALIZATION>
+
+<entry>
+       <tag></tag>
+       <string></string>
+</entry>       
+
+<entry>
+       <tag></tag>
+       <string></string>
+</entry>       
+               
+<entry>
+       <tag></tag>
+       <string></string>
+</entry>       
+
+</LOCALIZATION>
index 21c50a7..77da987 100644 (file)
@@ -1,20 +1,20 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
-<!DOCTYPE LOCALIZATION SYSTEM "../../../localization/xml/localization.dtd">\r
-<LOCALIZATION>\r
-\r
-<entry>\r
-       <tag></tag>\r
-       <string></string>\r
-</entry>       \r
-\r
-<entry>\r
-       <tag></tag>\r
-       <string></string>\r
-</entry>       \r
-               \r
-<entry>\r
-       <tag></tag>\r
-       <string></string>\r
-</entry>       \r
-\r
-</LOCALIZATION>\r
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE LOCALIZATION SYSTEM "../../../localization/xml/localization.dtd">
+<LOCALIZATION>
+
+<entry>
+       <tag></tag>
+       <string></string>
+</entry>       
+
+<entry>
+       <tag></tag>
+       <string></string>
+</entry>       
+               
+<entry>
+       <tag></tag>
+       <string></string>
+</entry>       
+
+</LOCALIZATION>
index 21c50a7..77da987 100644 (file)
@@ -1,20 +1,20 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
-<!DOCTYPE LOCALIZATION SYSTEM "../../../localization/xml/localization.dtd">\r
-<LOCALIZATION>\r
-\r
-<entry>\r
-       <tag></tag>\r
-       <string></string>\r
-</entry>       \r
-\r
-<entry>\r
-       <tag></tag>\r
-       <string></string>\r
-</entry>       \r
-               \r
-<entry>\r
-       <tag></tag>\r
-       <string></string>\r
-</entry>       \r
-\r
-</LOCALIZATION>\r
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE LOCALIZATION SYSTEM "../../../localization/xml/localization.dtd">
+<LOCALIZATION>
+
+<entry>
+       <tag></tag>
+       <string></string>
+</entry>       
+
+<entry>
+       <tag></tag>
+       <string></string>
+</entry>       
+               
+<entry>
+       <tag></tag>
+       <string></string>
+</entry>       
+
+</LOCALIZATION>
index 3370a2c..a49c926 100644 (file)
@@ -1,39 +1,39 @@
-@echo off\r
-rem  Only to check that examples can be built\r
-cd ..\..\core\examples\call_scilab\cpp\common\r
-nmake /nologo /f makefile.mak clean >NUL\r
-cd ..\..\..\..\..\development_tools\examples\r
-\r
-rem  Only to check that examples can be built\r
-cd ..\..\core\examples\call_scilab\c\common\r
-nmake /nologo /f makefile.mak clean >NUL\r
-cd ..\..\..\..\..\development_tools\examples\r
-\r
-cd ..\..\differential_equations\examples\r
-nmake /nologo /f makefile.mak clean  >NUL\r
-cd ..\..\development_tools\examples\r
-\r
-cd ..\..\incremental_link\examples\dynamic_links_c_and_fortran\r
-nmake /nologo /f makefile.mak clean  >NUL\r
-cd ..\..\..\development_tools\examples\r
-\r
-cd ..\..\incremental_link\examples\gateway\r
-nmake /nologo /f makefile.mak clean  >NUL\r
-cd ..\..\..\development_tools\examples\r
-\r
-cd ..\..\incremental_link\examples\interfaces\c\r
-nmake /nologo /f makefile.mak clean  >NUL\r
-cd ..\..\..\..\development_tools\examples\r
-\r
-cd ..\..\incremental_link\examples\interfaces\fortran\r
-nmake /nologo /f makefile.mak clean  >NUL\r
-cd ..\..\..\..\development_tools\examples\r
-\r
-cd ..\..\linear_algebra\examples\r
-nmake /nologo /f makefile.mak clean  >NUL\r
-cd ..\..\development_tools\examples\r
-\r
-rem problems with Intersci :( \r
-cd ..\..\intersci\examples  >NUL\r
-nmake /nologo /f makefile.mak clean\r
-cd ..\..\development_tools\examples\r
+@echo off
+rem  Only to check that examples can be built
+cd ..\..\core\examples\call_scilab\cpp\common
+nmake /nologo /f makefile.mak clean >NUL
+cd ..\..\..\..\..\development_tools\examples
+
+rem  Only to check that examples can be built
+cd ..\..\core\examples\call_scilab\c\common
+nmake /nologo /f makefile.mak clean >NUL
+cd ..\..\..\..\..\development_tools\examples
+
+cd ..\..\differential_equations\examples
+nmake /nologo /f makefile.mak clean  >NUL
+cd ..\..\development_tools\examples
+
+cd ..\..\incremental_link\examples\dynamic_links_c_and_fortran
+nmake /nologo /f makefile.mak clean  >NUL
+cd ..\..\..\development_tools\examples
+
+cd ..\..\incremental_link\examples\gateway
+nmake /nologo /f makefile.mak clean  >NUL
+cd ..\..\..\development_tools\examples
+
+cd ..\..\incremental_link\examples\interfaces\c
+nmake /nologo /f makefile.mak clean  >NUL
+cd ..\..\..\..\development_tools\examples
+
+cd ..\..\incremental_link\examples\interfaces\fortran
+nmake /nologo /f makefile.mak clean  >NUL
+cd ..\..\..\..\development_tools\examples
+
+cd ..\..\linear_algebra\examples
+nmake /nologo /f makefile.mak clean  >NUL
+cd ..\..\development_tools\examples
+
+rem problems with Intersci :( 
+cd ..\..\intersci\examples  >NUL
+nmake /nologo /f makefile.mak clean
+cd ..\..\development_tools\examples
index fcd5160..9ce48f8 100644 (file)
@@ -1,45 +1,45 @@
-@echo off\r
-\r
-@echo off\r
-rem  Only to check that examples can be built\r
-cd ..\..\core\examples\call_scilab\cpp\common\r
-nmake /nologo /f makefile.mak all >NUL\r
-cd ..\..\..\..\..\development_tools\examples\r
-\r
-rem  Only to check that examples can be built\r
-cd ..\..\core\examples\call_scilab\c\common\r
-nmake /nologo /f makefile.mak all >NUL\r
-cd ..\..\..\..\..\development_tools\examples\r
-\r
-cd ..\..\differential_equations\examples\r
-nmake /nologo /f makefile.mak tests\r
-cd ..\..\development_tools\examples\r
-\r
-cd ..\..\incremental_link\examples\dynamic_links_c_and_fortran\r
-nmake /nologo /f makefile.mak tests\r
-cd ..\..\..\development_tools\examples\r
-\r
-cd ..\..\incremental_link\examples\gateway\r
-nmake /nologo /f makefile.mak tests\r
-cd ..\..\..\development_tools\examples\r
-\r
-cd ..\..\incremental_link\examples\interfaces\c\r
-nmake /nologo /f makefile.mak all /A > NUL\r
-nmake /nologo /f makefile.mak tests /A\r
-cd ..\..\..\..\development_tools\examples\r
-\r
-cd ..\..\incremental_link\examples\interfaces\fortran\r
-nmake /nologo /f makefile.mak all /A > NUL\r
-nmake /nologo /f makefile.mak tests /A\r
-cd ..\..\..\..\development_tools\examples\r
-\r
-cd ..\..\linear_algebra\examples\r
-nmake /nologo /f makefile.mak all /A >NUL\r
-nmake /nologo /f makefile.mak tests /A\r
-cd ..\..\development_tools\examples\r
-\r
-rem problems with Intersci :( \r
-cd ..\..\intersci\examples\r
-nmake /nologo /f makefile.mak tests\r
-cd ..\..\development_tools\examples\r
-\r
+@echo off
+
+@echo off
+rem  Only to check that examples can be built
+cd ..\..\core\examples\call_scilab\cpp\common
+nmake /nologo /f makefile.mak all >NUL
+cd ..\..\..\..\..\development_tools\examples
+
+rem  Only to check that examples can be built
+cd ..\..\core\examples\call_scilab\c\common
+nmake /nologo /f makefile.mak all >NUL
+cd ..\..\..\..\..\development_tools\examples
+
+cd ..\..\differential_equations\examples
+nmake /nologo /f makefile.mak tests
+cd ..\..\development_tools\examples
+
+cd ..\..\incremental_link\examples\dynamic_links_c_and_fortran
+nmake /nologo /f makefile.mak tests
+cd ..\..\..\development_tools\examples
+
+cd ..\..\incremental_link\examples\gateway
+nmake /nologo /f makefile.mak tests
+cd ..\..\..\development_tools\examples
+
+cd ..\..\incremental_link\examples\interfaces\c
+nmake /nologo /f makefile.mak all /A > NUL
+nmake /nologo /f makefile.mak tests /A
+cd ..\..\..\..\development_tools\examples
+
+cd ..\..\incremental_link\examples\interfaces\fortran
+nmake /nologo /f makefile.mak all /A > NUL
+nmake /nologo /f makefile.mak tests /A
+cd ..\..\..\..\development_tools\examples
+
+cd ..\..\linear_algebra\examples
+nmake /nologo /f makefile.mak all /A >NUL
+nmake /nologo /f makefile.mak tests /A
+cd ..\..\development_tools\examples
+
+rem problems with Intersci :( 
+cd ..\..\intersci\examples
+nmake /nologo /f makefile.mak tests
+cd ..\..\development_tools\examples
+
index 21c50a7..77da987 100644 (file)
@@ -1,20 +1,20 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
-<!DOCTYPE LOCALIZATION SYSTEM "../../../localization/xml/localization.dtd">\r
-<LOCALIZATION>\r
-\r
-<entry>\r
-       <tag></tag>\r
-       <string></string>\r
-</entry>       \r
-\r
-<entry>\r
-       <tag></tag>\r
-       <string></string>\r
-</entry>       \r
-               \r
-<entry>\r
-       <tag></tag>\r
-       <string></string>\r
-</entry>       \r
-\r
-</LOCALIZATION>\r
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE LOCALIZATION SYSTEM "../../../localization/xml/localization.dtd">
+<LOCALIZATION>
+
+<entry>
+       <tag></tag>
+       <string></string>
+</entry>       
+
+<entry>
+       <tag></tag>
+       <string></string>
+</entry>       
+               
+<entry>
+       <tag></tag>
+       <string></string>
+</entry>       
+
+</LOCALIZATION>
index 21c50a7..77da987 100644 (file)
@@ -1,20 +1,20 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
-<!DOCTYPE LOCALIZATION SYSTEM "../../../localization/xml/localization.dtd">\r
-<LOCALIZATION>\r
-\r
-<entry>\r
-       <tag></tag>\r
-       <string></string>\r
-</entry>       \r
-\r
-<entry>\r
-       <tag></tag>\r
-       <string></string>\r
-</entry>       \r
-               \r
-<entry>\r
-       <tag></tag>\r
-       <string></string>\r
-</entry>       \r
-\r
-</LOCALIZATION>\r
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE LOCALIZATION SYSTEM "../../../localization/xml/localization.dtd">
+<LOCALIZATION>
+
+<entry>
+       <tag></tag>
+       <string></string>
+</entry>       
+
+<entry>
+       <tag></tag>
+       <string></string>
+</entry>       
+               
+<entry>
+       <tag></tag>
+       <string></string>
+</entry>       
+
+</LOCALIZATION>
index 21c50a7..77da987 100644 (file)
@@ -1,20 +1,20 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
-<!DOCTYPE LOCALIZATION SYSTEM "../../../localization/xml/localization.dtd">\r
-<LOCALIZATION>\r
-\r
-<entry>\r
-       <tag></tag>\r
-       <string></string>\r
-</entry>       \r
-\r
-<entry>\r
-       <tag></tag>\r
-       <string></string>\r
-</entry>       \r
-               \r
-<entry>\r
-       <tag></tag>\r
-       <string></string>\r
-</entry>       \r
-\r
-</LOCALIZATION>\r
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE LOCALIZATION SYSTEM "../../../localization/xml/localization.dtd">
+<LOCALIZATION>
+
+<entry>
+       <tag></tag>
+       <string></string>
+</entry>       
+
+<entry>
+       <tag></tag>
+       <string></string>
+</entry>       
+               
+<entry>
+       <tag></tag>
+       <string></string>
+</entry>       
+
+</LOCALIZATION>
index 21c50a7..77da987 100644 (file)
@@ -1,20 +1,20 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
-<!DOCTYPE LOCALIZATION SYSTEM "../../../localization/xml/localization.dtd">\r
-<LOCALIZATION>\r
-\r
-<entry>\r
-       <tag></tag>\r
-       <string></string>\r
-</entry>       \r
-\r
-<entry>\r
-       <tag></tag>\r
-       <string></string>\r
-</entry>       \r
-               \r
-<entry>\r
-       <tag></tag>\r
-       <string></string>\r
-</entry>       \r
-\r
-</LOCALIZATION>\r
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE LOCALIZATION SYSTEM "../../../localization/xml/localization.dtd">
+<LOCALIZATION>
+
+<entry>
+       <tag></tag>
+       <string></string>
+</entry>       
+
+<entry>
+       <tag></tag>
+       <string></string>
+</entry>       
+               
+<entry>
+       <tag></tag>
+       <string></string>
+</entry>       
+
+</LOCALIZATION>
index 21c50a7..77da987 100644 (file)
@@ -1,20 +1,20 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
-<!DOCTYPE LOCALIZATION SYSTEM "../../../localization/xml/localization.dtd">\r
-<LOCALIZATION>\r
-\r
-<entry>\r
-       <tag></tag>\r
-       <string></string>\r
-</entry>       \r
-\r
-<entry>\r
-       <tag></tag>\r
-       <string></string>\r
-</entry>       \r
-               \r
-<entry>\r
-       <tag></tag>\r
-       <string></string>\r
-</entry>       \r
-\r
-</LOCALIZATION>\r
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE LOCALIZATION SYSTEM "../../../localization/xml/localization.dtd">
+<LOCALIZATION>
+
+<entry>
+       <tag></tag>
+       <string></string>
+</entry>       
+
+<entry>
+       <tag></tag>
+       <string></string>
+</entry>       
+               
+<entry>
+       <tag></tag>
+       <string></string>
+</entry>       
+
+</LOCALIZATION>
index 21c50a7..77da987 100644 (file)
@@ -1,20 +1,20 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
-<!DOCTYPE LOCALIZATION SYSTEM "../../../localization/xml/localization.dtd">\r
-<LOCALIZATION>\r
-\r
-<entry>\r
-       <tag></tag>\r
-       <string></string>\r
-</entry>       \r
-\r
-<entry>\r
-       <tag></tag>\r
-       <string></string>\r
-</entry>       \r
-               \r
-<entry>\r
-       <tag></tag>\r
-       <string></string>\r
-</entry>       \r
-\r
-</LOCALIZATION>\r
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE LOCALIZATION SYSTEM "../../../localization/xml/localization.dtd">
+<LOCALIZATION>
+
+<entry>
+       <tag></tag>
+       <string></string>
+</entry>       
+
+<entry>
+       <tag></tag>
+       <string></string>
+</entry>       
+               
+<entry>
+       <tag></tag>
+       <string></string>
+</entry>       
+
+</LOCALIZATION>
index 59f6666..31f9b9c 100644 (file)
@@ -1,22 +1,22 @@
-SCIDIR=../../..\r
-SCIDIR1=..\..\..\r
-\r
-\r
-\r
-all:: tests\r
-\r
-clean::\r
-       @del *.dia \r
-\r
-distclean:: clean\r
-\r
-tests  :\r
-       @"$(SCIDIR1)\bin\scilex.exe" -nwni -nb -e scitest('odedc.sce',%t);quit; \r
-       @"$(SCIDIR1)\bin\scilex.exe" -nwni -nb -e scitest('odeoptions.sce',%t);quit; \r
-\r
-\r
-\r
-\r
-\r
-\r
-\r
+SCIDIR=../../..
+SCIDIR1=..\..\..
+
+
+
+all:: tests
+
+clean::
+       @del *.dia 
+
+distclean:: clean
+
+tests  :
+       @"$(SCIDIR1)\bin\scilex.exe" -nwni -nb -e scitest('odedc.sce',%t);quit; 
+       @"$(SCIDIR1)\bin\scilex.exe" -nwni -nb -e scitest('odeoptions.sce',%t);quit; 
+
+
+
+
+
+
+
index 487f73c..ca543ca 100644 (file)
\r
-//Copyright INRIA\r
\r
-Eps=1.e-3\r
- Eps  =\r
\r
-    0.001  \r
\r
-deff('xcd=f(t,xc,xd,iflag)',...\r
-    ['if iflag==0 then '\r
-     '  xcd=fc(t,xc,e(t)-hd(t,xd));'\r
-     'else '\r
-     '  xcd=fd(xd,hc(t,xc));'\r
-     'end']);\r
\r
\r
-A=[-10,2,3;4,-10,6;7,8,-10];B=[1;1;1];C=[1,1,1];\r
\r
-Ad=[1/2,1;0,1/20];Bd=[1;1];Cd=[1,1];\r
\r
-deff('st=e(t)','st=sin(3*t)')\r
\r
-deff('xdot=fc(t,x,u)','xdot=A*x+B*u')\r
\r
-deff('y=hc(t,x)','y=C*x')\r
\r
-deff('xp=fd(x,y)','xp=Ad*x + Bd*y')\r
\r
-deff('u=hd(t,x)','u=Cd*x')\r
\r
\r
-h=0.1;t0=0;t=0:0.1:2;\r
\r
-x0c=[0;0;0];x0d=[0;0];nd=2;\r
\r
-xcd=odedc([x0c;x0d],nd,h,t0,t,f);\r
\r
-if norm(xcd-odedc([x0c;x0d],nd,h,t0,t,'fcd'),1)   > Eps then bugmes();quit;end\r
\r
\r
\r
-//(see default directory)\r
\r
-if norm(xcd-odedc([x0c;x0d],nd,h,t0,t,'fcd1'),1)  > Eps then bugmes();quit;end\r
\r
\r
-deff('xcd=phis(t,xc,xd,iflag)',...\r
-    ['if iflag==0 then '\r
-     '  xcd=A*xc+B*xd;'\r
-     'else '\r
-     '  xcd=1-xd;'\r
-     'end']);\r
\r
\r
-t=0:0.1:30;\r
\r
-xcd=odedc([x0c;0],1,1,t0,t,phis);\r
\r
\r
-xcd2=odedc([x0c;0],1,1,t0,t,'phis');\r
\r
\r
-if norm(xcd-xcd2,1)  > Eps then bugmes();quit;end\r
\r
-deff('xd=ff(t,x)','xd=A*x+B*u')\r
\r
\r
-u=1/2;xn=ode(x0c,t0,t,ff);\r
\r
-//plot2d([t',t',t',t'],[(xcd(1,:))',(xcd(2,:))',(xcd(3,:))',(xcd(4,:))'])\r
\r
\r
-deff('xcd=phit(t,xc,xd,iflag)',...\r
-    ['if iflag==0 then '\r
-     '  xcd=[A*xc(1:3,:)+B*xc(4);xd];'\r
-     'else '\r
-     '  xcd=-xd;'\r
-     'end']);\r
\r
\r
-xcdt=odedc([x0c;1;1],1,1,t0,t,phit);\r
\r
\r
-xcdt2=odedc([x0c;1;1],1,1,t0,t,'phit');\r
\r
-if norm(xcdt-xcdt2,1) > Eps then bugmes();quit;end\r
\r
-//plot2d([t',t',t',t'],[(xcdt(1,:))',(xcdt(2,:))',(xcdt(3,:))',(xcdt(4,:))'])\r
\r
\r
-xcdt3=odedc('adams',[x0c;1;1],1,1,t0,t,'phit');\r
\r
-if norm(xcdt3-xcdt2,1)  > Eps then bugmes();quit;end\r
\r
\r
-xcdt4=odedc('fix',[x0c;1;1],1,1,t0,t,'phit');\r
\r
-if norm(xcdt4-xcdt2,1) > Eps then bugmes();quit;end\r
\r
\r
-xcdt5=odedc('stiff',[x0c;1;1],1,1,t0,t,'phit');\r
\r
-if norm(xcdt5-xcdt2,1) > Eps then bugmes();quit;end\r
\r
\r
\r
+//Copyright INRIA
+Eps=1.e-3
+ Eps  =
+    0.001  
+deff('xcd=f(t,xc,xd,iflag)',...
+    ['if iflag==0 then '
+     '  xcd=fc(t,xc,e(t)-hd(t,xd));'
+     'else '
+     '  xcd=fd(xd,hc(t,xc));'
+     'end']);
+A=[-10,2,3;4,-10,6;7,8,-10];B=[1;1;1];C=[1,1,1];
+Ad=[1/2,1;0,1/20];Bd=[1;1];Cd=[1,1];
+deff('st=e(t)','st=sin(3*t)')
+deff('xdot=fc(t,x,u)','xdot=A*x+B*u')
+deff('y=hc(t,x)','y=C*x')
+deff('xp=fd(x,y)','xp=Ad*x + Bd*y')
+deff('u=hd(t,x)','u=Cd*x')
+h=0.1;t0=0;t=0:0.1:2;
+x0c=[0;0;0];x0d=[0;0];nd=2;
+xcd=odedc([x0c;x0d],nd,h,t0,t,f);
+if norm(xcd-odedc([x0c;x0d],nd,h,t0,t,'fcd'),1)   > Eps then bugmes();quit;end
+//(see default directory)
+if norm(xcd-odedc([x0c;x0d],nd,h,t0,t,'fcd1'),1)  > Eps then bugmes();quit;end
+deff('xcd=phis(t,xc,xd,iflag)',...
+    ['if iflag==0 then '
+     '  xcd=A*xc+B*xd;'
+     'else '
+     '  xcd=1-xd;'
+     'end']);
+t=0:0.1:30;
+xcd=odedc([x0c;0],1,1,t0,t,phis);
+xcd2=odedc([x0c;0],1,1,t0,t,'phis');
+if norm(xcd-xcd2,1)  > Eps then bugmes();quit;end
+deff('xd=ff(t,x)','xd=A*x+B*u')
+u=1/2;xn=ode(x0c,t0,t,ff);
+//plot2d([t',t',t',t'],[(xcd(1,:))',(xcd(2,:))',(xcd(3,:))',(xcd(4,:))'])
+deff('xcd=phit(t,xc,xd,iflag)',...
+    ['if iflag==0 then '
+     '  xcd=[A*xc(1:3,:)+B*xc(4);xd];'
+     'else '
+     '  xcd=-xd;'
+     'end']);
+xcdt=odedc([x0c;1;1],1,1,t0,t,phit);
+xcdt2=odedc([x0c;1;1],1,1,t0,t,'phit');
+if norm(xcdt-xcdt2,1) > Eps then bugmes();quit;end
+//plot2d([t',t',t',t'],[(xcdt(1,:))',(xcdt(2,:))',(xcdt(3,:))',(xcdt(4,:))'])
+xcdt3=odedc('adams',[x0c;1;1],1,1,t0,t,'phit');
+if norm(xcdt3-xcdt2,1)  > Eps then bugmes();quit;end
+xcdt4=odedc('fix',[x0c;1;1],1,1,t0,t,'phit');
+if norm(xcdt4-xcdt2,1) > Eps then bugmes();quit;end
+xcdt5=odedc('stiff',[x0c;1;1],1,1,t0,t,'phit');
+if norm(xcdt5-xcdt2,1) > Eps then bugmes();quit;end
index f0e095c..cb157b8 100644 (file)
@@ -1,67 +1,67 @@
-//Copyright INRIA\r
-Eps=1.e-3\r
-deff('xcd=f(t,xc,xd,iflag)',...\r
-    ['if iflag==0 then '\r
-     '  xcd=fc(t,xc,e(t)-hd(t,xd));'\r
-     'else '\r
-     '  xcd=fd(xd,hc(t,xc));'\r
-     'end']);\r
-\r
-A=[-10,2,3;4,-10,6;7,8,-10];B=[1;1;1];C=[1,1,1];\r
-Ad=[1/2,1;0,1/20];Bd=[1;1];Cd=[1,1];\r
-deff('st=e(t)','st=sin(3*t)')\r
-deff('xdot=fc(t,x,u)','xdot=A*x+B*u')\r
-deff('y=hc(t,x)','y=C*x')\r
-deff('xp=fd(x,y)','xp=Ad*x + Bd*y')\r
-deff('u=hd(t,x)','u=Cd*x')\r
-\r
-h=0.1;t0=0;t=0:0.1:2;\r
-x0c=[0;0;0];x0d=[0;0];nd=2;\r
-xcd=odedc([x0c;x0d],nd,h,t0,t,f);\r
-if norm(xcd-odedc([x0c;x0d],nd,h,t0,t,'fcd'),1)   > Eps then pause,end\r
-\r
-\r
-//(see default directory)\r
-if norm(xcd-odedc([x0c;x0d],nd,h,t0,t,'fcd1'),1)  > Eps then pause,end\r
-\r
-deff('xcd=phis(t,xc,xd,iflag)',...\r
-    ['if iflag==0 then '\r
-     '  xcd=A*xc+B*xd;'\r
-     'else '\r
-     '  xcd=1-xd;'\r
-     'end']);\r
-\r
-t=0:0.1:30;\r
-xcd=odedc([x0c;0],1,1,t0,t,phis);\r
-\r
-xcd2=odedc([x0c;0],1,1,t0,t,'phis');\r
-\r
-if norm(xcd-xcd2,1)  > Eps then pause,end\r
-deff('xd=ff(t,x)','xd=A*x+B*u')\r
-\r
-u=1/2;xn=ode(x0c,t0,t,ff);\r
-//plot2d([t',t',t',t'],[(xcd(1,:))',(xcd(2,:))',(xcd(3,:))',(xcd(4,:))'])\r
-\r
-deff('xcd=phit(t,xc,xd,iflag)',...\r
-    ['if iflag==0 then '\r
-     '  xcd=[A*xc(1:3,:)+B*xc(4);xd];'\r
-     'else '\r
-     '  xcd=-xd;'\r
-     'end']);\r
-\r
-xcdt=odedc([x0c;1;1],1,1,t0,t,phit);\r
-\r
-xcdt2=odedc([x0c;1;1],1,1,t0,t,'phit');\r
-if norm(xcdt-xcdt2,1) > Eps then pause,end\r
-//plot2d([t',t',t',t'],[(xcdt(1,:))',(xcdt(2,:))',(xcdt(3,:))',(xcdt(4,:))'])\r
-\r
-xcdt3=odedc('adams',[x0c;1;1],1,1,t0,t,'phit');\r
-if norm(xcdt3-xcdt2,1)  > Eps then pause,end\r
-\r
-xcdt4=odedc('fix',[x0c;1;1],1,1,t0,t,'phit');\r
-if norm(xcdt4-xcdt2,1) > Eps then pause,end\r
-\r
-xcdt5=odedc('stiff',[x0c;1;1],1,1,t0,t,'phit');\r
-if norm(xcdt5-xcdt2,1) > Eps then pause,end\r
-\r
-\r
+//Copyright INRIA
+Eps=1.e-3
+deff('xcd=f(t,xc,xd,iflag)',...
+    ['if iflag==0 then '
+     '  xcd=fc(t,xc,e(t)-hd(t,xd));'
+     'else '
+     '  xcd=fd(xd,hc(t,xc));'
+     'end']);
+
+A=[-10,2,3;4,-10,6;7,8,-10];B=[1;1;1];C=[1,1,1];
+Ad=[1/2,1;0,1/20];Bd=[1;1];Cd=[1,1];
+deff('st=e(t)','st=sin(3*t)')
+deff('xdot=fc(t,x,u)','xdot=A*x+B*u')
+deff('y=hc(t,x)','y=C*x')
+deff('xp=fd(x,y)','xp=Ad*x + Bd*y')
+deff('u=hd(t,x)','u=Cd*x')
+
+h=0.1;t0=0;t=0:0.1:2;
+x0c=[0;0;0];x0d=[0;0];nd=2;
+xcd=odedc([x0c;x0d],nd,h,t0,t,f);
+if norm(xcd-odedc([x0c;x0d],nd,h,t0,t,'fcd'),1)   > Eps then pause,end
+
+
+//(see default directory)
+if norm(xcd-odedc([x0c;x0d],nd,h,t0,t,'fcd1'),1)  > Eps then pause,end
+
+deff('xcd=phis(t,xc,xd,iflag)',...
+    ['if iflag==0 then '
+     '  xcd=A*xc+B*xd;'
+     'else '
+     '  xcd=1-xd;'
+     'end']);
+
+t=0:0.1:30;
+xcd=odedc([x0c;0],1,1,t0,t,phis);
+
+xcd2=odedc([x0c;0],1,1,t0,t,'phis');
+
+if norm(xcd-xcd2,1)  > Eps then pause,end
+deff('xd=ff(t,x)','xd=A*x+B*u')
+
+u=1/2;xn=ode(x0c,t0,t,ff);
+//plot2d([t',t',t',t'],[(xcd(1,:))',(xcd(2,:))',(xcd(3,:))',(xcd(4,:))'])
+
+deff('xcd=phit(t,xc,xd,iflag)',...
+    ['if iflag==0 then '
+     '  xcd=[A*xc(1:3,:)+B*xc(4);xd];'
+     'else '
+     '  xcd=-xd;'
+     'end']);
+
+xcdt=odedc([x0c;1;1],1,1,t0,t,phit);
+
+xcdt2=odedc([x0c;1;1],1,1,t0,t,'phit');
+if norm(xcdt-xcdt2,1) > Eps then pause,end
+//plot2d([t',t',t',t'],[(xcdt(1,:))',(xcdt(2,:))',(xcdt(3,:))',(xcdt(4,:))'])
+
+xcdt3=odedc('adams',[x0c;1;1],1,1,t0,t,'phit');
+if norm(xcdt3-xcdt2,1)  > Eps then pause,end
+
+xcdt4=odedc('fix',[x0c;1;1],1,1,t0,t,'phit');
+if norm(xcdt4-xcdt2,1) > Eps then pause,end
+
+xcdt5=odedc('stiff',[x0c;1;1],1,1,t0,t,'phit');
+if norm(xcdt5-xcdt2,1) > Eps then pause,end
+
+
index 4775016..37ac5cc 100644 (file)
\r
-//Copyright INRIA\r
\r
-Eps=1.e-5\r
- Eps  =\r
\r
-    0.00001  \r
\r
-//        %ODEOPTIONS\r
\r
-//\r
\r
-rand('seed',0);rand('normal');\r
\r
-nx=20;A=rand(nx,nx);A=A-4.5*eye();\r
\r
-deff('y=f(t,x)','y=A*x')\r
\r
-deff('J=j(t,x)','J=A')\r
\r
-x0=ones(nx,1);t0=0;t=[1,2,3,4,5];\r
\r
-nt=size(t,'*');\r
\r
-eAt=expm(A*t(nt));\r
\r
\r
-//        Test itask=%ODEOPTIONS(1)\r
\r
\r
-//itask=1  --->  usual call (t=vector of instants, solution at all t)\r
\r
-//========================\r
\r
-itask=1;tcrit=0;h0=0;hmax=0;hmin=0;ixpr=0;mxstep=0;maxordn=0;maxords=0;\r
\r
-jacflag=2;ml=-1;mu=-1;\r
\r
-%ODEOPTIONS=[itask,tcrit,h0,hmax,hmin,jacflag,mxstep,maxordn,maxords,ixpr,ml,mu];\r
\r
-xf=ode(x0,t0,t,f);   //lsoda\r
\r
-if norm(xf(:,nt)-eAt*x0)  > Eps then bugmes();quit;end\r
\r
-xfj=ode(x0,t0,t,f,j);   //lsoda with jacobian\r
- Warning: Jacobian external is given, but \r
- not used!,  see %ODEOPTIONS(6)\r
\r
\r
-if norm(xfj(:,nt)-eAt*x0)  > Eps then bugmes();quit;end\r
\r
\r
\r
-//itask=2;   --->  solution at mesh points  ---> t=tmax\r
\r
-//========================\r
\r
-%ODEOPTIONS(1)=2;tmax=t(5);\r
\r
-xft=ode(x0,t0,tmax,f);\r
\r
-[p,q]=size(xft);\r
\r
-xlast=xft(2:nx+1,q);\r
\r
-if xft(1,q)<tmax then bugmes();quit;end\r
\r
-if norm(xlast-expm(A*xft(1,q))*x0) > Eps  then bugmes();quit;end\r
\r
\r
-//itask=3;   ---> solution at first mesh point beyond t=tmax\r
\r
-%ODEOPTIONS(1)=3;\r
\r
-x3=ode(x0,t0,tmax,f);\r
\r
-if norm(x3(2:nx+1)-xlast,1) > Eps then bugmes();quit;end\r
\r
\r
-//itask=4; test with %ODEOPTIONS(2)=tcrit\r
\r
-%ODEOPTIONS(1)=4; //---> computation at all t and t>tcrit are not called\r
\r
-tcrit=2.5;%ODEOPTIONS(2)=tcrit;\r
\r
-chk=0;\r
\r
-deff('y=fcrit(t,x)',['if t<=tcrit then'\r
-                      ' y=A*x;'\r
-                      'else'\r
-                      ' y=A*x;chk=resume(1);end'])\r
\r
-x42=ode(x0,t0,t,fcrit);\r
- Warning: integration up to tcrit\r
\r
\r
-if chk==1 then bugmes();quit;end\r
\r
-[p,q]=size(x42);\r
\r
-if norm(x42(:,q)-ode(x0,t0,tcrit,f),1) > Eps then bugmes();quit;end\r
\r
\r
-//itask=5; test with %ODEOPTIONS(2)=tcrit\r
\r
-%ODEOPTIONS(1)=5;  //---> computation at mesh points and t>tcrit are not called\r
\r
-%ODEOPTIONS(6)=2;  // Estimated jacobian\r
\r
-chk=0;\r
\r
-x52=ode(x0,t0,2.3,fcrit);\r
\r
-if chk==1 then bugmes();quit;end\r
\r
-[p,q]=size(x52);\r
\r
-if x52(1,q)>tcrit then bugmes();quit;end\r
\r
\r
-//test of %ODEOPTIONS(3:5)=[h0,hmax,hmin]\r
\r
-%ODEOPTIONS(1)=1;\r
\r
-h0=0.0;hmax=0.1;hmin=0.0001;\r
\r
-%ODEOPTIONS(3:5)=[h0,hmax,hmin];\r
\r
-x35=ode(x0,t0,t,f);\r
\r
-if norm(x35-xf,1)  > Eps then bugmes();quit;end\r
\r
\r
-//test of %ODEOPTIONS(6)=jacflag\r
\r
-%ODEOPTIONS(6)=1;//Jacobian given\r
\r
-%ODEOPTIONS(3:5)=[0 0 0];\r
\r
-x61=ode('st',x0,t0,t,f,j);   //with Jacobian\r
\r
-if norm (x61-xf,1) > Eps then bugmes();quit;end\r
\r
\r
\r
-%ODEOPTIONS(6)=0; // jacobian nor called nor estimated\r
\r
-x60=ode('st',x0,t0,t,f,j);   //Jacobian not used (warning)\r
- Warning: Jacobian external is given, but \r
- not used!,  see %ODEOPTIONS(6)\r
\r
\r
-x60=ode('st',x0,t0,t,f);    //Jacobian not used\r
\r
-if norm (x60-x61,1)  > Eps then bugmes();quit;end\r
\r
\r
\r
-%ODEOPTIONS(6)=1;//Jacobian estimated\r
\r
-x60=ode('st',x0,t0,t,f)  ;\r
- Warning: No Jacobian external given but \r
- one is required by %ODEOPTIONS(6) value!\r
\r
\r
-if norm (x60-x61,1) > Eps then bugmes();quit;end\r
\r
\r
-//test of %ODEOPTIONS(6)=jacflag   (adams)\r
\r
-%ODEOPTIONS(6)=1;//with given Jacobian\r
\r
-x60=ode('ad',x0,t0,t,f,j) ;\r
\r
-if norm (x60-x61,1)  > Eps then bugmes();quit;end\r
\r
\r
\r
-%ODEOPTIONS(6)=0;// jacobian nor called nor estimated\r
\r
-x60=ode('ad',x0,t0,t,f,j);   //Jacobian not used (warning)\r
- Warning: Jacobian external is given, but \r
- not used!,  see %ODEOPTIONS(6)\r
\r
\r
-x60=ode('ad',x0,t0,t,f);    //Jacobian not used\r
\r
-if norm (x60-x61,1) > Eps then bugmes();quit;end\r
\r
\r
-// test lsoda\r
\r
-%ODEOPTIONS(6)=2;// jacobian  estimated\r
\r
-x60=ode(x0,t0,t,f);\r
\r
-if norm (x60-x61,1) > Eps then bugmes();quit;end\r
\r
\r
-%ODEOPTIONS(6)=1;//Jacobian estimated\r
\r
-x60=ode(x0,t0,t,f);\r
- Warning: No Jacobian external given but \r
- one is required by %ODEOPTIONS(6) value!\r
\r
\r
-if norm (x60-x61,1) > Eps then bugmes();quit;end\r
\r
\r
\r
-//   Banded Jacobian\r
\r
-itask=1;tcrit=0;h0=0;hmax=0;hmin=0;ixpr=0;mxstep=0;maxordn=0;maxords=0;\r
\r
-//provisional values as default\r
\r
-jacflag=2;ml=-1;mu=-1;\r
\r
\r
-%ODEOPTIONS=[itask,tcrit,h0,hmax,hmin,jacflag,mxstep,maxordn,maxords,ixpr,ml,mu];\r
\r
-jacflag=2;%ODEOPTIONS(6)=jacflag;   //Banded Jacobian, given\r
\r
-nx=20;A=diag(-[1:nx]);x0=ones(nx,1);\r
\r
-t0=0;t=[1,2,3,4,5];\r
\r
-for k=1:nx-1, A(k,k+1)=1;end\r
\r
-for k=1:nx-2, A(k,k+2)=-2;end\r
\r
-for k=1:nx-1, A(k+1,k)=-1;end\r
\r
-for k=1:nx-2, A(k+2,k)=2;end\r
\r
-for k=1:nx-3, A(k+3,k)=-3;end\r
\r
-clear f;\r
\r
-deff('xd=f(t,x)','xd=A*x')\r
\r
-ml=3;mu=2;\r
\r
-%ODEOPTIONS(11:12)=[ml,mu];\r
\r
-for i=1:nx;\r
-    for j=1:nx;\r
-if A(i,j)<>0 then J(i-j+mu+1,j)=A(i,j);end\r
-end;end;\r
-Warning :redefining function: j                       \r
\r
\r
-// J is a ml+mu+1 x ny matrix.\r
\r
-// Column 1 of J is made of mu zeros followed by df1/dx1, df2/dx1, df3/dx1,\r
\r
-// i.e. 1 + ml possibly nonzeros entries.\r
\r
-// Column 2 of J is made of mu-1 zeros followed by df1/dx2, df2/dx2,0...\r
\r
-// etc...\r
\r
-%ODEOPTIONS(6)=1;%ODEOPTIONS(11:12)=[-1,-1];\r
\r
-deff('jj=j1(t,x)','jj=A')\r
\r
-xnotband=ode('st',x0,t0,t,f,j1);\r
\r
\r
\r
-%ODEOPTIONS(6)=4;//banded jacobian external given\r
\r
-%ODEOPTIONS(11:12)=[3,2];\r
\r
-deff('jj=j(t,x)','jj=J')\r
\r
-xband=ode('st',x0,t0,t,f,j);\r
\r
-if norm (xnotband-xband,1)  > Eps then bugmes();quit;end\r
\r
\r
-%ODEOPTIONS(6)=5;//banded jacobian evaluated\r
\r
-%ODEOPTIONS(11:12)=[3,2];\r
\r
-deff('jj=j(t,x)','jj=J')\r
\r
-xband=ode('st',x0,t0,t,f,j);\r
- Warning: Jacobian external is given, but \r
- not used!,  see %ODEOPTIONS(6)\r
\r
\r
-if norm (xnotband-xband,1) > Eps then bugmes();quit;end\r
\r
\r
\r
-//            Test of %ODEOPTIONS(7)\r
\r
-//%ODEOPTIONS(7)=mxstep  ---> maximum number od steps allowed\r
\r
-itask=1;tcrit=0;h0=0;hmax=0;hmin=0;ixpr=0;mxstep=0;maxordn=0;maxords=0;\r
\r
-//provisional values as default\r
\r
-jacflag=2;ml=-1;mu=-1;\r
\r
-%ODEOPTIONS=[itask,tcrit,h0,hmax,hmin,jacflag,mxstep,maxordn,maxords,ixpr,ml,mu];\r
\r
-%ODEOPTIONS(7)=10;\r
\r
-//ode(x0,t0,t,f);  // ---> Non convergence\r
\r
\r
-//            Test of %ODEOPTIONS(8:9)\r
\r
-//%ODEOPTIONS(8:9)=[maxordn,maxords] ---> maximum order for nonstiff and stiff\r
\r
-itask=1;tcrit=0;h0=0;hmax=0;hmin=0;ixpr=0;mxstep=0;maxordn=0;maxords=0;\r
\r
-//provisional values as default\r
\r
-jacflag=2;ml=-1;mu=-1;\r
\r
-%ODEOPTIONS=[itask,tcrit,h0,hmax,hmin,jacflag,mxstep,maxordn,maxords,ixpr,ml,mu];\r
\r
-%ODEOPTIONS(8:9)=[0,0]; //---> default values\r
\r
-wref=ode(x0,t0,t,f); //just for computing reference\r
\r
\r
-%ODEOPTIONS(8:9)=[4,3];\r
\r
-ww=ode(x0,t0,t,f);\r
\r
-if norm (wref-ww,1) > Eps then bugmes();quit;end\r
\r
\r
-%ODEOPTIONS(8:9)=[12,5];\r
\r
-if norm (wref-ode(x0,t0,t,f),1) > Eps then bugmes();quit;end\r
\r
\r
-//using stiff method\r
\r
\r
-%ODEOPTIONS(9)=0;\r
\r
-wref=ode('st',x0,t0,t,f);\r
\r
-%ODEOPTIONS(9)=5;\r
\r
-if norm (wref-ode('st',x0,t0,t,f),1)  > Eps then bugmes();quit;end\r
\r
-%ODEOPTIONS(9)=4;\r
\r
-if norm (wref-ode('st',x0,t0,t,f),1) > Eps then bugmes();quit;end\r
\r
\r
\r
-//using nonstiff method\r
\r
\r
-%ODEOPTIONS(8)=0;\r
\r
-wref=ode('ad',x0,t0,t,f);\r
\r
-%ODEOPTIONS(8)=12;\r
\r
-if norm (wref-ode('ad',x0,t0,t,f),1)  > Eps then bugmes();quit;end\r
\r
-%ODEOPTIONS(8)=5;\r
\r
-if norm (wref-ode('ad',x0,t0,t,f),1) > Eps then bugmes();quit;end\r
\r
\r
-//mixed\r
\r
-%ODEOPTIONS(8:9)=[5,12];\r
\r
-wref=ode(x0,t0,t,f);\r
\r
-%ODEOPTIONS(8:9)=[4,10];\r
\r
-if norm (ode(x0,t0,t,f)-wref,1) > Eps then bugmes();quit;end\r
\r
\r
\r
-A=diag([-10,-0.01,-1]);\r
\r
-deff('uu=u(t)','uu=sin(t)');\r
\r
-B=rand(3,1);\r
\r
-deff('y=f(t,x)','y=A*x+B*u(t)')\r
-Warning :redefining function: f                       \r
\r
\r
-%ODEOPTIONS(1)=2;\r
\r
-yy1=ode('stiff',[1;1;1],0,1,f);\r
\r
-yy2=ode('stiff',[1;1;1],0,2,f);\r
\r
-%ODEOPTIONS(1)=3;\r
\r
-yy1=ode('stiff',[1;1;1],0,1,f);\r
\r
-yy2=ode('stiff',[1;1;1],0,2,f);\r
\r
\r
-clear %ODEOPTIONS;\r
\r
-rand('seed',0);rand('normal');\r
\r
-nx=20;A=rand(nx,nx);A=A-4.5*eye();\r
\r
-clear f;\r
\r
-deff('y=f(t,x)','y=A*x')\r
\r
-clear j;\r
\r
-deff('J=j(t,x)','J=A')\r
\r
-//%ODEOPTIONS(1)=1;\r
\r
-y2=ode('stiff',ones(nx,1),0,2,f,j);\r
\r
-[y1,w,iw]=ode('stiff',ones(nx,1),0,1,f,j);\r
\r
-y2p=ode('stiff',y1,1,2,f,j,w,iw);\r
\r
-y12=ode('stiff',ones(nx,1),0,[1,2],f,j);\r
\r
-if norm (y12(:,2)-y2p) > Eps then bugmes();quit;end\r
\r
-yaf=ode('adams',ones(nx,1),0,2,f,j);\r
\r
-yaj=ode('adams',ones(nx,1),0,2,f,j);\r
\r
-ysf=ode('stiff',ones(nx,1),0,2,f,j);\r
\r
-ysj=ode('stiff',ones(nx,1),0,2,f,j);\r
\r
\r
\r
\r
+//Copyright INRIA
+Eps=1.e-5
+ Eps  =
+    0.00001  
+//        %ODEOPTIONS
+//
+rand('seed',0);rand('normal');
+nx=20;A=rand(nx,nx);A=A-4.5*eye();
+deff('y=f(t,x)','y=A*x')
+deff('J=j(t,x)','J=A')
+x0=ones(nx,1);t0=0;t=[1,2,3,4,5];
+nt=size(t,'*');
+eAt=expm(A*t(nt));
+//        Test itask=%ODEOPTIONS(1)
+//itask=1  --->  usual call (t=vector of instants, solution at all t)
+//========================
+itask=1;tcrit=0;h0=0;hmax=0;hmin=0;ixpr=0;mxstep=0;maxordn=0;maxords=0;
+jacflag=2;ml=-1;mu=-1;
+%ODEOPTIONS=[itask,tcrit,h0,hmax,hmin,jacflag,mxstep,maxordn,maxords,ixpr,ml,mu];
+xf=ode(x0,t0,t,f);   //lsoda
+if norm(xf(:,nt)-eAt*x0)  > Eps then bugmes();quit;end
+xfj=ode(x0,t0,t,f,j);   //lsoda with jacobian
+ Warning: Jacobian external is given, but 
+ not used!,  see %ODEOPTIONS(6)
+if norm(xfj(:,nt)-eAt*x0)  > Eps then bugmes();quit;end
+//itask=2;   --->  solution at mesh points  ---> t=tmax
+//========================
+%ODEOPTIONS(1)=2;tmax=t(5);
+xft=ode(x0,t0,tmax,f);
+[p,q]=size(xft);
+xlast=xft(2:nx+1,q);
+if xft(1,q)<tmax then bugmes();quit;end
+if norm(xlast-expm(A*xft(1,q))*x0) > Eps  then bugmes();quit;end
+//itask=3;   ---> solution at first mesh point beyond t=tmax
+%ODEOPTIONS(1)=3;
+x3=ode(x0,t0,tmax,f);
+if norm(x3(2:nx+1)-xlast,1) > Eps then bugmes();quit;end
+//itask=4; test with %ODEOPTIONS(2)=tcrit
+%ODEOPTIONS(1)=4; //---> computation at all t and t>tcrit are not called
+tcrit=2.5;%ODEOPTIONS(2)=tcrit;
+chk=0;
+deff('y=fcrit(t,x)',['if t<=tcrit then'
+                      ' y=A*x;'
+                      'else'
+                      ' y=A*x;chk=resume(1);end'])
+x42=ode(x0,t0,t,fcrit);
+ Warning: integration up to tcrit
+if chk==1 then bugmes();quit;end
+[p,q]=size(x42);
+if norm(x42(:,q)-ode(x0,t0,tcrit,f),1) > Eps then bugmes();quit;end
+//itask=5; test with %ODEOPTIONS(2)=tcrit
+%ODEOPTIONS(1)=5;  //---> computation at mesh points and t>tcrit are not called
+%ODEOPTIONS(6)=2;  // Estimated jacobian
+chk=0;
+x52=ode(x0,t0,2.3,fcrit);
+if chk==1 then bugmes();quit;end
+[p,q]=size(x52);
+if x52(1,q)>tcrit then bugmes();quit;end
+//test of %ODEOPTIONS(3:5)=[h0,hmax,hmin]
+%ODEOPTIONS(1)=1;
+h0=0.0;hmax=0.1;hmin=0.0001;
+%ODEOPTIONS(3:5)=[h0,hmax,hmin];
+x35=ode(x0,t0,t,f);
+if norm(x35-xf,1)  > Eps then bugmes();quit;end
+//test of %ODEOPTIONS(6)=jacflag
+%ODEOPTIONS(6)=1;//Jacobian given
+%ODEOPTIONS(3:5)=[0 0 0];
+x61=ode('st',x0,t0,t,f,j);   //with Jacobian
+if norm (x61-xf,1) > Eps then bugmes();quit;end
+%ODEOPTIONS(6)=0; // jacobian nor called nor estimated
+x60=ode('st',x0,t0,t,f,j);   //Jacobian not used (warning)
+ Warning: Jacobian external is given, but 
+ not used!,  see %ODEOPTIONS(6)
+x60=ode('st',x0,t0,t,f);    //Jacobian not used
+if norm (x60-x61,1)  > Eps then bugmes();quit;end
+%ODEOPTIONS(6)=1;//Jacobian estimated
+x60=ode('st',x0,t0,t,f)  ;
+ Warning: No Jacobian external given but 
+ one is required by %ODEOPTIONS(6) value!
+if norm (x60-x61,1) > Eps then bugmes();quit;end
+//test of %ODEOPTIONS(6)=jacflag   (adams)
+%ODEOPTIONS(6)=1;//with given Jacobian
+x60=ode('ad',x0,t0,t,f,j) ;
+if norm (x60-x61,1)  > Eps then bugmes();quit;end
+%ODEOPTIONS(6)=0;// jacobian nor called nor estimated
+x60=ode('ad',x0,t0,t,f,j);   //Jacobian not used (warning)
+ Warning: Jacobian external is given, but 
+ not used!,  see %ODEOPTIONS(6)
+x60=ode('ad',x0,t0,t,f);    //Jacobian not used
+if norm (x60-x61,1) > Eps then bugmes();quit;end
+// test lsoda
+%ODEOPTIONS(6)=2;// jacobian  estimated
+x60=ode(x0,t0,t,f);
+if norm (x60-x61,1) > Eps then bugmes();quit;end
+%ODEOPTIONS(6)=1;//Jacobian estimated
+x60=ode(x0,t0,t,f);
+ Warning: No Jacobian external given but 
+ one is required by %ODEOPTIONS(6) value!
+if norm (x60-x61,1) > Eps then bugmes();quit;end
+//   Banded Jacobian
+itask=1;tcrit=0;h0=0;hmax=0;hmin=0;ixpr=0;mxstep=0;maxordn=0;maxords=0;
+//provisional values as default
+jacflag=2;ml=-1;mu=-1;
+%ODEOPTIONS=[itask,tcrit,h0,hmax,hmin,jacflag,mxstep,maxordn,maxords,ixpr,ml,mu];
+jacflag=2;%ODEOPTIONS(6)=jacflag;   //Banded Jacobian, given
+nx=20;A=diag(-[1:nx]);x0=ones(nx,1);
+t0=0;t=[1,2,3,4,5];
+for k=1:nx-1, A(k,k+1)=1;end
+for k=1:nx-2, A(k,k+2)=-2;end
+for k=1:nx-1, A(k+1,k)=-1;end
+for k=1:nx-2, A(k+2,k)=2;end
+for k=1:nx-3, A(k+3,k)=-3;end
+clear f;
+deff('xd=f(t,x)','xd=A*x')
+ml=3;mu=2;
+%ODEOPTIONS(11:12)=[ml,mu];
+for i=1:nx;
+    for j=1:nx;
+if A(i,j)<>0 then J(i-j+mu+1,j)=A(i,j);end
+end;end;
+Warning :redefining function: j                       
+// J is a ml+mu+1 x ny matrix.
+// Column 1 of J is made of mu zeros followed by df1/dx1, df2/dx1, df3/dx1,
+// i.e. 1 + ml possibly nonzeros entries.
+// Column 2 of J is made of mu-1 zeros followed by df1/dx2, df2/dx2,0...
+// etc...
+%ODEOPTIONS(6)=1;%ODEOPTIONS(11:12)=[-1,-1];
+deff('jj=j1(t,x)','jj=A')
+xnotband=ode('st',x0,t0,t,f,j1);
+%ODEOPTIONS(6)=4;//banded jacobian external given
+%ODEOPTIONS(11:12)=[3,2];
+deff('jj=j(t,x)','jj=J')
+xband=ode('st',x0,t0,t,f,j);
+if norm (xnotband-xband,1)  > Eps then bugmes();quit;end
+%ODEOPTIONS(6)=5;//banded jacobian evaluated
+%ODEOPTIONS(11:12)=[3,2];
+deff('jj=j(t,x)','jj=J')
+xband=ode('st',x0,t0,t,f,j);
+ Warning: Jacobian external is given, but 
+ not used!,  see %ODEOPTIONS(6)
+if norm (xnotband-xband,1) > Eps then bugmes();quit;end
+//            Test of %ODEOPTIONS(7)
+//%ODEOPTIONS(7)=mxstep  ---> maximum number od steps allowed
+itask=1;tcrit=0;h0=0;hmax=0;hmin=0;ixpr=0;mxstep=0;maxordn=0;maxords=0;
+//provisional values as default
+jacflag=2;ml=-1;mu=-1;
+%ODEOPTIONS=[itask,tcrit,h0,hmax,hmin,jacflag,mxstep,maxordn,maxords,ixpr,ml,mu];
+%ODEOPTIONS(7)=10;
+//ode(x0,t0,t,f);  // ---> Non convergence
+//            Test of %ODEOPTIONS(8:9)
+//%ODEOPTIONS(8:9)=[maxordn,maxords] ---> maximum order for nonstiff and stiff
+itask=1;tcrit=0;h0=0;hmax=0;hmin=0;ixpr=0;mxstep=0;maxordn=0;maxords=0;
+//provisional values as default
+jacflag=2;ml=-1;mu=-1;
+%ODEOPTIONS=[itask,tcrit,h0,hmax,hmin,jacflag,mxstep,maxordn,maxords,ixpr,ml,mu];
+%ODEOPTIONS(8:9)=[0,0]; //---> default values
+wref=ode(x0,t0,t,f); //just for computing reference
+%ODEOPTIONS(8:9)=[4,3];
+ww=ode(x0,t0,t,f);
+if norm (wref-ww,1) > Eps then bugmes();quit;end
+%ODEOPTIONS(8:9)=[12,5];
+if norm (wref-ode(x0,t0,t,f),1) > Eps then bugmes();quit;end
+//using stiff method
+%ODEOPTIONS(9)=0;
+wref=ode('st',x0,t0,t,f);
+%ODEOPTIONS(9)=5;
+if norm (wref-ode('st',x0,t0,t,f),1)  > Eps then bugmes();quit;end
+%ODEOPTIONS(9)=4;
+if norm (wref-ode('st',x0,t0,t,f),1) > Eps then bugmes();quit;end
+//using nonstiff method
+%ODEOPTIONS(8)=0;
+wref=ode('ad',x0,t0,t,f);
+%ODEOPTIONS(8)=12;
+if norm (wref-ode('ad',x0,t0,t,f),1)  > Eps then bugmes();quit;end
+%ODEOPTIONS(8)=5;
+if norm (wref-ode('ad',x0,t0,t,f),1) > Eps then bugmes();quit;end
+//mixed
+%ODEOPTIONS(8:9)=[5,12];
+wref=ode(x0,t0,t,f);
+%ODEOPTIONS(8:9)=[4,10];
+if norm (ode(x0,t0,t,f)-wref,1) > Eps then bugmes();quit;end
+A=diag([-10,-0.01,-1]);
+deff('uu=u(t)','uu=sin(t)');
+B=rand(3,1);
+deff('y=f(t,x)','y=A*x+B*u(t)')
+Warning :redefining function: f                       
+%ODEOPTIONS(1)=2;
+yy1=ode('stiff',[1;1;1],0,1,f);
+yy2=ode('stiff',[1;1;1],0,2,f);
+%ODEOPTIONS(1)=3;
+yy1=ode('stiff',[1;1;1],0,1,f);
+yy2=ode('stiff',[1;1;1],0,2,f);
+clear %ODEOPTIONS;
+rand('seed',0);rand('normal');
+nx=20;A=rand(nx,nx);A=A-4.5*eye();
+clear f;
+deff('y=f(t,x)','y=A*x')
+clear j;
+deff('J=j(t,x)','J=A')
+//%ODEOPTIONS(1)=1;
+y2=ode('stiff',ones(nx,1),0,2,f,j);
+[y1,w,iw]=ode('stiff',ones(nx,1),0,1,f,j);
+y2p=ode('stiff',y1,1,2,f,j,w,iw);
+y12=ode('stiff',ones(nx,1),0,[1,2],f,j);
+if norm (y12(:,2)-y2p) > Eps then bugmes();quit;end
+yaf=ode('adams',ones(nx,1),0,2,f,j);
+yaj=ode('adams',ones(nx,1),0,2,f,j);
+ysf=ode('stiff',ones(nx,1),0,2,f,j);
+ysj=ode('stiff',ones(nx,1),0,2,f,j);
index 4fe0837..7b80672 100644 (file)
-//Copyright INRIA\r
-Eps=1.e-5\r
-//        %ODEOPTIONS \r
-//       \r
-rand('seed',0);rand('normal');\r
-nx=20;A=rand(nx,nx);A=A-4.5*eye();\r
-deff('y=f(t,x)','y=A*x')\r
-deff('J=j(t,x)','J=A')\r
-x0=ones(nx,1);t0=0;t=[1,2,3,4,5];\r
-nt=size(t,'*');\r
-eAt=expm(A*t(nt));\r
-\r
-//        Test itask=%ODEOPTIONS(1)\r
-\r
-//itask=1  --->  usual call (t=vector of instants, solution at all t)\r
-//========================\r
-itask=1;tcrit=0;h0=0;hmax=0;hmin=0;ixpr=0;mxstep=0;maxordn=0;maxords=0;\r
-jacflag=2;ml=-1;mu=-1;\r
-%ODEOPTIONS=[itask,tcrit,h0,hmax,hmin,jacflag,mxstep,maxordn,maxords,ixpr,ml,mu];\r
-xf=ode(x0,t0,t,f);   //lsoda\r
-if norm(xf(:,nt)-eAt*x0)  > Eps then pause,end\r
-xfj=ode(x0,t0,t,f,j);   //lsoda with jacobian\r
-if norm(xfj(:,nt)-eAt*x0)  > Eps then pause,end\r
-\r
-\r
-//itask=2;   --->  solution at mesh points  ---> t=tmax\r
-//========================\r
-%ODEOPTIONS(1)=2;tmax=t(5);\r
-xft=ode(x0,t0,tmax,f);\r
-[p,q]=size(xft);\r
-xlast=xft(2:nx+1,q);\r
-if xft(1,q)<tmax then pause,end\r
-if norm(xlast-expm(A*xft(1,q))*x0) > Eps  then pause,end\r
-\r
-//itask=3;   ---> solution at first mesh point beyond t=tmax\r
-%ODEOPTIONS(1)=3;\r
-x3=ode(x0,t0,tmax,f);\r
-if norm(x3(2:nx+1)-xlast,1) > Eps then pause,end\r
-\r
-//itask=4; test with %ODEOPTIONS(2)=tcrit\r
-%ODEOPTIONS(1)=4; //---> computation at all t and t>tcrit are not called\r
-tcrit=2.5;%ODEOPTIONS(2)=tcrit;\r
-chk=0;\r
-deff('y=fcrit(t,x)',['if t<=tcrit then'\r
-                      ' y=A*x;'\r
-                      'else'\r
-                      ' y=A*x;chk=resume(1);end'])\r
-x42=ode(x0,t0,t,fcrit);\r
-if chk==1 then pause,end\r
-[p,q]=size(x42);\r
-if norm(x42(:,q)-ode(x0,t0,tcrit,f),1) > Eps then pause,end\r
-\r
-//itask=5; test with %ODEOPTIONS(2)=tcrit\r
-%ODEOPTIONS(1)=5;  //---> computation at mesh points and t>tcrit are not called\r
-%ODEOPTIONS(6)=2;  // Estimated jacobian\r
-chk=0;\r
-x52=ode(x0,t0,2.3,fcrit);\r
-if chk==1 then pause,end\r
-[p,q]=size(x52);\r
-if x52(1,q)>tcrit then pause,end\r
-\r
-//test of %ODEOPTIONS(3:5)=[h0,hmax,hmin]\r
-%ODEOPTIONS(1)=1;\r
-h0=0.0;hmax=0.1;hmin=0.0001;\r
-%ODEOPTIONS(3:5)=[h0,hmax,hmin];\r
-x35=ode(x0,t0,t,f);\r
-if norm(x35-xf,1)  > Eps then pause,end\r
-\r
-//test of %ODEOPTIONS(6)=jacflag\r
-%ODEOPTIONS(6)=1;//Jacobian given\r
-%ODEOPTIONS(3:5)=[0 0 0];\r
-x61=ode('st',x0,t0,t,f,j);   //with Jacobian\r
-if norm (x61-xf,1) > Eps then pause,end\r
-\r
-\r
-%ODEOPTIONS(6)=0; // jacobian nor called nor estimated\r
-x60=ode('st',x0,t0,t,f,j);   //Jacobian not used (warning)\r
-x60=ode('st',x0,t0,t,f);    //Jacobian not used\r
-if norm (x60-x61,1)  > Eps then pause,end\r
-\r
-\r
-%ODEOPTIONS(6)=1;//Jacobian estimated\r
-x60=ode('st',x0,t0,t,f)  ; \r
-if norm (x60-x61,1) > Eps then pause,end\r
-\r
-//test of %ODEOPTIONS(6)=jacflag   (adams)\r
-%ODEOPTIONS(6)=1;//with given Jacobian\r
-x60=ode('ad',x0,t0,t,f,j) ;  \r
-if norm (x60-x61,1)  > Eps then pause,end\r
-\r
-\r
-%ODEOPTIONS(6)=0;// jacobian nor called nor estimated\r
-x60=ode('ad',x0,t0,t,f,j);   //Jacobian not used (warning)\r
-x60=ode('ad',x0,t0,t,f);    //Jacobian not used\r
-if norm (x60-x61,1) > Eps then pause,end\r
-\r
-// test lsoda\r
-%ODEOPTIONS(6)=2;// jacobian  estimated\r
-x60=ode(x0,t0,t,f);\r
-if norm (x60-x61,1) > Eps then pause,end\r
-\r
-%ODEOPTIONS(6)=1;//Jacobian estimated\r
-x60=ode(x0,t0,t,f);\r
-if norm (x60-x61,1) > Eps then pause,end\r
-\r
-\r
-//   Banded Jacobian\r
-itask=1;tcrit=0;h0=0;hmax=0;hmin=0;ixpr=0;mxstep=0;maxordn=0;maxords=0;\r
-//provisional values as default\r
-jacflag=2;ml=-1;mu=-1;\r
-\r
-%ODEOPTIONS=[itask,tcrit,h0,hmax,hmin,jacflag,mxstep,maxordn,maxords,ixpr,ml,mu];\r
-jacflag=2;%ODEOPTIONS(6)=jacflag;   //Banded Jacobian, given\r
-nx=20;A=diag(-[1:nx]);x0=ones(nx,1);\r
-t0=0;t=[1,2,3,4,5];\r
-for k=1:nx-1, A(k,k+1)=1;end\r
-for k=1:nx-2, A(k,k+2)=-2;end\r
-for k=1:nx-1, A(k+1,k)=-1;end\r
-for k=1:nx-2, A(k+2,k)=2;end\r
-for k=1:nx-3, A(k+3,k)=-3;end\r
-clear f;\r
-deff('xd=f(t,x)','xd=A*x')\r
-ml=3;mu=2;\r
-%ODEOPTIONS(11:12)=[ml,mu];\r
-for i=1:nx;\r
-    for j=1:nx;\r
-if A(i,j)<>0 then J(i-j+mu+1,j)=A(i,j);end\r
-end;end;\r
-// J is a ml+mu+1 x ny matrix.\r
-// Column 1 of J is made of mu zeros followed by df1/dx1, df2/dx1, df3/dx1,\r
-// i.e. 1 + ml possibly nonzeros entries.\r
-// Column 2 of J is made of mu-1 zeros followed by df1/dx2, df2/dx2, ...\r
-// etc...\r
-%ODEOPTIONS(6)=1;%ODEOPTIONS(11:12)=[-1,-1];\r
-deff('jj=j1(t,x)','jj=A')\r
-xnotband=ode('st',x0,t0,t,f,j1);\r
-\r
-\r
-%ODEOPTIONS(6)=4;//banded jacobian external given\r
-%ODEOPTIONS(11:12)=[3,2];\r
-deff('jj=j(t,x)','jj=J')\r
-xband=ode('st',x0,t0,t,f,j);\r
-if norm (xnotband-xband,1)  > Eps then pause,end\r
-\r
-%ODEOPTIONS(6)=5;//banded jacobian evaluated\r
-%ODEOPTIONS(11:12)=[3,2];\r
-deff('jj=j(t,x)','jj=J')\r
-xband=ode('st',x0,t0,t,f,j);\r
-if norm (xnotband-xband,1) > Eps then pause,end\r
-\r
-\r
-//            Test of %ODEOPTIONS(7)  \r
-//%ODEOPTIONS(7)=mxstep  ---> maximum number od steps allowed\r
-itask=1;tcrit=0;h0=0;hmax=0;hmin=0;ixpr=0;mxstep=0;maxordn=0;maxords=0;\r
-//provisional values as default\r
-jacflag=2;ml=-1;mu=-1;\r
-%ODEOPTIONS=[itask,tcrit,h0,hmax,hmin,jacflag,mxstep,maxordn,maxords,ixpr,ml,mu];\r
-%ODEOPTIONS(7)=10;\r
-//ode(x0,t0,t,f);  // ---> Non convergence\r
-\r
-//            Test of %ODEOPTIONS(8:9)  \r
-//%ODEOPTIONS(8:9)=[maxordn,maxords] ---> maximum order for nonstiff and stiff\r
-itask=1;tcrit=0;h0=0;hmax=0;hmin=0;ixpr=0;mxstep=0;maxordn=0;maxords=0;\r
-//provisional values as default\r
-jacflag=2;ml=-1;mu=-1;\r
-%ODEOPTIONS=[itask,tcrit,h0,hmax,hmin,jacflag,mxstep,maxordn,maxords,ixpr,ml,mu];\r
-%ODEOPTIONS(8:9)=[0,0]; //---> default values\r
-wref=ode(x0,t0,t,f); //just for computing reference\r
-\r
-%ODEOPTIONS(8:9)=[4,3];\r
-ww=ode(x0,t0,t,f);\r
-if norm (wref-ww,1) > Eps then pause,end\r
-\r
-%ODEOPTIONS(8:9)=[12,5];\r
-if norm (wref-ode(x0,t0,t,f),1) > Eps then pause,end\r
-\r
-//using stiff method\r
-\r
-%ODEOPTIONS(9)=0;\r
-wref=ode('st',x0,t0,t,f);\r
-%ODEOPTIONS(9)=5;\r
-if norm (wref-ode('st',x0,t0,t,f),1)  > Eps then pause,end\r
-%ODEOPTIONS(9)=4;\r
-if norm (wref-ode('st',x0,t0,t,f),1) > Eps then pause,end\r
-\r
-\r
-//using nonstiff method\r
-\r
-%ODEOPTIONS(8)=0;\r
-wref=ode('ad',x0,t0,t,f);\r
-%ODEOPTIONS(8)=12;\r
-if norm (wref-ode('ad',x0,t0,t,f),1)  > Eps then pause,end\r
-%ODEOPTIONS(8)=5;\r
-if norm (wref-ode('ad',x0,t0,t,f),1) > Eps then pause,end\r
-\r
-//mixed \r
-%ODEOPTIONS(8:9)=[5,12];\r
-wref=ode(x0,t0,t,f);\r
-%ODEOPTIONS(8:9)=[4,10];\r
-if norm (ode(x0,t0,t,f)-wref,1) > Eps then pause,end\r
-\r
-\r
-A=diag([-10,-0.01,-1]);\r
-deff('uu=u(t)','uu=sin(t)');\r
-B=rand(3,1);\r
-deff('y=f(t,x)','y=A*x+B*u(t)')\r
-%ODEOPTIONS(1)=2;\r
-yy1=ode('stiff',[1;1;1],0,1,f);\r
-yy2=ode('stiff',[1;1;1],0,2,f);\r
-%ODEOPTIONS(1)=3;\r
-yy1=ode('stiff',[1;1;1],0,1,f);\r
-yy2=ode('stiff',[1;1;1],0,2,f);\r
-\r
-clear %ODEOPTIONS;\r
-rand('seed',0);rand('normal');\r
-nx=20;A=rand(nx,nx);A=A-4.5*eye();\r
-clear f;\r
-deff('y=f(t,x)','y=A*x')\r
-clear j;\r
-deff('J=j(t,x)','J=A')\r
-//%ODEOPTIONS(1)=1;\r
-y2=ode('stiff',ones(nx,1),0,2,f,j);\r
-[y1,w,iw]=ode('stiff',ones(nx,1),0,1,f,j);\r
-y2p=ode('stiff',y1,1,2,f,j,w,iw);\r
-y12=ode('stiff',ones(nx,1),0,[1,2],f,j);\r
-if norm (y12(:,2)-y2p) > Eps then pause,end\r
-yaf=ode('adams',ones(nx,1),0,2,f,j);\r
-yaj=ode('adams',ones(nx,1),0,2,f,j);\r
-ysf=ode('stiff',ones(nx,1),0,2,f,j);\r
-ysj=ode('stiff',ones(nx,1),0,2,f,j);\r
-\r
-\r
-\r
+//Copyright INRIA
+Eps=1.e-5
+//        %ODEOPTIONS 
+//       
+rand('seed',0);rand('normal');
+nx=20;A=rand(nx,nx);A=A-4.5*eye();
+deff('y=f(t,x)','y=A*x')
+deff('J=j(t,x)','J=A')
+x0=ones(nx,1);t0=0;t=[1,2,3,4,5];
+nt=size(t,'*');
+eAt=expm(A*t(nt));
+
+//        Test itask=%ODEOPTIONS(1)
+
+//itask=1  --->  usual call (t=vector of instants, solution at all t)
+//========================
+itask=1;tcrit=0;h0=0;hmax=0;hmin=0;ixpr=0;mxstep=0;maxordn=0;maxords=0;
+jacflag=2;ml=-1;mu=-1;
+%ODEOPTIONS=[itask,tcrit,h0,hmax,hmin,jacflag,mxstep,maxordn,maxords,ixpr,ml,mu];
+xf=ode(x0,t0,t,f);   //lsoda
+if norm(xf(:,nt)-eAt*x0)  > Eps then pause,end
+xfj=ode(x0,t0,t,f,j);   //lsoda with jacobian
+if norm(xfj(:,nt)-eAt*x0)  > Eps then pause,end
+
+
+//itask=2;   --->  solution at mesh points  ---> t=tmax
+//========================
+%ODEOPTIONS(1)=2;tmax=t(5);
+xft=ode(x0,t0,tmax,f);
+[p,q]=size(xft);
+xlast=xft(2:nx+1,q);
+if xft(1,q)<tmax then pause,end
+if norm(xlast-expm(A*xft(1,q))*x0) > Eps  then pause,end
+
+//itask=3;   ---> solution at first mesh point beyond t=tmax
+%ODEOPTIONS(1)=3;
+x3=ode(x0,t0,tmax,f);
+if norm(x3(2:nx+1)-xlast,1) > Eps then pause,end
+
+//itask=4; test with %ODEOPTIONS(2)=tcrit
+%ODEOPTIONS(1)=4; //---> computation at all t and t>tcrit are not called
+tcrit=2.5;%ODEOPTIONS(2)=tcrit;
+chk=0;
+deff('y=fcrit(t,x)',['if t<=tcrit then'
+                      ' y=A*x;'
+                      'else'
+                      ' y=A*x;chk=resume(1);end'])
+x42=ode(x0,t0,t,fcrit);
+if chk==1 then pause,end
+[p,q]=size(x42);
+if norm(x42(:,q)-ode(x0,t0,tcrit,f),1) > Eps then pause,end
+
+//itask=5; test with %ODEOPTIONS(2)=tcrit
+%ODEOPTIONS(1)=5;  //---> computation at mesh points and t>tcrit are not called
+%ODEOPTIONS(6)=2;  // Estimated jacobian
+chk=0;
+x52=ode(x0,t0,2.3,fcrit);
+if chk==1 then pause,end
+[p,q]=size(x52);
+if x52(1,q)>tcrit then pause,end
+
+//test of %ODEOPTIONS(3:5)=[h0,hmax,hmin]
+%ODEOPTIONS(1)=1;
+h0=0.0;hmax=0.1;hmin=0.0001;
+%ODEOPTIONS(3:5)=[h0,hmax,hmin];
+x35=ode(x0,t0,t,f);
+if norm(x35-xf,1)  > Eps then pause,end
+
+//test of %ODEOPTIONS(6)=jacflag
+%ODEOPTIONS(6)=1;//Jacobian given
+%ODEOPTIONS(3:5)=[0 0 0];
+x61=ode('st',x0,t0,t,f,j);   //with Jacobian
+if norm (x61-xf,1) > Eps then pause,end
+
+