Merge remote-tracking branch 'origin/master' into YaSp 33/15733/2
Antoine ELIAS [Mon, 5 Jan 2015 09:40:38 +0000 (10:40 +0100)]
Conflicts:
scilab/modules/dynamic_link/etc/dynamic_link.start
scilab/modules/elementary_functions/Makefile.am
scilab/modules/elementary_functions/Makefile.in
scilab/modules/elementary_functions/includes/gw_elementary_functions.h
scilab/modules/elementary_functions/sci_gateway/c/gw_elementary_functions.c
scilab/modules/elementary_functions/src/c/elementary_functions.vcxproj
scilab/modules/linear_algebra/tests/nonreg_tests/bug_545.tst
scilab/modules/sparse/tests/nonreg_tests/bug_3310.dia.ref
scilab/modules/sparse/tests/nonreg_tests/bug_3310.tst

Change-Id: Ie02c79d0ea2403032ff885e79b43c33cc266f8f9

142 files changed:
scilab/CHANGES_5.5.X
scilab/etc/scilab.start
scilab/modules/action_binding/locales/action_binding.pot
scilab/modules/api_scilab/locales/api_scilab.pot
scilab/modules/arnoldi/locales/arnoldi.pot
scilab/modules/atoms/locales/atoms.pot
scilab/modules/atoms/macros/atomsGetConfig.sci
scilab/modules/atoms/macros/atoms_internals/atomsDESCRIPTIONget.sci
scilab/modules/atoms/macros/atoms_internals/atomsDownload.sci
scilab/modules/atoms/tests/nonreg_tests/bug_11199.dia.ref
scilab/modules/atoms/tests/nonreg_tests/bug_13674.dia.ref [new file with mode: 0644]
scilab/modules/atoms/tests/nonreg_tests/bug_13674.tst [new file with mode: 0644]
scilab/modules/atoms/tests/nonreg_tests/bug_9805.dia.ref
scilab/modules/atoms/tests/unit_tests/atomsAutoloadAdd.dia.ref
scilab/modules/atoms/tests/unit_tests/atomsAutoloadDel.dia.ref
scilab/modules/atoms/tests/unit_tests/atomsDepTreeShow.dia.ref
scilab/modules/atoms/tests/unit_tests/atomsInstall.dia.ref
scilab/modules/atoms/tests/unit_tests/atomsInstallList.dia.ref
scilab/modules/atoms/tests/unit_tests/atomsIsInstalled.dia.ref
scilab/modules/atoms/tests/unit_tests/atomsIsLoaded.dia.ref
scilab/modules/atoms/tests/unit_tests/atomsLoad.dia.ref
scilab/modules/atoms/tests/unit_tests/atomsRemove.dia.ref
scilab/modules/atoms/tests/unit_tests/atomsRemoveList.dia.ref
scilab/modules/atoms/tests/unit_tests/atomsRepositoryAdd.dia.ref
scilab/modules/atoms/tests/unit_tests/atomsRepositoryDel.dia.ref
scilab/modules/atoms/tests/unit_tests/atomsSetConfig.dia.ref
scilab/modules/atoms/tests/unit_tests/atomsShow.dia.ref
scilab/modules/atoms/tests/unit_tests/atomsUpdate.dia.ref
scilab/modules/boolean/locales/boolean.pot
scilab/modules/cacsd/locales/cacsd.pot
scilab/modules/cacsd/macros/pfss.sci
scilab/modules/cacsd/tests/unit_tests/plzr.dia.ref
scilab/modules/cacsd/tests/unit_tests/plzr.tst
scilab/modules/commons/locales/commons.pot
scilab/modules/compatibility_functions/locales/compatibility_functions.pot
scilab/modules/completion/locales/completion.pot
scilab/modules/console/locales/console.pot
scilab/modules/core/locales/core.pot
scilab/modules/data_structures/locales/data_structures.pot
scilab/modules/demo_tools/locales/demo_tools.pot
scilab/modules/development_tools/help/en_US/assert/assert_checkerror.xml
scilab/modules/development_tools/help/ja_JP/assert/assert_checkerror.xml
scilab/modules/development_tools/locales/development_tools.pot
scilab/modules/development_tools/tests/unit_tests/assert/computedigits.dia.ref
scilab/modules/development_tools/tests/unit_tests/assert/computedigits.tst
scilab/modules/differential_equations/locales/differential_equations.pot
scilab/modules/dynamic_link/etc/dynamic_link.start
scilab/modules/dynamic_link/locales/dynamic_link.pot
scilab/modules/dynamic_link/macros/configure_msvc.sci
scilab/modules/dynamic_link/macros/windows/dlwCompile.sci
scilab/modules/dynamic_link/macros/windows/dlwConfigureEnv.sci [new file with mode: 0644]
scilab/modules/dynamic_link/macros/windows/dlwFindMsVcCompiler.sci
scilab/modules/dynamic_link/macros/windows/dlwGenerateCleaner.sci
scilab/modules/dynamic_link/macros/windows/dlwGetSdkPath.sci
scilab/modules/elementary_functions/Makefile.am
scilab/modules/elementary_functions/Makefile.in
scilab/modules/elementary_functions/includes/gw_elementary_functions.h
scilab/modules/elementary_functions/locales/elementary_functions.pot
scilab/modules/elementary_functions/macros/%s_log10.sci [moved from scilab/modules/elementary_functions/macros/log10.sci with 96% similarity]
scilab/modules/elementary_functions/sci_gateway/c/sci_log10.c [new file with mode: 0644]
scilab/modules/elementary_functions/sci_gateway/cpp/elem_func_gw.cpp
scilab/modules/elementary_functions/sci_gateway/cpp/elem_func_gw/elem_func_gw.vcxproj
scilab/modules/elementary_functions/sci_gateway/cpp/elem_func_gw/elem_func_gw.vcxproj.filters
scilab/modules/elementary_functions/sci_gateway/elementary_functions_gateway.xml
scilab/modules/elementary_functions/src/c/core_Import.def
scilab/modules/elementary_functions/src/c/elementary_functions.vcxproj
scilab/modules/elementary_functions/src/c/elementary_functions.vcxproj.filters
scilab/modules/external_objects/locales/external_objects.pot
scilab/modules/external_objects_java/locales/external_objects_java.pot
scilab/modules/fftw/locales/fftw.pot
scilab/modules/fileio/locales/fileio.pot
scilab/modules/functions/locales/functions.pot
scilab/modules/genetic_algorithms/locales/genetic_algorithms.pot
scilab/modules/graph/locales/graph.pot
scilab/modules/graphic_export/locales/graphic_export.pot
scilab/modules/graphic_export/src/java/org/scilab/modules/graphic_export/Export.java
scilab/modules/graphic_export/tests/nonreg_tests/bug_13676.dia.ref [new file with mode: 0644]
scilab/modules/graphic_export/tests/nonreg_tests/bug_13676.tst [new file with mode: 0644]
scilab/modules/graphic_objects/locales/graphic_objects.pot
scilab/modules/graphics/locales/graphics.pot
scilab/modules/gui/locales/gui.pot
scilab/modules/hdf5/locales/hdf5.pot
scilab/modules/helptools/data/configuration/scilab_macros.txt
scilab/modules/helptools/locales/helptools.pot
scilab/modules/history_browser/locales/history_browser.pot
scilab/modules/history_manager/locales/history_manager.pot
scilab/modules/integer/locales/integer.pot
scilab/modules/interpolation/locales/interpolation.pot
scilab/modules/io/locales/io.pot
scilab/modules/jvm/locales/jvm.pot
scilab/modules/linear_algebra/locales/linear_algebra.pot
scilab/modules/linear_algebra/tests/nonreg_tests/bug_545.dia.ref [new file with mode: 0644]
scilab/modules/linear_algebra/tests/nonreg_tests/bug_545.tst
scilab/modules/localization/locales/localization.pot
scilab/modules/m2sci/locales/m2sci.pot
scilab/modules/matio/locales/matio.pot
scilab/modules/mexlib/locales/mexlib.pot
scilab/modules/modules_manager/locales/modules_manager.pot
scilab/modules/mpi/locales/mpi.pot
scilab/modules/optimization/locales/optimization.pot
scilab/modules/output_stream/locales/output_stream.pot
scilab/modules/overloading/locales/overloading.pot
scilab/modules/parallel/locales/parallel.pot
scilab/modules/parameters/locales/parameters.pot
scilab/modules/polynomials/locales/polynomials.pot
scilab/modules/preferences/locales/preferences.pot
scilab/modules/randlib/locales/randlib.pot
scilab/modules/renderer/locales/renderer.pot
scilab/modules/scicos/locales/scicos.pot
scilab/modules/scicos_blocks/locales/scicos_blocks.pot
scilab/modules/scinotes/locales/scinotes.pot
scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/texture/JoGLTextureManager.java
scilab/modules/signal_processing/locales/signal_processing.pot
scilab/modules/simulated_annealing/locales/simulated_annealing.pot
scilab/modules/sound/locales/sound.pot
scilab/modules/sparse/help/en_US/iterativesolvers/pcg.xml [deleted file]
scilab/modules/sparse/help/ja_JP/iterativesolvers/pcg.xml [deleted file]
scilab/modules/sparse/locales/sparse.pot
scilab/modules/sparse/macros/pcg.sci [deleted file]
scilab/modules/sparse/tests/nonreg_tests/bug_3310.dia.ref [deleted file]
scilab/modules/sparse/tests/nonreg_tests/bug_3310.tst [deleted file]
scilab/modules/special_functions/locales/special_functions.pot
scilab/modules/spreadsheet/locales/spreadsheet.pot
scilab/modules/startup/locales/startup.pot
scilab/modules/statistics/help/en_US/descriptive_statistics/msd.xml [deleted file]
scilab/modules/statistics/help/ja_JP/descriptive_statistics/msd.xml [deleted file]
scilab/modules/statistics/help/ja_JP/labostat.xml [deleted file]
scilab/modules/statistics/locales/statistics.pot
scilab/modules/statistics/macros/msd.sci [deleted file]
scilab/modules/statistics/tests/nonreg_tests/bug_1742.dia.ref
scilab/modules/statistics/tests/nonreg_tests/bug_1742.tst
scilab/modules/string/locales/string.pot
scilab/modules/symbolic/locales/symbolic.pot
scilab/modules/tclsci/locales/tclsci.pot
scilab/modules/time/locales/time.pot
scilab/modules/types/locales/types.pot
scilab/modules/ui_data/locales/ui_data.pot
scilab/modules/umfpack/locales/umfpack.pot
scilab/modules/windows_tools/locales/windows_tools.pot
scilab/modules/xcos/images/palettes/SAWTOOTH_f.png
scilab/modules/xcos/locales/xcos.pot
scilab/modules/xml/locales/xml.pot

index 377b582..8f86ae2 100644 (file)
@@ -14,8 +14,24 @@ Removed Functions
 
 * IsAScalar removed. Please use isscalar instead.
 
+* msd removed. Please use stdev instead.
+
+* pcg removed. Please use conjgrad instead.
+
 * milk_drop removed.
 
+Scilab Bug Fixes
+================
+
+* Bug #13673 fixed - Anti-aliasing of xpoly marks did not render correctly.
+
+* Bug #13674 fixed - User .wgetrc configuration file is now by-passed when ATOMS does not use a proxy.
+
+* Bug #13676 fixed - An invisible figure could not be exported.
+
+* Bug #13677 fixed - Indentation of examples in assert_checkerror help page was wrong.
+
+
                      Changes between version 5.5.0 and 5.5.1
                      =======================================
 
index e0051e0..8da91a4 100644 (file)
@@ -83,19 +83,28 @@ if sciargs()<>"-nouserstartup" then
 
   startupfiles = [ SCIHOME + filesep() + ".scilab"     ; .. // Home directory startup
                    SCIHOME + filesep() + "scilab.ini" ];    //  ""      ""    startup
-
-  if SCIHOME <> pwd() then
-    startupfiles = [ startupfiles     ; ..
-                     ".scilab"        ; .. // Working directory startup
-                     "scilab.ini" ]   ;    //  ""         ""    startup
-  end
-
   for i = 1:size(startupfiles, "*")
     if isfile(startupfiles(i)) then
       exec(startupfiles(i),-1);
     end
   end
 
+  // execute .scilab and scilab.start only
+  // if last exec does not change current directory to SCIHOME
+  // See bug #4150
+  workingDirectory = pwd();
+  if SCIHOME <> workingDirectory then
+
+      workingfiles = [ workingDirectory + filesep() + ".scilab"     ; .. // Working directory startup
+                       workingDirectory + filesep() + "scilab.ini" ];    //  ""      ""    startup
+
+      for i = 1:size(startupfiles, "*")
+        if isfile(startupfiles(i)) then
+          exec(startupfiles(i),-1);
+        end
+      end
+  end
+
   clear i;
   clear startupfiles;
 end
index 370b0af..adb870f 100644 (file)
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2014-09-18 17:01+0100\n"
+"Revision-Date: 2014-12-02 16:09+0100\n"
 
 # File: sci_gateway/cpp/sci_notify.cpp, line: 46
 # File: sci_gateway/cpp/sci_notify.cpp, line: 54
index 7c51e9d..3ef8772 100644 (file)
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2014-09-18 17:01+0100\n"
+"Revision-Date: 2014-12-02 16:09+0100\n"
 
 # File: src/cpp/api_boolean.cpp, line: 35
 # File: src/cpp/api_boolean_sparse.cpp, line: 33
index 58cff95..14aaa7e 100644 (file)
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2014-09-18 17:01+0100\n"
+"Revision-Date: 2014-12-02 16:09+0100\n"
 
 # File: sci_gateway/c/sci_dnaupd.c, line: 98
 # File: sci_gateway/c/sci_dnaupd.c, line: 116
index e63f86a..8461d85 100644 (file)
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2014-09-18 17:01+0100\n"
+"Revision-Date: 2014-12-02 16:09+0100\n"
 
 # File: macros/atomsAutoload.sci, line: 47
 # File: macros/atomsLoad.sci, line: 38
@@ -523,7 +523,7 @@ msgid "%s: Wrong value for input argument #%d.\n"
 msgstr ""
 
 #
-# File: macros/atomsGetConfig.sci, line: 119
+# File: macros/atomsGetConfig.sci, line: 124
 #, c-format
 msgid "%s: The config file ('%s') is not well formated at line %d\n"
 msgstr ""
@@ -1289,25 +1289,43 @@ msgid "%s: Wrong type for input argument #%d: Boolean expected.\n"
 msgstr ""
 
 #
-# File: macros/atoms_internals/atomsDESCRIPTIONget.sci, line: 179
+# File: macros/atoms_internals/atomsDESCRIPTIONget.sci, line: 182
 #, c-format
 msgid "%s: DESCRIPTION file ('%s') does not exist.\n"
 msgstr ""
 
 #
-# File: macros/atoms_internals/atomsDESCRIPTIONget.sci, line: 189
+# File: macros/atoms_internals/atomsDESCRIPTIONget.sci, line: 192
 #, c-format
 msgid "%s: gzip not found.\n"
 msgstr ""
 
 #
-# File: macros/atoms_internals/atomsDESCRIPTIONget.sci, line: 198
+# File: macros/atoms_internals/atomsDESCRIPTIONget.sci, line: 201
 #, c-format
 msgid "%s: Extraction of the DESCRIPTION file ('%s') has failed.\n"
 msgstr ""
 
 #
-# File: macros/atoms_internals/atomsDESCRIPTIONget.sci, line: 267
+# File: macros/atoms_internals/atomsDESCRIPTIONget.sci, line: 205
+msgid "Done"
+msgstr ""
+
+#
+# File: macros/atoms_internals/atomsDESCRIPTIONget.sci, line: 205
+# File: macros/atoms_internals/atomsDESCRIPTIONget.sci, line: 213
+# File: macros/atoms_internals/atomsDESCRIPTIONget.sci, line: 217
+msgid "Scanning repository"
+msgstr ""
+
+#
+# File: macros/atoms_internals/atomsDESCRIPTIONget.sci, line: 213
+# File: macros/atoms_internals/atomsDESCRIPTIONget.sci, line: 217
+msgid "Skipped"
+msgstr ""
+
+#
+# File: macros/atoms_internals/atomsDESCRIPTIONget.sci, line: 284
 #, c-format
 msgid "%s: save ('%s') has failed.\n"
 msgstr ""
@@ -1415,120 +1433,120 @@ msgid "%s: Neither Wget or Curl found: Please install one of them\n"
 msgstr ""
 
 #
-# File: macros/atoms_internals/atomsDownload.sci, line: 176
+# File: macros/atoms_internals/atomsDownload.sci, line: 181
 msgid "Download in progress... Please be patient."
 msgstr ""
 
 #
-# File: macros/atoms_internals/atomsDownload.sci, line: 195
+# File: macros/atoms_internals/atomsDownload.sci, line: 200
 #, c-format
 msgid "%s: Error: the response status from the URL %s is invalid.\n"
 msgstr ""
 
 #
-# File: macros/atoms_internals/atomsDownload.sci, line: 196
+# File: macros/atoms_internals/atomsDownload.sci, line: 201
 #, c-format
 msgid "%s: Error while opening an Internet connection.\n"
 msgstr ""
 
 #
-# File: macros/atoms_internals/atomsDownload.sci, line: 197
+# File: macros/atoms_internals/atomsDownload.sci, line: 202
 #, c-format
 msgid "%s: Error while opening the URL %s.\n"
 msgstr ""
 
 #
-# File: macros/atoms_internals/atomsDownload.sci, line: 198
+# File: macros/atoms_internals/atomsDownload.sci, line: 203
 #, c-format
 msgid "%s: Error while creating the file %s on disk.\n"
 msgstr ""
 
 #
-# File: macros/atoms_internals/atomsDownload.sci, line: 199
+# File: macros/atoms_internals/atomsDownload.sci, line: 204
 #, c-format
 msgid "%s: Error while retrieving the size of file at URL %s.\n"
 msgstr ""
 
 #
-# File: macros/atoms_internals/atomsDownload.sci, line: 200
+# File: macros/atoms_internals/atomsDownload.sci, line: 205
 #, c-format
 msgid "%s: Error while reading the file from the URL %s.\n"
 msgstr ""
 
 #
-# File: macros/atoms_internals/atomsDownload.sci, line: 201
+# File: macros/atoms_internals/atomsDownload.sci, line: 206
 #, c-format
 msgid "%s: Error while writing the file %s on disk.\n"
 msgstr ""
 
 #
-# File: macros/atoms_internals/atomsDownload.sci, line: 202
+# File: macros/atoms_internals/atomsDownload.sci, line: 207
 #, c-format
 msgid "%s: Error while downloading the file from the URL %s.\n"
 msgstr ""
 
 #
-# File: macros/atoms_internals/atomsDownload.sci, line: 203
+# File: macros/atoms_internals/atomsDownload.sci, line: 208
 #, c-format
 msgid "%s: Error: out of memory.\n"
 msgstr ""
 
 #
-# File: macros/atoms_internals/atomsDownload.sci, line: 209
+# File: macros/atoms_internals/atomsDownload.sci, line: 214
 #, c-format
 msgid "%s: The following file hasn't been downloaded:\n"
 msgstr ""
 
 #
-# File: macros/atoms_internals/atomsDownload.sci, line: 210
+# File: macros/atoms_internals/atomsDownload.sci, line: 215
 #, c-format
 msgid "\t - URL      : '%s'\n"
 msgstr ""
 
 #
-# File: macros/atoms_internals/atomsDownload.sci, line: 211
+# File: macros/atoms_internals/atomsDownload.sci, line: 216
 #, c-format
 msgid "\t - Local location : '%s'\n"
 msgstr ""
 
 #
-# File: macros/atoms_internals/atomsDownload.sci, line: 229
+# File: macros/atoms_internals/atomsDownload.sci, line: 234
 #, c-format
 msgid "%s: The following file has not been copied:\n"
 msgstr ""
 
 #
-# File: macros/atoms_internals/atomsDownload.sci, line: 230
+# File: macros/atoms_internals/atomsDownload.sci, line: 235
 #, c-format
 msgid "\t - source    : '%s'\n"
 msgstr ""
 
 #
-# File: macros/atoms_internals/atomsDownload.sci, line: 231
+# File: macros/atoms_internals/atomsDownload.sci, line: 236
 #, c-format
 msgid "\t - destination : '%s'\n"
 msgstr ""
 
 #
-# File: macros/atoms_internals/atomsDownload.sci, line: 246
+# File: macros/atoms_internals/atomsDownload.sci, line: 251
 #, c-format
 msgid "%s: The downloaded file does not match the MD5SUM:\n"
 msgstr ""
 
 #
-# File: macros/atoms_internals/atomsDownload.sci, line: 247
+# File: macros/atoms_internals/atomsDownload.sci, line: 252
 #, c-format
 msgid "\t - file      : '%s'\n"
 msgstr ""
 
 #
-# File: macros/atoms_internals/atomsDownload.sci, line: 248
+# File: macros/atoms_internals/atomsDownload.sci, line: 253
 #, c-format
 msgid "\t - MD5SUM expected : '%s'\n"
 msgstr ""
 
 #
-# File: macros/atoms_internals/atomsDownload.sci, line: 249
+# File: macros/atoms_internals/atomsDownload.sci, line: 254
 #, c-format
 msgid "\t - MD5SUM watched  : '%s'\n"
 msgstr ""
index bc98b92..3a9213c 100644 (file)
@@ -63,6 +63,11 @@ function result = atomsGetConfig(field)
         i = find(pref_attrs(1, :) == field);
         if ~isempty(i) then
             result = getPreferencesValue("//web/body/proxy", pref_attrs(2, i));
+            if result == "true" then
+                result = "True";
+            elseif result == "false" then
+                result = "False";
+            end
             return;
         end
 
index 8368041..27f2214 100644 (file)
@@ -157,6 +157,8 @@ function [packages,categories_flat,categories] = atomsDESCRIPTIONget(update)
             mkdir(atoms_tmp_directory);
         end
 
+        nbRepoError = 0;
+        allRepoError = [];
         for i=1:size(repositories,"*")
             // Building url & file_out
             // ----------------------------------------
@@ -171,35 +173,50 @@ function [packages,categories_flat,categories] = atomsDESCRIPTIONget(update)
 
             // Launch the download
             // ----------------------------------------
-            atomsDownload(url, file_out);
+            try
+                atomsDownload(url, file_out);
 
-            // We check that file_out exists
-            // ----------------------------------------
-            if ~isfile(file_out) then
-                error(msprintf(gettext("%s: DESCRIPTION file (''%s'') does not exist.\n"),"atomsDESCRIPTIONget", file_out));
-            end
-
-            // Extract It
-            // ----------------------------------------
-            if LINUX | MACOSX | SOLARIS | BSD then
-                extract_cmd = "gunzip "+ file_out;
-            else
-                gzip_path = getshortpathname(fullpath(pathconvert(SCI+"/tools/gzip/gzip.exe",%F)));
-                if ~isfile(gzip_path) then
-                    error(msprintf(gettext("%s: gzip not found.\n"), "atomsDESCRIPTIONget"));
+                // We check that file_out exists
+                // ----------------------------------------
+                if ~isfile(file_out) then
+                    error(msprintf(gettext("%s: DESCRIPTION file (''%s'') does not exist.\n"),"atomsDESCRIPTIONget", file_out));
                 end
-                extract_cmd = """" + gzip_path + """" + " -d """ + file_out + """";
-            end
 
-            [rep, stat ,err] = unix_g(extract_cmd);
+                // Extract It
+                // ----------------------------------------
+                if LINUX | MACOSX | SOLARIS | BSD then
+                    extract_cmd = "gunzip "+ file_out;
+                else
+                    gzip_path = getshortpathname(fullpath(pathconvert(SCI+"/tools/gzip/gzip.exe",%F)));
+                    if ~isfile(gzip_path) then
+                        error(msprintf(gettext("%s: gzip not found.\n"), "atomsDESCRIPTIONget"));
+                    end
+                    extract_cmd = """" + gzip_path + """" + " -d """ + file_out + """";
+                end
 
-            if stat ~= 0 then
-                disp(err);
-                error(msprintf(gettext("%s: Extraction of the DESCRIPTION file (''%s'') has failed.\n"),"atomsDESCRIPTIONget",file_out));
-            end
+                [rep, stat ,err] = unix_g(extract_cmd);
 
-            description_files = [ description_files ; strsubst(file_out,"/\.gz$/","","r") repositories(i) ];
+                if stat ~= 0 then
+                    disp(err);
+                    error(msprintf(gettext("%s: Extraction of the DESCRIPTION file (''%s'') has failed.\n"),"atomsDESCRIPTIONget",file_out));
+                end
 
+                description_files = [ description_files ; strsubst(file_out,"/\.gz$/","","r") repositories(i) ];
+                mprintf(_("Scanning repository") + " " + repositories(i) + " ... " + _("Done") + "\n\n");
+            catch
+                [msg, ierr] = lasterror();
+                nbRepoError = nbRepoError + 1;
+                allRepoError = [allRepoError ; msg]
+                // If failed downloading latest repository and all previous failed => error
+                if nbRepoError == size(repositories, "*") then
+                    warning(msg);
+                    mprintf(_("Scanning repository") + " " + repositories(i) + " ... " + _("Skipped") + "\n\n");
+                    error("All ATOMS repositories scan failed.");
+                else
+                    warning(msg);
+                    mprintf(_("Scanning repository") + " " + repositories(i) + " ... " + _("Skipped") + "\n\n");
+                end
+            end
         end
 
         // 2nd step : Loop on available Description files
index 59ffe3f..13e3d8e 100644 (file)
@@ -163,6 +163,11 @@ function atomsDownload(url_in,file_out,md5sum)
 
         end
 
+        if WGET & atomsGetConfig("useProxy") == "False" then
+            proxy_user_arg = " --no-proxy";
+        end
+
+
         if getos() == "Windows" & CURL then
             download_cmd = """" + pathconvert(SCI+"/tools/curl/curl.exe",%F) + """" + proxy_host_arg + proxy_user_arg + timeout_arg + " -s """ + url_in + """ -o """ + file_out + """";
         elseif CURL then
index e88a954..b7ac5dc 100644 (file)
@@ -14,3 +14,5 @@
 // <-- Short Description -->
 // atomsSystemUpdate returned an error.
 atomsSystemUpdate();
+Scanning repository http://atoms.scilab.org/5.5 ... Done
+
diff --git a/scilab/modules/atoms/tests/nonreg_tests/bug_13674.dia.ref b/scilab/modules/atoms/tests/nonreg_tests/bug_13674.dia.ref
new file mode 100644 (file)
index 0000000..4a100e7
--- /dev/null
@@ -0,0 +1,42 @@
+// =============================================================================
+// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+// Copyright (C) 2014 - Scilab Enterprises - Bruno JOFRET
+//
+//  This file is distributed under the same license as the Scilab package.
+// =============================================================================
+// <-- TEST WITH ATOMS -->
+//
+// <-- LINUX ONLY -->
+//
+// <-- Non-regression test for bug 13674 -->
+//
+// <-- Bugzilla URL -->
+// http://bugzilla.scilab.org/show_bug.cgi?id=13674
+//
+// <-- Short Description -->
+// atomsSystemUpdate() failed if USER has it's own wgetrc config file
+// using proxy settings
+// Save user .wgetrc file for test
+restoreUserConfig = %f;
+if isfile("~/.wgetrc") then
+    copyfile("~/.wgetrc", "~/.wgetrc.bak");
+    restoreUserConfig = %t;
+end
+fd = mopen("~/.wgetrc", "w+");
+mputl("use_proxy = on", fd);
+mputl("http_proxy = http://proxy_name:1234/", fd);
+mputl("https_proxy = http://proxy_name:1234/", fd);
+mputl("ftp_proxy = http://proxy_name:1234/", fd);
+mclose(fd);
+status = atomsGetConfig("useProxy");
+atomsSetConfig("useProxy", "False");
+atomsSystemUpdate();
+Scanning repository http://atoms.scilab.org/5.5 ... Done
+
+// Restore values
+atomsSetConfig("useProxy", status);
+if restoreUserConfig then
+    copyfile("~/.wgetrc.bak", "~/.wgetrc");
+else
+    mdelete("~/.wgetrc");
+end
diff --git a/scilab/modules/atoms/tests/nonreg_tests/bug_13674.tst b/scilab/modules/atoms/tests/nonreg_tests/bug_13674.tst
new file mode 100644 (file)
index 0000000..08216cf
--- /dev/null
@@ -0,0 +1,46 @@
+// =============================================================================
+// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+// Copyright (C) 2014 - Scilab Enterprises - Bruno JOFRET
+//
+//  This file is distributed under the same license as the Scilab package.
+// =============================================================================
+
+// <-- TEST WITH ATOMS -->
+//
+// <-- LINUX ONLY -->
+//
+// <-- Non-regression test for bug 13674 -->
+//
+// <-- Bugzilla URL -->
+// http://bugzilla.scilab.org/show_bug.cgi?id=13674
+//
+// <-- Short Description -->
+// atomsSystemUpdate() failed if USER has it's own wgetrc config file
+// using proxy settings
+
+// Save user .wgetrc file for test
+restoreUserConfig = %f;
+if isfile("~/.wgetrc") then
+    copyfile("~/.wgetrc", "~/.wgetrc.bak");
+    restoreUserConfig = %t;
+end
+
+fd = mopen("~/.wgetrc", "w+");
+mputl("use_proxy = on", fd);
+mputl("http_proxy = http://proxy_name:1234/", fd);
+mputl("https_proxy = http://proxy_name:1234/", fd);
+mputl("ftp_proxy = http://proxy_name:1234/", fd);
+mclose(fd);
+
+status = atomsGetConfig("useProxy");
+atomsSetConfig("useProxy", "False");
+
+atomsSystemUpdate();
+
+// Restore values
+atomsSetConfig("useProxy", status);
+if restoreUserConfig then
+    copyfile("~/.wgetrc.bak", "~/.wgetrc");
+else
+    mdelete("~/.wgetrc");
+end
index 8c5f82c..a5c47c2 100644 (file)
@@ -14,3 +14,5 @@
 // <-- Short Description -->
 // atomsSystemUpdate() failed on some Windows.
 atomsSystemUpdate();
+Scanning repository http://atoms.scilab.org/5.5 ... Done
+
index 0269e1a..f32703b 100644 (file)
@@ -18,6 +18,8 @@ atomsSetConfig("autoloadAddAfterInstall","False");
 atomsSetConfig("Verbose" ,"False");
 // Load the 1st scenario : See scene10.test.atoms.scilab.org.txt
 atomsRepositorySetOfl("http://scene10.test.atoms.scilab.org");
+Scanning repository http://scene10.test.atoms.scilab.org ... Done
+
 // 1st test case
 // =============================================================================
 // Install toolbox_5 in the user section
@@ -99,3 +101,5 @@ if ~isempty( atomsGetInstalled() ) then bugmes();quit;end
 // =============================================================================
 atomsRestoreConfig(%T);
 atomsRepositorySetOfl(mgetl(SCI+"/modules/atoms/tests/unit_tests/repositories.orig"));
+Scanning repository http://atoms.scilab.org/5.5 ... Done
+
index ee407b3..ee22061 100644 (file)
@@ -18,6 +18,8 @@ atomsSetConfig("autoloadAddAfterInstall","False");
 atomsSetConfig("Verbose" ,"False");
 // Load the 1st scenario : See scene10.test.atoms.scilab.org.txt
 atomsRepositorySetOfl("http://scene10.test.atoms.scilab.org");
+Scanning repository http://scene10.test.atoms.scilab.org ... Done
+
 // 1st test case
 // =============================================================================
 // Install toolbox_5 in both user and allusers sections
@@ -95,3 +97,5 @@ if ~isempty( atomsAutoloadList() ) then bugmes();quit;end
 // =============================================================================
 atomsRestoreConfig(%T);
 atomsRepositorySetOfl(mgetl(SCI+"/modules/atoms/tests/unit_tests/repositories.orig"));
+Scanning repository http://atoms.scilab.org/5.5 ... Done
+
index 78b4138..0e7c234 100644 (file)
@@ -14,6 +14,8 @@ atomsSetConfig("autoloadAddAfterInstall","False");
 atomsSetConfig("Verbose" ,"False");
 // Load the 1st scenario : See scene10.test.atoms.scilab.org.txt
 atomsRepositorySetOfl("http://scene10.test.atoms.scilab.org");
+Scanning repository http://scene10.test.atoms.scilab.org ... Done
+
 // Install toolbox 5
 atomsInstall("toolbox_5");
 // Show the dependency tree
@@ -25,6 +27,8 @@ atomsDepTreeShow("toolbox_5");
             `-- toolbox_1 - 1.0-1
 // Load the 2nd scenario : See scene11.test.atoms.scilab.org.txt
 atomsRepositorySetOfl("http://scene11.test.atoms.scilab.org");
+Scanning repository http://scene11.test.atoms.scilab.org ... Done
+
 // Update modules
 atomsUpdate();
 // Show the dependency tree
@@ -40,3 +44,5 @@ atomsRemove("toolbox_5");
 // =============================================================================
 atomsRestoreConfig(%T);
 atomsRepositorySetOfl(mgetl(SCI+"/modules/atoms/tests/unit_tests/repositories.orig"));
+Scanning repository http://atoms.scilab.org/5.5 ... Done
+
index efd04c1..a83a562 100644 (file)
@@ -14,6 +14,8 @@ atomsSetConfig("autoloadAddAfterInstall","False");
 atomsSetConfig("Verbose" ,"False");
 // Load the 1st scenario : See scene10.test.atoms.scilab.org.txt
 atomsRepositorySetOfl("http://scene10.test.atoms.scilab.org");
+Scanning repository http://scene10.test.atoms.scilab.org ... Done
+
 // Install the toolbox 5
 // =============================================================================
 atomsInstall("toolbox_5");
@@ -117,13 +119,19 @@ atomsRemove("toolbox_5","allusers");
 // Install the toolbox 7 (Local package)
 // =============================================================================
 atomsInstall(SCI+"/modules/atoms/tests/unit_tests/toolbox_7_1.0-1.bin.zip","allusers");
+Scanning repository http://scene10.test.atoms.scilab.org ... Done
+
 atomsInstall(SCI+"/modules/atoms/tests/unit_tests/toolbox_7_1.0-1.bin.zip","user");
+Scanning repository http://scene10.test.atoms.scilab.org ... Done
+
 if ~atomsIsInstalled("toolbox_7","allusers") then bugmes();quit;end
 if ~atomsIsInstalled("toolbox_7","user")     then bugmes();quit;end
 atomsRemove("toolbox_7","allusers");
 if atomsIsInstalled("toolbox_7","allusers")  then bugmes();quit;end
 if ~atomsIsInstalled("toolbox_7","user")     then bugmes();quit;end
 atomsInstall(SCI+"/modules/atoms/tests/unit_tests/toolbox_7_1.0-1.bin.zip","allusers");
+Scanning repository http://scene10.test.atoms.scilab.org ... Done
+
 atomsRemove("toolbox_7","user");
 if atomsIsInstalled("toolbox_7","user")      then bugmes();quit;end
 if ~atomsIsInstalled("toolbox_7","allusers") then bugmes();quit;end
@@ -132,3 +140,5 @@ atomsRemove("toolbox_7","allusers");
 // =============================================================================
 atomsRestoreConfig(%T);
 atomsRepositorySetOfl(mgetl(SCI+"/modules/atoms/tests/unit_tests/repositories.orig"));
+Scanning repository http://atoms.scilab.org/5.5 ... Done
+
index 0710873..78b6bc9 100644 (file)
@@ -9,6 +9,8 @@ load("SCI/modules/atoms/macros/atoms_internals/lib");
 // Load the 1st scenario : See scene10.test.atoms.scilab.org.txt
 // =============================================================================
 atomsRepositorySetOfl("http://scene10.test.atoms.scilab.org");
+Scanning repository http://scene10.test.atoms.scilab.org ... Done
+
 // -----------------------------------------------------------------------------
 ref = [ "+" "U" "toolbox_4" "1.0-1" ;
         "+" ""  "toolbox_2" "1.0-1" ;
@@ -27,6 +29,8 @@ if or(atomsInstallList("toolbox_6")<>ref) then bugmes();quit;end
 // Load the 2nd scenario : See scene10.test.atoms.scilab.org.txt
 // =============================================================================
 atomsRepositorySetOfl("http://scene11.test.atoms.scilab.org");
+Scanning repository http://scene11.test.atoms.scilab.org ... Done
+
 // -----------------------------------------------------------------------------
 ref = [ "+" "U" "toolbox_4" "1.1-1" ;
         "+" ""  "toolbox_2" "1.0-1" ;
@@ -45,3 +49,5 @@ if or(atomsInstallList("toolbox_6")<>ref) then bugmes();quit;end
 // Restore Original values
 // =============================================================================
 atomsRepositorySetOfl(mgetl(SCI+"/modules/atoms/tests/unit_tests/repositories.orig"));
+Scanning repository http://atoms.scilab.org/5.5 ... Done
+
index 662c85d..636294a 100644 (file)
@@ -15,6 +15,8 @@ atomsSetConfig("Verbose" ,"False");
 // Load the 2nd scenario : See scene11.test.atoms.scilab.org.txt
 // =============================================================================
 atomsRepositorySetOfl("http://scene11.test.atoms.scilab.org");
+Scanning repository http://scene11.test.atoms.scilab.org ... Done
+
 // Install toolbox N°2
 atomsInstall(["toolbox_2","2.0";"toolbox_2","2.1"],"user");
 // Check input parameters
@@ -88,3 +90,5 @@ if ~isempty( atomsGetInstalled() ) then bugmes();quit;end
 // =============================================================================
 atomsRestoreConfig(%T);
 atomsRepositorySetOfl(mgetl(SCI+"/modules/atoms/tests/unit_tests/repositories.orig"));
+Scanning repository http://atoms.scilab.org/5.5 ... Done
+
index 8d16ddd..7dcb6bb 100644 (file)
@@ -14,6 +14,8 @@ atomsSetConfig("autoloadAddAfterInstall","False");
 atomsSetConfig("Verbose" ,"False");
 //force official ATOMS repository
 atomsRepositorySetOfl(mgetl(SCI+"/modules/atoms/tests/unit_tests/repositories.orig"));
+Scanning repository http://atoms.scilab.org/5.5 ... Done
+
 // Install toolbox N°2
 atomsInstall(["toolbox_2","2.1"],"user");
 // Check installation
index 9714a2c..f49aa44 100644 (file)
@@ -15,6 +15,8 @@ atomsRestoreConfig(%T);
 atomsSaveConfig();
 //force official ATOMS repository
 atomsRepositorySetOfl(mgetl(SCI+"/modules/atoms/tests/unit_tests/repositories.orig"));
+Scanning repository http://atoms.scilab.org/5.5 ... Done
+
 // Set some parameters for the test
 // =============================================================================
 atomsSetConfig("autoloadAddAfterInstall","False");
index 32f3b4f..1c2fefb 100644 (file)
@@ -22,6 +22,8 @@ atomsSetConfig("Verbose" ,"False");
 // Load the 1st scenario : See scene1.test.atoms.scilab.org.txt
 // =============================================================================
 atomsRepositorySetOfl("http://scene1.test.atoms.scilab.org");
+Scanning repository http://scene1.test.atoms.scilab.org ... Done
+
 if atomsIsInstalled("toolbox_1") then
     atomsRemove("toolbox_1");
 end
@@ -239,3 +241,5 @@ assert_checktrue(isempty(atomsGetInstalled()));
 // =============================================================================
 atomsRestoreConfig(%T);
 atomsRepositorySetOfl(mgetl(SCI+"/modules/atoms/tests/unit_tests/repositories.orig"));
+Scanning repository http://atoms.scilab.org/5.5 ... Done
+
index 128d07d..4701089 100644 (file)
@@ -15,6 +15,8 @@ atomsSetConfig("Verbose" ,"False");
 // Load the 1st scenario : See scene10.test.atoms.scilab.org.txt
 // =============================================================================
 atomsRepositorySetOfl("http://scene10.test.atoms.scilab.org");
+Scanning repository http://scene10.test.atoms.scilab.org ... Done
+
 // Install toolbox_5 & toolbox_3
 // =============================================================================
 atomsInstall("toolbox_5","user");
@@ -65,3 +67,5 @@ if ~isempty( atomsGetInstalled() ) then bugmes();quit;end
 // =============================================================================
 atomsRestoreConfig(%T);
 atomsRepositorySetOfl(mgetl(SCI+"/modules/atoms/tests/unit_tests/repositories.orig"));
+Scanning repository http://atoms.scilab.org/5.5 ... Done
+
index 6a667c1..408407b 100644 (file)
@@ -11,7 +11,17 @@ if isempty([ atomsRepositoryList("user") ; atomsRepositoryList("allusers")]) the
        rep2 = "http://scene11.test.atoms.scilab.org";
        
        if atomsRepositoryAdd(rep1,"user")     <> 1 then bugmes();quit;end
+Scanning repository http://atoms.scilab.org/5.5 ... Done
+
+Scanning repository http://scene10.test.atoms.scilab.org ... Done
+
        if atomsRepositoryAdd(rep2,"allusers") <> 1 then bugmes();quit;end
+Scanning repository http://atoms.scilab.org/5.5 ... Done
+
+Scanning repository http://scene11.test.atoms.scilab.org ... Done
+
+Scanning repository http://scene10.test.atoms.scilab.org ... Done
+
        
        if or(atomsRepositoryList("user")     <> [rep1,"user"]) then bugmes();quit;end
        if or(atomsRepositoryList("allusers") <> [rep2,"allusers"]) then bugmes();quit;end
@@ -20,12 +30,26 @@ if isempty([ atomsRepositoryList("user") ; atomsRepositoryList("allusers")]) the
        if find( atomsRepositoryList("all") == [rep2]) == [] then bugmes();quit;end
        
        if atomsRepositoryDel(rep1,"user") <> 1 then bugmes();quit;end
+Scanning repository http://atoms.scilab.org/5.5 ... Done
+
+Scanning repository http://scene11.test.atoms.scilab.org ... Done
+
        if atomsRepositoryDel(rep2,"allusers") <> 1 then bugmes();quit;end
+Scanning repository http://atoms.scilab.org/5.5 ... Done
+
        
        if atomsRepositoryAdd( [rep1;rep2],"user") <> 2 then bugmes();quit;end
+Scanning repository http://atoms.scilab.org/5.5 ... Done
+
+Scanning repository http://scene10.test.atoms.scilab.org ... Done
+
+Scanning repository http://scene11.test.atoms.scilab.org ... Done
+
        if or(atomsRepositoryList("user")     <> [rep1 "user";rep2 "user"]) then bugmes();quit;end
        if or(atomsRepositoryList("allusers") <> []) then bugmes();quit;end
        if atomsRepositoryDel([rep1;rep2],"user") <> 2 then bugmes();quit;end
+Scanning repository http://atoms.scilab.org/5.5 ... Done
+
        
        if ~isempty([ atomsRepositoryList("user") ; atomsRepositoryList("allusers")]) then bugmes();quit;end
 end
index 6a667c1..408407b 100644 (file)
@@ -11,7 +11,17 @@ if isempty([ atomsRepositoryList("user") ; atomsRepositoryList("allusers")]) the
        rep2 = "http://scene11.test.atoms.scilab.org";
        
        if atomsRepositoryAdd(rep1,"user")     <> 1 then bugmes();quit;end
+Scanning repository http://atoms.scilab.org/5.5 ... Done
+
+Scanning repository http://scene10.test.atoms.scilab.org ... Done
+
        if atomsRepositoryAdd(rep2,"allusers") <> 1 then bugmes();quit;end
+Scanning repository http://atoms.scilab.org/5.5 ... Done
+
+Scanning repository http://scene11.test.atoms.scilab.org ... Done
+
+Scanning repository http://scene10.test.atoms.scilab.org ... Done
+
        
        if or(atomsRepositoryList("user")     <> [rep1,"user"]) then bugmes();quit;end
        if or(atomsRepositoryList("allusers") <> [rep2,"allusers"]) then bugmes();quit;end
@@ -20,12 +30,26 @@ if isempty([ atomsRepositoryList("user") ; atomsRepositoryList("allusers")]) the
        if find( atomsRepositoryList("all") == [rep2]) == [] then bugmes();quit;end
        
        if atomsRepositoryDel(rep1,"user") <> 1 then bugmes();quit;end
+Scanning repository http://atoms.scilab.org/5.5 ... Done
+
+Scanning repository http://scene11.test.atoms.scilab.org ... Done
+
        if atomsRepositoryDel(rep2,"allusers") <> 1 then bugmes();quit;end
+Scanning repository http://atoms.scilab.org/5.5 ... Done
+
        
        if atomsRepositoryAdd( [rep1;rep2],"user") <> 2 then bugmes();quit;end
+Scanning repository http://atoms.scilab.org/5.5 ... Done
+
+Scanning repository http://scene10.test.atoms.scilab.org ... Done
+
+Scanning repository http://scene11.test.atoms.scilab.org ... Done
+
        if or(atomsRepositoryList("user")     <> [rep1 "user";rep2 "user"]) then bugmes();quit;end
        if or(atomsRepositoryList("allusers") <> []) then bugmes();quit;end
        if atomsRepositoryDel([rep1;rep2],"user") <> 2 then bugmes();quit;end
+Scanning repository http://atoms.scilab.org/5.5 ... Done
+
        
        if ~isempty([ atomsRepositoryList("user") ; atomsRepositoryList("allusers")]) then bugmes();quit;end
 end
index 2857b4a..4033cb3 100644 (file)
@@ -55,6 +55,8 @@ assert_checkequal(string(atomsSetConfig("proxyUser","scilab")),"1");
 assert_checkequal(string(atomsSetConfig("proxyPassword","scilab")),"1");
 assert_checkequal(string(atomsSetConfig("downloadTool",config_downloadTool)),"0");
 assert_checkequal(string(atomsSetConfig("offline","False")),"1");
+Scanning repository http://atoms.scilab.org/5.5 ... Done
+
 assert_checkequal(string(atomsSetConfig("autoload","True")),"1");
 assert_checkequal(atomsGetConfig(),ref);
 // Restore original values
index a8ebf0d..4a5bc71 100644 (file)
@@ -16,6 +16,8 @@ atomsSetConfig("Verbose" ,"False");
 // Load the 1st scenario : See scene10.test.atoms.scilab.org.txt
 // =============================================================================
 atomsRepositorySetOfl("http://scene10.test.atoms.scilab.org");
+Scanning repository http://scene10.test.atoms.scilab.org ... Done
+
 // Install the toolbox 5
 // =============================================================================
 atomsInstall("toolbox_3");
@@ -48,3 +50,5 @@ atomsRemove("toolbox_3");
 // =============================================================================
 atomsRestoreConfig(%T);
 atomsRepositorySetOfl(mgetl(SCI+"/modules/atoms/tests/unit_tests/repositories.orig"));
+Scanning repository http://atoms.scilab.org/5.5 ... Done
+
index 2943986..e8d8447 100644 (file)
@@ -20,6 +20,8 @@ atomsSetConfig("Verbose" ,"False");
 // =============================================================================
 // Load the 1st scenario : See scene10.test.atoms.scilab.org.txt
 atomsRepositorySetOfl("http://scene10.test.atoms.scilab.org");
+Scanning repository http://scene10.test.atoms.scilab.org ... Done
+
 atomsInstall("toolbox_5","user");
 // Check if the module is really installed
 if ~atomsIsInstalled(["toolbox_5" "1.0-1"],"user") then bugmes();quit;end
@@ -33,6 +35,8 @@ if atomsGetInstalledStatus(["toolbox_2" "1.0-1"],"user")<>"A" then bugmes();quit
 if atomsGetInstalledStatus(["toolbox_1" "1.0-1"],"user")<>"A" then bugmes();quit;end
 // Load the 2nd scenario : See scene11.test.atoms.scilab.org.txt
 atomsRepositorySetOfl("http://scene11.test.atoms.scilab.org");
+Scanning repository http://scene11.test.atoms.scilab.org ... Done
+
 atomsUpdate();
 if ~atomsIsInstalled(["toolbox_5" "1.0-1"],"user") then bugmes();quit;end
 if  atomsIsInstalled(["toolbox_4" "1.0-1"],"all")  then bugmes();quit;end
@@ -51,6 +55,8 @@ if ~isempty( atomsGetInstalled() ) then bugmes();quit;end
 // =============================================================================
 // Load the 1st scenario : See scene10.test.atoms.scilab.org.txt
 atomsRepositorySetOfl("http://scene10.test.atoms.scilab.org");
+Scanning repository http://scene10.test.atoms.scilab.org ... Done
+
 atomsInstall("toolbox_4","user");
 atomsInstall("toolbox_5","user");
 // Check if the module is really installed
@@ -65,6 +71,8 @@ if atomsGetInstalledStatus(["toolbox_2" "1.0-1"],"user")<>"A" then bugmes();quit
 if atomsGetInstalledStatus(["toolbox_1" "1.0-1"],"user")<>"A" then bugmes();quit;end
 // Load the 2nd scenario : See scene11.test.atoms.scilab.org.txt
 atomsRepositorySetOfl("http://scene11.test.atoms.scilab.org");
+Scanning repository http://scene11.test.atoms.scilab.org ... Done
+
 atomsUpdate();
 if ~atomsIsInstalled(["toolbox_5" "1.0-1"],"user") then bugmes();quit;end
 if  atomsIsInstalled(["toolbox_4" "1.0-1"],"all")  then bugmes();quit;end
@@ -85,6 +93,8 @@ if ~isempty( atomsGetInstalled() ) then bugmes();quit;end
 // =============================================================================
 // Load the 1st scenario : See scene10.test.atoms.scilab.org.txt
 atomsRepositorySetOfl("http://scene10.test.atoms.scilab.org");
+Scanning repository http://scene10.test.atoms.scilab.org ... Done
+
 atomsInstall("toolbox_3","user");
 atomsInstall("toolbox_4","user");
 if ~atomsIsInstalled(["toolbox_4" "1.0-1"],"user") then bugmes();quit;end
@@ -101,6 +111,8 @@ if atomsGetInstalledStatus(["toolbox_2" "1.0-1"],"user")<>"A" then bugmes();quit
 if atomsGetInstalledStatus(["toolbox_1" "1.0-1"],"user")<>"A" then bugmes();quit;end
 // Load the 2nd scenario : See scene11.test.atoms.scilab.org.txt
 atomsRepositorySetOfl("http://scene11.test.atoms.scilab.org");
+Scanning repository http://scene11.test.atoms.scilab.org ... Done
+
 atomsUpdate();
 if ~atomsIsInstalled(["toolbox_4" "1.1-1"],"user") then bugmes();quit;end
 if ~atomsIsInstalled(["toolbox_3" "1.0-1"],"user") then bugmes();quit;end
@@ -122,6 +134,8 @@ if ~isempty( atomsGetInstalled() ) then bugmes();quit;end
 // =============================================================================
 // Load the 1st scenario : See scene10.test.atoms.scilab.org.txt
 atomsRepositorySetOfl("http://scene10.test.atoms.scilab.org");
+Scanning repository http://scene10.test.atoms.scilab.org ... Done
+
 atomsInstall("toolbox_5","user");
 atomsInstall("toolbox_5","allusers");
 if ~atomsIsInstalled(["toolbox_5" "1.0-1"],"user") then bugmes();quit;end
@@ -144,6 +158,8 @@ if atomsGetInstalledStatus(["toolbox_2" "1.0-1"],"allusers")<>"A" then bugmes();
 if atomsGetInstalledStatus(["toolbox_1" "1.0-1"],"allusers")<>"A" then bugmes();quit;end
 // Load the 2nd scenario : See scene11.test.atoms.scilab.org.txt
 atomsRepositorySetOfl("http://scene11.test.atoms.scilab.org");
+Scanning repository http://scene11.test.atoms.scilab.org ... Done
+
 atomsUpdate([],"user");
 if ~atomsIsInstalled(["toolbox_5" "1.0-1"],"user") then bugmes();quit;end
 if  atomsIsInstalled(["toolbox_4" "1.0-1"],"user") then bugmes();quit;end
@@ -178,6 +194,8 @@ if ~isempty( atomsGetInstalled() ) then bugmes();quit;end
 // =============================================================================
 // Load the 1st scenario : See scene11.test.atoms.scilab.org.txt
 atomsRepositorySetOfl("http://scene11.test.atoms.scilab.org");
+Scanning repository http://scene11.test.atoms.scilab.org ... Done
+
 atomsInstall("toolbox_5","user");
 // Check if the module is really installed
 if ~atomsIsInstalled(["toolbox_5" "1.0-1"],"user") then bugmes();quit;end
@@ -190,6 +208,8 @@ if atomsGetInstalledStatus(["toolbox_2" "1.0-1"],"user")<>"A" then bugmes();quit
 if atomsGetInstalledStatus(["toolbox_1" "1.0-1"],"user")<>"A" then bugmes();quit;end
 // Load the 2nd scenario : See scene12.test.atoms.scilab.org.txt
 atomsRepositorySetOfl("http://scene12.test.atoms.scilab.org");
+Scanning repository http://scene12.test.atoms.scilab.org ... Done
+
 atomsUpdate();
 if ~atomsIsInstalled(["toolbox_5" "1.0-1"],"user") then bugmes();quit;end
 if ~atomsIsInstalled(["toolbox_4" "1.1-1"],"user") then bugmes();quit;end
@@ -207,3 +227,5 @@ if ~isempty( atomsGetInstalled() ) then bugmes();quit;end
 // =============================================================================
 atomsRestoreConfig(%T);
 atomsRepositorySetOfl(mgetl(SCI+"/modules/atoms/tests/unit_tests/repositories.orig"));
+Scanning repository http://atoms.scilab.org/5.5 ... Done
+
index 2a2374f..0468640 100644 (file)
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2014-09-18 17:01+0100\n"
+"Revision-Date: 2014-12-02 16:09+0100\n"
 
 # File: sci_gateway/c/sci_and.c, line: 40
 # File: sci_gateway/c/sci_and.c, line: 58
index 60e8e0d..f126bf2 100644 (file)
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2014-09-18 17:01+0100\n"
+"Revision-Date: 2014-12-02 16:09+0100\n"
 
 # File: sci_gateway/c/sci_contr.c, line: 72
 # File: sci_gateway/c/sci_contr.c, line: 78
@@ -969,7 +969,7 @@ msgstr ""
 # File: macros/linf.sci, line: 22
 # File: macros/lqg.sci, line: 14
 # File: macros/macglov.sci, line: 23
-# File: macros/pfss.sci, line: 29
+# File: macros/pfss.sci, line: 35
 # File: macros/syslin.sci, line: 47
 # File: macros/trfmod.sci, line: 42
 #, c-format
index 41f1a70..115a205 100644 (file)
@@ -23,8 +23,12 @@ function elts = pfss(S, rmax, cord)
         rmax = [];
         cord = [];
     case 2 then
-        if type(rmax) == 10 then cord = rmax; end
-        if type(rmax) == 1 then cord = []; end
+        if type(rmax) == 10 then
+            cord = rmax;
+            rmax=[];
+        elseif type(rmax) == 1 then
+            cord = [];
+        end
     end
 
     if and(typeof(S) <> ["rational", "state-space"]) then
@@ -40,7 +44,7 @@ function elts = pfss(S, rmax, cord)
     [f, g, h, dd, dom] = S([2:5, 7]);
     [n, n] = size(f);
     if rmax == [] then
-        [f, x, bs] = bdiag(f);
+        [f, x, bs] = bdiag(f,max(100,norm(f,1)));
     else
         [f, x, bs] = bdiag(f, rmax);
     end
index 3ddc942..f5b739e 100644 (file)
@@ -96,14 +96,7 @@ s=poly(0,"s");
 n=[1+s 2+3*s+4*s^2];
 d=[1+3*s 5-s^3];
 // continuous transfert fct
-hc=syslin("c",n./d)
- hc  =
-                          2  
-    1 + s      2 + 3s + 4s   
-    -----      -----------   
-                       3     
-    1 + 3s        5 - s      
+hc=syslin("c",n./d);
 checkplzr(hc,[],[1.7099759,0;-0.8549880,1.4808826;-0.8549880,-1.4808826;-1/3 0]);
 // discete transfert fct
 hd=syslin("d",n./d);
index a5946d3..23313d7 100644 (file)
@@ -106,7 +106,7 @@ s=poly(0,"s");
 n=[1+s 2+3*s+4*s^2];
 d=[1+3*s 5-s^3];
 // continuous transfert fct
-hc=syslin("c",n./d)
+hc=syslin("c",n./d);
 checkplzr(hc,[],[1.7099759,0;-0.8549880,1.4808826;-0.8549880,-1.4808826;-1/3 0]);
 // discete transfert fct
 hd=syslin("d",n./d);
index 906ba31..dd78d50 100644 (file)
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2014-09-18 17:01+0100\n"
+"Revision-Date: 2014-12-02 16:09+0100\n"
 
 # File: src/java/org/scilab/modules/commons/xml/ScilabXMLUtilities.java, line: 59
 msgid "Could not save file: "
index fd4b837..59dabf6 100644 (file)
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2014-09-18 17:01+0100\n"
+"Revision-Date: 2014-12-02 16:09+0100\n"
 
 # File: macros/%b_cumprod.sci, line: 31
 # File: macros/%b_cumsum.sci, line: 31
index 2380e9e..c35cc36 100644 (file)
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2014-09-18 17:01+0100\n"
+"Revision-Date: 2014-12-02 16:09+0100\n"
 
 # File: sci_gateway/c/sci_completion.c, line: 43
 # File: sci_gateway/c/sci_completion.c, line: 83
index a9e4cfe..f504f29 100644 (file)
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2014-09-18 17:01+0100\n"
+"Revision-Date: 2014-12-02 16:09+0100\n"
 
 # File: sci_gateway/c/sci_clc.c, line: 41
 # File: sci_gateway/c/sci_lines.c, line: 206
@@ -1320,7 +1320,7 @@ msgid "Graphics handle field"
 msgstr ""
 
 #
-# File: src/c/cmdLine/getKey.c, line: 371
+# File: src/c/cmdLine/getKey.c, line: 370
 # File: src/java/org/scilab/modules/console/SciConsole.java, line: 560
 #, c-format
 msgid ""
index 6c088cb..c1d5991 100644 (file)
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2014-09-18 17:01+0100\n"
+"Revision-Date: 2014-12-02 16:09+0100\n"
 
 # File: examples/capi/call_scifunction/sci_call_scifunc.c, line: 37
 # File: examples/capi/call_scifunction/sci_call_scifunc.c, line: 55
index eeaff9d..6bba9de 100644 (file)
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2014-09-18 17:01+0100\n"
+"Revision-Date: 2014-12-02 16:09+0100\n"
 
 # File: sci_gateway/c/sci_mlist.c, line: 35
 # File: sci_gateway/c/sci_tlist.c, line: 35
index 37745be..40656c5 100644 (file)
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2014-09-18 17:01+0100\n"
+"Revision-Date: 2014-12-02 16:09+0100\n"
 
 # File: macros/add_demo.sci, line: 38
 #, c-format
index c9aadea..b94c2d5 100644 (file)
             the number of input arguments in wrong or the type of <literal>x</literal>
             is wrong.
         </para>
-        <programlisting role="example">function y = f(x)
-            [lhs, rhs] = argn()
-            if ( rhs &lt;&gt; 1 ) then
-            lstr = gettext("%s: Wrong number of input argument: %d expected.\n")
-            errmsg = msprintf ( lstr , "f" , 1 )
-            error(errmsg)
-            end
-            if ( typeof(x) &lt;&gt; "constant" ) then
-            lstr = gettext("%s: Wrong type for argument #%d: Matrix expected.\n")
-            errmsg = msprintf ( lstr , "f" , 1 )
-            error(errmsg,123456789)
-            end
-            y = x
-            endfunction    
-        </programlisting>
+        <programlisting role="example"><![CDATA[
+function y = f(x)
+    [lhs, rhs] = argn()
+    if ( rhs <> 1 ) then
+        lstr = gettext("%s: Wrong number of input argument: %d expected.\n")
+        errmsg = msprintf ( lstr , "f" , 1 )
+        error(errmsg)
+    end
+    if ( typeof(x) <> "constant" ) then
+        lstr = gettext("%s: Wrong type for argument #%d: Matrix expected.\n")
+        errmsg = msprintf ( lstr , "f" , 1 )
+        error(errmsg,123456789)
+    end
+    y = x
+endfunction
+        ]]></programlisting>
         <para>Our task is to check the error messages produced by this function.
             The two following tests pass: the error message is the expected one. We
             let <literal>assert_checkerror</literal> manage the localization, by
             <literal>assert_checkerror</literal> to format the message and to convert
             the "%s" and "%d" formats into their actual values.
         </para>
-        <programlisting role="example">lcl1 = "%s: Wrong number of input argument: %d expected.\n";
-            assert_checkerror ( "y = f()"      , lcl1 , [] , "f" , 1);
-            
-            lcl2 = "%s: Wrong type for argument #%d: Matrix expected.\n";
-            assert_checkerror ( "y = f(""a"")" , lcl2 , [] , "f" , 1);    
-        </programlisting>
+        <programlisting role="example"><![CDATA[
+lcl1 = "%s: Wrong number of input argument: %d expected.\n";
+assert_checkerror ( "y = f()" , lcl1 , [] , "f" , 1);
+
+lcl2 = "%s: Wrong type for argument #%d: Matrix expected.\n";
+assert_checkerror ( "y = f(""a"")" , lcl2 , [] , "f" , 1);
+        ]]></programlisting>
         <para>On the other hand, if we make the assumption that the current locale
             language is english, we could as well use the following statement. But
             this is not a recommended practice, since the test will fail if the
             current locale is French, for example.
         </para>
-        <programlisting role="example">assert_checkerror ( "y = f()" , "f: Wrong number of input argument: 1 expected." );   </programlisting>
+        <programlisting role="example"><![CDATA[
+assert_checkerror ( "y = f()" , "f: Wrong number of input argument: 1 expected." );
+        ]]></programlisting>
         <para>In the following test, we also check the error number.</para>
-        <programlisting role="example">lcl1="%s: Wrong number of input argument: %d expected.\n";
-            assert_checkerror ( "y=f()" ,      lcl1 , 10000     , "f" , 1);
-            
-            lcl2 = "%s: Wrong type for argument #%d: Matrix expected.\n";
-            assert_checkerror ( "y=f(""a"")" , lcl2 , 123456789 , "f" , 1);    
-        </programlisting>
+        <programlisting role="example"><![CDATA[
+lcl1="%s: Wrong number of input argument: %d expected.\n";
+assert_checkerror ( "y=f()" , lcl1 , 10000     , "f" , 1);
+
+lcl2 = "%s: Wrong type for argument #%d: Matrix expected.\n";
+assert_checkerror ( "y=f(""a"")" , lcl2 , 123456789 , "f" , 1);
+        ]]></programlisting>
         <para>The two following tests fail.</para>
-        <programlisting role="example">assert_checkerror ( "y = f()" , "oups" );
-            
-            msg1 = msprintf(gettext("%s: Wrong number of input argument: %d expected.\n"), "f", 1);
-            assert_checkerror ( "y = f()" , msg1 , 12 );    
-        </programlisting>
+        <programlisting role="example"><![CDATA[
+assert_checkerror ( "y = f()" , "oups" );
+
+msg1 = msprintf(gettext("%s: Wrong number of input argument: %d expected.\n"), "f", 1);
+assert_checkerror ( "y = f()" , msg1 , 12 );
+        ]]></programlisting>
         <para>When errmsg is given as output argument, no error is generated, as
             in the following example. Notice the content of the
             <literal>flag</literal> and <literal>errmsg</literal> variables.
         </para>
-        <programlisting role="example">// A test which pass: flag is %t, errmsg is empty
-            msg1 = msprintf(gettext("%s: Wrong number of input argument: %d expected.\n"), "f", 1);
-            [flag, errmsg] = assert_checkerror ( "y = f()" , msg1 )
-            
-            // A test which fail: flag is %f, errmsg is not empty
-            [flag, errmsg] = assert_checkerror ( "y = f()" , "oups" )    
-        </programlisting>
+        <programlisting role="example"><![CDATA[
+// A test which pass: flag is %t, errmsg is empty
+msg1 = msprintf(gettext("%s: Wrong number of input argument: %d expected.\n"), "f", 1);
+[flag, errmsg] = assert_checkerror ( "y = f()" , msg1 )
+
+// A test which fail: flag is %f, errmsg is not empty
+[flag, errmsg] = assert_checkerror ( "y = f()" , "oups" )
+        ]]></programlisting>
         <para>The messages in the two following tests are localized, so that they
             can work whatever the current language is. Instead of using the extra
             parameter <literal>a1</literal>, we directly localize the message, which
             is less short, but is a perfectly valid code.
         </para>
-        <programlisting role="example">msg1 = msprintf(gettext("%s: Wrong number of input argument: %d expected.\n"), "f", 1);
-            assert_checkerror ( "y = f()"      , msg1 );
-            
-            msg2 = msprintf(gettext("%s: Wrong type for argument #%d: Matrix expected.\n"), "f", 1);
-            assert_checkerror ( "y = f(""a"")" , msg2 );
-        </programlisting>
+        <programlisting role="example"><![CDATA[
+msg1 = msprintf(gettext("%s: Wrong number of input argument: %d expected.\n"), "f", 1);
+assert_checkerror ( "y = f()" , msg1 );
+
+msg2 = msprintf(gettext("%s: Wrong type for argument #%d: Matrix expected.\n"), "f", 1);
+assert_checkerror ( "y = f(""a"")" , msg2 );
+        ]]></programlisting>
         <para>It may happen that we want to just test the error number, but not
             the error message. The following script just checks that the generated
             error number is 123456789 when the first argument is not a matrix of
             doubles: we do not check the error message.
         </para>
-        <programlisting role="example">assert_checkerror("f(""foo"")", [], 123456789);</programlisting>
+        <programlisting role="example"><![CDATA[
+assert_checkerror("f(""foo"")", [], 123456789);
+        ]]></programlisting>
     </refsection>
     <refsection>
         <title>History</title>
index c7066d6..57d3517 100644 (file)
             入力引数の数が間違っているか<literal>x</literal>の型が間違っている
             場合にエラーを発生します.
         </para>
-        <programlisting role="example">function y = f(x)
-            [lhs, rhs] = argn()
-            if ( rhs &lt;&gt; 1 ) then
-            lstr = gettext("%s: Wrong number of input argument: %d expected.\n")
-            errmsg = msprintf ( lstr , "f" , 1 )
-            error(errmsg)
-            end
-            if ( typeof(x) &lt;&gt; "constant" ) then
-            lstr = gettext("%s: Wrong type for argument #%d: Matrix expected.\n")
-            errmsg = msprintf ( lstr , "f" , 1 )
-            error(errmsg,123456789)
-            end
-            y = x
-            endfunction    
-        </programlisting>
+        <programlisting role="example"><![CDATA[
+function y = f(x)
+    [lhs, rhs] = argn()
+    if ( rhs <> 1 ) then
+        lstr = gettext("%s: Wrong number of input argument: %d expected.\n")
+        errmsg = msprintf ( lstr , "f" , 1 )
+        error(errmsg)
+    end
+    if ( typeof(x) <> "constant" ) then
+        lstr = gettext("%s: Wrong type for argument #%d: Matrix expected.\n")
+        errmsg = msprintf ( lstr , "f" , 1 )
+        error(errmsg,123456789)
+    end
+    y = x
+endfunction
+        ]]></programlisting>
         <para>
             我々のタスクは,この関数により生成されたエラーメッセージを確認することです.
             以下の2つのテストをパスします:
             メッセージを整形し,
             "%s" および "%d" フォーマットを実際の値に変換する際に使用されます.
         </para>
-        <programlisting role="example">lcl1 = "%s: Wrong number of input argument: %d expected.\n";
-            assert_checkerror ( "y = f()"      , lcl1 , [] , "f" , 1);
-            lcl2 = "%s: Wrong type for argument #%d: Matrix expected.\n";
-            assert_checkerror ( "y = f(""a"")" , lcl2 , [] , "f" , 1);    
-        </programlisting>
+        <programlisting role="example"><![CDATA[
+lcl1 = "%s: Wrong number of input argument: %d expected.\n";
+assert_checkerror ( "y = f()" , lcl1 , [] , "f" , 1);
+
+lcl2 = "%s: Wrong type for argument #%d: Matrix expected.\n";
+assert_checkerror ( "y = f(""a"")" , lcl2 , [] , "f" , 1);
+        ]]></programlisting>
         <para>
             ここで,カレントのロケール言語が英語であると仮定すると,
             以下のコードを正しく使用できます.
             しかし,例えばカレントのロケールがフランス語である場合に失敗するため,
             これは推奨される手法ではありません.
         </para>
-        <programlisting role="example">assert_checkerror ( "y = f()" , "f: Wrong number of input argument: 1 expected." );   </programlisting>
+        <programlisting role="example"><![CDATA[
+assert_checkerror ( "y = f()" , "f: Wrong number of input argument: 1 expected." );
+        ]]></programlisting>
         <para>以下のテストでは, エラー番号も確認します.</para>
-        <programlisting role="example">lcl1="%s: Wrong number of input argument: %d expected.\n";
-            assert_checkerror ( "y=f()" ,      lcl1 , 10000     , "f" , 1);
-            lcl2 = "%s: Wrong type for argument #%d: Matrix expected.\n";
-            assert_checkerror ( "y=f(""a"")" , lcl2 , 123456789 , "f" , 1);    
-        </programlisting>
+        <programlisting role="example"><![CDATA[
+lcl1="%s: Wrong number of input argument: %d expected.\n";
+assert_checkerror ( "y=f()" , lcl1 , 10000 , "f" , 1);
+
+lcl2 = "%s: Wrong type for argument #%d: Matrix expected.\n";
+assert_checkerror ( "y=f(""a"")" , lcl2 , 123456789 , "f" , 1);
+        ]]></programlisting>
         <para>以下の2つのテストは失敗します.</para>
-        <programlisting role="example">assert_checkerror ( "y = f()" , "oups" );
-            msg1 = msprintf(gettext("%s: Wrong number of input argument: %d expected.\n"), "f", 1);
-            assert_checkerror ( "y = f()" , msg1 , 12 );    
-        </programlisting>
+        <programlisting role="example"><![CDATA[
+assert_checkerror ( "y = f()" , "oups" );
+msg1 = msprintf(gettext("%s: Wrong number of input argument: %d expected.\n"), "f", 1);
+assert_checkerror ( "y = f()" , msg1 , 12 );
+        ]]></programlisting>
         <para>
             errmsgが出力引数に指定された場合,以下の例のように,エラーが生成されます.
             変数<literal>flag</literal> および <literal>errmsg</literal>の内容に
             注意してください.
         </para>
-        <programlisting role="example">// パスするテスト: flag は %t, errmsg は空
-            msg1 = msprintf(gettext("%s: Wrong number of input argument: %d expected.\n"), "f", 1);
-            [flag, errmsg] = assert_checkerror ( "y = f()" , msg1 )
-            // 失敗するテスト: flag は %f, errmsg は空でない
-            [flag, errmsg] = assert_checkerror ( "y = f()" , "oups" )    
-        </programlisting>
+        <programlisting role="example"><![CDATA[
+// パスするテスト: flag は %t, errmsg は空
+msg1 = msprintf(gettext("%s: Wrong number of input argument: %d expected.\n"), "f", 1);
+[flag, errmsg] = assert_checkerror ( "y = f()" , msg1 )
+// 失敗するテスト: flag は %f, errmsg は空でない
+[flag, errmsg] = assert_checkerror ( "y = f()" , "oups" )
+        ]]></programlisting>
         <para>
             以下の2つのテストのメッセージはローカライズされており,
             カレントの言語が何であっても動作します.
             長くはなりますが,完全に有効なコードである
             ローカライズされたメッセージを直接使用します.
         </para>
-        <programlisting role="example">msg1 = msprintf(gettext("%s: Wrong number of input argument: %d expected.\n"), "f", 1);
-            assert_checkerror ( "y = f()"      , msg1 );
-            msg2 = msprintf(gettext("%s: Wrong type for argument #%d: Matrix expected.\n"), "f", 1);
-            assert_checkerror ( "y = f(""a"")" , msg2 );
-        </programlisting>
+        <programlisting role="example"><![CDATA[
+msg1 = msprintf(gettext("%s: Wrong number of input argument: %d expected.\n"), "f", 1);
+assert_checkerror ( "y = f()" , msg1 );
+msg2 = msprintf(gettext("%s: Wrong type for argument #%d: Matrix expected.\n"), "f", 1);
+assert_checkerror ( "y = f(""a"")" , msg2 );
+        ]]></programlisting>
         <para>
             エラー番号を確認したいがエラーメッセージは確認したくない場合がありえます.
             以下のスクリプトは,
             生成されるエラー番号が 123456789 であることのみを
             確認します: エラーメッセージは確認しません.
         </para>
-        <programlisting role="example">assert_checkerror("f(""foo"")", [], 123456789);</programlisting>
+        <programlisting role="example"><![CDATA[
+assert_checkerror("f(""foo"")", [], 123456789);
+        ]]></programlisting>
     </refsection>
     <refsection>
         <title>履歴</title>
index 36f1cef..2733f67 100644 (file)
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2014-09-18 17:01+0100\n"
+"Revision-Date: 2014-12-02 16:09+0100\n"
 
 # File: macros/assert/assert_checkalmostequal.sci, line: 16
 # File: macros/assert/assert_checkfilesequal.sci, line: 15
index 82deae5..3e37773 100644 (file)
@@ -9,16 +9,16 @@
 // <-- CLI SHELL MODE -->
 // <-- ENGLISH IMPOSED -->
 function flag = MY_assert_equal ( computed , expected )
-  if computed==expected then
-    flag = 1;
-  else
-    flag = 0;
-  end
-  if flag <> 1 then bugmes();quit;end
+    if computed==expected then
+        flag = 1;
+    else
+        flag = 0;
+    end
+    if flag <> 1 then bugmes();quit;end
 endfunction
 format("v",10);
 //
-dmax = -log10(2^(-53));
+dmax = -log(2^(-53))/log(10);
 //
 computed = assert_computedigits ( 1 , 1 );
 MY_assert_equal ( computed , dmax );
@@ -77,7 +77,7 @@ ieee(back);
 a = [
 3.982729777831130693D-59
 2.584939414228211484D-26
-4.391531370352049090D+43 
+4.391531370352049090D+43
 1.725436586898508346D+68
 ];
 b = [
@@ -88,18 +88,18 @@ b = [
 ];
 c = assert_computedigits ( a , b , 2 );
 e = [
-    53.        
-    53.        
-    51.977632  
-    51.678072  
+53.
+53.
+51.977632
+51.678072
 ];
 assert_checkalmostequal ( c , e , 1.e-7 );
 //
-// Check that the vectorization was correct, i.e. no specific  
+// Check that the vectorization was correct, i.e. no specific
 // case in the processing of the data is forgotten.
 //
 function pI = permInverse(p)
-    // Given the permutation p, compute the 
+    // Given the permutation p, compute the
     // inverse permutation pI.
     N = size(p,"*")
     pI(p) = (1:N)'
index a16f529..cc4361e 100644 (file)
 // <-- ENGLISH IMPOSED -->
 
 function flag = MY_assert_equal ( computed , expected )
-  if computed==expected then
-    flag = 1;
-  else
-    flag = 0;
-  end
-  if flag <> 1 then pause,end
+    if computed==expected then
+        flag = 1;
+    else
+        flag = 0;
+    end
+    if flag <> 1 then pause,end
 endfunction
 
 format("v",10);
 
 //
-dmax = -log10(2^(-53));
+dmax = -log(2^(-53))/log(10);
 //
 computed = assert_computedigits ( 1 , 1 );
 MY_assert_equal ( computed , dmax );
@@ -82,7 +82,7 @@ ieee(back);
 a = [
 3.982729777831130693D-59
 2.584939414228211484D-26
-4.391531370352049090D+43 
+4.391531370352049090D+43
 1.725436586898508346D+68
 ];
 b = [
@@ -93,18 +93,18 @@ b = [
 ];
 c = assert_computedigits ( a , b , 2 );
 e = [
-    53.        
-    53.        
-    51.977632  
-    51.678072  
+53.
+53.
+51.977632
+51.678072
 ];
 assert_checkalmostequal ( c , e , 1.e-7 );
 //
-// Check that the vectorization was correct, i.e. no specific  
+// Check that the vectorization was correct, i.e. no specific
 // case in the processing of the data is forgotten.
 //
 function pI = permInverse(p)
-    // Given the permutation p, compute the 
+    // Given the permutation p, compute the
     // inverse permutation pI.
     N = size(p,"*")
     pI(p) = (1:N)'
index ff25723..0c63ee7 100644 (file)
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2014-09-18 17:01+0100\n"
+"Revision-Date: 2014-12-02 16:09+0100\n"
 
 # File: demos/bike/bike.dem.gateway.sce, line: 10
 msgid "Unstable trajectory"
index e970198..5a0c47a 100644 (file)
@@ -10,6 +10,7 @@
 
 //Load  functions libraries
 // =============================================================================
+<<<<<<< HEAD
 load('SCI/modules/dynamic_link/macros/lib');
 
 // Configure Environment Variables for Microsoft Visual Studio C and
@@ -27,4 +28,11 @@ if getos() == 'Windows' then
         end
     end
 end
+=======
+  load('SCI/modules/dynamic_link/macros/lib');
+endfunction
+
+dynamic_linklib = startModule();
+clear startModule;
+>>>>>>> origin/master
 
index 95bbea7..4c8321d 100644 (file)
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2014-09-18 17:01+0100\n"
+"Revision-Date: 2014-12-02 16:09+0100\n"
 
 # File: sci_gateway/c/sci_addinter.c, line: 46
 # File: sci_gateway/c/sci_addinter.c, line: 58
@@ -169,47 +169,47 @@ msgid "%s: An error occurred: %s\n"
 msgstr ""
 
 #
-# File: src/c/dynamic_link.c, line: 119
+# File: src/c/dynamic_link.c, line: 120
 #, c-format
 msgid "%s: can not to load a x86 dll in a x64 environment.\n"
 msgstr ""
 
 #
-# File: src/c/dynamic_link.c, line: 128
+# File: src/c/dynamic_link.c, line: 129
 #, c-format
 msgid "%s: can not load a x64 dll in a x86 environment.\n"
 msgstr ""
 
 #
-# File: src/c/dynamic_link.c, line: 141
+# File: src/c/dynamic_link.c, line: 142
 #, c-format
 msgid "%s: The file %s does not exist in PATH environment.\n"
 msgstr ""
 
 #
-# File: src/c/dynamic_link.c, line: 148
+# File: src/c/dynamic_link.c, line: 149
 #, c-format
 msgid "Link failed for dynamic library '%s'.\n"
 msgstr ""
 
 #
-# File: src/c/dynamic_link.c, line: 149
+# File: src/c/dynamic_link.c, line: 150
 #, c-format
 msgid "An error occurred: %s\n"
 msgstr ""
 
 #
-# File: src/c/dynamic_link.c, line: 159
+# File: src/c/dynamic_link.c, line: 160
 msgid "Shared archive loaded.\n"
 msgstr ""
 
 #
-# File: src/c/dynamic_link.c, line: 160
+# File: src/c/dynamic_link.c, line: 161
 msgid "Link done.\n"
 msgstr ""
 
 #
-# File: src/c/dynamic_link.c, line: 350
+# File: src/c/dynamic_link.c, line: 351
 #, c-format
 msgid ""
 "Number of entry points %d.\n"
@@ -217,43 +217,43 @@ msgid ""
 msgstr ""
 
 #
-# File: src/c/dynamic_link.c, line: 372
+# File: src/c/dynamic_link.c, line: 373
 #, c-format
 msgid "] : %d library.\n"
 msgstr ""
 
 #
-# File: src/c/dynamic_link.c, line: 376
+# File: src/c/dynamic_link.c, line: 377
 #, c-format
 msgid "] : %d libraries.\n"
 msgstr ""
 
 #
-# File: src/c/dynamic_link.c, line: 384
+# File: src/c/dynamic_link.c, line: 385
 #, c-format
 msgid "Entry point %s in shared library %d.\n"
 msgstr ""
 
 #
-# File: src/c/dynamic_link.c, line: 445
+# File: src/c/dynamic_link.c, line: 446
 #, c-format
 msgid "Cannot open shared files max entry %d reached.\n"
 msgstr ""
 
 #
-# File: src/c/dynamic_link.c, line: 484
+# File: src/c/dynamic_link.c, line: 485
 #, c-format
 msgid "Entry name %s.\n"
 msgstr ""
 
 #
-# File: src/c/dynamic_link.c, line: 495
+# File: src/c/dynamic_link.c, line: 496
 #, c-format
 msgid "%s is not an entry point.\n"
 msgstr ""
 
 #
-# File: src/c/dynamic_link.c, line: 504
+# File: src/c/dynamic_link.c, line: 505
 #, c-format
 msgid "Linking %s.\n"
 msgstr ""
@@ -820,17 +820,17 @@ msgid "%s: Failed to add include path : %s"
 msgstr ""
 
 #
-# File: macros/windows/dlwCompile.sci, line: 16
+# File: macros/windows/dlwCompile.sci, line: 18
 msgid "   Compilation of "
 msgstr ""
 
 #
-# File: macros/windows/dlwCompile.sci, line: 22
+# File: macros/windows/dlwCompile.sci, line: 24
 msgid "   Building shared library (be patient)\n"
 msgstr ""
 
 #
-# File: macros/windows/dlwCompile.sci, line: 36
+# File: macros/windows/dlwCompile.sci, line: 38
 #, c-format
 msgid "%s: Error while executing %s.\n"
 msgstr ""
index 10209bc..faddb55 100644 (file)
@@ -36,6 +36,10 @@ function bOK = configure_msvc()
         end
     end
 
+    if bOK then
+        val = setenv("SCILAB_MSVC", "1");
+    end
+
 
 endfunction
 //=============================================================================
index 5da069a..c52bc8f 100644 (file)
@@ -9,6 +9,8 @@
 //=============================================================================
 function dlwCompile(files, make_command, makename)
 
+    dlwConfigureEnv();
+
     nf = size(files,"*");
 
     for i=1:nf
diff --git a/scilab/modules/dynamic_link/macros/windows/dlwConfigureEnv.sci b/scilab/modules/dynamic_link/macros/windows/dlwConfigureEnv.sci
new file mode 100644 (file)
index 0000000..6939e89
--- /dev/null
@@ -0,0 +1,23 @@
+// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+// Copyright (C) Scilab Enterprises - 2014 - Antoine ELIAS
+//
+// This file must be used under the terms of the CeCILL.
+// This source file is licensed as described in the file COPYING, which
+// you should have received as part of this distribution.  The terms
+// are also available at
+// http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.txt
+
+//=============================================================================
+function dlwConfigureEnv()
+    if getenv("SCILAB_MSVC", "0") == "0" then
+        // Configure Ms VC environment
+        configure_msvc();
+        if findmsifortcompiler() <> "unknown" then
+            // Configure Intel Fortran environment
+            configure_msifort();
+        else
+            // Use F2C
+            setenv("USE_F2C", "YES");
+        end
+    end
+endfunction
\ No newline at end of file
index ca34c35..48b73a5 100644 (file)
@@ -14,30 +14,48 @@ function MSCompiler = dlwFindMsVcCompiler()
 
     // We use always last version of MS compiler
 
+    val = getenv("SCILAB_PREFERED_MSVC", "");
+    if val <> "" then
+        funcs = list(dlwIsVc12Express,dlwIsVc12Pro,dlwIsVc11Express,dlwIsVc11Pro,dlwIsVc10Express,dlwIsVc10Pro);
+        compilers = ["msvc120express";
+        "msvc120pro";
+        "msvc110express";
+        "msvc110pro";
+        "msvc100express";
+        "msvc100pro";];
+        idx = find(val == compilers);
+        if idx <> [] then
+            func = funcs(idx);
+            if func() then
+                MSCompiler = val;
+                return;
+            end
+        end
+    end
 
     if dlwIsVc12Express() then
-      MSCompiler = 'msvc120express';     // Microsoft Visual 2013 Express
-      return;
+        MSCompiler = "msvc120express";     // Microsoft Visual 2013 Express
+        return;
     end
 
     if dlwIsVc12Pro() then
-      MSCompiler = 'msvc120pro';       // Microsoft Visual 2013 Professional (or more)
-      return;
+        MSCompiler = "msvc120pro";       // Microsoft Visual 2013 Professional (or more)
+        return;
     end
 
     if dlwIsVc11Express() then
-      MSCompiler = 'msvc110express';     // Microsoft Visual 2012 Express
-      return;
+        MSCompiler = "msvc110express";     // Microsoft Visual 2012 Express
+        return;
     end
 
     if dlwIsVc11Pro() then
-      MSCompiler = 'msvc110pro';       // Microsoft Visual 2012 Professional (or more)
-      return;
+        MSCompiler = "msvc110pro";       // Microsoft Visual 2012 Professional (or more)
+        return;
     end
 
     if dlwIsVc10Pro() & dlwIsVc10Express() then
-      MSCompiler = 'msvc100express';     // Microsoft Visual 2010 Express with SDK extension
-      return;
+        MSCompiler = "msvc100express";     // Microsoft Visual 2010 Express with SDK extension
+        return;
     end
 
     if dlwIsVc10Express() then
index 979f7c1..e7562bb 100644 (file)
@@ -8,8 +8,16 @@
 // http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.txt
 //=============================================================================
 function dlwGenerateCleaner(fd, makename)
+    val = getenv("SCILAB_PREFERED_MSVC", "");
     make_command = dlwGetMakefileCmdCleaner(makename);
     mfprintf(fd,"if fileinfo(''%s'') <> [] then\n", makename);
+    if val <> "" then
+        mfprintf(fd,"  setenv(""SCILAB_PREFERED_MSVC"", ""%s"");\n", val);
+    end
+    mfprintf(fd,"  if ~ exists(""dynamic_linkwindowslib"") then\n");
+    mfprintf(fd,"    load(""SCI/modules/dynamic_link/macros/windows/lib"")\n");
+    mfprintf(fd,"  end\n");
+    mfprintf(fd,"  dlwConfigureEnv();\n");
     mfprintf(fd,"  unix_s(''%s'');\n", make_command);
     mfprintf(fd,"  mdelete(''%s'');\n", makename);
     mfprintf(fd,"end\n");
index c3b10d0..c3db719 100644 (file)
@@ -12,15 +12,25 @@ function SDKpath = dlwGetSdkPath()
 
     SDKpath = [];
 
-    entries = [
-        "Software\Microsoft\Microsoft SDKs\Windows\v8.0A" "InstallationFolder" ; .. // Windows 8 A
-        "Software\Microsoft\Microsoft SDKs\Windows\v8.0" "InstallationFolder" ; .. // Windows 8    
+    compiler = findmsvccompiler();
+    entries = [];
+
+    //detect sdk 8 only for VS >= 2012
+    if find(compiler == ["msvc120express";"msvc120pro";"msvc110express";"msvc110pro"]) <> [] then;
+        entries = [entries ;
+            "Software\Microsoft\Microsoft SDKs\Windows\v8.0A" "InstallationFolder" ; .. // Windows 8 A
+            "Software\Microsoft\Microsoft SDKs\Windows\v8.0" "InstallationFolder" .. // Windows 8
+        ];
+    end
+
+    entries = [entries;
         "Software\Microsoft\Microsoft SDKs\Windows\v7.0" "InstallationFolder"; .. // Microsoft Windows SDK 7.0
         "Software\Microsoft\Microsoft SDKs\Windows\v7.0A" "InstallationFolder"; .. // Microsoft Windows SDK 7.0A
         "Software\Microsoft\Microsoft SDKs\Windows\v7.1" "InstallationFolder"; .. // Microsoft Windows SDK 7.1
         "Software\Microsoft\Microsoft SDKs\Windows" "CurrentInstallFolder" ; .. // Vista & Seven SDK
         "Software\Microsoft\MicrosoftSDK\InstalledSDKs\D2FF9F89-8AA2-4373-8A31-C838BF4DBBE1" "Install Dir" ; .. // Windows 2003 R2 SDK
-        "Software\Microsoft\MicrosoftSDK\InstalledSDKs\8F9E5EF3-A9A5-491B-A889-C58EFFECE8B3" "Install Dir"]; // Windows 2003 SDK
+        "Software\Microsoft\MicrosoftSDK\InstalledSDKs\8F9E5EF3-A9A5-491B-A889-C58EFFECE8B3" "Install Dir" .. // Windows 2003 SDK
+    ];
 
     for i = 1:size(entries(:,1),"*")
         err = execstr("SDKpath = winqueryreg(""HKEY_LOCAL_MACHINE"", entries(i,1), entries(i,2))", "errcatch");
index e9d621a..2ab522e 100644 (file)
@@ -290,7 +290,8 @@ GATEWAY_C_SOURCES = \
     sci_gateway/c/sci_nearfloat.c \
     sci_gateway/c/sci_isequalbitwise.c \
     sci_gateway/c/sci_base2dec.c \
-    sci_gateway/c/sci_dec2base.c
+    sci_gateway/c/sci_dec2base.c \
+    sci_gateway/c/sci_log10.c
 
 GATEWAY_CXX_SOURCES =  \
     sci_gateway/cpp/sci_isequal.cpp \
index a341d65..53839ec 100644 (file)
@@ -352,7 +352,8 @@ am__objects_7 =  \
        sci_gateway/c/libscielementary_functions_la-sci_nearfloat.lo \
        sci_gateway/c/libscielementary_functions_la-sci_isequalbitwise.lo \
        sci_gateway/c/libscielementary_functions_la-sci_base2dec.lo \
-       sci_gateway/c/libscielementary_functions_la-sci_dec2base.lo
+       sci_gateway/c/libscielementary_functions_la-sci_dec2base.lo \
+       sci_gateway/c/libscielementary_functions_la-sci_log10.lo
 am__objects_8 =  \
        sci_gateway/cpp/libscielementary_functions_la-sci_isequal.lo \
        sci_gateway/cpp/libscielementary_functions_la-elem_func_gw.lo \
@@ -1077,7 +1078,8 @@ GATEWAY_C_SOURCES = \
     sci_gateway/c/sci_nearfloat.c \
     sci_gateway/c/sci_isequalbitwise.c \
     sci_gateway/c/sci_base2dec.c \
-    sci_gateway/c/sci_dec2base.c
+    sci_gateway/c/sci_dec2base.c \
+    sci_gateway/c/sci_log10.c
 
 GATEWAY_CXX_SOURCES = \
     sci_gateway/cpp/sci_isequal.cpp \
@@ -1967,6 +1969,9 @@ sci_gateway/c/libscielementary_functions_la-sci_base2dec.lo:  \
 sci_gateway/c/libscielementary_functions_la-sci_dec2base.lo:  \
        sci_gateway/c/$(am__dirstamp) \
        sci_gateway/c/$(DEPDIR)/$(am__dirstamp)
+sci_gateway/c/libscielementary_functions_la-sci_log10.lo:  \
+       sci_gateway/c/$(am__dirstamp) \
+       sci_gateway/c/$(DEPDIR)/$(am__dirstamp)
 sci_gateway/cpp/$(am__dirstamp):
        @$(MKDIR_P) sci_gateway/cpp
        @: > sci_gateway/cpp/$(am__dirstamp)
@@ -2132,6 +2137,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libscielementary_functions_la-sci_base2dec.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libscielementary_functions_la-sci_dec2base.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libscielementary_functions_la-sci_isequalbitwise.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libscielementary_functions_la-sci_log10.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libscielementary_functions_la-sci_nearfloat.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libscielementary_functions_la-sci_number_properties.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libscielementary_functions_la-sci_sqrt.Plo@am__quote@
@@ -2630,6 +2636,13 @@ sci_gateway/c/libscielementary_functions_la-sci_dec2base.lo: sci_gateway/c/sci_d
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscielementary_functions_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o sci_gateway/c/libscielementary_functions_la-sci_dec2base.lo `test -f 'sci_gateway/c/sci_dec2base.c' || echo '$(srcdir)/'`sci_gateway/c/sci_dec2base.c
 
+sci_gateway/c/libscielementary_functions_la-sci_log10.lo: sci_gateway/c/sci_log10.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscielementary_functions_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT sci_gateway/c/libscielementary_functions_la-sci_log10.lo -MD -MP -MF sci_gateway/c/$(DEPDIR)/libscielementary_functions_la-sci_log10.Tpo -c -o sci_gateway/c/libscielementary_functions_la-sci_log10.lo `test -f 'sci_gateway/c/sci_log10.c' || echo '$(srcdir)/'`sci_gateway/c/sci_log10.c
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) sci_gateway/c/$(DEPDIR)/libscielementary_functions_la-sci_log10.Tpo sci_gateway/c/$(DEPDIR)/libscielementary_functions_la-sci_log10.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='sci_gateway/c/sci_log10.c' object='sci_gateway/c/libscielementary_functions_la-sci_log10.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscielementary_functions_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o sci_gateway/c/libscielementary_functions_la-sci_log10.lo `test -f 'sci_gateway/c/sci_log10.c' || echo '$(srcdir)/'`sci_gateway/c/sci_log10.c
+
 .cpp.o:
 @am__fastdepCXX_TRUE@  $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
 @am__fastdepCXX_TRUE@  $(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
index 9bfff2e..2aeb679 100644 (file)
@@ -65,6 +65,7 @@ C_GATEWAY_PROTOTYPE(sci_testmatrix);
 //C_GATEWAY_PROTOTYPE(sci_triu);
 C_GATEWAY_PROTOTYPE(sci_base2dec);
 C_GATEWAY_PROTOTYPE(sci_dec2base);
+C_GATEWAY_PROTOTYPE(sci_log10);
 
 #endif /*  __GW_ELEMENTARIES_FUNCTIONS__ */
 /*--------------------------------------------------------------------------*/
index 00fed2e..9e25afe 100644 (file)
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2014-10-08 15:51+0100\n"
+"Revision-Date: 2014-12-02 16:09+0100\n"
 
 # File: sci_gateway/c/sci_base2dec.c, line: 41
 # File: sci_gateway/c/sci_base2dec.c, line: 54
@@ -24,6 +24,8 @@ msgstr ""
 # File: sci_gateway/c/sci_dec2base.c, line: 124
 # File: sci_gateway/c/sci_dec2base.c, line: 159
 # File: sci_gateway/c/sci_frexp.c, line: 35
+# File: sci_gateway/c/sci_log10.c, line: 51
+# File: sci_gateway/c/sci_log10.c, line: 59
 # File: sci_gateway/c/sci_size.c, line: 54
 # File: sci_gateway/c/sci_size.c, line: 62
 # File: sci_gateway/c/sci_size.c, line: 70
@@ -91,6 +93,8 @@ msgstr ""
 #
 # File: sci_gateway/c/sci_base2dec.c, line: 140
 # File: sci_gateway/c/sci_dec2base.c, line: 197
+# File: sci_gateway/c/sci_log10.c, line: 111
+# File: sci_gateway/c/sci_log10.c, line: 122
 #, c-format
 msgid "%s: Memory allocation error.\n"
 msgstr ""
@@ -279,92 +283,7 @@ msgid "%s: Wrong value for input argument #%d: '%s' or '%s' expected.\n"
 msgstr ""
 
 #
-# File: macros/%sp_gsort.sci, line: 41
-#, c-format
-msgid "%s: Wrong size for input argument #%d: sparse vectors expected.\n"
-msgstr ""
-
-#
-# File: macros/%sp_max.sci, line: 20
-# File: macros/%sp_min.sci, line: 20
-#, c-format
-msgid "%s: Wrong size of input argument: %d expected.\n"
-msgstr ""
-
-#
-# File: macros/%sp_max.sci, line: 29
-# File: macros/%sp_max.sci, line: 40
-# File: macros/%sp_max.sci, line: 134
-# File: macros/%sp_max.sci, line: 250
-# File: macros/%sp_min.sci, line: 29
-# File: macros/%sp_min.sci, line: 40
-# File: macros/%sp_min.sci, line: 133
-# File: macros/%sp_min.sci, line: 208
-# File: macros/%sp_min.sci, line: 254
-#, c-format
-msgid "%s: Wrong type for input argument #%d: A sparse matrix expected.\n"
-msgstr ""
-
-#
-# File: macros/%sp_max.sci, line: 127
-# File: macros/%sp_max.sci, line: 237
-#, c-format
-msgid "%s: Wrong number of output argument: %d expected.\n"
-msgstr ""
-
-#
-# File: macros/%sp_max.sci, line: 144
-# File: macros/%sp_min.sci, line: 143
-#, c-format
-msgid "%s: Wrong value for input argument #%d: ['r' 'c' 'm'] expected.\n"
-msgstr ""
-
-#
-# File: macros/%sp_max.sci, line: 212
-# File: macros/%sp_max.sci, line: 262
-# File: macros/%sp_min.sci, line: 216
-# File: macros/%sp_min.sci, line: 266
-#, c-format
-msgid ""
-"%s: Wrong size of input argument #%d: Same size as input argument #%d "
-"expected.\n"
-msgstr ""
-
-#
-# File: macros/%sp_max.sci, line: 231
-# File: macros/%sp_min.sci, line: 235
-#, c-format
-msgid ""
-"%s: Wrong type for input argument #%d: A sparse matrix or a character "
-"expected.\n"
-msgstr ""
-
-#
-# File: macros/%sp_max.sci, line: 248
-# File: macros/%sp_min.sci, line: 252
-#, c-format
-msgid ""
-"%s: Wrong type for input argument #%d (List element: %d): A sparse matrix "
-"expected.\n"
-msgstr ""
-
-#
-# File: macros/%sp_max.sci, line: 260
-# File: macros/%sp_min.sci, line: 264
-#, c-format
-msgid ""
-"%s: Wrong size of input argument #%d (List element: %d): Same size as input "
-"argument #%d expected.\n"
-msgstr ""
-
-#
-# File: macros/%sp_min.sci, line: 126
-# File: macros/%sp_min.sci, line: 241
-#, c-format
-msgid "%s: Wrong number of output argument: %d expected"
-msgstr ""
-
-#
+# File: macros/%s_log10.sci, line: 14
 # File: macros/acosd.sci, line: 15
 # File: macros/acosh.sci, line: 30
 # File: macros/acoshm.sci, line: 17
@@ -427,7 +346,6 @@ msgstr ""
 # File: macros/isvector.sci, line: 18
 # File: macros/lex_sort.sci, line: 17
 # File: macros/linspace.sci, line: 19
-# File: macros/log10.sci, line: 14
 # File: macros/log2.sci, line: 14
 # File: macros/logm.sci, line: 23
 # File: macros/logspace.sci, line: 19
@@ -465,6 +383,92 @@ msgid "%s: Wrong number of input argument(s): %d expected.\n"
 msgstr ""
 
 #
+# File: macros/%sp_gsort.sci, line: 41
+#, c-format
+msgid "%s: Wrong size for input argument #%d: sparse vectors expected.\n"
+msgstr ""
+
+#
+# File: macros/%sp_max.sci, line: 20
+# File: macros/%sp_min.sci, line: 20
+#, c-format
+msgid "%s: Wrong size of input argument: %d expected.\n"
+msgstr ""
+
+#
+# File: macros/%sp_max.sci, line: 29
+# File: macros/%sp_max.sci, line: 40
+# File: macros/%sp_max.sci, line: 134
+# File: macros/%sp_max.sci, line: 250
+# File: macros/%sp_min.sci, line: 29
+# File: macros/%sp_min.sci, line: 40
+# File: macros/%sp_min.sci, line: 133
+# File: macros/%sp_min.sci, line: 208
+# File: macros/%sp_min.sci, line: 254
+#, c-format
+msgid "%s: Wrong type for input argument #%d: A sparse matrix expected.\n"
+msgstr ""
+
+#
+# File: macros/%sp_max.sci, line: 127
+# File: macros/%sp_max.sci, line: 237
+#, c-format
+msgid "%s: Wrong number of output argument: %d expected.\n"
+msgstr ""
+
+#
+# File: macros/%sp_max.sci, line: 144
+# File: macros/%sp_min.sci, line: 143
+#, c-format
+msgid "%s: Wrong value for input argument #%d: ['r' 'c' 'm'] expected.\n"
+msgstr ""
+
+#
+# File: macros/%sp_max.sci, line: 212
+# File: macros/%sp_max.sci, line: 262
+# File: macros/%sp_min.sci, line: 216
+# File: macros/%sp_min.sci, line: 266
+#, c-format
+msgid ""
+"%s: Wrong size of input argument #%d: Same size as input argument #%d "
+"expected.\n"
+msgstr ""
+
+#
+# File: macros/%sp_max.sci, line: 231
+# File: macros/%sp_min.sci, line: 235
+#, c-format
+msgid ""
+"%s: Wrong type for input argument #%d: A sparse matrix or a character "
+"expected.\n"
+msgstr ""
+
+#
+# File: macros/%sp_max.sci, line: 248
+# File: macros/%sp_min.sci, line: 252
+#, c-format
+msgid ""
+"%s: Wrong type for input argument #%d (List element: %d): A sparse matrix "
+"expected.\n"
+msgstr ""
+
+#
+# File: macros/%sp_max.sci, line: 260
+# File: macros/%sp_min.sci, line: 264
+#, c-format
+msgid ""
+"%s: Wrong size of input argument #%d (List element: %d): Same size as input "
+"argument #%d expected.\n"
+msgstr ""
+
+#
+# File: macros/%sp_min.sci, line: 126
+# File: macros/%sp_min.sci, line: 241
+#, c-format
+msgid "%s: Wrong number of output argument: %d expected"
+msgstr ""
+
+#
 # File: macros/acosd.sci, line: 22
 # File: macros/asind.sci, line: 24
 #, c-format
@@ -8,7 +8,7 @@
 // are also available at
 // http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.txt
 
-function y = log10(x)
+function y = %s_log10(x)
     [lhs, rhs] = argn(0);
     if rhs == 0 then
         error(msprintf(gettext("%s: Wrong number of input argument(s): %d expected.\n"),"log10", 1));
diff --git a/scilab/modules/elementary_functions/sci_gateway/c/sci_log10.c b/scilab/modules/elementary_functions/sci_gateway/c/sci_log10.c
new file mode 100644 (file)
index 0000000..2e244df
--- /dev/null
@@ -0,0 +1,144 @@
+/*
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) 2007 - INRIA - Jean-Baptiste SILVY
+ * Copyright (C) 2007 - INRIA - Allan CORNET
+ * Copyright (C) 2007 - INRIA - Cong WU
+ *
+ * This file must be used under the terms of the CeCILL.
+ * This source file is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution.  The terms
+ * are also available at
+ * http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.txt
+ *
+ */
+
+/*------------------------------------------------------------------------*/
+#include <string.h>
+#include "gw_elementary_functions.h"
+#include "api_scilab.h"
+#include "Scierror.h"
+#include "sci_malloc.h"
+#include "localization.h"
+#include "sciprint.h"
+#include "setieee.h"
+
+/*--------------------------------------------------------------------------*/
+int sci_log10(char *fname, void* pvApiCtx)
+{
+    SciErr sciErr;
+    int i = 0;
+    int complex = 0;
+    int check_ieee = 0;
+
+    int* piAddr = NULL;
+    int iType = 0;
+    int iRows = 0;
+    int iCols = 0;
+    double* pIn = NULL;
+    double* pOutR = NULL;
+    double* pOutI = NULL;
+    double imag = M_PI / log(10.0);
+
+    int iRhs = nbInputArgument(pvApiCtx);
+
+    CheckInputArgument(pvApiCtx, 1, 1);
+    CheckOutputArgument(pvApiCtx, 1, 1);
+
+    sciErr = getVarAddressFromPosition(pvApiCtx, 1, &piAddr);
+    if (sciErr.iErr)
+    {
+        printError(&sciErr, 0);
+        Scierror(999, _("%s: Can not read input argument #%d.\n"), fname, 2);
+        return 0;
+    }
+
+    sciErr = getVarType(pvApiCtx, piAddr, &iType);
+    if (sciErr.iErr)
+    {
+        printError(&sciErr, 0);
+        Scierror(999, _("%s: Can not read input argument #%d.\n"), fname, 1);
+        return 0;
+    }
+
+    if (iType != sci_matrix || isVarComplex(pvApiCtx, piAddr))
+    {
+        //manage complex log10 via %s_log macro
+        OverLoad(1);
+        return 0;
+    }
+
+    sciErr = getMatrixOfDouble(pvApiCtx, piAddr, &iRows, &iCols, &pIn);
+    if (sciErr.iErr)
+    {
+        printError(&sciErr, 0);
+        return 0;
+    }
+
+    //check values
+    for (i = 0 ; i < iRows * iCols ; ++i)
+    {
+        double d = pIn[i];
+        if (d < 0)
+        {
+            complex = 1;
+        }
+
+        if (d == 0)
+        {
+            check_ieee = 1;
+        }
+    }
+
+    if (check_ieee)
+    {
+        if (getieee() == 0)
+        {
+            Scierror(999, "Singularity of log or tan function.\n");
+            return 0;
+        }
+
+        if (getieee() == 1)
+        {
+            sciprint(_("Warning : singularity of 'log' or 'tan' function.\n"));
+        }
+    }
+
+    if (complex)
+    {
+        sciErr = allocComplexMatrixOfDouble(pvApiCtx, iRhs + 1, iRows, iCols, &pOutR, &pOutI);
+        if (sciErr.iErr)
+        {
+            Scierror(999, _("%s: Memory allocation error.\n"), fname);
+            return 0;
+        }
+
+        memset(pOutI, 0x00, iRows * iCols * sizeof(double));
+    }
+    else
+    {
+        sciErr = allocMatrixOfDouble(pvApiCtx, iRhs + 1, iRows, iCols, &pOutR);
+        if (sciErr.iErr)
+        {
+            Scierror(999, _("%s: Memory allocation error.\n"), fname);
+            return 0;
+        }
+    }
+
+
+    for (i = 0 ; i < iRows * iCols ; ++i)
+    {
+        if (pIn[i] < 0)
+        {
+            pOutR[i] = log10(-pIn[i]);
+            pOutI[i] = imag;
+        }
+        else
+        {
+            pOutR[i] = log10(pIn[i]);
+        }
+    }
+
+    AssignOutputVariable(pvApiCtx, 1) = iRhs + 1;
+    ReturnArguments(pvApiCtx);
+    return 0;
+}
index 694d4b4..aa57e7c 100644 (file)
@@ -76,6 +76,7 @@ int ElemFuncModule::Load()
     symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"rat", &sci_rat, MODULE_NAME));
     symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"base2dec", &sci_base2dec, MODULE_NAME));
     symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"dec2base", &sci_dec2base, MODULE_NAME));
+    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"log10", &sci_log10, MODULE_NAME));
     return 1;
 }
 
index a76fa56..f682982 100644 (file)
@@ -211,6 +211,7 @@ lib /DEF:"$(ProjectDir)elementary_functions_Import.def" /SUBSYSTEM:WINDOWS /MACH
     <ClCompile Include="..\..\c\sci_base2dec.c" />
     <ClCompile Include="..\..\c\sci_dec2base.c" />
     <ClCompile Include="..\..\c\sci_isequalbitwise.c" />
+    <ClCompile Include="..\..\c\sci_log10.c" />
     <ClCompile Include="..\..\c\sci_nearfloat.c" />
     <ClCompile Include="..\..\c\sci_number_properties.c" />
     <ClCompile Include="..\..\c\sci_sqrt.c" />
index c4d3b94..7570955 100644 (file)
     <ClCompile Include="..\sci_sign.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\c\sci_log10.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\..\includes\elem_func_gw.hxx">
index d722cf2..784df91 100644 (file)
@@ -86,4 +86,5 @@
     <PRIMITIVE gatewayId="6" primitiveId="53" primitiveName="base2dec" />
     <PRIMITIVE gatewayId="6" primitiveId="54" primitiveName="dec2base" />
     <PRIMITIVE gatewayId="6" primitiveId="55" primitiveName="find" />
+    <PRIMITIVE gatewayId="6" primitiveId="56" primitiveName="log10" />
 </GATEWAY>
index 1221889..fc292c1 100644 (file)
@@ -237,7 +237,6 @@ lib /DEF:"$(ProjectDir)cacsd_f_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platfor
     <ClCompile Include="f2c_workaround.c" />
     <ClCompile Include="finite.c" />
     <ClCompile Include="floor.c" />
-    <ClCompile Include="..\..\sci_gateway\c\gw_elementary_functions.c" />
     <ClCompile Include="idmax.c" />
     <ClCompile Include="idmin.c" />
     <ClCompile Include="int2db.c" />
index f4ee7dd..93a0e95 100644 (file)
@@ -56,9 +56,6 @@
     <ClCompile Include="floor.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\sci_gateway\c\gw_elementary_functions.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="idmax.c">
       <Filter>Source Files</Filter>
     </ClCompile>
index deeea13..1105b92 100644 (file)
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2014-09-18 17:01+0100\n"
+"Revision-Date: 2014-12-02 16:09+0100\n"
 
 # File: includes/ScilabAbstractEnvironmentException.hxx, line: 108
 msgid "Exception thrown in file"
index b20b4bc..47fd420 100644 (file)
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2014-09-18 17:01+0100\n"
+"Revision-Date: 2014-12-02 16:09+0100\n"
 
 # File: sci_gateway/cpp/sci_jconvMatrixMethod.cpp, line: 35
 #, c-format
index 8d000ec..8188bc9 100644 (file)
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2014-09-18 17:01+0100\n"
+"Revision-Date: 2014-12-02 16:09+0100\n"
 
 # File: sci_gateway/c/gw_fftw.c, line: 49
 #, c-format
index 4a98531..b351af5 100644 (file)
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2014-09-18 17:01+0100\n"
+"Revision-Date: 2014-12-02 16:09+0100\n"
 
 # File: sci_gateway/c/sci_basename.c, line: 45
 # File: sci_gateway/c/sci_basename.c, line: 58
index 2b54e01..abb741b 100644 (file)
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2014-09-18 17:01+0100\n"
+"Revision-Date: 2014-12-02 16:09+0100\n"
 
 # File: sci_gateway/c/sci_exec.c, line: 52
 # File: sci_gateway/c/sci_exec.c, line: 60
@@ -174,7 +174,7 @@ msgstr ""
 # File: macros/profile.sci, line: 13
 # File: macros/remove_profiling.sci, line: 13
 # File: macros/reset_profiling.sci, line: 13
-# File: macros/showprofile.sci, line: 13
+# File: macros/showprofile.sci, line: 14
 #, c-format
 msgid "%s: Wrong number of input argument(s): %d expected.\n"
 msgstr ""
index e948b9d..974864e 100644 (file)
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2014-09-18 17:01+0100\n"
+"Revision-Date: 2014-12-02 16:09+0100\n"
 
 # File: demos/GAIsing2ddemo.sce, line: 63
 # File: demos/GAdemo.sce, line: 86
index 423bf6c..af5e0f7 100644 (file)
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2014-09-18 17:01+0100\n"
+"Revision-Date: 2014-12-02 16:09+0100\n"
 
 # File: src/java/org/scilab/modules/graph/utils/ScilabGraphMessages.java, line: 22
 msgid "Copy"
index 7e765c9..f6a3cac 100644 (file)
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2014-09-18 17:01+0100\n"
+"Revision-Date: 2014-12-02 16:09+0100\n"
 
 # File: sci_gateway/c/gw_graphic_export.c, line: 84
 # File: src/nographic_export/nographic_export.c, line: 26
index a7c92ec..95873ec 100644 (file)
@@ -153,7 +153,7 @@ public class Export {
         DrawerVisitor visitor = DrawerVisitor.getVisitor(uid);
         if (visitor != null) {
             Canvas canvas = visitor.getCanvas();
-            if (canvas instanceof JoGLCanvas && isBitmapFormat(types[type])) {
+            if (canvas instanceof JoGLCanvas && isBitmapFormat(types[type]) && visitor.getFigure().getVisible()) {
                 try {
                     return exportBitmap(uid, type, extendedFilename, true, params);
                 } catch (OutOfMemoryError e) {
@@ -226,6 +226,17 @@ public class Export {
                 public void updateObject(Integer id, int property) {
                     // Don't update during the export
                 }
+
+                @Override
+                public void visit(Figure figure) {
+                    // Fix for bug 13676: allow vectorial export even if the figure is invisible
+                    synchronized (figure) {
+                        super.visit(figure);
+                        if (!figure.getVisible()) {
+                            askAcceptVisitor(figure.getChildren());
+                        }
+                    }
+                }
             };
 
             try {
diff --git a/scilab/modules/graphic_export/tests/nonreg_tests/bug_13676.dia.ref b/scilab/modules/graphic_export/tests/nonreg_tests/bug_13676.dia.ref
new file mode 100644 (file)
index 0000000..f59b432
--- /dev/null
@@ -0,0 +1,32 @@
+// =============================================================================
+// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+// Copyright (C) 2014 - Scilab Enterprises - Calixte DENIZET
+//
+//  This file is distributed under the same license as the Scilab package.
+// =============================================================================
+//
+// <-- Non-regression test for bug 13676 -->
+//
+// <-- Bugzilla URL -->
+// http://bugzilla.scilab.org/13676
+//
+// <-- Short Description -->
+// An invisible figure could not be exported.
+f = gcf();
+f.visible = "off";
+plot2d();
+path = TMPDIR + "/bug_13676.png";
+xs2png(f, path);
+jimport javax.imageio.ImageIO;
+jimport java.net.URL;
+url = URL.new("file:////" + path);
+bi = ImageIO.read(url);
+w = bi.getWidth(jvoid);
+h = bi.getHeight(jvoid);
+data = uint32(bi.getRGB(0, 0, w, h, [], 0, w));
+jremove ImageIO URL url bi
+// Check if the image is not fully white
+assert_checkfalse(and(data == (uint32(2^32 - 1))))
+ ans  =
+  T  
diff --git a/scilab/modules/graphic_export/tests/nonreg_tests/bug_13676.tst b/scilab/modules/graphic_export/tests/nonreg_tests/bug_13676.tst
new file mode 100644 (file)
index 0000000..92a0f55
--- /dev/null
@@ -0,0 +1,34 @@
+// =============================================================================
+// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+// Copyright (C) 2014 - Scilab Enterprises - Calixte DENIZET
+//
+//  This file is distributed under the same license as the Scilab package.
+// =============================================================================
+//
+// <-- Non-regression test for bug 13676 -->
+//
+// <-- Bugzilla URL -->
+// http://bugzilla.scilab.org/13676
+//
+// <-- Short Description -->
+// An invisible figure could not be exported.
+
+f = gcf();
+f.visible = "off";
+plot2d();
+
+path = TMPDIR + "/bug_13676.png";
+xs2png(f, path);
+
+jimport javax.imageio.ImageIO;
+jimport java.net.URL;
+
+url = URL.new("file:////" + path);
+bi = ImageIO.read(url);
+w = bi.getWidth(jvoid);
+h = bi.getHeight(jvoid);
+data = uint32(bi.getRGB(0, 0, w, h, [], 0, w));
+jremove ImageIO URL url bi
+
+// Check if the image is not fully white
+assert_checkfalse(and(data == (uint32(2^32 - 1))))
index 8dbfb2e..4f8a657 100644 (file)
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2014-09-18 17:01+0100\n"
+"Revision-Date: 2014-12-02 16:09+0100\n"
 
 # File: src/java/org/scilab/modules/graphic_objects/datatip/Datatip.java, line: 351
 #, c-format
index 49c5922..0bdf540 100644 (file)
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2014-10-08 15:55+0100\n"
+"Revision-Date: 2014-12-02 16:09+0100\n"
 
 # File: sci_gateway/c/gw_graphics.c, line: 134
 # File: src/nographics/nographics.c, line: 83
index ef00b3c..7d09841 100644 (file)
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2014-09-18 17:01+0100\n"
+"Revision-Date: 2014-12-02 16:09+0100\n"
 
 # File: sci_gateway/c/gw_gui.c, line: 89
 #, c-format
index 9dce429..0d701f8 100644 (file)
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2014-09-18 17:01+0100\n"
+"Revision-Date: 2014-12-02 16:09+0100\n"
 
 # File: sci_gateway/cpp/sci_export_to_hdf5.cpp, line: 103
 #, c-format
index 3a3a875..13ca98c 100644 (file)
@@ -407,7 +407,6 @@ mean
 meanf
 median
 moment
-msd
 mvcorrel
 mvvacov
 nancumsum
@@ -486,7 +485,6 @@ chsolve
 conjgrad
 gmres
 issparse
-pcg
 qmr
 sp2adj
 speye
index 6f69833..75a0c2a 100644 (file)
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2014-10-08 15:29+0100\n"
+"Revision-Date: 2014-12-02 16:09+0100\n"
 
 # File: sci_gateway/c/gw_helptools.c, line: 39
 #, c-format
index 9ee7f0d..f45ad68 100644 (file)
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2014-09-18 17:01+0100\n"
+"Revision-Date: 2014-12-02 16:09+0100\n"
 
 # File: sci_gateway/c/gw_history_browser.c, line: 37
 # File: src/nohistory_browser/nohistory_browser.c, line: 25
index df40655..4de72df 100644 (file)
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2014-09-18 17:01+0100\n"
+"Revision-Date: 2014-12-02 16:09+0100\n"
 
 # File: sci_gateway/c/sci_addhistory.c, line: 83
 #, c-format
index 7e4f1be..5fab895 100644 (file)
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2014-09-18 17:01+0100\n"
+"Revision-Date: 2014-12-02 16:09+0100\n"
 
 # File: sci_gateway/c/sci_iconvert.c, line: 37
 # File: sci_gateway/c/sci_iconvert.c, line: 51
index 0731a6a..98ad976 100644 (file)
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2014-09-18 17:01+0100\n"
+"Revision-Date: 2014-12-02 16:09+0100\n"
 
 # File: sci_gateway/c/sci_bsplin3val.c, line: 62
 # File: sci_gateway/c/sci_cshep2d.c, line: 50
index 70f65e7..af09bef 100644 (file)
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2014-09-18 17:01+0100\n"
+"Revision-Date: 2014-12-02 16:09+0100\n"
 
 # File: sci_gateway/c/sci_file.c, line: 61
 # File: sci_gateway/c/sci_file.c, line: 69
index 4a69f56..5d55ac8 100644 (file)
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2014-09-18 17:01+0100\n"
+"Revision-Date: 2014-12-02 16:09+0100\n"
 
 # File: sci_gateway/c/gw_jvm.c, line: 47
 msgid "JVM interface disabled in -nogui or -nwni modes.\n"
index 6eb9168..f864f64 100644 (file)
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2014-09-18 17:01+0100\n"
+"Revision-Date: 2014-12-02 16:09+0100\n"
 
 # File: sci_gateway/c/sci_backslash.c, line: 66
 # File: sci_gateway/c/sci_backslash.c, line: 87
diff --git a/scilab/modules/linear_algebra/tests/nonreg_tests/bug_545.dia.ref b/scilab/modules/linear_algebra/tests/nonreg_tests/bug_545.dia.ref
new file mode 100644 (file)
index 0000000..ecbc782
--- /dev/null
@@ -0,0 +1,37 @@
+// =============================================================================
+// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+// Copyright (C) 2005-2008 - INRIA
+//
+//  This file is distributed under the same license as the Scilab package.
+// =============================================================================
+// <-- JVM NOT MANDATORY -->
+// <-- Non-regression test for bug 545 -->
+//
+// <-- Bugzilla URL -->
+// http://bugzilla.scilab.org/show_bug.cgi?id=545
+//
+// <-- Short Description -->
+//    Bug Report Id: 031202003109134720
+//    This is obviously a conflict between a local variable ndims and the new function ndims().
+//    I expect the same problem also in:
+//
+//    macros/percent/%b_i_hm.sci
+//    macros/percent/%hm_i_hm.sc
+//    macros/percent/%p_i_hm.sci
+//
+//    Wasn't this an already solved issue??
+//    On Scilab CVS with " %i_i_hm   " function
+//    The Error Messages are:
+//     Warning :redefining function: ndims
+//             inside function: %i_i_hm
+//
+//    Commands:
+//    a=int8(hypermat([3 2 2]));b=hypermat([1 2 2]);
+//    a(1,:,:)=b
+//    Enrico SEGRE on Linux version RH9 distribution  with   as window manager
+//    Israel
+//    November 9, 2003 at 13:47:20
+a        = int8(hypermat([3 2 2]));
+b        = hypermat([1 2 2]);
+a(1,:,:) = b;
+// Just check if there is no "Warning :redefining function: ndims" displayed in .dia.ref
index 1a84e72..76323e5 100644 (file)
@@ -5,6 +5,8 @@
 //  This file is distributed under the same license as the Scilab package.
 // =============================================================================
 
+// <-- JVM NOT MANDATORY -->
+
 // <-- Non-regression test for bug 545 -->
 //
 // <-- Bugzilla URL -->
 //             inside function: %i_i_hm
 //
 //    Commands:
-//    a=int8(hypermat({3 2 2}));b=hypermat({1 2 2});
+//    a=int8(hypermat([3 2 2]));b=hypermat([1 2 2]);
 //    a(1,:,:)=b
 //    Enrico SEGRE on Linux version RH9 distribution  with   as window manager
 //    Israel
 //    November 9, 2003 at 13:47:20
 
-// <-- INTERACTIVE TEST -->
-
 a        = int8(hypermat([3 2 2]));
 b        = hypermat([1 2 2]);
-a(1,:,:) = b
+a(1,:,:) = b;
 
-// Just check if there is no "Warning :redefining function: ndims" displayed
+// Just check if there is no "Warning :redefining function: ndims" displayed in .dia.ref
index 94a304d..a51c5ca 100644 (file)
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2014-09-18 17:01+0100\n"
+"Revision-Date: 2014-12-02 16:09+0100\n"
 
 # File: sci_gateway/c/sci_addlocalizationdomain.c, line: 51
 # File: sci_gateway/c/sci_addlocalizationdomain.c, line: 72
index d390c5b..d72f402 100644 (file)
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2014-09-18 17:01+0100\n"
+"Revision-Date: 2014-12-02 16:09+0100\n"
 
 # File: macros/buildmacros.sce, line: 18
 #, c-format
index ba77d81..1b63e0e 100644 (file)
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2014-09-18 17:01+0100\n"
+"Revision-Date: 2014-12-02 16:09+0100\n"
 
 # File: sci_gateway/c/sci_matfile_close.c, line: 63
 # File: sci_gateway/c/sci_matfile_listvar.c, line: 63
index c187f79..ecb50d0 100644 (file)
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2014-09-18 17:01+0100\n"
+"Revision-Date: 2014-12-02 16:09+0100\n"
 
 # File: includes/mex.h, line: 87
 msgid "mexPutFull failed\n"
index 1b608ec..ae9e903 100644 (file)
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2014-09-18 17:01+0100\n"
+"Revision-Date: 2014-12-02 16:09+0100\n"
 
 # File: macros/tbx_build_blocks.sci, line: 21
 # File: macros/tbx_build_pal_loader.sci, line: 13
index b3017b6..24f6732 100644 (file)
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2014-09-18 17:01+0100\n"
+"Revision-Date: 2014-12-02 16:09+0100\n"
 
 # File: sci_gateway/c/sci_mpi_bcast.c, line: 42
 # File: sci_gateway/c/sci_mpi_bcast.c, line: 56
index 8427411..4bb39dc 100644 (file)
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2014-09-18 17:01+0100\n"
+"Revision-Date: 2014-12-02 16:09+0100\n"
 
 # File: sci_gateway/c/sci_qld.c, line: 86
 # File: sci_gateway/c/sci_qld.c, line: 112
index c019673..827a255 100644 (file)
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2014-09-18 17:01+0100\n"
+"Revision-Date: 2014-12-02 16:09+0100\n"
 
 # File: sci_gateway/c/sci_mprintf.c, line: 66
 # File: sci_gateway/c/sci_msprintf.c, line: 156
index 36c7cfa..6b87fd2 100644 (file)
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2014-09-18 17:01+0100\n"
+"Revision-Date: 2014-12-02 16:09+0100\n"
 
 # File: macros/%0_i_st.sci, line: 19
 #, c-format
index 00d0272..98b0cab 100644 (file)
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2014-09-18 17:01+0100\n"
+"Revision-Date: 2014-12-02 16:09+0100\n"
 
 # File: sci_gateway/cpp/sci_parallel_run.cpp, line: 547
 #, c-format
index f000171..0509f8e 100644 (file)
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2014-09-18 17:01+0100\n"
+"Revision-Date: 2014-12-02 16:09+0100\n"
 
 # File: src/c/parameters.c, line: 144
 # File: src/c/parameters.c, line: 571
index b7ca1e6..1cb68b1 100644 (file)
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2014-09-18 17:01+0100\n"
+"Revision-Date: 2014-12-02 16:09+0100\n"
 
 # File: demos/polynomials.dem.gateway.sce, line: 10
 msgid "Polynomials"
@@ -87,7 +87,7 @@ msgstr ""
 
 #
 # File: macros/gcd.sci, line: 18
-# File: macros/gcd.sci, line: 25
+# File: macros/gcd.sci, line: 23
 # File: macros/lcm.sci, line: 18
 # File: macros/lcm.sci, line: 23
 #, c-format
index 841b3b7..6091d00 100644 (file)
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2014-09-18 17:01+0100\n"
+"Revision-Date: 2014-12-02 16:09+0100\n"
 
 # File: sci_gateway/c/gw_preferences.c, line: 38
 #, c-format
index ece9feb..17eb1b0 100644 (file)
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2014-09-18 17:01+0100\n"
+"Revision-Date: 2014-12-02 16:09+0100\n"
 
 # File: sci_gateway/c/sci_grand.c, line: 156
 # File: sci_gateway/c/sci_grand.c, line: 511
index 01796a3..a01129e 100644 (file)
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2014-09-18 17:01+0100\n"
+"Revision-Date: 2014-12-02 16:09+0100\n"
 
 # File: src/java/org/scilab/modules/renderer/JoGLView/interaction/RubberBox.java, line: 276
 msgid "Click to set first bounds"
index 90637a2..1986070 100644 (file)
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2014-09-18 17:01+0100\n"
+"Revision-Date: 2014-12-02 16:09+0100\n"
 
 # File: sci_gateway/c/sci_buildouttb.c, line: 95
 #, c-format
index 6a93b01..c38d791 100644 (file)
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2014-09-18 17:01+0100\n"
+"Revision-Date: 2014-12-02 16:09+0100\n"
 
 # File: src/c/convert.c, line: 1214
 # File: src/c/convert.c, line: 1239
index 8dc7ce4..0af697c 100644 (file)
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2014-09-18 17:01+0100\n"
+"Revision-Date: 2014-12-02 16:09+0100\n"
 
 # File: sci_gateway/c/gw_scinotes.c, line: 37
 # File: src/noscinotes/noscinotes.c, line: 22
index 4ad3a22..71876e1 100644 (file)
@@ -201,7 +201,7 @@ public class JoGLTextureManager implements TextureManager {
                 if (textures.length == 1) {
                     gl.glEnable(GL2.GL_TEXTURE_2D);
                     gl.glEnable(GL2.GL_BLEND);
-                    gl.glBlendFunc(GL2.GL_ONE, GL2.GL_ONE_MINUS_SRC_ALPHA);
+                    gl.glBlendFunc(GL2.GL_SRC_ALPHA, GL2.GL_ONE_MINUS_SRC_ALPHA);
                     gl.glTexEnvi(GL2.GL_TEXTURE_ENV, GL2.GL_TEXTURE_ENV_MODE, GL2.GL_REPLACE);
 
                     textures[0].setTexParameteri(gl, GL2.GL_TEXTURE_MAG_FILTER, getAsGLFilter(getMagnificationFilter(), false));
@@ -352,7 +352,9 @@ public class JoGLTextureManager implements TextureManager {
 
             gl.glEnable(GL2.GL_TEXTURE_2D);
             gl.glEnable(GL2.GL_BLEND);
-            gl.glBlendFunc(GL2.GL_ONE, GL2.GL_ONE_MINUS_SRC_ALPHA);
+
+            // ONE => SRC_ALPHA (fix for bug 13673)
+            gl.glBlendFunc(GL2.GL_SRC_ALPHA, GL2.GL_ONE_MINUS_SRC_ALPHA);
 
             gl.glEnable(GL2.GL_ALPHA_TEST);
             gl.glAlphaFunc(GL2.GL_GREATER, 0.0f);
index 4d2c4e2..d1c7a51 100644 (file)
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2014-10-08 15:42+0100\n"
+"Revision-Date: 2014-12-02 16:09+0100\n"
 
 # File: sci_gateway/c/sci_conv2.c, line: 38
 # File: sci_gateway/c/sci_conv2.c, line: 99
index f16b774..46963b5 100644 (file)
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2014-09-18 17:01+0100\n"
+"Revision-Date: 2014-12-02 16:09+0100\n"
 
 # File: demos/SAIsing2ddemo.sce, line: 10
 # File: demos/SAdemo.sce, line: 10
index b154bcb..98f2647 100644 (file)
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2014-09-18 17:01+0100\n"
+"Revision-Date: 2014-12-02 16:09+0100\n"
 
 # File: sci_gateway/c/sci_PlaySound.c, line: 48
 # File: sci_gateway/c/sci_PlaySound.c, line: 56
diff --git a/scilab/modules/sparse/help/en_US/iterativesolvers/pcg.xml b/scilab/modules/sparse/help/en_US/iterativesolvers/pcg.xml
deleted file mode 100644 (file)
index 2c7bfb9..0000000
+++ /dev/null
@@ -1,340 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) 2013 - Scilab Enterprises - Paul Bignier: made obsolete, merged in conjgrad
- * Copyright (C) XXXX-2008 - INRIA
- *
- * This file must be used under the terms of the CeCILL.
- * This source file is licensed as described in the file COPYING, which
- * you should have received as part of this distribution.  The terms
- * are also available at
- * http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.txt
- *
- -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:id="pcg" xml:lang="en">
-    <refnamediv>
-        <refname>pcg</refname>
-        <refpurpose>precondioned conjugate gradient</refpurpose>
-    </refnamediv>
-    <refsynopsisdiv>
-        <title>Calling Sequence</title>
-        <synopsis>[x, flag, err, iter, res] = pcg(A, b [, tol [, maxIter [, M [, M2 [, x0 [, verbose]]]]]])
-            [x, flag, err, iter, res] = pcg(A, b [key=value,...])
-        </synopsis>
-    </refsynopsisdiv>
-    <refsection>
-        <title>Arguments</title>
-        <variablelist>
-            <varlistentry>
-                <term>A</term>
-                <term/>
-                <listitem>
-                    <para>a matrix, or a function, or a list computing
-                        <literal>A*x</literal> for each given <literal>x</literal>. The
-                        following is a description of the computation of A*x depending on
-                        the type of A.
-                    </para>
-                    <itemizedlist>
-                        <listitem>
-                            <para>
-                                <literal>matrix.</literal>If A is a matrix, it can be
-                                dense or sparse
-                            </para>
-                        </listitem>
-                        <listitem>
-                            <para>
-                                <literal>function.</literal>If A is a function, it must
-                                have the following header :
-                            </para>
-                            <programlisting role=""><![CDATA[
-function y = A ( x )
- ]]></programlisting>
-                        </listitem>
-                        <listitem>
-                            <para>
-                                <literal>list.</literal>If A is a list, the first element
-                                of the list is expected to be a function and the other elements
-                                in the list are the arguments of the function, from index 2 to
-                                the end. When the function is called, the current value of x is
-                                passed to the function as the first argument. The other
-                                arguments passed are the one given in the list.
-                            </para>
-                        </listitem>
-                    </itemizedlist>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>b</term>
-                <listitem>
-                    <para>right hand side vector (size: nx1)</para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>tol</term>
-                <listitem>
-                    <para>error relative tolerance (default: 1e-8).
-                        The termination criteria is based on the 2-norm of the
-                        residual r=b-Ax, divided by the 2-norm of the right hand side b.
-                    </para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>maxIter</term>
-                <listitem>
-                    <para>maximum number of iterations (default: n)</para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>M</term>
-                <listitem>
-                    <para>preconditioner: full or sparse matrix or function returning
-                        <literal>M\x</literal> (default: none)
-                    </para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>M2</term>
-                <listitem>
-                    <para>preconditioner: full or sparse matrix or function returning
-                        <literal>M2\x</literal> for each <literal>x</literal> (default:
-                        none)
-                    </para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>x0</term>
-                <listitem>
-                    <para>initial guess vector (default: zeros(n,1))</para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>verbose</term>
-                <listitem>
-                    <para>set to 1 to enable verbose logging (default 0)</para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>x</term>
-                <listitem>
-                    <para>solution vector</para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>flag</term>
-                <listitem>
-                    <para>
-                        0 if <literal>pcg</literal> converged to the desired tolerance
-                        within <literal>maxi</literal> iterations, 1 else
-                    </para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>err</term>
-                <listitem>
-                    <para>final relative norm of the residual (the 2-norm of the right-hand side b is used)</para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>iter</term>
-                <listitem>
-                    <para>number of iterations performed</para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>res</term>
-                <listitem>
-                    <para>vector of the residual relative norms</para>
-                </listitem>
-            </varlistentry>
-        </variablelist>
-    </refsection>
-    <refsection>
-        <title>Description</title>
-        <warning>
-            This function is obsolete.
-            It has been merged into <link linkend="conjgrad">conjgrad</link>.
-            <literal>pcg(A, b, ...) => conjgrad(A, b, "pcg", ...)</literal>.
-        </warning>
-        <para>
-            Solves the linear system <literal>Ax=b</literal> using the conjugate
-            gradient method with or without preconditioning. The preconditionning
-            should be defined by a symmetric positive definite matrix
-            <literal>M</literal>, or two matrices <literal>M1</literal> and
-            <literal>M2</literal> such that <literal>M=M1*M2</literal>. in the case
-            the function solves <literal>inv(M)*A*x = inv(M)*b</literal> for
-            <literal>x</literal>. <literal>M</literal>, <literal>M1</literal> and
-            <literal>M2</literal> can be Scilab functions with calling sequence
-            <literal>y=Milx(x)</literal> which computes the corresponding left
-            division <literal>y=Mi\x</literal>.
-        </para>
-        <para>
-            The <literal>A</literal> matrix must be a symmetric positive
-            definite matrix (full or sparse) or a function with calling sequence
-            <literal>y=Ax(x)</literal> which computes <literal>y=A*x</literal>
-        </para>
-    </refsection>
-    <refsection>
-        <title>Example with well conditionned and ill conditionned
-            problems
-        </title>
-        <para>In the following example, two linear systems are solved. The first
-            maxtrix has a condition number equal to ~0.02, which makes the algorithm
-            converge in exactly 10 iterations. Since this is the size of the matrix,
-            it is an expected behaviour for a gradient conjugate method. The second
-            one has a low condition number equal to 1.d-6, which makes the algorithm
-            converge in a larger 22 iterations. This is why the parameter maxIter is
-            set to 30. See below for other examples of the "key=value" syntax.
-        </para>
-        <programlisting role="example"><![CDATA[
-//Well conditionned problem
-A=[ 94  0   0   0    0   28  0   0   32  0
-     0   59  13  5    0   0   0   10  0   0
-     0   13  72  34   2   0   0   0   0   65
-     0   5   34  114  0   0   0   0   0   55
-     0   0   2   0    70  0   28  32  12  0
-     28  0   0   0    0   87  20  0   33  0
-     0   0   0   0    28  20  71  39  0   0
-     0   10  0   0    32  0   39  46  8   0
-     32  0   0   0    12  33  0   8   82  11
-     0   0   65  55   0   0   0   0   11  100];
-
-b=ones(10,1);
-[x, fail, err, iter, res]=pcg(A,b,1d-12,15);
-mprintf("      fail=%d, iter=%d, errrel=%e\n",fail,iter,err)
-
-//Ill contionned one
-A=[ 894     0   0     0   0   28  0   0   1000  70000
-      0      5   13    5   0   0   0   0   0     0
-      0      13  72    34  0   0   0   0   0     6500
-      0      5   34    1   0   0   0   0   0     55
-      0      0   0     0   70  0   28  32  12    0
-      28     0   0     0   0   87  20  0   33    0
-      0      0   0     0   28  20  71  39  0     0
-      0      0   0     0   32  0   39  46  8     0
-      1000   0   0     0   12  33  0   8   82    11
-      70000  0   6500  55  0   0   0   0   11    100];
-
-[x, fail, err, iter, res]=pcg(A,b,maxIter=30,tol=1d-12);
-mprintf("      fail=%d, iter=%d, errrel=%e\n",fail,iter,err)
- ]]></programlisting>
-    </refsection>
-    <refsection>
-        <title>Examples with A given as a sparse matrix, or function, or
-            list
-        </title>
-        <para>The following example shows that the method can handle sparse
-            matrices as well. It also shows the case where a function, computing the
-            right-hand side, is given to the "pcg" primitive. The final case shown by
-            this example, is when a list is passed to the primitive.
-        </para>
-        <programlisting role="example"><![CDATA[
-//Well conditionned problem
-A=[ 94  0   0   0    0   28  0   0   32  0
-     0   59  13  5    0   0   0   10  0   0
-     0   13  72  34   2   0   0   0   0   65
-     0   5   34  114  0   0   0   0   0   55
-     0   0   2   0    70  0   28  32  12  0
-     28  0   0   0    0   87  20  0   33  0
-     0   0   0   0    28  20  71  39  0   0
-     0   10  0   0    32  0   39  46  8   0
-     32  0   0   0    12  33  0   8   82  11
-     0   0   65  55   0   0   0   0   11  100];
-b=ones(10,1);
-
-// Convert A into a sparse matrix
-Asparse=sparse(A);
-[x, fail, err, iter, res]=pcg(Asparse,b,maxIter=30,tol=1d-12);
-mprintf("      fail=%d, iter=%d, errrel=%e\n",fail,iter,err)
-
-// Define a function which computes the right-hand side.
-function y=Atimesx(x)
-  A=[ 94  0   0   0    0   28  0   0   32  0
-       0   59  13  5    0   0   0   10  0   0
-       0   13  72  34   2   0   0   0   0   65
-       0   5   34  114  0   0   0   0   0   55
-       0   0   2   0    70  0   28  32  12  0
-       28  0   0   0    0   87  20  0   33  0
-       0   0   0   0    28  20  71  39  0   0
-       0   10  0   0    32  0   39  46  8   0
-       32  0   0   0    12  33  0   8   82  11
-       0   0   65  55   0   0   0   0   11  100];
-  y=A*x
-endfunction
-
-// Pass the script Atimesx to the primitive
-[x, fail, err, iter, res]=pcg(Atimesx,b,maxIter=30,tol=1d-12);
-mprintf("      fail=%d, iter=%d, errrel=%e\n",fail,iter,err)
-
-// Define a function which computes the right-hand side.
-function y=Atimesxbis(x,A)
-  y=A*x
-endfunction
-
-// Pass a list to the primitive
-Alist = list(Atimesxbis,Asparse);
-[x, fail, err, iter, res]=pcg(Alist,b,maxIter=30,tol=1d-12);
-mprintf("      fail=%d, iter=%d, errrel=%e\n",fail,iter,err)
- ]]></programlisting>
-    </refsection>
-    <refsection>
-        <title>Examples with key=value syntax</title>
-        <para>The following example shows how to pass arguments with the
-            "key=value" syntax. This allows to set non-positionnal arguments, that is,
-            to set arguments which are not depending on their order in the list of
-            arguments. The available keys are the names of the optional arguments,
-            that is : tol, maxIter, %M, %M2, x0, verbose. Notice that, in the
-            following example, the verbose option is given before the maxIter option.
-            Without the "key=value" syntax, the positionnal arguments would require
-            that maxIter come first and verbose after.
-        </para>
-        <programlisting role="example"><![CDATA[
-// Example of an argument passed with key=value syntax
-A=[100,1;1,10];
-b=[101;11];
-[xcomputed, flag, err, iter, res]=pcg(A,b,verbose=1);
-
-// With key=value syntax, the order does not matter
-[xcomputed, flag, err, iter, res]=pcg(A,b,verbose=1,maxIter=0);
- ]]></programlisting>
-    </refsection>
-    <refsection role="see also">
-        <title>See Also</title>
-        <simplelist type="inline">
-            <member>
-                <link linkend="conjgrad">conjgrad</link>
-            </member>
-            <member>
-                <link linkend="backslash">backslash</link>
-            </member>
-            <member>
-                <link linkend="qmr">qmr</link>
-            </member>
-            <member>
-                <link linkend="gmres">gmres</link>
-            </member>
-        </simplelist>
-    </refsection>
-    <refsection>
-        <title>References</title>
-        <para>"Templates for the Solution of Linear Systems: Building Blocks for
-            Iterative Methods", Barrett, Berry, Chan, Demmel, Donato, Dongarra,
-            Eijkhout, Pozo, Romine, and Van der Vorst, SIAM Publications, 1993, ftp
-            netlib2.cs.utk.edu/linalg/templates.ps
-        </para>
-        <para>"Iterative Methods for Sparse Linear Systems, Second Edition", Saad,
-            SIAM Publications, 2003, ftp
-            ftp.cs.umn.edu/dept/users/saad/PS/all_ps.zip
-        </para>
-    </refsection>
-    <refsection>
-        <title>History</title>
-        <revhistory>
-            <revision>
-                <revnumber>5.5.0</revnumber>
-                <revdescription>
-                    Calling pcg(A, b, ...) is deprecated. conjgrad(A, b, "pcg", ...) should be used instead.
-                </revdescription>
-            </revision>
-        </revhistory>
-    </refsection>
-</refentry>
diff --git a/scilab/modules/sparse/help/ja_JP/iterativesolvers/pcg.xml b/scilab/modules/sparse/help/ja_JP/iterativesolvers/pcg.xml
deleted file mode 100644 (file)
index bd8f33f..0000000
+++ /dev/null
@@ -1,583 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) XXXX-2008 - INRIA
- * 
- * This file must be used under the terms of the CeCILL.
- * This source file is licensed as described in the file COPYING, which
- * you should have received as part of this distribution.  The terms
- * are also available at    
- * http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.txt
- *
- -->
-
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:id="pcg" xml:lang="ja">
-    
-    <refnamediv>
-        
-        <refname>pcg</refname>
-        
-        <refpurpose>プリコンディショナ付き共役勾配法</refpurpose>
-        
-    </refnamediv>
-    
-    <refsynopsisdiv>
-        
-        <title>呼び出し手順</title>
-        
-        <synopsis>[x, flag, err, iter, res] = pcg(A, b [, tol [, maxIter [, M [, M2 [, x0 [, verbose]]]]]])
-            
-            [x, flag, err, iter, res] = pcg(A, b [key=value,...])
-            
-        </synopsis>
-        
-    </refsynopsisdiv>
-    
-    <refsection>
-        
-        <title>引数</title>
-        
-        <variablelist>
-            
-            <varlistentry>
-                
-                <term>A</term>
-                
-                <term/>
-                
-                <listitem>
-                    
-                    <para>
-                        
-                        行列, または指定した<literal>x</literal>について
-                        
-                        <literal>A*x</literal>を計算する関数またはリスト.
-                        
-                        以下にAの型に応じたA*xの計算に関する説明を示します.
-                        
-                    </para>
-                    
-                    <itemizedlist>
-                        
-                        <listitem>
-                            
-                            <para>
-                                
-                                <literal>行列.</literal>Aが行列の場合, 通常の行列
-                                
-                                または疎行列とすることができます
-                                
-                            </para>
-                            
-                        </listitem>
-                        
-                        <listitem>
-                            
-                            <para>
-                                
-                                <literal>関数.</literal>Aが関数の場合, 
-                                
-                                以下のヘッダーを有する必要があります :
-                                
-                            </para>
-                            
-                            <programlisting role=""><![CDATA[ 
-function y = A ( x )
- ]]></programlisting>
-                            
-                        </listitem>
-                        
-                        <listitem>
-                            
-                            <para>
-                                
-                                <literal>list.</literal> Aがリストの場合, 
-                                
-                                リストの最初の要素は関数で,リストのその他の
-                                
-                                要素(インデックス2から末尾まで)は関数の引数となります.
-                                
-                                関数がコールされる時,
-                                
-                                xのカレントの値は関数に最初の引数として渡されます.
-                                
-                                他の引数はリストに指定された値です.
-                                
-                            </para>
-                            
-                        </listitem>
-                        
-                    </itemizedlist>
-                    
-                </listitem>
-                
-            </varlistentry>
-            
-            <varlistentry>
-                
-                <term>b</term>
-                
-                <listitem>
-                    
-                    <para>右辺ベクトルr (大きさ: nx1)</para>
-                    
-                </listitem>
-                
-            </varlistentry>
-            
-            <varlistentry>
-                
-                <term>tol</term>
-                
-                <listitem>
-                    
-                    <para>相対許容誤差 (デフォルト: 1e-8). 
-                        
-                        終了条件は残差r=b-Axの2次ノルムを
-                        
-                        右辺bの2次ノルムで割った値に基づきます.
-                        
-                    </para>
-                    
-                </listitem>
-                
-            </varlistentry>
-            
-            <varlistentry>
-                
-                <term>maxIter</term>
-                
-                <listitem>
-                    
-                    <para>反復最大回数 (デフォルト: n)</para>
-                    
-                </listitem>
-                
-            </varlistentry>
-            
-            <varlistentry>
-                
-                <term>M</term>
-                
-                <listitem>
-                    
-                    <para>プリコンディショナ: 通常の行列または疎行列または
-                        
-                        <literal>M\x</literal>を返す関数 (デフォルト: none)
-                        
-                    </para>
-                    
-                </listitem>
-                
-            </varlistentry>
-            
-            <varlistentry>
-                
-                <term>M2</term>
-                
-                <listitem>
-                    
-                    <para>プリコンディショナ: 通常の行列または疎行列または
-                        
-                        <literal>x</literal>について<literal>M2\x</literal>を返す関数 (デフォルト:
-                        
-                        none)
-                        
-                    </para>
-                    
-                </listitem>
-                
-            </varlistentry>
-            
-            <varlistentry>
-                
-                <term>x0</term>
-                
-                <listitem>
-                    
-                    <para>初期推定ベクトル (デフォルト: zeros(n,1))</para>
-                    
-                </listitem>
-                
-            </varlistentry>
-            
-            <varlistentry>
-                
-                <term>verbose</term>
-                
-                <listitem>
-                    
-                    <para>冗長なログを有効にする場合は1に設定(デフォルト 0)</para>
-                    
-                </listitem>
-                
-            </varlistentry>
-            
-            <varlistentry>
-                
-                <term>x</term>
-                
-                <listitem>
-                    
-                    <para>解ベクトル</para>
-                    
-                </listitem>
-                
-            </varlistentry>
-            
-            <varlistentry>
-                
-                <term>flag</term>
-                
-                <listitem>
-                    
-                    <para>
-                        
-                        <literal>maxi</literal>回の反復回数内に
-                        
-                        <literal>pcg</literal>が指定した
-                        
-                        許容誤差に収束する場合に 0, そうでない場合に 1
-                        
-                    </para>
-                    
-                </listitem>
-                
-            </varlistentry>
-            
-            <varlistentry>
-                
-                <term>err</term>
-                
-                <listitem>
-                    
-                    <para>
-                        
-                        最終残差相対ノルム (右辺bの2次ノルムが使用されます)
-                        
-                    </para>
-                    
-                </listitem>
-                
-            </varlistentry>
-            
-            <varlistentry>
-                
-                <term>iter</term>
-                
-                <listitem>
-                    
-                    <para>実行された反復回数</para>
-                    
-                </listitem>
-                
-            </varlistentry>
-            
-            <varlistentry>
-                
-                <term>res</term>
-                
-                <listitem>
-                    
-                    <para>残差相対ノルムのベクトル</para>
-                    
-                </listitem>
-                
-            </varlistentry>
-            
-        </variablelist>
-        
-    </refsection>
-    
-    <refsection>
-        
-        <title>説明</title>
-        
-        <para>
-            
-            プリコンディショナ有りまたは無しの
-            
-            共役勾配法により線形システム<literal>Ax=b</literal>を解きます.
-            
-            プリコンディショナは,
-            
-            対称正定行列<literal>M</literal>
-            
-            または<literal>M=M1*M2</literal>となるような
-            
-            2つの行列<literal>M1</literal> および<literal>M2</literal>
-            
-            により定義されます.
-            
-            この場合,関数は<literal>inv(M)*A*x = inv(M)*b</literal>を
-            
-            <literal>x</literal>について解きます.
-            
-            <literal>M</literal>, <literal>M1</literal>および
-            
-            <literal>M2</literal> は,対応する左除算
-            
-            <literal>y=Mi\x</literal>を計算する
-            
-            呼び出し手順<literal>y=Milx(x)</literal>を有する
-            
-            Scilab関数とすることができます.
-            
-        </para>
-        
-        <para>
-            
-            <literal>A</literal>行列は対称正定行列
-            
-            (通常の行列または疎行列)または
-            
-            <literal>y=A*x</literal>を計算する
-            
-            呼び出し手順<literal>y=Ax(x)</literal>を有する関数と
-            
-            する必要があります.
-            
-        </para>
-        
-    </refsection>
-    
-    <refsection>
-        
-        <title>良好な条件または悪い条件の問題の例</title>
-        
-        <para>
-            
-            以下の例では,2つの線形システムを解きます.
-            
-            最初の行列の条件数は ~0.02 に等しくなり,
-            
-            アルゴリズムはちょうど10回の反復で収束します.
-            
-            これが行列の大きさの場合,共役勾配法で指定される動作となります.
-            
-            後者は,条件数1.d-6に等しくなり,22回の反復で収束します.
-            
-            これは,パラメータ maxIterを30に設定する理由です.
-            
-            "key=value" 構文のその他の例については以下を参照ください. 
-            
-        </para>
-        
-        <programlisting role="example"><![CDATA[ 
-//良い条件の例
-A=[ 94  0   0   0    0   28  0   0   32  0  
-     0   59  13  5    0   0   0   10  0   0  
-     0   13  72  34   2   0   0   0   0   65 
-     0   5   34  114  0   0   0   0   0   55 
-     0   0   2   0    70  0   28  32  12  0  
-     28  0   0   0    0   87  20  0   33  0  
-     0   0   0   0    28  20  71  39  0   0  
-     0   10  0   0    32  0   39  46  8   0  
-     32  0   0   0    12  33  0   8   82  11 
-     0   0   65  55   0   0   0   0   11  100];
-b=ones(10,1);
-[x, fail, err, iter, res]=pcg(A,b,1d-12,15);
-mprintf("      fail=%d, iter=%d, errrel=%e\n",fail,iter,err)
-//悪い条件の例
-A=[ 894     0   0     0   0   28  0   0   1000  70000
-      0      5   13    5   0   0   0   0   0     0    
-      0      13  72    34  0   0   0   0   0     6500 
-      0      5   34    1   0   0   0   0   0     55   
-      0      0   0     0   70  0   28  32  12    0    
-      28     0   0     0   0   87  20  0   33    0    
-      0      0   0     0   28  20  71  39  0     0    
-      0      0   0     0   32  0   39  46  8     0    
-      1000   0   0     0   12  33  0   8   82    11   
-      70000  0   6500  55  0   0   0   0   11    100];
-[x, fail, err, iter, res]=pcg(A,b,maxIter=30,tol=1d-12);
-mprintf("      fail=%d, iter=%d, errrel=%e\n",fail,iter,err)
- ]]></programlisting>
-        
-    </refsection>
-    
-    <refsection>
-        
-        <title>Aを疎行列または関数またはリストとして指定する例</title>
-        
-        <para>以下の例では,疎行列を同時に処理する方法を示します.
-            
-            右辺を計算する関数が "pcg" プリミティブに指定される
-            
-            場合も示します.
-            
-            この例における最後のケースでは,
-            
-            リストがプリミティブに指定される場合です.
-            
-        </para>
-        
-        <programlisting role="example"><![CDATA[ 
-//良い条件の例
-A=[ 94  0   0   0    0   28  0   0   32  0  
-     0   59  13  5    0   0   0   10  0   0  
-     0   13  72  34   2   0   0   0   0   65 
-     0   5   34  114  0   0   0   0   0   55 
-     0   0   2   0    70  0   28  32  12  0  
-     28  0   0   0    0   87  20  0   33  0  
-     0   0   0   0    28  20  71  39  0   0  
-     0   10  0   0    32  0   39  46  8   0  
-     32  0   0   0    12  33  0   8   82  11 
-     0   0   65  55   0   0   0   0   11  100];
-b=ones(10,1);
-// Aを疎行列に変換
-Asparse=sparse(A);
-[x, fail, err, iter, res]=pcg(Asparse,b,maxIter=30,tol=1d-12);
-mprintf("      fail=%d, iter=%d, errrel=%e\n",fail,iter,err)
-// 右辺を計算する関数を定義.
-function y=Atimesx(x)
-  A=[ 94  0   0   0    0   28  0   0   32  0  
-       0   59  13  5    0   0   0   10  0   0  
-       0   13  72  34   2   0   0   0   0   65
-       0   5   34  114  0   0   0   0   0   55
-       0   0   2   0    70  0   28  32  12  0
-       28  0   0   0    0   87  20  0   33  0
-       0   0   0   0    28  20  71  39  0   0
-       0   10  0   0    32  0   39  46  8   0
-       32  0   0   0    12  33  0   8   82  11
-       0   0   65  55   0   0   0   0   11  100];
-  y=A*x
-endfunction
-// スクリプトAtimesx をプリミティブに指定
-[x, fail, err, iter, res]=pcg(Atimesx,b,maxIter=30,tol=1d-12);
-mprintf("      fail=%d, iter=%d, errrel=%e\n",fail,iter,err)
-// 右辺を計算する関数を定義.
-function y=Atimesxbis(x,A)
-  y=A*x
-endfunction
-// リストをプリミティブに指定
-Alist = list(Atimesxbis,Asparse);
-[x, fail, err, iter, res]=pcg(Alist,b,maxIter=30,tol=1d-12);
-mprintf("      fail=%d, iter=%d, errrel=%e\n",fail,iter,err)
- ]]></programlisting>
-        
-    </refsection>
-    
-    <refsection>
-        
-        <title>key=value構文の例</title>
-        
-        <para>
-            
-            以下の例では"key=value"構文により引数を指定する方法を示します.
-            
-            これにより,位置を固定せずに引数を設定できるようになり,
-            
-            引数のリストにおいてその順番に依存せずに引数を設定できます.
-            
-            利用可能なキーはオプションの引数の名前で,以下に示します:
-            
-            tol, maxIter, %M, %M2, x0, verbose. 
-            
-            以下の例では,
-            
-            maxIterオプションの前にverboseオプションを指定します.
-            
-            "key=value" 構文ではなく,
-            
-            位置を指定する引数の場合は,
-            
-            maxIterを最初にverboseを後に指定する必要があります.
-            
-        </para>
-        
-        <programlisting role="example"><![CDATA[ 
-// 引数をkey=value構文で指定する例
-A=[100,1;1,10];
-b=[101;11];
-[xcomputed, flag, err, iter, res]=pcg(A,b,verbose=1);
-// key=value構文では, 順番は関係ありません
-[xcomputed, flag, err, iter, res]=pcg(A,b,verbose=1,maxIter=0);
- ]]></programlisting>
-        
-    </refsection>
-    
-    <refsection role="see also">
-        
-        <title>参照</title>
-        
-        <simplelist type="inline">
-            
-            <member>
-                
-                <link linkend="conjgrad">conjgrad</link>
-                
-            </member>
-            
-            <member>
-                
-                <link linkend="backslash">backslash</link>
-                
-            </member>
-            
-            <member>
-                
-                <link linkend="qmr">qmr</link>
-                
-            </member>
-            
-            <member>
-                
-                <link linkend="gmres">gmres</link>
-                
-            </member>
-            
-        </simplelist>
-        
-    </refsection>
-    
-    <refsection>
-        
-        <title>参考文献</title>
-        
-        <para>"Templates for the Solution of Linear Systems: Building Blocks for
-            
-            Iterative Methods", Barrett, Berry, Chan, Demmel, Donato, Dongarra,
-            
-            Eijkhout, Pozo, Romine, and Van der Vorst, SIAM Publications, 1993, ftp
-            
-            netlib2.cs.utk.edu/linalg/templates.ps
-            
-        </para>
-        
-        <para>"Iterative Methods for Sparse Linear Systems, Second Edition", Saad,
-            
-            SIAM Publications, 2003, ftp
-            
-            ftp.cs.umn.edu/dept/users/saad/PS/all_ps.zip
-            
-        </para>
-        
-    </refsection>
-    
-    <refsection>
-        
-        <title>履歴</title>
-        
-        <revhistory>
-            
-            <revision>
-                
-                <revnumber>5.5.0</revnumber>
-                
-                <revdescription>
-                    
-                    pcg(A, b, ...) のコールは廃止されました. 
-                    
-                    代わりに conjgrad(A, b, "pcg", ...) を使用してください.
-                    
-                </revdescription>
-                
-            </revision>
-            
-        </revhistory>
-        
-    </refsection>
-    
-</refentry>
-
index ff900f2..9a64044 100644 (file)
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2014-09-18 17:01+0100\n"
+"Revision-Date: 2014-12-02 16:09+0100\n"
 
 # File: includes/spDefs.h, line: 379
 #, c-format
@@ -244,7 +244,6 @@ msgstr ""
 # File: macros/%bicgstab.sci, line: 52
 # File: macros/%cgs.sci, line: 52
 # File: macros/%pcg.sci, line: 63
-# File: macros/pcg.sci, line: 210
 #, c-format
 msgid "Norm of right-hand side : %s\n"
 msgstr ""
@@ -254,7 +253,6 @@ msgstr ""
 # File: macros/%bicgstab.sci, line: 56
 # File: macros/%cgs.sci, line: 56
 # File: macros/%pcg.sci, line: 67
-# File: macros/pcg.sci, line: 214
 #, c-format
 msgid "Special processing where the right-hand side is zero.\n"
 msgstr ""
@@ -264,7 +262,6 @@ msgstr ""
 # File: macros/%bicgstab.sci, line: 76
 # File: macros/%cgs.sci, line: 76
 # File: macros/%pcg.sci, line: 85
-# File: macros/pcg.sci, line: 232
 #, c-format
 msgid "  Type of preconditionning #1 : %d\n"
 msgstr ""
@@ -274,7 +271,6 @@ msgstr ""
 # File: macros/%bicgstab.sci, line: 77
 # File: macros/%cgs.sci, line: 77
 # File: macros/%pcg.sci, line: 86
-# File: macros/pcg.sci, line: 233
 #, c-format
 msgid "  Type of preconditionning #2 : %d\n"
 msgstr ""
@@ -285,7 +281,6 @@ msgstr ""
 # File: macros/%bicgstab.sci, line: 142
 # File: macros/%cgs.sci, line: 85
 # File: macros/%pcg.sci, line: 94
-# File: macros/pcg.sci, line: 241
 #, c-format
 msgid "  New residual = %s < tol = %s => break\n"
 msgstr ""
@@ -295,7 +290,6 @@ msgstr ""
 # File: macros/%bicgstab.sci, line: 91
 # File: macros/%cgs.sci, line: 91
 # File: macros/%pcg.sci, line: 100
-# File: macros/pcg.sci, line: 247
 #, c-format
 msgid "  Iteration #%s/%s residual : %s\n"
 msgstr ""
@@ -305,7 +299,6 @@ msgstr ""
 # File: macros/%bicgstab.sci, line: 188
 # File: macros/%cgs.sci, line: 180
 # File: macros/conjgrad.sci, line: 266
-# File: macros/pcg.sci, line: 298
 #, c-format
 msgid "Final residual = %s > tol =%s\n"
 msgstr ""
@@ -315,7 +308,6 @@ msgstr ""
 # File: macros/%bicgstab.sci, line: 189
 # File: macros/%cgs.sci, line: 181
 # File: macros/conjgrad.sci, line: 267
-# File: macros/pcg.sci, line: 299
 #, c-format
 msgid "Algorithm fails\n"
 msgstr ""
@@ -325,7 +317,6 @@ msgstr ""
 # File: macros/%bicgstab.sci, line: 193
 # File: macros/%cgs.sci, line: 185
 # File: macros/conjgrad.sci, line: 271
-# File: macros/pcg.sci, line: 303
 #, c-format
 msgid "%s: Convergence error.\n"
 msgstr ""
@@ -335,7 +326,6 @@ msgstr ""
 # File: macros/%bicgstab.sci, line: 198
 # File: macros/%cgs.sci, line: 190
 # File: macros/conjgrad.sci, line: 276
-# File: macros/pcg.sci, line: 308
 #, c-format
 msgid "Algorithm pass\n"
 msgstr ""
@@ -345,8 +335,6 @@ msgstr ""
 # File: macros/conjgrad.sci, line: 92
 # File: macros/conjgrad.sci, line: 95
 # File: macros/gmres.sci, line: 148
-# File: macros/pcg.sci, line: 65
-# File: macros/pcg.sci, line: 68
 # File: macros/qmr.sci, line: 296
 # File: macros/sp2adj.sci, line: 19
 #, c-format
@@ -367,9 +355,6 @@ msgstr ""
 # File: macros/conjgrad.sci, line: 145
 # File: macros/conjgrad.sci, line: 202
 # File: macros/conjgrad.sci, line: 231
-# File: macros/pcg.sci, line: 115
-# File: macros/pcg.sci, line: 158
-# File: macros/pcg.sci, line: 187
 # File: macros/sp2adj.sci, line: 29
 #, c-format
 msgid "%s: Wrong type for input argument #%d.\n"
@@ -457,7 +442,6 @@ msgstr ""
 
 #
 # File: macros/conjgrad.sci, line: 119
-# File: macros/pcg.sci, line: 89
 #, c-format
 msgid "Arguments:\n"
 msgstr ""
@@ -466,9 +450,6 @@ msgstr ""
 # File: macros/conjgrad.sci, line: 150
 # File: macros/conjgrad.sci, line: 206
 # File: macros/conjgrad.sci, line: 235
-# File: macros/pcg.sci, line: 120
-# File: macros/pcg.sci, line: 162
-# File: macros/pcg.sci, line: 191
 #, c-format
 msgid "%s: Wrong type for input argument #%d: Square matrix expected.\n"
 msgstr ""
@@ -481,7 +462,6 @@ msgstr ""
 
 #
 # File: macros/conjgrad.sci, line: 158
-# File: macros/pcg.sci, line: 125
 #, c-format
 msgid "%s: Wrong type for input argument #%d: Column vector expected.\n"
 msgstr ""
@@ -495,10 +475,6 @@ msgstr ""
 # File: macros/gmres.sci, line: 75
 # File: macros/gmres.sci, line: 127
 # File: macros/gmres.sci, line: 141
-# File: macros/pcg.sci, line: 129
-# File: macros/pcg.sci, line: 165
-# File: macros/pcg.sci, line: 194
-# File: macros/pcg.sci, line: 202
 # File: macros/qmr.sci, line: 133
 # File: macros/qmr.sci, line: 162
 # File: macros/qmr.sci, line: 216
@@ -523,8 +499,6 @@ msgstr ""
 #
 # File: macros/conjgrad.sci, line: 178
 # File: macros/conjgrad.sci, line: 182
-# File: macros/pcg.sci, line: 134
-# File: macros/pcg.sci, line: 138
 # File: macros/qmr.sci, line: 255
 # File: macros/qmr.sci, line: 277
 #, c-format
@@ -533,7 +507,6 @@ msgstr ""
 
 #
 # File: macros/conjgrad.sci, line: 243
-# File: macros/pcg.sci, line: 199
 #, c-format
 msgid "%s: Wrong value for input argument #%d: Column vector expected.\n"
 msgstr ""
diff --git a/scilab/modules/sparse/macros/pcg.sci b/scilab/modules/sparse/macros/pcg.sci
deleted file mode 100644 (file)
index e08d691..0000000
+++ /dev/null
@@ -1,311 +0,0 @@
-// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-// Copyright (C) 2013 - Scilab Enterprises - Paul Bignier: tagged as obsolete,
-//                                                         use conjgrad(A,b,"pcg",...) instead
-// Copyright (C) 2009 - INRIA - Michael Baudin
-// Copyright (C) 2008 - INRIA - Michael Baudin
-// Copyright (C) 2006 - INRIA - Serge Steer
-// Copyright (C) 2005 - IRISA - Sage Group
-//
-// This file must be used under the terms of the CeCILL.
-// This source file is licensed as described in the file COPYING, which
-// you should have received as part of this distribution.  The terms
-// are also available at
-// http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.txt
-
-//
-// pcg --
-//   PCG solves the symmetric positive definite linear system %Ax=b
-//   using the Preconditionned Conjugate Gradient.
-//   If M is given, it is used as a preconditionning matrix.
-//   If both M and M2 are given, the matrix M * M2 is used as a preconditionning
-//   matrix.
-//
-// input   %A       REAL symmetric positive definite matrix or a function
-//                  y=Ax(x) which computes  y=%A*x for a given x
-//         b        REAL right hand side vector
-//         tol, optional      REAL error tolerance (default: 1e-8)
-//         maxIter, optional  INTEGER maximum number of iterations (default: size(%b))
-//         %M, optional       REAL preconditioner matrix (default: none)
-//         %M2, optional      REAL preconditioner matrix (default: none)
-//         x0, optional       REAL initial guess vector (default: the zero vector)
-//         verbose, optional  INTEGER set to 1 to enable verbose logging (default : 0)
-//
-// output  x        REAL solution vector
-//         flag     INTEGER: 0 = solution found to tolerance
-//                           1 = no convergence given maxIter
-//         resNorm  REAL final relative norm of the residual
-//         iter     INTEGER number of iterations performed
-//         resVec   REAL residual vector
-//
-// References
-//
-//     "Templates for the Solution of Linear Systems: Building Blocks
-//     for Iterative Methods",
-//     Barrett, Berry, Chan, Demmel, Donato, Dongarra, Eijkhout,
-//     Pozo, Romine, and Van der Vorst, SIAM Publications, 1993
-//     (ftp netlib2.cs.utk.edu; cd linalg; get templates.ps).
-//
-//     "Iterative Methods for Sparse Linear Systems, Second Edition"
-//     Saad, SIAM Publications, 2003
-//     (ftp ftp.cs.umn.edu; cd dept/users/saad/PS; get all_ps.zip).
-//
-//     Golub and Van Loan, Matrix Computations
-//
-// Notes
-//     This script was originally a matlab > scilab translation of the cg.m
-//     script from http://www.netlib.org/templates/matlab
-//
-//     The input / output arguments of this command are the same as
-//     Matlab's pcg command.
-//
-function [x, flag, resNorm, iter, resVec] = pcg(%A, %b, tol, maxIter, %M, %M2, x0, verbose )
-    warnobsolete("conjgrad", "5.5.1");
-    [lhs,rhs] = argn(0);
-    if (rhs < 2),
-        error(msprintf(gettext("%s: Wrong number of input arguments: %d to %d expected.\n"),"pcg",2,7));
-    end
-    if (rhs > 7),
-        error(msprintf(gettext("%s: Wrong number of input arguments: %d to %d expected.\n"),"pcg",2,7));
-    end
-    if exists("tol","local")==0 then
-        tol = 1e-8
-    end
-    if exists("maxIter","local")==0 then
-        maxIter = size(%b,1)
-    end
-    if exists("%M","local")==0 then
-        %M=[]
-    end
-    if exists("%M2","local")==0 then
-        %M2=[]
-    end
-    if exists("x0","local")==0 then
-        x0=zeros(%b);
-    end
-    if exists("verbose","local")==0 then
-        verbose=0;
-    end
-    if (verbose==1) then
-        printf(gettext("Arguments:\n"));
-        printf("  tol="+string(tol)+"\n");
-        printf("  maxIter="+string(maxIter)+"\n");
-        printf("  M=\n")
-        disp(%M)
-        printf("  M2=\n");
-        disp(%M2)
-        printf("  x0=\n");
-        disp(x0)
-        printf("  verbose="+string(verbose)+"\n");
-    end
-    // Compute matrixType
-    select type(%A)
-    case 1 then
-        matrixType = 1;
-    case 5 then
-        matrixType = 1;
-    case 13 then
-        matrixType = 0;
-        Aargs=list()
-    case 15 then
-        Aargs=list(%A(2:$))
-        // Caution : modify the input argument %A !
-        %A=%A(1);
-        matrixType = 0;
-    else
-        error(msprintf(gettext("%s: Wrong type for input argument #%d.\n"),"pcg",1));
-    end
-    // If %A is a matrix (dense or sparse)
-    if (matrixType == 1),
-        if (size(%A,1) ~= size(%A,2)),
-            error(msprintf(gettext("%s: Wrong type for input argument #%d: Square matrix expected.\n"),"pcg",1));
-        end
-    end
-    // Check right hand side %b
-    if (size(%b,2) ~= 1),
-        error(msprintf(gettext("%s: Wrong type for input argument #%d: Column vector expected.\n"),"pcg",2));
-    end
-    if (matrixType ==1),
-        if (size(%b,1) ~= size(%A,1)),
-            error(msprintf(gettext("%s: Wrong size for input argument #%d: Same size as input argument #%d expected.\n"),"pcg",2,1));
-        end
-    end
-    // Check type of the error tolerance tol
-    if or(size(tol) ~= [1 1]) then
-        error(msprintf(gettext("%s: Wrong type for input argument #%d: Scalar expected.\n"),"pcg",3));
-    end
-    // Check the type of maximum number of iterations maxIter
-    if or(size(maxIter) ~= [1 1]) then
-        error(msprintf(gettext("%s: Wrong type for input argument #%d: Scalar expected.\n"),"pcg",4));
-    end
-    // Compute precondType
-    select type(%M)
-    case 1 then
-        // M is a matrix
-        // precondType = 0 if the M is empty
-        //             = 1 if the M is not empty
-        precondType = bool2s(size(%M,"*")>=1);
-    case 5 then
-        precondType = 1;
-    case 13 then
-        Margs=list()
-        precondType = 2;
-    case 15 then
-        Margs=list(%M(2:$))
-        // Caution : modify the input argument %M !
-        %M=%M(1);
-        precondType = 2;
-    else
-        error(msprintf(gettext("%s: Wrong type for input argument #%d.\n"),"pcg",5));
-    end
-    if (precondType == 1),
-        if (size(%M,1) ~= size(%M,2)),
-            error(msprintf(gettext("%s: Wrong type for input argument #%d: Square matrix expected.\n"),"pcg",5));
-        end
-        if ( size(%M,1) ~= size(%b,1) ),
-            error(msprintf(gettext("%s: Wrong size for input argument #%d: Same size as input argument #%d expected.\n"),"pcg",5,2));
-        end
-    end
-    // Compute precondBis
-    select type(%M2)
-    case 1 then
-        // M2 is a matrix
-        // precondBis = 0 if the M2 is empty
-        //            = 1 if the M2 is not empty
-        precondBis =bool2s(size(%M2,"*")>=1);
-    case 5 then
-        precondBis = 1;
-    case 13 then
-        M2args=list()
-        precondBis = 2;
-    case 15 then
-        M2args=list(%M2(2:$))
-        // Caution : modify the input argument %M2 !
-        %M2=%M2(1);
-        // Caution : modify precondType again !
-        precondType = 2;
-    else
-        error(msprintf(gettext("%s: Wrong type for input argument #%d.\n"),"pcg",6));
-    end
-    if (precondBis == 1),
-        if (size(%M2,1) ~= size(%M2,2)),
-            error(msprintf(gettext("%s: Wrong type for input argument #%d: Square matrix expected.\n"),"pcg",6));
-        end
-        if ( size(%M2,1) ~= size(%b,1) ),
-            error(msprintf(gettext("%s: Wrong size for input argument #%d: Same size as input argument #%d expected.\n"),"pcg",6,2));
-        end
-    end
-    // Check size of the initial vector x0
-    if (size(x0,2) ~= 1),
-        error(msprintf(gettext("%s: Wrong value for input argument #%d: Column vector expected.\n"),"pcg",7));
-    end
-    if (size(x0,1) ~= size(%b,1)),
-        error(msprintf(gettext("%s: Wrong size for input argument #%d: Same size as input argument #%d expected.\n"),"pcg",7,2));
-    end
-    // ------------
-    // Computations
-    // ------------
-    // initialization
-    bnrm2 = norm(%b);
-    if (verbose==1) then
-        printf(gettext("Norm of right-hand side : %s\n"), string(bnrm2));
-    end
-    if  (bnrm2 == 0) then
-        if (verbose==1) then
-            printf(gettext("Special processing where the right-hand side is zero.\n"));
-        end
-        // When rhs is 0, there is a trivial solution : x=0
-        x = zeros(%b);
-        resNorm = 0;
-        resVec = resNorm;
-    else
-        x = x0;
-        // r = %b - %A*x;
-        if (matrixType ==1),
-            r = %b - %A*x;
-        else
-            r = %b - %A(x,Aargs(:));
-        end
-        resNorm = norm(r) / bnrm2;
-        resVec = resNorm;
-    end
-    if (verbose==1) then
-        printf(gettext("  Type of preconditionning #1 : %d\n"),precondType);
-        printf(gettext("  Type of preconditionning #2 : %d\n"),precondBis);
-    end
-    // begin iteration
-    // Distinguish the number of iterations processed from the currentiter index
-    iter = 0
-    for currentiter = 1:maxIter
-        if (resNorm <= tol) then
-            if (verbose==1) then
-                printf(gettext("  New residual = %s < tol = %s => break\n"),string(resNorm),string(tol));
-            end
-            break;
-        end
-        iter = iter + 1
-        if (verbose==1) then
-            printf(gettext("  Iteration #%s/%s residual : %s\n"),string(currentiter),string(maxIter),string(resNorm));
-            printf("  x=\n");
-            disp(x);
-        end
-        if %M == [] & %M2 == [] then
-            z = r;
-        elseif %M2 == [] then
-            // Compute z so that M z = r
-            if (precondType == 1) then
-                z = %M \ r;
-            elseif (precondType == 2) then
-                z = %M(r,Margs(:));
-            else
-                z = r;
-            end
-        else
-            // Compute z so that M M2 z = r
-            if (precondBis == 1) then
-                z = %M \ r;
-                z = %M2 \ z;
-            elseif (precondBis == 2) then
-                z = %M(r,Margs(:));
-                z = %M2(z,M2args(:));
-            else
-                z = r;
-            end
-        end
-        rho = r'*z;
-        if (currentiter > 1) then
-            bet = rho / rho_old;
-            p = z + bet*p;
-        else
-            p = z;
-        end
-        // q = %A*p;
-        if (matrixType ==1),
-            q = %A*p;
-        else
-            q = %A(p);
-        end
-        alp = rho / (p'*q );
-        x = x + alp*p;
-        r = r - alp*q;
-        resNorm = norm(r) / bnrm2;
-        // Caution : transform the scalar resVec into vector resVec !
-        resVec = [resVec;resNorm];
-        rho_old = rho;
-    end
-    // test for convergence
-    if (resNorm > tol) then
-        if (verbose==1) then
-            printf(gettext("Final residual = %s > tol =%s\n"),string(resNorm),string(tol));
-            printf(gettext("Algorithm fails\n"));
-        end
-        flag = 1;
-        if (lhs < 2) then
-            warning(msprintf(gettext("%s: Convergence error.\n"),"pcg"));
-        end
-    else
-        flag = 0;
-        if (verbose==1) then
-            printf(gettext("Algorithm pass\n"));
-        end
-    end
-endfunction
diff --git a/scilab/modules/sparse/tests/nonreg_tests/bug_3310.dia.ref b/scilab/modules/sparse/tests/nonreg_tests/bug_3310.dia.ref
deleted file mode 100644 (file)
index 8c29e88..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-// =============================================================================
-// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-// Copyright (C) 2007-2008 - INRIA - Serge STEER <serge.steer@inria.fr>
-//
-//  This file is distributed under the same license as the Scilab package.
-// =============================================================================
-// <-- CLI SHELL MODE -->
-// <-- ENGLISH IMPOSED -->
-// <-- Non-regression test for bug 3310 -->
-//
-// <-- Bugzilla URL -->
-// http://bugzilla.scilab.org/show_bug.cgi?id=3310
-//
-// <-- Short Description -->
-// Wrong implementation of input arguments
-A=[10,1;1,10];
-// Suppose that the rhs is in myrhs instead of b
-myrhs=[11;11];
-[xcomputed, flag, err, iter, res]=conjgrad(A,myrhs);
-xexpected=[1;1];
-assert_checkequal(xcomputed, xexpected);
diff --git a/scilab/modules/sparse/tests/nonreg_tests/bug_3310.tst b/scilab/modules/sparse/tests/nonreg_tests/bug_3310.tst
deleted file mode 100644 (file)
index adfac97..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-// =============================================================================
-// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-// Copyright (C) 2007-2008 - INRIA - Serge STEER <serge.steer@inria.fr>
-//
-//  This file is distributed under the same license as the Scilab package.
-// =============================================================================
-
-// <-- CLI SHELL MODE -->
-
-// <-- ENGLISH IMPOSED -->
-
-// <-- Non-regression test for bug 3310 -->
-//
-// <-- Bugzilla URL -->
-// http://bugzilla.scilab.org/show_bug.cgi?id=3310
-//
-// <-- Short Description -->
-// Wrong implementation of input arguments
-A=[10,1;1,10];
-// Suppose that the rhs is in myrhs instead of b
-myrhs=[11;11];
-[xcomputed, flag, err, iter, res]=conjgrad(A,myrhs);
-xexpected=[1;1];
-assert_checkequal(xcomputed, xexpected);
-
-
index b99f995..36fb3b8 100644 (file)
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2014-09-18 17:01+0100\n"
+"Revision-Date: 2014-12-02 16:09+0100\n"
 
 # File: sci_gateway/c/sci_besselh.c, line: 74
 # File: sci_gateway/c/sci_besselh.c, line: 103
index 9fa8212..dead4c9 100644 (file)
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2014-09-18 17:01+0100\n"
+"Revision-Date: 2014-12-02 16:09+0100\n"
 
 # File: sci_gateway/c/gw_csv_helpers.c, line: 72
 # File: sci_gateway/c/gw_csv_helpers.c, line: 137
index 862a18f..e2f2ecb 100644 (file)
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2014-09-18 17:01+0100\n"
+"Revision-Date: 2014-12-02 16:09+0100\n"
 
 # File: src/c/initMPI.c, line: 27
 #, c-format
diff --git a/scilab/modules/statistics/help/en_US/descriptive_statistics/msd.xml b/scilab/modules/statistics/help/en_US/descriptive_statistics/msd.xml
deleted file mode 100644 (file)
index dbf7fd2..0000000
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) 2013 - Scilab Enterprises - Paul Bignier: made obsolete, merged in stdev
- * Copyright (C) 2000 - INRIA - Carlos Klimann
- *
- * This file must be used under the terms of the CeCILL.
- * This source file is licensed as described in the file COPYING, which
- * you should have received as part of this distribution.  The terms
- * are also available at
- * http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.txt
- *
- -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:lang="en" xml:id="msd">
-    <refnamediv>
-        <refname>msd</refname>
-        <refpurpose>
-            mean squared deviation
-            <emphasis role="bold">This function is obsolete.</emphasis>
-        </refpurpose>
-    </refnamediv>
-    <refsynopsisdiv>
-        <title>Calling Sequence</title>
-        <synopsis>y = msd(x)
-            y = msd(x, "r") or m = msd(x, 1)
-            y = msd(x, "c") or m = msd(x, 2)
-        </synopsis>
-    </refsynopsisdiv>
-    <refsection>
-        <title>Arguments</title>
-        <variablelist>
-            <varlistentry>
-                <term>x</term>
-                <listitem>
-                    <para>real or complex vector or matrix</para>
-                </listitem>
-            </varlistentry>
-        </variablelist>
-    </refsection>
-    <refsection>
-        <title>Description</title>
-        <para>
-            This function computes the mean squared deviation of the values of a
-            vector or matrix <literal>x</literal>.
-        </para>
-        <para>
-            For a vector or a matrix <literal> x</literal>, <literal> y=msd(x) </literal> returns in the
-            scalar <literal>y</literal> the mean squared deviation of all the entries of <literal> x</literal>.
-        </para>
-        <para>
-            <literal> y=msd(x,'r') </literal> (or, equivalently, <literal> y=msd(x,1) </literal>) is the
-            rowwise mean squared  deviation. It returns in each entry of the row
-            vector <literal>y</literal> the mean squared deviation of each column of <literal> x </literal>.
-        </para>
-        <para>
-            <literal> y=msd(x,'c') </literal> (or, equivalently, <literal> m=msd(x,2) </literal>) is the
-            columnwise mean squared deviation. It returns in each entry of the
-            column vector <literal> y </literal> the mean squared deviation of each row of <literal>x</literal>.
-        </para>
-        <warning>
-            This function is obsolete.
-            It is better to use <link linkend="stdev">stdev</link> instead of <code>msd</code>.
-            <literal>msd(x) => stdev(x, "*", %nan)</literal>,
-            <literal>msd(x, "r") => stdev(x, "r", %nan)</literal>,
-            <literal>msd(x, "c") => stdev(x, "c", %nan)</literal>.
-        </warning>
-    </refsection>
-    <refsection>
-        <title>Examples</title>
-        <programlisting role="example"><![CDATA[
-x = [0.2113249 0.0002211 0.6653811; 0.7560439 0.3303271 0.6283918]
-m = msd(x)
-m = msd(x, "r")
-m = msd(x, "c")
- ]]></programlisting>
-    </refsection>
-    <refsection>
-        <title>Bibliography</title>
-        <para>
-            Wonacott, T.H. &amp; Wonacott, R.J.; Introductory Statistics, fifth edition, J.Wiley &amp; Sons, 1990.
-        </para>
-    </refsection>
-    <refsection>
-        <title>History</title>
-        <revhistory>
-            <revision>
-                <revnumber>5.5.0</revnumber>
-                <revdescription>
-                    Function tagged as obsolete. Will be removed in 5.5.1. Please use <link linkend="stdev">stdev</link> instead.
-                </revdescription>
-            </revision>
-        </revhistory>
-    </refsection>
-</refentry>
diff --git a/scilab/modules/statistics/help/ja_JP/descriptive_statistics/msd.xml b/scilab/modules/statistics/help/ja_JP/descriptive_statistics/msd.xml
deleted file mode 100644 (file)
index ccbc1b7..0000000
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) 2000 - INRIA - Carlos Klimann
- * 
- * This file must be used under the terms of the CeCILL.
- * This source file is licensed as described in the file COPYING, which
- * you should have received as part of this distribution.  The terms
- * are also available at    
- * http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.txt
- *
- -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:lang="ja" xml:id="msd">
-    <refnamediv>
-        <refname>msd</refname>
-        <refpurpose>平均二乗偏差</refpurpose>
-    </refnamediv>
-    <refsynopsisdiv>
-        <title>呼び出し手順</title>
-        <synopsis>y=msd(x)
-            y=msd(x,'r') or m=msd(x,1)
-            y=msd(x,'c') or m=msd(x,2)
-        </synopsis>
-    </refsynopsisdiv>
-    <refsection>
-        <title>パラメータ</title>
-        <variablelist>
-            <varlistentry>
-                <term>x</term>
-                <listitem>
-                    <para>実数または複素数のベクトルまたは行列</para>
-                </listitem>
-            </varlistentry>
-        </variablelist>
-    </refsection>
-    <refsection>
-        <title>説明</title>
-        <para>
-            この関数は,ベクトルまたは行列<literal>x</literal>の値の
-            平均二乗偏差を計算します.
-        </para>
-        <para>
-            あるベクトルまたは行列 <literal> x</literal>について, 
-            <literal>  y=msd(x) </literal> は,
-            スカラー<literal> y</literal>に
-            <literal> x</literal>の全エントリの平均二乗偏差を返します.
-        </para>
-        <para>
-            <literal> y=msd(x,'r') </literal>   (または等価な<literal>  y=msd(x,1) </literal>)  
-            は,行方向の平均二乗偏差です.
-            この場合,行ベクトル<literal>y</literal>に
-            <literal> x </literal>の各列の平均二乗偏差が返されます.
-        </para>
-        <para>
-            <literal> y=msd(x,'c')  </literal> (または等価な<literal> m=msd(x,2)  </literal>) 
-            は,列方向の平均二乗偏差です.
-            この場合,列ベクトル<literal>y</literal>に
-            <literal> x </literal>の各行の平均二乗偏差が返されます.
-        </para>
-    </refsection>
-    <refsection>
-        <title>例</title>
-        <programlisting role="example"><![CDATA[ 
-x=[0.2113249 0.0002211 0.6653811;0.7560439 0.3303271 0.6283918]
-m=msd(x)
-m=msd(x,'r')
-m=msd(x,'c')
- ]]></programlisting>
-    </refsection>
-    <refsection>
-        <title>参考文献</title>
-        <para>
-            Wonacott, T.H. &amp; Wonacott, R.J.; Introductory Statistics, fifth edition, J.Wiley &amp; Sons, 1990.
-        </para>
-    </refsection>
-</refentry>
diff --git a/scilab/modules/statistics/help/ja_JP/labostat.xml b/scilab/modules/statistics/help/ja_JP/labostat.xml
deleted file mode 100644 (file)
index 8394248..0000000
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) 2000 - INRIA - Carlos Klimann
- * 
- * This file must be used under the terms of the CeCILL.
- * This source file is licensed as described in the file COPYING, which
- * you should have received as part of this distribution.  The terms
- * are also available at    
- * http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.txt
- *
- -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:lang="ja" xml:id="labostat">
-    <refnamediv>
-        <refname>labostat</refname>
-        <refpurpose>Scilab統計ツールボックス</refpurpose>
-    </refnamediv>
-    <refsection>
-        <title>内容</title>
-        <programlisting role=""><![CDATA[ 
-center: 変数を中心化
-centrered: 変数を中心化および縮減
-cmoment: 全ての次数の中心モーメント
-correl: 相関
-covar: 共分散
-ftest: フィッシャーテストおよびそのp値
-geomean: 幾何学的平均
-harmean: 調和平均
-iqr: 四分位範囲
-mad: 平均絶対偏差
-meanf:  頻度表を有するベクトルまたは行列の算術平均
-median: 標本の50%値
-mn: ベクトルまたは行列の算術平均
-moment: 全次数のモーメント
-msd:  平均二乗偏差
-mvvacov : 分散-共分散の多変量行列
-nand2mean: 2個の独立した標本の平均の差の推定
-nanmax:  NaNを無視する最大値
-nanmean: mNaNを無視する平均
-nanmeanf:  NaNを無視する頻度表の平均
-nanmedian: NaNを無視する標本の50%
-nanmin: NaNを無視する最小値
-nanstdev:  NaNを無視する標準偏差
-nanstdevf: NaNを無視する頻度表を有する標準偏差
-nansum: NaNを無視する合計
-nfreq: 標本の値の頻度
-pca: 主成分解析
-pctl: 標本のパーセンタイル値のベクトル(降順)
-perctl: 標本のパーセンタイル値のベクトル(降順)
-quart: 四分位数
-stdev: 標準偏差
-stdevf: 頻度の標準偏差
-strange: 最大値の最小値の間の距離
-tabul: 値の頻度
-var: 分散
-varf: 頻度表の分散
- ]]></programlisting>
-    </refsection>
-    <refsection>
-        <title>参考文献</title>
-        <para>
-            Wonacott, T.H. &amp; Wonacott, R.J.; Introductory Statistics, 5th edition, J.Wiley &amp; Sons, 1990.
-        </para>
-        <para>
-            Saporta,  Gilbert, Probabilites, Analyse  des Donnees  et Statistique, Editions Technip, Paris, 1990.
-        </para>
-    </refsection>
-</refentry>
index f3a30c9..dd3ac74 100644 (file)
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2014-09-18 17:01+0100\n"
+"Revision-Date: 2014-12-02 16:09+0100\n"
 
 # File: sci_gateway/c/sci_cdfbet.c, line: 45
 msgid "X,Y,A and B"
@@ -414,7 +414,6 @@ msgstr ""
 # File: macros/harmean.sci, line: 47
 # File: macros/mad.sci, line: 49
 # File: macros/meanf.sci, line: 71
-# File: macros/msd.sci, line: 46
 # File: macros/nanmedian.sci, line: 51
 # File: macros/variance.sci, line: 79
 # File: macros/wcenter.sci, line: 57
@@ -561,7 +560,6 @@ msgstr ""
 
 #
 # File: macros/iqr.sci, line: 35
-# File: macros/msd.sci, line: 36
 #, c-format
 msgid "%s: Wrong number of input argument: At least %d expected.\n"
 msgstr ""
diff --git a/scilab/modules/statistics/macros/msd.sci b/scilab/modules/statistics/macros/msd.sci
deleted file mode 100644 (file)
index be9cb06..0000000
+++ /dev/null
@@ -1,48 +0,0 @@
-// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-// Copyright (C) 2013 - Scilab Enterprises - Paul Bignier: made obsolete, merged in stdev
-// Copyright (C) 1999 - INRIA - Carlos Klimann
-//
-// This file must be used under the terms of the CeCILL.
-// This source file is licensed as described in the file COPYING, which
-// you should have received as part of this distribution.  The terms
-// are also available at
-// http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.txt
-//
-
-
-function m=msd(x,orien)
-    //
-    //This function computes  the mean squared  deviation of the values of a
-    //vector or matrix x.
-    //
-    //For a vector or a matrix x, m=msd(x) returns in  the scalar y the mean
-    //squared deviation of all the entries of x.
-    //
-    //m=msd(x,'r') (or,   equivalently,   m=msd(x,1)) is the   rowwise  mean
-    //squared  deviation. It returns  in each entry of the  row vector y the
-    //mean squared deviation of each column of x.
-    //
-    //m=msd(x,'c') (or,   equivalently, m=msd(x,2)) is  the  columnwise mean
-    //squared deviation. It returns in each entry of the column vector y the
-    //mean squared deviation of each row of x.
-    //
-    //Reference: Wonacott  T.H.& Wonacott  R.J. .-  Introductory Statistics,
-    //5th edition, John Wiley, 1990.
-    //
-    //
-    warnobsolete("stdev", "5.5.1");
-
-    rhs=argn(2)
-    if rhs==0 then error(msprintf(gettext("%s: Wrong number of input argument: At least %d expected.\n"),"msd",1)), end
-    if x==[] then s=%nan, return, end
-    if rhs==1 then orien="*",end
-    if orien=="*" then
-        m=sqrt(sum((x-mean(x)).^2)/size(x,orien));
-    elseif orien=="c"|orien==2 then
-        m=sqrt(sum((x-mean(x,orien)*ones(x(1,:))).^2,orien)/size(x,orien));
-    elseif orien=="r"|orien==1 then
-        m=sqrt(sum((x-ones(x(:,1))*mean(x,orien)).^2,orien)/size(x,orien));
-    else
-        error(msprintf(gettext("%s: Wrong value for input argument #%d: ''%s'', ''%s'', %d or %d expected.\n"),"msd",2,"r","c",1,2)),
-    end
-endfunction
index 8e4d969..2e7da11 100644 (file)
@@ -12,7 +12,7 @@
 // http://bugzilla.scilab.org/show_bug.cgi?id=1742
 //
 // <-- Short Description -->
-//    function [m]=msd(x,orien)
+//    function [m]=stdev(x,orien)
 //    //This function computes  the mean squared  deviation of the values of a
 //    //vector or matrix x.
 //
 //    This formula is wrong. Must be canged in:
 //    m=sqrt(sum((x-ones(x(:,1))*mean(x,'r')).^2,'r')/nrow);
 x=matrix([5 2:8],2,4);
-if (msd(x)-3.5)                  >= %eps then bugmes();quit;end
-WARNING: Feature msd is obsolete.
-         Please use stdev instead.
-         This feature will be permanently removed in Scilab 5.5.1
-
-if norm(msd(x,1)-[3 1 1 1]/2)    >= %eps then bugmes();quit;end
-WARNING: Feature msd is obsolete.
-         Please use stdev instead.
-         This feature will be permanently removed in Scilab 5.5.1
-
-if norm(msd(x,'r')-[3 1 1 1]/2)  >= %eps then bugmes();quit;end
-WARNING: Feature msd is obsolete.
-         Please use stdev instead.
-         This feature will be permanently removed in Scilab 5.5.1
-
-if norm(msd(x,2)-sqrt([2;5]))    >= %eps then bugmes();quit;end
-WARNING: Feature msd is obsolete.
-         Please use stdev instead.
-         This feature will be permanently removed in Scilab 5.5.1
-
-if norm(msd(x,'c')-sqrt([2;5]))  >= %eps then bugmes();quit;end
-WARNING: Feature msd is obsolete.
-         Please use stdev instead.
-         This feature will be permanently removed in Scilab 5.5.1
-
+if (stdev(x)-3.5)                  >= %eps then bugmes();quit;end
+if norm(stdev(x,1,mean(x, 1))-[3 1 1 1]/2)    >= %eps then bugmes();quit;end
+if norm(stdev(x,"r",mean(x, 1))-[3 1 1 1]/2)  >= %eps then bugmes();quit;end
+if norm(stdev(x,2,mean(x, 2))-sqrt([2;5]))    >= %eps then bugmes();quit;end
+if norm(stdev(x,"c",mean(x, 2))-sqrt([2;5]))  >= %eps then bugmes();quit;end
index d43bc72..ff17c16 100644 (file)
@@ -13,7 +13,7 @@
 // http://bugzilla.scilab.org/show_bug.cgi?id=1742
 //
 // <-- Short Description -->
-//    function [m]=msd(x,orien)
+//    function [m]=stdev(x,orien)
 //    //This function computes  the mean squared  deviation of the values of a
 //    //vector or matrix x.
 //
@@ -25,8 +25,8 @@
 
 x=matrix([5 2:8],2,4);
 
-if (msd(x)-3.5)                  >= %eps then pause,end
-if norm(msd(x,1)-[3 1 1 1]/2)    >= %eps then pause,end
-if norm(msd(x,'r')-[3 1 1 1]/2)  >= %eps then pause,end
-if norm(msd(x,2)-sqrt([2;5]))    >= %eps then pause,end
-if norm(msd(x,'c')-sqrt([2;5]))  >= %eps then pause,end
+if (stdev(x)-3.5)                  >= %eps then pause,end
+if norm(stdev(x,1,mean(x, 1))-[3 1 1 1]/2)    >= %eps then pause,end
+if norm(stdev(x,"r",mean(x, 1))-[3 1 1 1]/2)  >= %eps then pause,end
+if norm(stdev(x,2,mean(x, 2))-sqrt([2;5]))    >= %eps then pause,end
+if norm(stdev(x,"c",mean(x, 2))-sqrt([2;5]))  >= %eps then pause,end
index 39b258b..a0e6cc0 100644 (file)
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2014-09-18 17:01+0100\n"
+"Revision-Date: 2014-12-02 16:09+0100\n"
 
 # File: sci_gateway/c/sci_ascii.c, line: 171
 msgid "WARNING : \n"
index 500e85c..38c4a70 100644 (file)
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2014-09-18 17:01+0100\n"
+"Revision-Date: 2014-12-02 16:09+0100\n"
 
 # File: sci_gateway/c/gw_symbolic.c, line: 33
 #, c-format
index 87a7124..aee791a 100644 (file)
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2014-09-18 17:01+0100\n"
+"Revision-Date: 2014-12-02 16:09+0100\n"
 
 # File: sci_gateway/c/gw_tclsci.c, line: 72
 msgid "Warning: Problem(s) with TCL/TK interface. Interface not enabled.\n"
index 8ec1d0c..49e52c2 100644 (file)
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2014-09-18 17:01+0100\n"
+"Revision-Date: 2014-12-02 16:09+0100\n"
 
 # File: sci_gateway/c/sci_calendar.c, line: 59
 # File: sci_gateway/c/sci_calendar.c, line: 65
index ce513b8..5c8c5eb 100644 (file)
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2014-09-18 17:01+0100\n"
+"Revision-Date: 2014-12-02 16:09+0100\n"
 
 # File: src/java/org/scilab/modules/types/ScilabTypeEnumDescription.java, line: 24
 msgid "Double"
index ac2e32b..39420a4 100644 (file)
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2014-09-18 17:01+0100\n"
+"Revision-Date: 2014-12-02 16:09+0100\n"
 
 # File: sci_gateway/c/gw_ui_data.c, line: 40
 # File: src/noui_data/noui_data.c, line: 28
index 1c7410e..4b42e5b 100644 (file)
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2014-09-18 17:01+0100\n"
+"Revision-Date: 2014-12-02 16:09+0100\n"
 
 # File: sci_gateway/c/sci_res_with_prec.c, line: 169
 #, c-format
index 5926b41..284c8b3 100644 (file)
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2014-09-18 17:01+0100\n"
+"Revision-Date: 2014-12-02 16:09+0100\n"
 
 # File: sci_gateway/c/sci_consolebox.c, line: 51
 # File: sci_gateway/c/sci_consolebox.c, line: 93
index 5de3bce..dc8cc49 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/SAWTOOTH_f.png and b/scilab/modules/xcos/images/palettes/SAWTOOTH_f.png differ
index 5ec6f4d..3f94474 100644 (file)
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2014-09-18 17:01+0100\n"
+"Revision-Date: 2014-12-02 16:09+0100\n"
 
 # File: sci_gateway/c/gw_xcos.c, line: 56
 # File: src/noxcos/noxcos.c, line: 22
index 54e42ba..f27c1e4 100644 (file)
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2014-09-18 17:01+0100\n"
+"Revision-Date: 2014-12-02 16:09+0100\n"
 
 # File: sci_gateway/cpp/sci_htmlDump.cpp, line: 55
 # File: sci_gateway/cpp/sci_htmlDump.cpp, line: 80