summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPierre MARECHAL <pierre.marechal@scilab.org>2009-07-15 17:04:44 +0200
committerPierre MARECHAL <pierre.marechal@scilab.org>2009-07-15 17:04:44 +0200
commit9f38c14f4a63c79f742f39e4d12a05e60fa7aa49 (patch)
tree9dcfc2cd6b01dc0958458f730676df46b6f2114e
parentf3c8885458b015407655cb6b8dab7c3bc179316d (diff)
parent42422e1fa072aa3cdc2e4ca94494b3af694c444d (diff)
downloadscilab-9f38c14f4a63c79f742f39e4d12a05e60fa7aa49.zip
scilab-9f38c14f4a63c79f742f39e4d12a05e60fa7aa49.tar.gz
Merge commit 'origin/master' into atoms
Conflicts: scilab/configure scilab/etc/modules.xml.vc scilab/modules/Makefile.am scilab/modules/Makefile.in
-rw-r--r--scilab/Scilab.sln28
-rw-r--r--scilab/Scilab_f2c.sln28
-rwxr-xr-xscilab/configure3
-rw-r--r--scilab/configure.ac1
-rw-r--r--scilab/etc/modules.xml.in1
-rw-r--r--scilab/etc/modules.xml.vc3
-rw-r--r--scilab/modules/Makefile.am6
-rw-r--r--scilab/modules/Makefile.in7
-rw-r--r--scilab/modules/api_scilab/help/en_US/common_getvaraddr_api.xml (renamed from scilab/modules/core/help/en_US/api/common_getvaraddr_api.xml)2
-rw-r--r--scilab/modules/api_scilab/help/en_US/common_getvardimension_api.xml207
-rw-r--r--scilab/modules/api_scilab/help/en_US/common_getvartype_api.xml (renamed from scilab/modules/core/help/en_US/api/common_getvartype_api.xml)2
-rw-r--r--scilab/modules/api_scilab/help/en_US/common_iscomplex_api.xml (renamed from scilab/modules/core/help/en_US/api/common_iscomplex_api.xml)2
-rw-r--r--scilab/modules/api_scilab/help/en_US/common_isvarmatrixtype_api.xml197
-rw-r--r--scilab/modules/api_scilab/help/en_US/double_reading_api.xml (renamed from scilab/modules/core/help/en_US/api/double_reading_api.xml)0
-rw-r--r--scilab/modules/api_scilab/help/en_US/double_writing_api.xml19
-rw-r--r--scilab/modules/api_scilab/help/en_US/int_getmatrixofintegerprecision_api.xml201
-rw-r--r--scilab/modules/api_scilab/help/en_US/integer_reading_api.xml (renamed from scilab/modules/core/help/en_US/api/integer_reading_api.xml)0
-rw-r--r--scilab/modules/api_scilab/help/en_US/integer_writing_api.xml (renamed from scilab/modules/core/help/en_US/api/integer_writing_api.xml)0
-rw-r--r--scilab/modules/api_scilab/help/en_US/poly_getpolyvariablename_api.xml242
-rw-r--r--scilab/modules/api_scilab/help/en_US/poly_reading_api.xml (renamed from scilab/modules/core/help/en_US/api/poly_reading_api.xml)0
-rw-r--r--scilab/modules/api_scilab/help/en_US/poly_writing_api.xml (renamed from scilab/modules/core/help/en_US/api/poly_writing_api.xml)0
-rw-r--r--scilab/modules/api_scilab/help/en_US/string_reading_api.xml (renamed from scilab/modules/core/help/en_US/api/string_reading_api.xml)0
-rw-r--r--scilab/modules/api_scilab/help/en_US/string_writing_api.xml (renamed from scilab/modules/core/help/en_US/api/string_writing_api.xml)0
-rw-r--r--scilab/modules/api_scilab/includes/api_int.h2
-rw-r--r--scilab/modules/api_scilab/src/c/api_common.c27
-rw-r--r--scilab/modules/core/help/en_US/api/double_writing_api.xml263
-rw-r--r--scilab/modules/core/includes/callinterf.h1
-rw-r--r--scilab/modules/core/includes/stack-c.h18
-rw-r--r--scilab/modules/core/src/c/callinterf.c5
-rw-r--r--scilab/modules/data_structures/src/c/hmops.c84
-rw-r--r--scilab/modules/differential_equations/license.txt10
-rw-r--r--scilab/modules/fileio/Makefile.am28
-rw-r--r--scilab/modules/fileio/Makefile.in226
-rw-r--r--scilab/modules/fileio/fileio.vcproj98
-rw-r--r--scilab/modules/fileio/includes/gw_fileio.h3
-rw-r--r--scilab/modules/fileio/includes/h5_readDataFromFile.h60
-rw-r--r--scilab/modules/fileio/includes/h5_writeDataToFile.h44
-rw-r--r--scilab/modules/fileio/sci_gateway/c/gw_fileio.c6
-rw-r--r--scilab/modules/fileio/sci_gateway/fileio_gateway.xml2
-rw-r--r--scilab/modules/fileio/src/c/DllmainFileio.c2
-rw-r--r--scilab/modules/graphics/help/en_US/Graphics.xml462
-rw-r--r--scilab/modules/graphics/help/images/Matplot.pngbin0 -> 3690 bytes
-rw-r--r--scilab/modules/graphics/help/images/Sfgrayplot.pngbin0 -> 30550 bytes
-rw-r--r--scilab/modules/graphics/help/images/Sgrayplot.pngbin0 -> 56393 bytes
-rw-r--r--scilab/modules/graphics/help/images/black.pngbin0 -> 29694 bytes
-rw-r--r--scilab/modules/graphics/help/images/bode.pngbin0 -> 15737 bytes
-rw-r--r--scilab/modules/graphics/help/images/champ.pngbin0 -> 10073 bytes
-rw-r--r--scilab/modules/graphics/help/images/champ1.pngbin0 -> 16955 bytes
-rw-r--r--scilab/modules/graphics/help/images/chart.pngbin0 -> 30827 bytes
-rw-r--r--scilab/modules/graphics/help/images/contour.pngbin0 -> 27118 bytes
-rw-r--r--scilab/modules/graphics/help/images/errbar.pngbin0 -> 11681 bytes
-rw-r--r--scilab/modules/graphics/help/images/eval3dp.pngbin0 -> 10390 bytes
-rw-r--r--scilab/modules/graphics/help/images/evans.pngbin0 -> 7060 bytes
-rw-r--r--scilab/modules/graphics/help/images/fchamp.pngbin0 -> 15680 bytes
-rw-r--r--scilab/modules/graphics/help/images/fcontour.pngbin0 -> 18112 bytes
-rw-r--r--scilab/modules/graphics/help/images/fcontour2d.pngbin0 -> 8875 bytes
-rw-r--r--scilab/modules/graphics/help/images/fgrayplot.pngbin0 -> 8451 bytes
-rw-r--r--scilab/modules/graphics/help/images/fplot2d.pngbin0 -> 4159 bytes
-rw-r--r--scilab/modules/graphics/help/images/fplot3d.pngbin0 -> 22854 bytes
-rw-r--r--scilab/modules/graphics/help/images/fplot3d1.pngbin0 -> 33664 bytes
-rw-r--r--scilab/modules/graphics/help/images/gainplot.pngbin0 -> 12324 bytes
-rw-r--r--scilab/modules/graphics/help/images/genfac3d.pngbin0 -> 13530 bytes
-rw-r--r--scilab/modules/graphics/help/images/geom3d.pngbin0 -> 10477 bytes
-rw-r--r--scilab/modules/graphics/help/images/grayplot.pngbin0 -> 59629 bytes
-rw-r--r--scilab/modules/graphics/help/images/hist3d.pngbin0 -> 16195 bytes
-rw-r--r--scilab/modules/graphics/help/images/histplot.pngbin0 -> 10503 bytes
-rw-r--r--scilab/modules/graphics/help/images/m_circle.pngbin0 -> 5028 bytes
-rw-r--r--scilab/modules/graphics/help/images/nyquist.pngbin0 -> 11365 bytes
-rw-r--r--scilab/modules/graphics/help/images/param3d.pngbin0 -> 11645 bytes
-rw-r--r--scilab/modules/graphics/help/images/param3d1.pngbin0 -> 11645 bytes
-rw-r--r--scilab/modules/graphics/help/images/plot2d.pngbin0 -> 10821 bytes
-rw-r--r--scilab/modules/graphics/help/images/plot2d2.pngbin0 -> 7193 bytes
-rw-r--r--scilab/modules/graphics/help/images/plot2d3.pngbin0 -> 5033 bytes
-rw-r--r--scilab/modules/graphics/help/images/plot2d4.pngbin0 -> 13062 bytes
-rw-r--r--scilab/modules/graphics/help/images/plot3d.pngbin0 -> 40746 bytes
-rw-r--r--scilab/modules/graphics/help/images/plot3d1.pngbin0 -> 40746 bytes
-rw-r--r--scilab/modules/graphics/help/images/plzr.pngbin0 -> 10006 bytes
-rw-r--r--scilab/modules/graphics/help/images/sgrid.pngbin0 -> 19046 bytes
-rw-r--r--scilab/modules/graphics/help/images/xgrid.pngbin0 -> 5637 bytes
-rw-r--r--scilab/modules/graphics/help/images/xstringb.pngbin0 -> 3755 bytes
-rw-r--r--scilab/modules/graphics/help/images/xtitle.pngbin0 -> 4385 bytes
-rw-r--r--scilab/modules/graphics/help/images/zgrid.pngbin0 -> 26248 bytes
-rw-r--r--scilab/modules/graphics/src/c/FeC.c1
-rw-r--r--scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/filechooser/SwingScilabExportFileChooser.java33
-rw-r--r--scilab/modules/hdf5/.gitignore5
-rw-r--r--scilab/modules/hdf5/Makefile.am90
-rw-r--r--scilab/modules/hdf5/Makefile.in1124
-rw-r--r--scilab/modules/hdf5/build.xml24
-rw-r--r--scilab/modules/hdf5/changelog.txt8
-rw-r--r--scilab/modules/hdf5/etc/hdf5.quit8
-rw-r--r--scilab/modules/hdf5/etc/hdf5.start15
-rw-r--r--scilab/modules/hdf5/hdf5.iss53
-rw-r--r--scilab/modules/hdf5/includes/dynlib_hdf5_scilab.h28
-rw-r--r--scilab/modules/hdf5/includes/gw_hdf5.h24
-rw-r--r--scilab/modules/hdf5/includes/h5_attributeConstants.h (renamed from scilab/modules/fileio/includes/h5_attributeConstants.h)0
-rw-r--r--scilab/modules/hdf5/includes/h5_fileManagement.h (renamed from scilab/modules/fileio/includes/h5_fileManagement.h)22
-rw-r--r--scilab/modules/hdf5/includes/h5_readDataFromFile.h61
-rw-r--r--scilab/modules/hdf5/includes/h5_writeDataToFile.h46
-rw-r--r--scilab/modules/hdf5/license.txt9
-rw-r--r--scilab/modules/hdf5/macros/buildmacros.bat11
-rw-r--r--scilab/modules/hdf5/macros/buildmacros.sce16
-rw-r--r--scilab/modules/hdf5/macros/cleanmacros.bat13
-rw-r--r--scilab/modules/hdf5/readme.txt1
-rw-r--r--scilab/modules/hdf5/sci_gateway/c/gw_hdf5.c32
-rw-r--r--scilab/modules/hdf5/sci_gateway/cpp/sci_export_to_hdf5.cpp (renamed from scilab/modules/fileio/sci_gateway/cpp/sci_export_to_hdf5.cpp)2
-rw-r--r--scilab/modules/hdf5/sci_gateway/cpp/sci_import_from_hdf5.cpp (renamed from scilab/modules/fileio/sci_gateway/cpp/sci_import_from_hdf5.cpp)2
-rw-r--r--scilab/modules/hdf5/sci_gateway/cpp/sci_no_hdf5.cpp (renamed from scilab/modules/fileio/sci_gateway/cpp/sci_no_hdf5.cpp)0
-rw-r--r--scilab/modules/hdf5/sci_gateway/hdf5_gateway.xml35
-rw-r--r--scilab/modules/hdf5/src/c/DllmainHdf5.c35
-rw-r--r--scilab/modules/hdf5/src/c/LibScilab_Import.def11
-rw-r--r--scilab/modules/hdf5/src/c/h5_fileManagement.c (renamed from scilab/modules/fileio/src/c/h5_fileManagement.c)0
-rw-r--r--scilab/modules/hdf5/src/c/h5_readDataFromFile.c (renamed from scilab/modules/fileio/src/c/h5_readDataFromFile.c)0
-rw-r--r--scilab/modules/hdf5/src/c/h5_writeDataToFile.c (renamed from scilab/modules/fileio/src/c/h5_writeDataToFile.c)0
-rw-r--r--scilab/modules/hdf5/src/c/hdf5.rc97
-rw-r--r--scilab/modules/hdf5/src/c/hdf5.vcproj477
-rw-r--r--scilab/modules/hdf5/src/c/resource.h0
-rw-r--r--scilab/modules/hdf5/src/java/hdf5-JAVA.vcproj115
-rw-r--r--scilab/modules/hdf5/version.xml21
-rw-r--r--scilab/modules/integer/src/fortran/intinttype.f8
-rw-r--r--scilab/modules/integer/src/fortran/intops.f9
-rw-r--r--scilab/modules/renderer/src/java/org/scilab/modules/renderer/utils/geom3D/ColoredTriangle.java13
-rw-r--r--scilab/modules/renderer/src/java/org/scilab/modules/renderer/utils/geom3D/TriangleDecomposition.java13
122 files changed, 3790 insertions, 962 deletions
diff --git a/scilab/Scilab.sln b/scilab/Scilab.sln
index 936617e..b2dba9e 100644
--- a/scilab/Scilab.sln
+++ b/scilab/Scilab.sln
@@ -69,6 +69,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LibScilab", "libs\LibScilab
69 {DFA0D75B-F7EF-4D02-B33F-486829405315} = {DFA0D75B-F7EF-4D02-B33F-486829405315} 69 {DFA0D75B-F7EF-4D02-B33F-486829405315} = {DFA0D75B-F7EF-4D02-B33F-486829405315}
70 {F0190B5D-FB21-47A2-99AC-06627CDD0F8A} = {F0190B5D-FB21-47A2-99AC-06627CDD0F8A} 70 {F0190B5D-FB21-47A2-99AC-06627CDD0F8A} = {F0190B5D-FB21-47A2-99AC-06627CDD0F8A}
71 {34F8E361-D2D9-43B0-93D2-F6CF5FAF6CEB} = {34F8E361-D2D9-43B0-93D2-F6CF5FAF6CEB} 71 {34F8E361-D2D9-43B0-93D2-F6CF5FAF6CEB} = {34F8E361-D2D9-43B0-93D2-F6CF5FAF6CEB}
72 {A824EA62-AF07-4F43-9036-0E63990556BD} = {A824EA62-AF07-4F43-9036-0E63990556BD}
72 {53A01263-92BE-4C87-AA9A-79297F882310} = {53A01263-92BE-4C87-AA9A-79297F882310} 73 {53A01263-92BE-4C87-AA9A-79297F882310} = {53A01263-92BE-4C87-AA9A-79297F882310}
73 {5B110267-7C18-437C-B87D-DBA2B50729E9} = {5B110267-7C18-437C-B87D-DBA2B50729E9} 74 {5B110267-7C18-437C-B87D-DBA2B50729E9} = {5B110267-7C18-437C-B87D-DBA2B50729E9}
74 {63352867-3983-48E3-94FE-DD8F0D6E921F} = {63352867-3983-48E3-94FE-DD8F0D6E921F} 75 {63352867-3983-48E3-94FE-DD8F0D6E921F} = {63352867-3983-48E3-94FE-DD8F0D6E921F}
@@ -1021,6 +1022,17 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "api_scilab", "modules\api_s
1021 {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} 1022 {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
1022 EndProjectSection 1023 EndProjectSection
1023EndProject 1024EndProject
1025Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hdf5", "modules\hdf5\src\c\hdf5.vcproj", "{A824EA62-AF07-4F43-9036-0E63990556BD}"
1026 ProjectSection(ProjectDependencies) = postProject
1027 {ECFFEB0C-1EDA-45EE-9A10-B18143852E17} = {ECFFEB0C-1EDA-45EE-9A10-B18143852E17}
1028 {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E} = {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E}
1029 {43C5BAB1-1DCA-4743-A183-77E0D42FE7D0} = {43C5BAB1-1DCA-4743-A183-77E0D42FE7D0}
1030 {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
1031 {A5911CD7-F8E8-440C-A23E-4843A0636F3A} = {A5911CD7-F8E8-440C-A23E-4843A0636F3A}
1032 EndProjectSection
1033EndProject
1034Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hdf5-Ant", "modules\hdf5\src\java\hdf5-JAVA.vcproj", "{9B6500B0-66F6-44F0-910D-47A1435B4E02}"
1035EndProject
1024Global 1036Global
1025 GlobalSection(SolutionConfigurationPlatforms) = preSolution 1037 GlobalSection(SolutionConfigurationPlatforms) = preSolution
1026 Debug|Win32 = Debug|Win32 1038 Debug|Win32 = Debug|Win32
@@ -2093,6 +2105,22 @@ Global
2093 {43C5BAB1-1DCA-4743-A183-77E0D42FE7D0}.Release|Win32.Build.0 = Release|Win32 2105 {43C5BAB1-1DCA-4743-A183-77E0D42FE7D0}.Release|Win32.Build.0 = Release|Win32
2094 {43C5BAB1-1DCA-4743-A183-77E0D42FE7D0}.Release|x64.ActiveCfg = Release|x64 2106 {43C5BAB1-1DCA-4743-A183-77E0D42FE7D0}.Release|x64.ActiveCfg = Release|x64
2095 {43C5BAB1-1DCA-4743-A183-77E0D42FE7D0}.Release|x64.Build.0 = Release|x64 2107 {43C5BAB1-1DCA-4743-A183-77E0D42FE7D0}.Release|x64.Build.0 = Release|x64
2108 {A824EA62-AF07-4F43-9036-0E63990556BD}.Debug|Win32.ActiveCfg = Debug|Win32
2109 {A824EA62-AF07-4F43-9036-0E63990556BD}.Debug|Win32.Build.0 = Debug|Win32
2110 {A824EA62-AF07-4F43-9036-0E63990556BD}.Debug|x64.ActiveCfg = Debug|x64
2111 {A824EA62-AF07-4F43-9036-0E63990556BD}.Debug|x64.Build.0 = Debug|x64
2112 {A824EA62-AF07-4F43-9036-0E63990556BD}.Release|Win32.ActiveCfg = Release|Win32
2113 {A824EA62-AF07-4F43-9036-0E63990556BD}.Release|Win32.Build.0 = Release|Win32
2114 {A824EA62-AF07-4F43-9036-0E63990556BD}.Release|x64.ActiveCfg = Release|x64
2115 {A824EA62-AF07-4F43-9036-0E63990556BD}.Release|x64.Build.0 = Release|x64
2116 {9B6500B0-66F6-44F0-910D-47A1435B4E02}.Debug|Win32.ActiveCfg = Debug|Win32
2117 {9B6500B0-66F6-44F0-910D-47A1435B4E02}.Debug|Win32.Build.0 = Debug|Win32
2118 {9B6500B0-66F6-44F0-910D-47A1435B4E02}.Debug|x64.ActiveCfg = Debug|x64
2119 {9B6500B0-66F6-44F0-910D-47A1435B4E02}.Debug|x64.Build.0 = Debug|x64
2120 {9B6500B0-66F6-44F0-910D-47A1435B4E02}.Release|Win32.ActiveCfg = Release|Win32
2121 {9B6500B0-66F6-44F0-910D-47A1435B4E02}.Release|Win32.Build.0 = Release|Win32
2122 {9B6500B0-66F6-44F0-910D-47A1435B4E02}.Release|x64.ActiveCfg = Release|x64
2123 {9B6500B0-66F6-44F0-910D-47A1435B4E02}.Release|x64.Build.0 = Release|x64
2096 EndGlobalSection 2124 EndGlobalSection
2097 GlobalSection(SolutionProperties) = preSolution 2125 GlobalSection(SolutionProperties) = preSolution
2098 HideSolutionNode = FALSE 2126 HideSolutionNode = FALSE
diff --git a/scilab/Scilab_f2c.sln b/scilab/Scilab_f2c.sln
index d58d675..d83ac84 100644
--- a/scilab/Scilab_f2c.sln
+++ b/scilab/Scilab_f2c.sln
@@ -69,6 +69,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LibScilab_f2c", "libs\LibSc
69 {DFA0D75B-F7EF-4D02-B33F-486829405315} = {DFA0D75B-F7EF-4D02-B33F-486829405315} 69 {DFA0D75B-F7EF-4D02-B33F-486829405315} = {DFA0D75B-F7EF-4D02-B33F-486829405315}
70 {F0190B5D-FB21-47A2-99AC-06627CDD0F8A} = {F0190B5D-FB21-47A2-99AC-06627CDD0F8A} 70 {F0190B5D-FB21-47A2-99AC-06627CDD0F8A} = {F0190B5D-FB21-47A2-99AC-06627CDD0F8A}
71 {34F8E361-D2D9-43B0-93D2-F6CF5FAF6CEB} = {34F8E361-D2D9-43B0-93D2-F6CF5FAF6CEB} 71 {34F8E361-D2D9-43B0-93D2-F6CF5FAF6CEB} = {34F8E361-D2D9-43B0-93D2-F6CF5FAF6CEB}
72 {A824EA62-AF07-4F43-9036-0E63990556BD} = {A824EA62-AF07-4F43-9036-0E63990556BD}
72 {53A01263-92BE-4C87-AA9A-79297F882310} = {53A01263-92BE-4C87-AA9A-79297F882310} 73 {53A01263-92BE-4C87-AA9A-79297F882310} = {53A01263-92BE-4C87-AA9A-79297F882310}
73 {5B110267-7C18-437C-B87D-DBA2B50729E9} = {5B110267-7C18-437C-B87D-DBA2B50729E9} 74 {5B110267-7C18-437C-B87D-DBA2B50729E9} = {5B110267-7C18-437C-B87D-DBA2B50729E9}
74 {63352867-3983-48E3-94FE-DD8F0D6E921F} = {63352867-3983-48E3-94FE-DD8F0D6E921F} 75 {63352867-3983-48E3-94FE-DD8F0D6E921F} = {63352867-3983-48E3-94FE-DD8F0D6E921F}
@@ -1021,6 +1022,17 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "api_scilab", "modules\api_s
1021 {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} 1022 {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
1022 EndProjectSection 1023 EndProjectSection
1023EndProject 1024EndProject
1025Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hdf5", "modules\hdf5\src\c\hdf5.vcproj", "{A824EA62-AF07-4F43-9036-0E63990556BD}"
1026 ProjectSection(ProjectDependencies) = postProject
1027 {ECFFEB0C-1EDA-45EE-9A10-B18143852E17} = {ECFFEB0C-1EDA-45EE-9A10-B18143852E17}
1028 {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E} = {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E}
1029 {43C5BAB1-1DCA-4743-A183-77E0D42FE7D0} = {43C5BAB1-1DCA-4743-A183-77E0D42FE7D0}
1030 {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
1031 {A5911CD7-F8E8-440C-A23E-4843A0636F3A} = {A5911CD7-F8E8-440C-A23E-4843A0636F3A}
1032 EndProjectSection
1033EndProject
1034Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hdf5-Ant", "modules\hdf5\src\java\hdf5-JAVA.vcproj", "{9B6500B0-66F6-44F0-910D-47A1435B4E02}"
1035EndProject
1024Global 1036Global
1025 GlobalSection(SolutionConfigurationPlatforms) = preSolution 1037 GlobalSection(SolutionConfigurationPlatforms) = preSolution
1026 Debug|Win32 = Debug|Win32 1038 Debug|Win32 = Debug|Win32
@@ -2093,6 +2105,22 @@ Global
2093 {43C5BAB1-1DCA-4743-A183-77E0D42FE7D0}.Release|Win32.Build.0 = Release|Win32 2105 {43C5BAB1-1DCA-4743-A183-77E0D42FE7D0}.Release|Win32.Build.0 = Release|Win32
2094 {43C5BAB1-1DCA-4743-A183-77E0D42FE7D0}.Release|x64.ActiveCfg = Release|x64 2106 {43C5BAB1-1DCA-4743-A183-77E0D42FE7D0}.Release|x64.ActiveCfg = Release|x64
2095 {43C5BAB1-1DCA-4743-A183-77E0D42FE7D0}.Release|x64.Build.0 = Release|x64 2107 {43C5BAB1-1DCA-4743-A183-77E0D42FE7D0}.Release|x64.Build.0 = Release|x64
2108 {A824EA62-AF07-4F43-9036-0E63990556BD}.Debug|Win32.ActiveCfg = Debug|Win32
2109 {A824EA62-AF07-4F43-9036-0E63990556BD}.Debug|Win32.Build.0 = Debug|Win32
2110 {A824EA62-AF07-4F43-9036-0E63990556BD}.Debug|x64.ActiveCfg = Debug|x64
2111 {A824EA62-AF07-4F43-9036-0E63990556BD}.Debug|x64.Build.0 = Debug|x64
2112 {A824EA62-AF07-4F43-9036-0E63990556BD}.Release|Win32.ActiveCfg = Release|Win32
2113 {A824EA62-AF07-4F43-9036-0E63990556BD}.Release|Win32.Build.0 = Release|Win32
2114 {A824EA62-AF07-4F43-9036-0E63990556BD}.Release|x64.ActiveCfg = Release|x64
2115 {A824EA62-AF07-4F43-9036-0E63990556BD}.Release|x64.Build.0 = Release|x64
2116 {9B6500B0-66F6-44F0-910D-47A1435B4E02}.Debug|Win32.ActiveCfg = Debug|Win32
2117 {9B6500B0-66F6-44F0-910D-47A1435B4E02}.Debug|Win32.Build.0 = Debug|Win32
2118 {9B6500B0-66F6-44F0-910D-47A1435B4E02}.Debug|x64.ActiveCfg = Debug|x64
2119 {9B6500B0-66F6-44F0-910D-47A1435B4E02}.Debug|x64.Build.0 = Debug|x64
2120 {9B6500B0-66F6-44F0-910D-47A1435B4E02}.Release|Win32.ActiveCfg = Release|Win32
2121 {9B6500B0-66F6-44F0-910D-47A1435B4E02}.Release|Win32.Build.0 = Release|Win32
2122 {9B6500B0-66F6-44F0-910D-47A1435B4E02}.Release|x64.ActiveCfg = Release|x64
2123 {9B6500B0-66F6-44F0-910D-47A1435B4E02}.Release|x64.Build.0 = Release|x64
2096 EndGlobalSection 2124 EndGlobalSection
2097 GlobalSection(SolutionProperties) = preSolution 2125 GlobalSection(SolutionProperties) = preSolution
2098 HideSolutionNode = FALSE 2126 HideSolutionNode = FALSE
diff --git a/scilab/configure b/scilab/configure
index 300891e..b5f5545 100755
--- a/scilab/configure
+++ b/scilab/configure
@@ -46220,7 +46220,7 @@ if test "$enable_stop_on_warning" = yes; then
46220 CXXFLAGS="$CXXFLAGS -Werror -O0" 46220 CXXFLAGS="$CXXFLAGS -Werror -O0"
46221fi 46221fi
46222 46222
46223ac_config_files="$ac_config_files libs/MALLOC/Makefile libs/dynamiclibrary/Makefile libs/doublylinkedlist/Makefile libs/hashtable/Makefile libs/libst/Makefile contrib/Makefile modules/helptools/Makefile modules/helptools/macros/xmlfiletohtml.sci modules/data_structures/Makefile modules/differential_equations/Makefile modules/optimization/Makefile modules/elementary_functions/Makefile modules/special_functions/Makefile modules/io/Makefile modules/shell/Makefile modules/completion/Makefile modules/history_manager/Makefile modules/jvm/Makefile modules/sound/Makefile modules/statistics/Makefile modules/mexlib/Makefile modules/sparse/Makefile modules/linear_algebra/Makefile modules/polynomials/Makefile modules/symbolic/Makefile modules/signal_processing/Makefile modules/arnoldi/Makefile modules/interpolation/Makefile modules/intersci/Makefile modules/localization/Makefile modules/metanet/Makefile modules/cacsd/Makefile modules/boolean/Makefile modules/integer/Makefile modules/double/Makefile modules/fileio/Makefile modules/spreadsheet/Makefile modules/string/Makefile modules/time/Makefile modules/graphics/Makefile modules/graphic_export/Makefile modules/renderer/Makefile modules/action_binding/Makefile modules/gui/Makefile modules/pvm/Makefile modules/randlib/Makefile modules/tclsci/Makefile modules/windows_tools/Makefile modules/core/Makefile modules/api_scilab/Makefile modules/call_scilab/Makefile modules/fftw/Makefile modules/umfpack/Makefile modules/scicos/Makefile modules/scicos_blocks/Makefile modules/functions/Makefile modules/dynamic_link/Makefile modules/overloading/Makefile modules/javasci/Makefile modules/maple2scilab/Makefile modules/m2sci/Makefile modules/compatibility_functions/Makefile modules/texmacs/Makefile modules/scipad/Makefile modules/development_tools/Makefile modules/output_stream/Makefile modules/console/Makefile modules/demo_tools/Makefile modules/genetic_algorithms/Makefile modules/simulated_annealing/Makefile modules/parameters/Makefile modules/matio/Makefile modules/atoms/Makefile modules/Makefile libs/Makefile Makefile scilab.pc etc/modules.xml etc/classpath.xml modules/jvm/etc/jvm_options.xml scilab-lib.properties scilab-lib-doc.properties" 46223ac_config_files="$ac_config_files libs/MALLOC/Makefile libs/dynamiclibrary/Makefile libs/doublylinkedlist/Makefile libs/hashtable/Makefile libs/libst/Makefile contrib/Makefile modules/helptools/Makefile modules/helptools/macros/xmlfiletohtml.sci modules/data_structures/Makefile modules/differential_equations/Makefile modules/optimization/Makefile modules/elementary_functions/Makefile modules/special_functions/Makefile modules/io/Makefile modules/shell/Makefile modules/completion/Makefile modules/history_manager/Makefile modules/jvm/Makefile modules/sound/Makefile modules/statistics/Makefile modules/mexlib/Makefile modules/sparse/Makefile modules/linear_algebra/Makefile modules/polynomials/Makefile modules/symbolic/Makefile modules/signal_processing/Makefile modules/arnoldi/Makefile modules/interpolation/Makefile modules/intersci/Makefile modules/localization/Makefile modules/metanet/Makefile modules/cacsd/Makefile modules/boolean/Makefile modules/integer/Makefile modules/double/Makefile modules/fileio/Makefile modules/spreadsheet/Makefile modules/string/Makefile modules/time/Makefile modules/graphics/Makefile modules/graphic_export/Makefile modules/renderer/Makefile modules/action_binding/Makefile modules/gui/Makefile modules/pvm/Makefile modules/randlib/Makefile modules/tclsci/Makefile modules/windows_tools/Makefile modules/core/Makefile modules/api_scilab/Makefile modules/call_scilab/Makefile modules/hdf5/Makefile modules/fftw/Makefile modules/umfpack/Makefile modules/scicos/Makefile modules/scicos_blocks/Makefile modules/functions/Makefile modules/dynamic_link/Makefile modules/overloading/Makefile modules/javasci/Makefile modules/maple2scilab/Makefile modules/m2sci/Makefile modules/compatibility_functions/Makefile modules/texmacs/Makefile modules/scipad/Makefile modules/development_tools/Makefile modules/output_stream/Makefile modules/console/Makefile modules/demo_tools/Makefile modules/genetic_algorithms/Makefile modules/simulated_annealing/Makefile modules/parameters/Makefile modules/matio/Makefile modules/atoms/Makefile modules/Makefile libs/Makefile Makefile scilab.pc etc/modules.xml etc/classpath.xml modules/jvm/etc/jvm_options.xml scilab-lib.properties scilab-lib-doc.properties"
46224 46224
46225 46225
46226# Detection of the module for the future version of Scilab 6 46226# Detection of the module for the future version of Scilab 6
@@ -47129,6 +47129,7 @@ do
47129 "modules/core/Makefile") CONFIG_FILES="$CONFIG_FILES modules/core/Makefile" ;; 47129 "modules/core/Makefile") CONFIG_FILES="$CONFIG_FILES modules/core/Makefile" ;;
47130 "modules/api_scilab/Makefile") CONFIG_FILES="$CONFIG_FILES modules/api_scilab/Makefile" ;; 47130 "modules/api_scilab/Makefile") CONFIG_FILES="$CONFIG_FILES modules/api_scilab/Makefile" ;;
47131 "modules/call_scilab/Makefile") CONFIG_FILES="$CONFIG_FILES modules/call_scilab/Makefile" ;; 47131 "modules/call_scilab/Makefile") CONFIG_FILES="$CONFIG_FILES modules/call_scilab/Makefile" ;;
47132 "modules/hdf5/Makefile") CONFIG_FILES="$CONFIG_FILES modules/hdf5/Makefile" ;;
47132 "modules/fftw/Makefile") CONFIG_FILES="$CONFIG_FILES modules/fftw/Makefile" ;; 47133 "modules/fftw/Makefile") CONFIG_FILES="$CONFIG_FILES modules/fftw/Makefile" ;;
47133 "modules/umfpack/Makefile") CONFIG_FILES="$CONFIG_FILES modules/umfpack/Makefile" ;; 47134 "modules/umfpack/Makefile") CONFIG_FILES="$CONFIG_FILES modules/umfpack/Makefile" ;;
47134 "modules/scicos/Makefile") CONFIG_FILES="$CONFIG_FILES modules/scicos/Makefile" ;; 47135 "modules/scicos/Makefile") CONFIG_FILES="$CONFIG_FILES modules/scicos/Makefile" ;;
diff --git a/scilab/configure.ac b/scilab/configure.ac
index 1146761..ce35cfe 100644
--- a/scilab/configure.ac
+++ b/scilab/configure.ac
@@ -1431,6 +1431,7 @@ modules/windows_tools/Makefile
1431modules/core/Makefile 1431modules/core/Makefile
1432modules/api_scilab/Makefile 1432modules/api_scilab/Makefile
1433modules/call_scilab/Makefile 1433modules/call_scilab/Makefile
1434modules/hdf5/Makefile
1434modules/fftw/Makefile 1435modules/fftw/Makefile
1435modules/umfpack/Makefile 1436modules/umfpack/Makefile
1436modules/scicos/Makefile 1437modules/scicos/Makefile
diff --git a/scilab/etc/modules.xml.in b/scilab/etc/modules.xml.in
index 1b20d61..0840a43 100644
--- a/scilab/etc/modules.xml.in
+++ b/scilab/etc/modules.xml.in
@@ -82,4 +82,5 @@
82<module name="parameters" activate="yes"/> 82<module name="parameters" activate="yes"/>
83<module name="atoms" activate="yes"/> 83<module name="atoms" activate="yes"/>
84<module name="matio" activate="@MATIO_ENABLE@"/> 84<module name="matio" activate="@MATIO_ENABLE@"/>
85<module name="hdf5" activate="yes"/>
85</modules> 86</modules>
diff --git a/scilab/etc/modules.xml.vc b/scilab/etc/modules.xml.vc
index d1109bf..7390772 100644
--- a/scilab/etc/modules.xml.vc
+++ b/scilab/etc/modules.xml.vc
@@ -83,5 +83,8 @@
83<module name="simulated_annealing" activate="yes"/> 83<module name="simulated_annealing" activate="yes"/>
84<module name="parameters" activate="yes"/> 84<module name="parameters" activate="yes"/>
85<module name="matio" activate="yes"/> 85<module name="matio" activate="yes"/>
86<<<<<<< HEAD:scilab/etc/modules.xml.vc
86<module name="atoms" activate="yes"/> 87<module name="atoms" activate="yes"/>
88<module name="hdf5" activate="yes"/>
89<!-- comments -->
87</modules> 90</modules>
diff --git a/scilab/modules/Makefile.am b/scilab/modules/Makefile.am
index 80ce748..65dd000 100644
--- a/scilab/modules/Makefile.am
+++ b/scilab/modules/Makefile.am
@@ -81,7 +81,8 @@ genetic_algorithms \
81simulated_annealing \ 81simulated_annealing \
82parameters \ 82parameters \
83matio \ 83matio \
84atoms 84atoms \
85hdf5
85 86
86#umfpack 87#umfpack
87 88
@@ -178,7 +179,8 @@ ENGINE_LIBS = $(top_builddir)/modules/fileio/libscifileio.la \
178 $(top_builddir)/modules/signal_processing/libscisignal_processing.la \ 179 $(top_builddir)/modules/signal_processing/libscisignal_processing.la \
179 $(top_builddir)/modules/interpolation/libsciinterpolation.la \ 180 $(top_builddir)/modules/interpolation/libsciinterpolation.la \
180 $(top_builddir)/modules/string/libscistring.la \ 181 $(top_builddir)/modules/string/libscistring.la \
181 $(top_builddir)/modules/functions/libscifunctions.la 182 $(top_builddir)/modules/functions/libscifunctions.la \
183 $(top_builddir)/modules/hdf5/libscihdf5.la
182 184
183OTHER_LIBS = $(top_builddir)/modules/fftw/libscifftw.la \ 185OTHER_LIBS = $(top_builddir)/modules/fftw/libscifftw.la \
184$(top_builddir)/modules/umfpack/libsciumfpack.la \ 186$(top_builddir)/modules/umfpack/libsciumfpack.la \
diff --git a/scilab/modules/Makefile.in b/scilab/modules/Makefile.in
index c826100..38dfe1f 100644
--- a/scilab/modules/Makefile.in
+++ b/scilab/modules/Makefile.in
@@ -137,7 +137,7 @@ DIST_SUBDIRS = core output_stream action_binding arnoldi \
137 sparse windows_tools functions overloading maple2scilab m2sci \ 137 sparse windows_tools functions overloading maple2scilab m2sci \
138 texmacs scipad development_tools compatibility_functions \ 138 texmacs scipad development_tools compatibility_functions \
139 helptools fftw umfpack demo_tools genetic_algorithms \ 139 helptools fftw umfpack demo_tools genetic_algorithms \
140 simulated_annealing parameters matio atoms scicos_blocks \ 140 simulated_annealing parameters matio atoms hdf5 scicos_blocks \
141 scicos . javasci 141 scicos . javasci
142DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) 142DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
143ACLOCAL = @ACLOCAL@ 143ACLOCAL = @ACLOCAL@
@@ -375,7 +375,7 @@ SUBDIRS = core output_stream action_binding arnoldi \
375 functions overloading maple2scilab m2sci texmacs scipad \ 375 functions overloading maple2scilab m2sci texmacs scipad \
376 development_tools compatibility_functions helptools fftw \ 376 development_tools compatibility_functions helptools fftw \
377 umfpack demo_tools genetic_algorithms simulated_annealing \ 377 umfpack demo_tools genetic_algorithms simulated_annealing \
378 parameters matio atoms $(am__append_1) scicos . \ 378 parameters matio atoms hdf5 $(am__append_1) scicos . \
379 $(am__append_2) 379 $(am__append_2)
380 380
381#### Basic files #### 381#### Basic files ####
@@ -450,7 +450,8 @@ ENGINE_LIBS = $(top_builddir)/modules/fileio/libscifileio.la \
450 $(top_builddir)/modules/signal_processing/libscisignal_processing.la \ 450 $(top_builddir)/modules/signal_processing/libscisignal_processing.la \
451 $(top_builddir)/modules/interpolation/libsciinterpolation.la \ 451 $(top_builddir)/modules/interpolation/libsciinterpolation.la \
452 $(top_builddir)/modules/string/libscistring.la \ 452 $(top_builddir)/modules/string/libscistring.la \
453 $(top_builddir)/modules/functions/libscifunctions.la 453 $(top_builddir)/modules/functions/libscifunctions.la \
454 $(top_builddir)/modules/hdf5/libscihdf5.la
454 455
455OTHER_LIBS = $(top_builddir)/modules/fftw/libscifftw.la \ 456OTHER_LIBS = $(top_builddir)/modules/fftw/libscifftw.la \
456 $(top_builddir)/modules/umfpack/libsciumfpack.la \ 457 $(top_builddir)/modules/umfpack/libsciumfpack.la \
diff --git a/scilab/modules/core/help/en_US/api/common_getvaraddr_api.xml b/scilab/modules/api_scilab/help/en_US/common_getvaraddr_api.xml
index 2c71363..6dd04e0 100644
--- a/scilab/modules/core/help/en_US/api/common_getvaraddr_api.xml
+++ b/scilab/modules/api_scilab/help/en_US/common_getvaraddr_api.xml
@@ -27,7 +27,7 @@
27 </refnamediv> 27 </refnamediv>
28 <refsection> 28 <refsection>
29 <title>Description</title> 29 <title>Description</title>
30 <para>This help describes how to retireve address of an argument in a gateway.</para> 30 <para>This help describes how to retrieve address of an argument in a gateway.</para>
31 <synopsis>int getVarAddressFromPosition(int _iVar, int** _piAddress)</synopsis> 31 <synopsis>int getVarAddressFromPosition(int _iVar, int** _piAddress)</synopsis>
32 </refsection> 32 </refsection>
33 <refsection> 33 <refsection>
diff --git a/scilab/modules/api_scilab/help/en_US/common_getvardimension_api.xml b/scilab/modules/api_scilab/help/en_US/common_getvardimension_api.xml
new file mode 100644
index 0000000..391482a
--- /dev/null
+++ b/scilab/modules/api_scilab/help/en_US/common_getvardimension_api.xml
@@ -0,0 +1,207 @@
1<?xml version="1.0" encoding="utf-8"?>
2<!--
3 * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
4 * Copyright (C) 2009 - DIGITEO - Antoine ELIAS
5 *
6 * This file must be used under the terms of the CeCILL.
7 * This source file is licensed as described in the file COPYING, which
8 * you should have received as part of this distribution. The terms
9 * are also available at
10 * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
11 *
12 -->
13<refentry version="5.0-subset Scilab" xml:id="Common getvardimension_API"
14 xml:lang="en" xmlns="http://docbook.org/ns/docbook"
15 xmlns:xlink="http://www.w3.org/1999/xlink"
16 xmlns:svg="http://www.w3.org/2000/svg"
17 xmlns:ns5="http://www.w3.org/1999/xhtml"
18 xmlns:mml="http://www.w3.org/1998/Math/MathML"
19 xmlns:db="http://docbook.org/ns/docbook">
20
21 <refnamediv>
22 <refname>getVarDimension</refname>
23
24 <refpurpose>
25 How to get dimention of a variable stored as matrix.
26 </refpurpose>
27 </refnamediv>
28 <refsection>
29 <title>Description</title>
30 <para>This help describes how to get dimention of a variable stored as matrix.</para>
31 <synopsis>int getVarDimension(int* _piAddress, int* _piRows, int* _piCols)</synopsis>
32 </refsection>
33 <refsection>
34 <title>Parameters</title>
35 <variablelist>
36 <varlistentry>
37 <term>_piAddress</term>
38 <listitem>
39 <para>
40 Address of the variable.
41 </para>
42 </listitem>
43 <term>_piRows</term>
44 <listitem>
45 <para>
46 Return number of rows.
47 </para>
48 </listitem>
49 <term>_piCols</term>
50 <listitem>
51 <para>
52 Return number of columns.
53 </para>
54 </listitem>
55 </varlistentry>
56 </variablelist>
57 </refsection>
58 <refsection>
59 <!--File_gateway: SCI/modules/core/tests/unit_tests/commom_function_api.c-->
60 <!--File_scilab: SCI/modules/core/tests/unit_tests/commom_function.tst-->
61 <!--Lib_name: commom_function-->
62 <!--Func_list: commom_function-->
63 <title>Gateway Source</title>
64 <programlisting role="code_gateway">
65 <![CDATA[
66int printf_info(int _iVar);
67
68int commom_function(char *fname,unsigned long fname_len)
69{
70 int i;
71 int iRet = 0;
72 int *piAddr1 = NULL;
73
74 for(i = 0 ; i < Rhs ; i++)
75 {
76 iRet = printf_info(i + 1);
77 if(iRet)
78 {
79 break;
80 }
81 sciprint("\n\n");
82 }
83
84 if(iRet)
85 {
86 //1 for true, 0 for false
87 iRet = !iRet;
88 createMatrixOfBoolean(1, 1, 1, &iRet);
89 //assign allocated variables to Lhs position
90 LhsVar(1) = 1;
91 }
92 else
93 {
94 //assign allocated variables to Lhs position
95 LhsVar(1) = 0;
96 }
97
98 return 0;
99}
100
101int printf_info(int _iVar)
102{
103 int* piAddr = NULL;
104 int iRet = 0;
105 int iType = 0;
106 int iRows = 0;
107 int iCols = 0;
108 int iItem = 0;
109 int iComplex = 0;
110
111 iRet = getVarAddressFromPosition(_iVar, &piAddr);
112 if(iRet)
113 {
114 return 1;
115 }
116
117 sciprint("Variable %d information:\n", _iVar);
118 iType = getVarType(piAddr);
119 sciprint("\tType: ");
120 switch(iType)
121 {
122 case sci_matrix :
123 sciprint("double\n");
124 break;
125 case sci_poly :
126 sciprint("polynomial\n");
127 break;
128 case sci_boolean :
129 sciprint("boolean\n");
130 break;
131 case sci_sparse :
132 sciprint("sparse\n");
133 break;
134 case sci_boolean_sparse :
135 sciprint("boolean_sparse\n");
136 break;
137 case sci_ints :
138 {
139 char pstSigned[] = "signed";
140 char pstUnsigned[] = "unsigned";
141 char* pstSign = pstSigned;
142
143 int iPrec = 0;
144 iRet = getMatrixOfIntegerPrecision(piAddr, &iPrec);
145
146 if(iPrec > 10)
147 {
148 pstSign = pstUnsigned;
149 }
150
151 sciprint("%s integer %d bits\n", pstSign, (iPrec % 10) * 8);
152 }
153 break;
154 case sci_strings :
155 sciprint("strings\n");
156 break;
157 case sci_list :
158 sciprint("list\n");
159 break;
160 case sci_tlist :
161 sciprint("tlist\n");
162 break;
163 case sci_mlist :
164 sciprint("mlist\n");
165 break;
166 default :
167 sciprint("Not manage by this function\n");
168 return 0;
169 }
170
171 if(isVarComplex(piAddr))
172 {
173 sciprint("\tComplex: Yes\n");
174 }
175
176 sciprint("\tDimensions: ");
177 if(isVarMatrixType(piAddr))
178 {
179 getVarDimension(piAddr, &iRows, &iCols);
180 sciprint("%d x %d", iRows, iCols);
181 }
182 else
183 {
184 getListItemNumber(piAddr, &iItem);
185 sciprint("%d", iItem);
186 }
187 return 0;
188}
189 ]]>
190 </programlisting>
191 </refsection>
192
193 <refsection>
194 <title>Scilab test script</title>
195 <programlisting role="code_scilab">
196 <![CDATA[
197l1 = [1,2*%i,3;%i,2,3*%i];
198l2 = ["may","the";"puffin","be";"with","you"];
199l3 = int8([1,2,3]);
200l4 = uint16([1000,2000,3000]);
201l5 = list(l1,l2,l3);
202l = list(l1,l2,l3,l4,l5);
203commom_function(l(1:$))
204 ]]>
205 </programlisting>
206 </refsection>
207</refentry> \ No newline at end of file
diff --git a/scilab/modules/core/help/en_US/api/common_getvartype_api.xml b/scilab/modules/api_scilab/help/en_US/common_getvartype_api.xml
index 451a075..57409c6 100644
--- a/scilab/modules/core/help/en_US/api/common_getvartype_api.xml
+++ b/scilab/modules/api_scilab/help/en_US/common_getvartype_api.xml
@@ -27,7 +27,7 @@
27 </refnamediv> 27 </refnamediv>
28 <refsection> 28 <refsection>
29 <title>Description</title> 29 <title>Description</title>
30 <para>This help describes how to retireve the scilab type of a variable.</para> 30 <para>This help describes how to retrieve the scilab type of a variable.</para>
31 <synopsis>int getVarType(int* _piAddress)</synopsis> 31 <synopsis>int getVarType(int* _piAddress)</synopsis>
32 </refsection> 32 </refsection>
33 <refsection> 33 <refsection>
diff --git a/scilab/modules/core/help/en_US/api/common_iscomplex_api.xml b/scilab/modules/api_scilab/help/en_US/common_iscomplex_api.xml
index c706841..72e4cf6 100644
--- a/scilab/modules/core/help/en_US/api/common_iscomplex_api.xml
+++ b/scilab/modules/api_scilab/help/en_US/common_iscomplex_api.xml
@@ -27,7 +27,7 @@
27 </refnamediv> 27 </refnamediv>
28 <refsection> 28 <refsection>
29 <title>Description</title> 29 <title>Description</title>
30 <para>This help describes how to retireve variable complexity.</para> 30 <para>This help describes how to retrieve variable complexity.</para>
31 <synopsis>int isVarComplex(int* _piAddress)</synopsis> 31 <synopsis>int isVarComplex(int* _piAddress)</synopsis>
32 </refsection> 32 </refsection>
33 <refsection> 33 <refsection>
diff --git a/scilab/modules/api_scilab/help/en_US/common_isvarmatrixtype_api.xml b/scilab/modules/api_scilab/help/en_US/common_isvarmatrixtype_api.xml
new file mode 100644
index 0000000..9f5d286
--- /dev/null
+++ b/scilab/modules/api_scilab/help/en_US/common_isvarmatrixtype_api.xml
@@ -0,0 +1,197 @@
1<?xml version="1.0" encoding="utf-8"?>
2<!--
3 * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
4 * Copyright (C) 2009 - DIGITEO - Antoine ELIAS
5 *
6 * This file must be used under the terms of the CeCILL.
7 * This source file is licensed as described in the file COPYING, which
8 * you should have received as part of this distribution. The terms
9 * are also available at
10 * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
11 *
12 -->
13<refentry version="5.0-subset Scilab" xml:id="Common isvarmatrixtype_API"
14 xml:lang="en" xmlns="http://docbook.org/ns/docbook"
15 xmlns:xlink="http://www.w3.org/1999/xlink"
16 xmlns:svg="http://www.w3.org/2000/svg"
17 xmlns:ns5="http://www.w3.org/1999/xhtml"
18 xmlns:mml="http://www.w3.org/1998/Math/MathML"
19 xmlns:db="http://docbook.org/ns/docbook">
20
21 <refnamediv>
22 <refname>isVarMatrixType</refname>
23
24 <refpurpose>
25 How to know if a variable is stored as a matrix.
26 </refpurpose>
27 </refnamediv>
28 <refsection>
29 <title>Description</title>
30 <para>This help describes how to know if a variable is stored as a matrix.</para>
31 <synopsis>int isVarMatrixType(int* _piAddress)</synopsis>
32 </refsection>
33 <refsection>
34 <title>Parameters</title>
35 <variablelist>
36 <varlistentry>
37 <term>_piAddress</term>
38 <listitem>
39 <para>
40 Address of the variable
41 </para>
42 </listitem>
43 </varlistentry>
44 </variablelist>
45 <title>Return value</title>
46 <para>This function returns 1 if the variable is stored as matrix otherwise 0</para>
47 </refsection>
48 <refsection>
49 <!--File_gateway: SCI/modules/core/tests/unit_tests/commom_function_api.c-->
50 <!--File_scilab: SCI/modules/core/tests/unit_tests/commom_function.tst-->
51 <!--Lib_name: commom_function-->
52 <!--Func_list: commom_function-->
53 <title>Gateway Source</title>
54 <programlisting role="code_gateway">
55 <![CDATA[
56int printf_info(int _iVar);
57
58int commom_function(char *fname,unsigned long fname_len)
59{
60 int i;
61 int iRet = 0;
62 int *piAddr1 = NULL;
63
64 for(i = 0 ; i < Rhs ; i++)
65 {
66 iRet = printf_info(i + 1);
67 if(iRet)
68 {
69 break;
70 }
71 sciprint("\n\n");
72 }
73
74 if(iRet)
75 {
76 //1 for true, 0 for false
77 iRet = !iRet;
78 createMatrixOfBoolean(1, 1, 1, &iRet);
79 //assign allocated variables to Lhs position
80 LhsVar(1) = 1;
81 }
82 else
83 {
84 //assign allocated variables to Lhs position
85 LhsVar(1) = 0;
86 }
87
88 return 0;
89}
90
91int printf_info(int _iVar)
92{
93 int* piAddr = NULL;
94 int iRet = 0;
95 int iType = 0;
96 int iRows = 0;
97 int iCols = 0;
98 int iItem = 0;
99 int iComplex = 0;
100
101 iRet = getVarAddressFromPosition(_iVar, &piAddr);
102 if(iRet)
103 {
104 return 1;
105 }
106
107 sciprint("Variable %d information:\n", _iVar);
108 iType = getVarType(piAddr);
109 sciprint("\tType: ");
110 switch(iType)
111 {
112 case sci_matrix :
113 sciprint("double\n");
114 break;
115 case sci_poly :
116 sciprint("polynomial\n");
117 break;
118 case sci_boolean :
119 sciprint("boolean\n");
120 break;
121 case sci_sparse :
122 sciprint("sparse\n");
123 break;
124 case sci_boolean_sparse :
125 sciprint("boolean_sparse\n");
126 break;
127 case sci_ints :
128 {
129 char pstSigned[] = "signed";
130 char pstUnsigned[] = "unsigned";
131 char* pstSign = pstSigned;
132
133 int iPrec = 0;
134 iRet = getMatrixOfIntegerPrecision(piAddr, &iPrec);
135
136 if(iPrec > 10)
137 {
138 pstSign = pstUnsigned;
139 }
140
141 sciprint("%s integer %d bits\n", pstSign, (iPrec % 10) * 8);
142 }
143 break;
144 case sci_strings :
145 sciprint("strings\n");
146 break;
147 case sci_list :
148 sciprint("list\n");
149 break;
150 case sci_tlist :
151 sciprint("tlist\n");
152 break;
153 case sci_mlist :
154 sciprint("mlist\n");
155 break;
156 default :
157 sciprint("Not manage by this function\n");
158 return 0;
159 }
160
161 if(isVarComplex(piAddr))
162 {
163 sciprint("\tComplex: Yes\n");
164 }
165
166 sciprint("\tDimensions: ");
167 if(isVarMatrixType(piAddr))
168 {
169 getVarDimension(piAddr, &iRows, &iCols);
170 sciprint("%d x %d", iRows, iCols);
171 }
172 else
173 {
174 getListItemNumber(piAddr, &iItem);
175 sciprint("%d", iItem);
176 }
177 return 0;
178}
179 ]]>
180 </programlisting>
181 </refsection>
182
183 <refsection>
184 <title>Scilab test script</title>
185 <programlisting role="code_scilab">
186 <![CDATA[
187l1 = [1,2*%i,3;%i,2,3*%i];
188l2 = ["may","the";"puffin","be";"with","you"];
189l3 = int8([1,2,3]);
190l4 = uint16([1000,2000,3000]);
191l5 = list(l1,l2,l3);
192l = list(l1,l2,l3,l4,l5);
193commom_function(l(1:$))
194 ]]>
195 </programlisting>
196 </refsection>
197</refentry> \ No newline at end of file
diff --git a/scilab/modules/core/help/en_US/api/double_reading_api.xml b/scilab/modules/api_scilab/help/en_US/double_reading_api.xml
index 0ae3e1d..0ae3e1d 100644
--- a/scilab/modules/core/help/en_US/api/double_reading_api.xml
+++ b/scilab/modules/api_scilab/help/en_US/double_reading_api.xml
diff --git a/scilab/modules/api_scilab/help/en_US/double_writing_api.xml b/scilab/modules/api_scilab/help/en_US/double_writing_api.xml
index 1cd42ea..2b1bf79 100644
--- a/scilab/modules/api_scilab/help/en_US/double_writing_api.xml
+++ b/scilab/modules/api_scilab/help/en_US/double_writing_api.xml
@@ -149,12 +149,12 @@
149 <!--Lib_name: double_writing--> 149 <!--Lib_name: double_writing-->
150 <!--Func_list: write_double--> 150 <!--Func_list: write_double-->
151 <title>Gateway Source</title> 151 <title>Gateway Source</title>
152 <programlisting role="code gateway"> 152 <programlisting role="code_gateway">
153 <![CDATA[ 153 <![CDATA[
154int write_double(char *fname,unsigned long fname_len) 154int write_double(char *fname,unsigned long fname_len)
155{ 155{
156 int i,j; 156 int i,j;
157 157 int iRet = 0;
158 //first variable info : real matrix of double 3 x 4 158 //first variable info : real matrix of double 3 x 4
159 int iRows1 = 3; 159 int iRows1 = 3;
160 int iCols1 = 4; 160 int iCols1 = 4;
@@ -190,7 +190,12 @@ int write_double(char *fname,unsigned long fname_len)
190 //} 190 //}
191 191
192 //create a variable from a existing data array 192 //create a variable from a existing data array
193 createMatrixOfDouble(Rhs + 1, iRows1, iCols1, pdblReal1); 193 iRet = createMatrixOfDouble(Rhs + 1, iRows1, iCols1, pdblReal1);
194 if(iRet)
195 {
196 //Error
197 return 1;
198 }
194 199
195 //after creation, we can free memory. 200 //after creation, we can free memory.
196 free(pdblReal1); 201 free(pdblReal1);
@@ -199,7 +204,12 @@ int write_double(char *fname,unsigned long fname_len)
199 *************************/ 204 *************************/
200 205
201 //reserve space in scilab memory and fill it 206 //reserve space in scilab memory and fill it
202 allocComplexMatrixOfDouble(Rhs + 2, iRows2, iCols2, &pdblReal2, &pdblImg2); 207 iRet = allocComplexMatrixOfDouble(Rhs + 2, iRows2, iCols2, &pdblReal2, &pdblImg2);
208 if(iRet)
209 {
210 //Error
211 return 1;
212 }
203 213
204 //fill array with incremental values for real part and decremental for imaginary part 214 //fill array with incremental values for real part and decremental for imaginary part
205 //[ 23i 1+22i 2+21i 3+20i 4+19i 5+18i 215 //[ 23i 1+22i 2+21i 3+20i 4+19i 5+18i
@@ -227,7 +237,6 @@ int write_double(char *fname,unsigned long fname_len)
227 //assign allocated variables to Lhs position 237 //assign allocated variables to Lhs position
228 LhsVar(1) = Rhs + 1; 238 LhsVar(1) = Rhs + 1;
229 LhsVar(2) = Rhs + 2; 239 LhsVar(2) = Rhs + 2;
230 PutLhsVar();
231 return 0; 240 return 0;
232} 241}
233 ]]> 242 ]]>
diff --git a/scilab/modules/api_scilab/help/en_US/int_getmatrixofintegerprecision_api.xml b/scilab/modules/api_scilab/help/en_US/int_getmatrixofintegerprecision_api.xml
new file mode 100644
index 0000000..ad25ec9
--- /dev/null
+++ b/scilab/modules/api_scilab/help/en_US/int_getmatrixofintegerprecision_api.xml
@@ -0,0 +1,201 @@
1<?xml version="1.0" encoding="utf-8"?>
2<!--
3 * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
4 * Copyright (C) 2009 - DIGITEO - Antoine ELIAS
5 *
6 * This file must be used under the terms of the CeCILL.
7 * This source file is licensed as described in the file COPYING, which
8 * you should have received as part of this distribution. The terms
9 * are also available at
10 * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
11 *
12 -->
13<refentry version="5.0-subset Scilab" xml:id="Common getmatrixofintegerprecision_API"
14 xml:lang="en" xmlns="http://docbook.org/ns/docbook"
15 xmlns:xlink="http://www.w3.org/1999/xlink"
16 xmlns:svg="http://www.w3.org/2000/svg"
17 xmlns:ns5="http://www.w3.org/1999/xhtml"
18 xmlns:mml="http://www.w3.org/1998/Math/MathML"
19 xmlns:db="http://docbook.org/ns/docbook">
20
21 <refnamediv>
22 <refname>getMatrixOfIntegerPrecision</refname>
23
24 <refpurpose>
25 How to get precision of an integer matrix.
26 </refpurpose>
27 </refnamediv>
28 <refsection>
29 <title>Description</title>
30 <para>This help describes how to get precision of an integer matrix.</para>
31 <synopsis>int getMatrixOfIntegerPrecision(int* _piAddress, int* _piPrecision)</synopsis>
32 </refsection>
33 <refsection>
34 <title>Parameters</title>
35 <variablelist>
36 <varlistentry>
37 <term>_piAddress</term>
38 <listitem>
39 <para>
40 Address of the variable.
41 </para>
42 </listitem>
43 <term>_piPrecision</term>
44 <listitem>
45 <para>
46 Return precision of an integer variable in bytes. ( 8 bits = 1, 16 bytes = 2, ... )
47 </para>
48 </listitem>
49 </varlistentry>
50 </variablelist>
51 </refsection>
52 <refsection>
53 <!--File_gateway: SCI/modules/core/tests/unit_tests/commom_function_api.c-->
54 <!--File_scilab: SCI/modules/core/tests/unit_tests/commom_function.tst-->
55 <!--Lib_name: commom_function-->
56 <!--Func_list: commom_function-->
57 <title>Gateway Source</title>
58 <programlisting role="code_gateway">
59 <![CDATA[
60int printf_info(int _iVar);
61
62int commom_function(char *fname,unsigned long fname_len)
63{
64 int i;
65 int iRet = 0;
66 int *piAddr1 = NULL;
67
68 for(i = 0 ; i < Rhs ; i++)
69 {
70 iRet = printf_info(i + 1);
71 if(iRet)
72 {
73 break;
74 }
75 sciprint("\n\n");
76 }
77
78 if(iRet)
79 {
80 //1 for true, 0 for false
81 iRet = !iRet;
82 createMatrixOfBoolean(1, 1, 1, &iRet);
83 //assign allocated variables to Lhs position
84 LhsVar(1) = 1;
85 }
86 else
87 {
88 //assign allocated variables to Lhs position
89 LhsVar(1) = 0;
90 }
91
92 return 0;
93}
94
95int printf_info(int _iVar)
96{
97 int* piAddr = NULL;
98 int iRet = 0;
99 int iType = 0;
100 int iRows = 0;
101 int iCols = 0;
102 int iItem = 0;
103 int iComplex = 0;
104
105 iRet = getVarAddressFromPosition(_iVar, &piAddr);
106 if(iRet)
107 {
108 return 1;
109 }
110
111 sciprint("Variable %d information:\n", _iVar);
112 iType = getVarType(piAddr);
113 sciprint("\tType: ");
114 switch(iType)
115 {
116 case sci_matrix :
117 sciprint("double\n");
118 break;
119 case sci_poly :
120 sciprint("polynomial\n");
121 break;
122 case sci_boolean :
123 sciprint("boolean\n");
124 break;
125 case sci_sparse :
126 sciprint("sparse\n");
127 break;
128 case sci_boolean_sparse :
129 sciprint("boolean_sparse\n");
130 break;
131 case sci_ints :
132 {
133 char pstSigned[] = "signed";
134 char pstUnsigned[] = "unsigned";
135 char* pstSign = pstSigned;
136
137 int iPrec = 0;
138 iRet = getMatrixOfIntegerPrecision(piAddr, &iPrec);
139
140 if(iPrec > 10)
141 {
142 pstSign = pstUnsigned;
143 }
144
145 sciprint("%s integer %d bits\n", pstSign, (iPrec % 10) * 8);
146 }
147 break;
148 case sci_strings :
149 sciprint("strings\n");
150 break;
151 case sci_list :
152 sciprint("list\n");
153 break;
154 case sci_tlist :
155 sciprint("tlist\n");
156 break;
157 case sci_mlist :
158 sciprint("mlist\n");
159 break;
160 default :
161 sciprint("Not manage by this function\n");
162 return 0;
163 }
164
165 if(isVarComplex(piAddr))
166 {
167 sciprint("\tComplex: Yes\n");
168 }
169
170 sciprint("\tDimensions: ");
171 if(isVarMatrixType(piAddr))
172 {
173 getVarDimension(piAddr, &iRows, &iCols);
174 sciprint("%d x %d", iRows, iCols);
175 }
176 else
177 {
178 getListItemNumber(piAddr, &iItem);
179 sciprint("%d", iItem);
180 }
181 return 0;
182}
183 ]]>
184 </programlisting>
185 </refsection>
186
187 <refsection>
188 <title>Scilab test script</title>
189 <programlisting role="code_scilab">
190 <![CDATA[
191l1 = [1,2*%i,3;%i,2,3*%i];
192l2 = ["may","the";"puffin","be";"with","you"];
193l3 = int8([1,2,3]);
194l4 = uint16([1000,2000,3000]);
195l5 = list(l1,l2,l3);
196l = list(l1,l2,l3,l4,l5);
197commom_function(l(1:$))
198 ]]>
199 </programlisting>
200 </refsection>
201</refentry> \ No newline at end of file
diff --git a/scilab/modules/core/help/en_US/api/integer_reading_api.xml b/scilab/modules/api_scilab/help/en_US/integer_reading_api.xml
index 43e84d4..43e84d4 100644
--- a/scilab/modules/core/help/en_US/api/integer_reading_api.xml
+++ b/scilab/modules/api_scilab/help/en_US/integer_reading_api.xml
diff --git a/scilab/modules/core/help/en_US/api/integer_writing_api.xml b/scilab/modules/api_scilab/help/en_US/integer_writing_api.xml
index 69b5a3f..69b5a3f 100644
--- a/scilab/modules/core/help/en_US/api/integer_writing_api.xml
+++ b/scilab/modules/api_scilab/help/en_US/integer_writing_api.xml
diff --git a/scilab/modules/api_scilab/help/en_US/poly_getpolyvariablename_api.xml b/scilab/modules/api_scilab/help/en_US/poly_getpolyvariablename_api.xml
new file mode 100644
index 0000000..d6c2700
--- /dev/null
+++ b/scilab/modules/api_scilab/help/en_US/poly_getpolyvariablename_api.xml
@@ -0,0 +1,242 @@
1<?xml version="1.0" encoding="utf-8"?>
2<!--
3 * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
4 * Copyright (C) 2009 - DIGITEO - Antoine ELIAS
5 *
6 * This file must be used under the terms of the CeCILL.
7 * This source file is licensed as described in the file COPYING, which
8 * you should have received as part of this distribution. The terms
9 * are also available at
10 * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
11 *
12 -->
13<refentry version="5.0-subset Scilab" xml:id="Common getpolyvariablename_API"
14 xml:lang="en" xmlns="http://docbook.org/ns/docbook"
15 xmlns:xlink="http://www.w3.org/1999/xlink"
16 xmlns:svg="http://www.w3.org/2000/svg"
17 xmlns:ns5="http://www.w3.org/1999/xhtml"
18 xmlns:mml="http://www.w3.org/1998/Math/MathML"
19 xmlns:db="http://docbook.org/ns/docbook">
20
21 <refnamediv>
22 <refname>getPolyVariableName</refname>
23
24 <refpurpose>
25 How to get the symbolic variable name.
26 </refpurpose>
27 </refnamediv>
28 <refsection>
29 <title>Description</title>
30 <para>This help describes how to get the symbolic variable name.</para>
31 <synopsis>int getPolyVariableName(int* _piAddress, char* _pstVarName, int* _piVarNameLen)</synopsis>
32 </refsection>
33 <refsection>
34 <title>Parameters</title>
35 <variablelist>
36 <varlistentry>
37 <term>_piAddress</term>
38 <listitem>
39 <para>
40 Address of the variable.
41 </para>
42 </listitem>
43 <term>_pstVarName</term>
44 <listitem>
45 <para>
46 Return the symbolic varaible name
47 </para>
48 </listitem>
49 <term>_piVarNameLen</term>
50 <listitem>
51 <para>
52 Return the length of _pstVarName
53 </para>
54 </listitem>
55 </varlistentry>
56 </variablelist>
57 </refsection>
58 <refsection>
59 <!--File_gateway: SCI/modules/core/tests/unit_tests/poly_reading_api.c-->
60 <!--File_scilab: SCI/modules/core/tests/unit_tests/poly_reading_api.tst-->
61 <!--Lib_name: poly_reading-->
62 <!--Func_list: read_poly-->
63 <title>Gateway Source</title>
64 <programlisting role="code_gateway">
65 <![CDATA[
66int read_poly(char *fname,unsigned long fname_len)
67{
68 int i,j;
69 int iRet = 0;
70
71 //variable info
72 int iRows = 0;
73 int iCols = 0;
74 int iVarLen = 0;
75 int* piAddr = NULL;
76 int* piNbCoef = NULL;
77 double** pdblReal = NULL;
78 double** pdblImg = NULL;
79 char* pstVarname = NULL;
80
81 //check input and output arguments
82 CheckRhs(1,1);
83 CheckLhs(1,1);
84
85 iRet = getVarAddressFromPosition(1, &piAddr);
86 if(iRet)
87 {
88 return 1;
89 }
90
91 if(getVarType(piAddr) != sci_poly || isVarComplex(piAddr) == FALSE)
92 {
93 return 1;
94 }
95
96 //get variable name length
97 iRet = getPolyVariableName(piAddr, NULL, &iVarLen);
98 if(iRet)
99 {
100 return 1;
101 }
102
103 //alloc buff to receive variable name
104 pstVarname = (char*)malloc(sizeof(char) * (iVarLen + 1));//1 for null termination
105 //get variable name
106 iRet = getPolyVariableName(piAddr, pstVarname, &iVarLen);
107 if(iRet)
108 {
109 return 1;
110 }
111
112 //First call: retrieve dimmension
113 iRet = getComplexMatrixOfPoly(piAddr, &iRows, &iCols, NULL, NULL, NULL);
114 if(iRet)
115 {
116 return 1;
117 }
118
119 //alloc array of coefficient
120 piNbCoef = (int*)malloc(sizeof(int) * iRows * iCols);
121 //Second call: retrieve coefficient
122 iRet = getComplexMatrixOfPoly(piAddr, &iRows, &iCols, piNbCoef, NULL, NULL);
123 if(iRet)
124 {
125 return 1;
126 }
127
128 //alloc arrays of data
129 pdblReal = (double**)malloc(sizeof(double*) * iRows * iCols);
130 pdblImg = (double**)malloc(sizeof(double*) * iRows * iCols);
131 for(i = 0 ; i < iRows * iCols ; i++)
132 {
133 pdblReal[i] = (double*)malloc(sizeof(double) * piNbCoef[i]);
134 pdblImg[i] = (double*)malloc(sizeof(double) * piNbCoef[i]);
135 }
136
137 //Third call: retrieve data
138 iRet = getComplexMatrixOfPoly(piAddr, &iRows, &iCols, piNbCoef, pdblReal, pdblImg);
139 if(iRet)
140 {
141 return 1;
142 }
143
144
145 //Do something with Data
146
147 //Invert polynomials in the matrix and invert coefficients
148
149 for(i = 0 ; i < (iRows * iCols) / 2 ; i++)
150 {
151 int iPos1 = iRows * iCols - 1 - i;
152 double* pdblSave = NULL;
153 int iNbCoefSave = 0;
154
155 //switch array of coefficient
156 pdblSave = pdblReal[i];
157 pdblReal[i] = pdblReal[iPos1];
158 pdblReal[iPos1] = pdblSave;
159
160 pdblSave = pdblImg[i];
161 pdblImg[i] = pdblImg[iPos1];
162 pdblImg[iPos1] = pdblSave;
163
164 //switch number of coefficient
165 iNbCoefSave = piNbCoef[i];
166 piNbCoef[i] = piNbCoef[iPos1];
167 piNbCoef[iPos1] = iNbCoefSave;
168 }
169
170 //switch coefficient
171 for(i = 0 ; i < iRows * iCols ; i++)
172 {
173 for(j = 0 ; j < piNbCoef[i] /2 ; j++)
174 {
175 int iPos2 = piNbCoef[i] - 1 - j;
176 double dblVal = pdblReal[i][j];
177 pdblReal[i][j] = pdblReal[i][iPos2];
178 pdblReal[i][iPos2] = dblVal;
179
180 dblVal = pdblImg[i][j];
181 pdblImg[i][j] = pdblImg[i][iPos2];
182 pdblImg[i][iPos2] = dblVal;
183 }
184 }
185
186 createComplexMatrixOfPoly(Rhs + 1, pstVarname, iRows, iCols, piNbCoef, pdblReal, pdblImg);
187
188 //free OS memory
189 free(pstVarname);
190 free(piNbCoef);
191
192 for(i = 0 ; i < iRows * iCols ; i++)
193 {
194 free(pdblReal[i]);
195 free(pdblImg[i]);
196 }
197
198 free(pdblReal);
199 free(pdblImg);
200
201 //assign allocated variables to Lhs position
202 LhsVar(1) = Rhs + 1;
203 return 0;
204}
205 ]]>
206 </programlisting>
207 </refsection>
208
209 <refsection>
210 <title>Scilab test script</title>
211 <programlisting role="code_scilab">
212 <![CDATA[
213coeff1 = [ ..
21429*%i,22*%i,16*%i,11*%i,7*%i,30,23,17,12,8,-31*%i,-24*%i,-18*%i,-13*%i,-9*%i,32,25,19,14,10,-33*%i,-26*%i,-20*%i,-15*%i,0,34,27,21,0,0,0,-28*%i,0,0,0,36-35*%i,0,0,0,0; ..
2154*%i,2*%i,%i,22,16,5,-3,0,-23*%i,-17*%i,-6*%i,0,0,24,18,0,0,0,-25*%i,-19*%i,0,0,0,26,20,0,0,0,-27*%i,-21*%i,0,0,0,28,0,0,0,0,0,0; ..
21611,7,4,2,1,-12*%i,-8*%i,-5*%i,3*%i,0,13,9,6,0,0,-14*%i,-10*%i,0,0,0,15,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0]
217
218x = poly(0, "x");
219p1 = 1;
220p2 = 2 * x + 3 * %i;
221p3 = 4 * x**2 - 5 * %i * x + 6;
222p4 = 7 * x**3 - 8 * %i * x**2 + 9 * x - 10 * %i;
223p5 = 11 * x**4 - 12 * %i * x**3 + 13 * x**2 - 14 * %i * x + 15;
224p6 = 16 * x**5 - 17 * %i * x**4 + 18 * x**3 - 19 * %i * x**2 + 20 * x - 21 * %i;
225p7 = 22 * x**6 - 23 * %i * x**5 + 24 * x**4 - 25 * %i * x**3 + 26 * x**2 - 27 * %i * x + 28;
226p8 = %i;
227p9 = 2 * %i * x - 3;
228p10 = 4 * %i * x**2 + 5 * x - 6 * %i;
229p11 = 7 * %i * x**3 + 8 * x**2 - 9 * %i * x + 10;
230p12 = 11 * %i * x**4 + 12 * x**3 - 13 * %i * x**2 + 14 * x - 15 * %i;
231p13 = 16 * %i * x**5 + 17 * x**4 - 18 * %i * x**3 + 19 * x**2 - 20 * %i * x + 21;
232p14 = 22 * %i * x**6 + 23 * x**5 - 24 * %i * x**4 + 25 * x**3 - 26 * %i * x**2 + 27 * x - 28 * %i;
233p15 = 29 * %i * x**7 + 30 * x**6 - 31 * %i * x**5 + 32 * x**4 - 33 * %i * x**3 + 34 * x**2 - 35 * %i + 36;
234p = [p1, p2, p3, p4, p5 ; p6, p7, p8, p9 ,p10 ; p11, p12, p13, p14, p15];
235
236p1 = read_poly(p);
237coeff2 = coeff(p1);
238if or(coeff2 <> coeff1) then error("failed"), end
239 ]]>
240 </programlisting>
241 </refsection>
242</refentry>
diff --git a/scilab/modules/core/help/en_US/api/poly_reading_api.xml b/scilab/modules/api_scilab/help/en_US/poly_reading_api.xml
index dd0db9c..dd0db9c 100644
--- a/scilab/modules/core/help/en_US/api/poly_reading_api.xml
+++ b/scilab/modules/api_scilab/help/en_US/poly_reading_api.xml
diff --git a/scilab/modules/core/help/en_US/api/poly_writing_api.xml b/scilab/modules/api_scilab/help/en_US/poly_writing_api.xml
index 869671f..869671f 100644
--- a/scilab/modules/core/help/en_US/api/poly_writing_api.xml
+++ b/scilab/modules/api_scilab/help/en_US/poly_writing_api.xml
diff --git a/scilab/modules/core/help/en_US/api/string_reading_api.xml b/scilab/modules/api_scilab/help/en_US/string_reading_api.xml
index ff6d3a0..ff6d3a0 100644
--- a/scilab/modules/core/help/en_US/api/string_reading_api.xml
+++ b/scilab/modules/api_scilab/help/en_US/string_reading_api.xml
diff --git a/scilab/modules/core/help/en_US/api/string_writing_api.xml b/scilab/modules/api_scilab/help/en_US/string_writing_api.xml
index c1e3730..c1e3730 100644
--- a/scilab/modules/core/help/en_US/api/string_writing_api.xml
+++ b/scilab/modules/api_scilab/help/en_US/string_writing_api.xml
diff --git a/scilab/modules/api_scilab/includes/api_int.h b/scilab/modules/api_scilab/includes/api_int.h
index 1de362b..5ea64bf 100644
--- a/scilab/modules/api_scilab/includes/api_int.h
+++ b/scilab/modules/api_scilab/includes/api_int.h
@@ -26,7 +26,7 @@
26/** 26/**
27 * Get integer precision ( 8, 16, 32, 64 ) 27 * Get integer precision ( 8, 16, 32, 64 )
28 * @param[in] _piAddress variable address 28 * @param[in] _piAddress variable address
29 * @param[out] _piPrecison return integer precision ( 8, 1-, 32, 64 ) 29 * @param[out] _piPrecison return integer precision ( 8, 16, 32, 64 )
30 */ 30 */
31API_SCILAB_IMPEXP int getMatrixOfIntegerPrecision(int* _piAddress, int* _piPrecision); 31API_SCILAB_IMPEXP int getMatrixOfIntegerPrecision(int* _piAddress, int* _piPrecision);
32 32
diff --git a/scilab/modules/api_scilab/src/c/api_common.c b/scilab/modules/api_scilab/src/c/api_common.c
index 731b5b0..871503f6 100644
--- a/scilab/modules/api_scilab/src/c/api_common.c
+++ b/scilab/modules/api_scilab/src/c/api_common.c
@@ -178,21 +178,26 @@ int isVarMatrixType(int* _piAddress)
178 { 178 {
179 int iType = getVarType(_piAddress); 179 int iType = getVarType(_piAddress);
180 180
181 if( iType == sci_matrix || 181 switch(iType)
182 iType == sci_poly ||
183 iType == sci_boolean ||
184 iType == sci_sparse ||
185 iType == sci_boolean_sparse ||
186 iType == sci_matlab_sparse ||
187 iType == sci_ints ||
188 iType == sci_handles ||
189 iType == sci_strings)
190 return 1;
191 else
192 { 182 {
183 case sci_matrix :
184 case sci_poly :
185 case sci_boolean :
186 case sci_sparse :
187 case sci_boolean_sparse :
188 case sci_matlab_sparse :
189 case sci_ints :
190 case sci_handles :
191 case sci_strings :
192 return 1;
193 default :
193 return 0; 194 return 0;
194 } 195 }
195 } 196 }
197 else
198 {
199 return 0;
200 }
196 return 1; 201 return 1;
197} 202}
198/*--------------------------------------------------------------------------*/ 203/*--------------------------------------------------------------------------*/
diff --git a/scilab/modules/core/help/en_US/api/double_writing_api.xml b/scilab/modules/core/help/en_US/api/double_writing_api.xml
deleted file mode 100644
index 2b1bf79..0000000
--- a/scilab/modules/core/help/en_US/api/double_writing_api.xml
+++ /dev/null
@@ -1,263 +0,0 @@
1<?xml version="1.0" encoding="utf-8"?>
2<!--
3 * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
4 * Copyright (C) 2009 - DIGITEO - Antoine ELIAS
5 *
6 * This file must be used under the terms of the CeCILL.
7 * This source file is licensed as described in the file COPYING, which
8 * you should have received as part of this distribution. The terms
9 * are also available at
10 * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
11 *
12 -->
13<refentry version="5.0-subset Scilab" xml:id="Double management writing_API"
14 xml:lang="en" xmlns="http://docbook.org/ns/docbook"
15 xmlns:xlink="http://www.w3.org/1999/xlink"
16 xmlns:svg="http://www.w3.org/2000/svg"
17 xmlns:ns5="http://www.w3.org/1999/xhtml"
18 xmlns:mml="http://www.w3.org/1998/Math/MathML"
19 xmlns:db="http://docbook.org/ns/docbook">
20
21 <refnamediv>
22 <refname>Double writing</refname>
23
24 <refpurpose>
25 How to write matrices of doubles in a gateway.
26 </refpurpose>
27 </refnamediv>
28 <refsection>
29 <title>Description</title>
30 <para>This help describes how matrix of doubles can be handled through the Scilab API.</para>
31 <para>There are 2 types of functions which can be used to write in the memory of Scilab.</para>
32 </refsection>
33 <refsection>
34 <title>Create from existing data</title>
35 <synopsis>int createMatrixOfDouble(int _iVar, int _iRows, int _iCols, double* _pdblReal)</synopsis>
36 <synopsis>int createComplexMatrixOfDouble(int _iVar, int _iRows, int _iCols, double* _pdblReal, double* _pdblImg)</synopsis>
37 </refsection>
38 <refsection>
39 <title>Parameters</title>
40
41 <variablelist>
42 <varlistentry>
43 <term>_iVar</term>
44 <listitem>
45 <para>
46 Position in the Scilab memory where you want to put the variable
47 </para>
48 </listitem>
49 </varlistentry>
50
51 <varlistentry>
52 <term>_iRows</term>
53 <listitem>
54 <para>
55 Number of rows of the new variable
56 </para>
57 </listitem>
58 </varlistentry>
59
60 <varlistentry>
61 <term>_iCols</term>
62 <listitem>
63 <para>
64 Numbers of columns of the new variable
65 </para>
66 </listitem>
67 </varlistentry>
68
69 <varlistentry>
70 <term>_pdblReal</term>
71 <listitem>
72 <para>
73 Address of real data array (size: _iCols * _iRows)
74 </para>
75 </listitem>
76 </varlistentry>
77
78 <varlistentry>
79 <term>_pdblImg</term>
80 <listitem>
81 <para>
82 Address of imaginary data array (size: _iCols * _iRows)
83 </para>
84 </listitem>
85 </varlistentry>
86
87 </variablelist>
88 </refsection>
89 <refsection>
90 <title>Write directly in Scilab memory</title>
91 <synopsis>int allocMatrixOfDouble(int _iVar, int _iRows, int _iCols, double** _pdblReal)</synopsis>
92 <synopsis>int allocComplexMatrixOfDouble(int _iVar, int _iRows, int _iCols, double** _pdblReal, double** _pdblImg)</synopsis>
93 </refsection>
94 <refsection>
95 <title>Parameters</title>
96
97 <variablelist>
98 <varlistentry>
99 <term>_iVar</term>
100 <listitem>
101 <para>
102 Position in the Scilab memory where you want to put the variable
103 </para>
104 </listitem>
105 </varlistentry>
106
107 <varlistentry>
108 <term>_iRows</term>
109 <listitem>
110 <para>
111 Number of rows of the new variable
112 </para>
113 </listitem>
114 </varlistentry>
115
116 <varlistentry>
117 <term>_iCols</term>
118 <listitem>
119 <para>
120 Numbers of columns of the new variable
121 </para>
122 </listitem>
123 </varlistentry>
124
125 <varlistentry>
126 <term>_pdblReal</term>
127 <listitem>
128 <para>
129 Returns address of real data array (size: _iCols * _iRows)
130 </para>
131 </listitem>
132 </varlistentry>
133
134 <varlistentry>
135 <term>_pdblImg</term>
136 <listitem>
137 <para>
138 Returns address of imaginary data array (size: _iCols * _iRows)
139 </para>
140 </listitem>
141 </varlistentry>
142
143 </variablelist>
144 </refsection>
145
146 <refsection>
147 <!--File_gateway: SCI/modules/core/tests/unit_tests/double_writing_api.c-->
148 <!--File_scilab: SCI/modules/core/tests/unit_tests/double_writing_api.tst-->
149 <!--Lib_name: double_writing-->
150 <!--Func_list: write_double-->
151 <title>Gateway Source</title>
152 <programlisting role="code_gateway">
153 <![CDATA[
154int write_double(char *fname,unsigned long fname_len)
155{
156 int i,j;
157 int iRet = 0;
158 //first variable info : real matrix of double 3 x 4
159 int iRows1 = 3;
160 int iCols1 = 4;
161 double* pdblReal1 = NULL;
162
163 //second variable info : complex matrix of double 4 x 6
164 int iRows2 = 4;
165 int iCols2 = 6;
166 double* pdblReal2 = NULL;
167 double* pdblImg2 = NULL;
168
169 /************************
170 * First variable *
171 ************************/
172 //alloc array of data in OS memory
173 pdblReal1 = (double*)malloc(sizeof(double) * iRows1 * iCols1);
174
175 //fill array with incremental values
176 //[ 0 1 2 3
177 // 4 5 6 7
178 // 8 9 10 11]
179 for(i = 0 ; i < iRows1 ; i++)
180 {
181 for(j = 0 ; j < iCols1 ; j++)
182 {
183 pdblReal1[i + iRows1 * j] = i * iCols1 + j;
184 }
185 }
186 //can be written in a single loop
187 //for(i = 0 ; i < iRows1 * iCols1; i++)
188 //{
189 // pdblReal1[i] = i;
190 //}
191
192 //create a variable from a existing data array
193 iRet = createMatrixOfDouble(Rhs + 1, iRows1, iCols1, pdblReal1);
194 if(iRet)
195 {
196 //Error
197 return 1;
198 }
199
200 //after creation, we can free memory.
201 free(pdblReal1);
202 /*************************
203 * Second variable *
204 *************************/
205
206 //reserve space in scilab memory and fill it
207 iRet = allocComplexMatrixOfDouble(Rhs + 2, iRows2, iCols2, &pdblReal2, &pdblImg2);
208 if(iRet)
209 {
210 //Error
211 return 1;
212 }
213
214 //fill array with incremental values for real part and decremental for imaginary part
215 //[ 23i 1+22i 2+21i 3+20i 4+19i 5+18i
216 // 6+17i 7+16i 8+15i 9+14i 10+13i 11+12i
217 // 12+11i 13+10i 14+9i 15+8i 16+7i 17+6i
218 // 18+5i 19+4i 20+3i 21+2i 22+1i 23 ]
219 for(i = 0 ; i < iRows2 ; i++)
220 {
221 for(j = 0 ; j < iCols2 ; j++)
222 {
223 pdblReal2[i + iRows2 * j] = i * iCols2 + j;
224 pdblImg2 [i + iRows2 * j] = (iRows2 * iCols2 - 1) - (i * iCols2 + j);
225 }
226 }
227 //can be written in a single loop
228 //for(i = 0 ; i < iRows2 * iCols2; i++)
229 //{
230 // pdblReal2[i] = i;
231 // pdblImg2 [i] = (iRows2 * iCols2 - 1) - i;
232 //}
233
234 // /!\ DO NOT FREE MEMORY, in this case, it's the Scilab memory
235
236
237 //assign allocated variables to Lhs position
238 LhsVar(1) = Rhs + 1;
239 LhsVar(2) = Rhs + 2;
240 return 0;
241}
242 ]]>
243 </programlisting>
244 </refsection>
245
246 <refsection>
247 <title>Scilab test script</title>
248 <programlisting role="code_scilab">
249 <![CDATA[
250a_ref = [ 0 1 2 3; ..
251 4 5 6 7; ..
252 8 9 10 11];
253b_ref = [ 23*%i, 1+22*%i, 2+21*%i, 3+20*%i, 4+19*%i, 5+18*%i; ..
254 6+17*%i, 7+16*%i, 8+15*%i, 9+14*%i, 10+13*%i, 11+12*%i; ..
255 12+11*%i, 13+10*%i, 14+9*%i, 15+8*%i, 16+7*%i, 17+6*%i; ..
256 18+5*%i, 19+4*%i, 20+3*%i, 21+2*%i, 22+1*%i, 23];
257[a,b] = write_double();
258if or(a <> a_ref) then error("failed");end
259if or(b <>; b_ref) then error("failed");end
260 ]]>
261 </programlisting>
262 </refsection>
263</refentry> \ No newline at end of file
diff --git a/scilab/modules/core/includes/callinterf.h b/scilab/modules/core/includes/callinterf.h
index a94deca..9edf11f 100644
--- a/scilab/modules/core/includes/callinterf.h
+++ b/scilab/modules/core/includes/callinterf.h
@@ -83,6 +83,7 @@
83/* 59 */ #include "dynamic_gateways.h" /* matio */ 83/* 59 */ #include "dynamic_gateways.h" /* matio */
84/* 60 */ #include "dynamic_gateways.h" /* helptools */ 84/* 60 */ #include "dynamic_gateways.h" /* helptools */
85/* 61 */ #include "../../call_scilab/includes/gw_call_scilab.h" 85/* 61 */ #include "../../call_scilab/includes/gw_call_scilab.h"
86/* 62 */ #include "../../hdf5/includes/gw_hdf5.h"
86 87
87/*------------------------------------- 88/*-------------------------------------
88 * long jump to stop interface computation 89 * long jump to stop interface computation
diff --git a/scilab/modules/core/includes/stack-c.h b/scilab/modules/core/includes/stack-c.h
index 097333c..8c80103 100644
--- a/scilab/modules/core/includes/stack-c.h
+++ b/scilab/modules/core/includes/stack-c.h
@@ -72,24 +72,6 @@ typedef enum {
72#define I_UINT16 12 72#define I_UINT16 12
73#define I_UINT32 14 73#define I_UINT32 14
74 74
75/*
76@TODO
77some other are definied in data_structures/src/c/hmops.c
78
79#define SCI_REAL_OR_CMPLX 1
80#define SCI_POLYNOMIAL 2
81#define SCI_BOOLEAN 4
82#define SCI_SP_BOOLEAN 6
83#define SCI_INTEGER 8
84#define SCI_IMPLICIT_POLY 129
85#define SCI_STRING sci_strings
86#define SCI_MLIST sci_mlist
87#define NOT_REAL_or_CMPLX_or_BOOL_or_INT -1
88#define OLD_HYPERMAT -2
89
90See if it is interesting including them here
91*/
92
93/* a set of define for the associated casts */ 75/* a set of define for the associated casts */
94 76
95#define IC_CHAR(x) ((char *) (x)) 77#define IC_CHAR(x) ((char *) (x))
diff --git a/scilab/modules/core/src/c/callinterf.c b/scilab/modules/core/src/c/callinterf.c
index 26bdcce..eb5dff7 100644
--- a/scilab/modules/core/src/c/callinterf.c
+++ b/scilab/modules/core/src/c/callinterf.c
@@ -33,7 +33,7 @@ static void sci_sigint_addinter(int n);
33 ** Watch out the positions are crutial !!! 33 ** Watch out the positions are crutial !!!
34 ** @TODO : Make this less crappy... 34 ** @TODO : Make this less crappy...
35 **/ 35 **/
36#define INTERFACES_MAX 61 36#define INTERFACES_MAX 62
37static OpTab Interfaces[INTERFACES_MAX] = { 37static OpTab Interfaces[INTERFACES_MAX] = {
38 /* 01 */ {gw_user}, /* free position may be used */ 38 /* 01 */ {gw_user}, /* free position may be used */
39 /* 02 */ {gw_linear_algebra}, 39 /* 02 */ {gw_linear_algebra},
@@ -95,7 +95,8 @@ static OpTab Interfaces[INTERFACES_MAX] = {
95 /* 58 */ {gw_dynamic_umfpack}, 95 /* 58 */ {gw_dynamic_umfpack},
96 /* 59 */ {gw_dynamic_matio}, 96 /* 59 */ {gw_dynamic_matio},
97 /* 60 */ {gw_dynamic_helptools}, 97 /* 60 */ {gw_dynamic_helptools},
98 /* 61 */ {gw_call_scilab} 98 /* 61 */ {gw_call_scilab},
99 /* 62 */ {gw_hdf5}
99}; 100};
100/*--------------------------------------------------------------------------*/ 101/*--------------------------------------------------------------------------*/
101static int sig_ok = 0; 102static int sig_ok = 0;
diff --git a/scilab/modules/data_structures/src/c/hmops.c b/scilab/modules/data_structures/src/c/hmops.c
index 9fb1465..8273613 100644
--- a/scilab/modules/data_structures/src/c/hmops.c
+++ b/scilab/modules/data_structures/src/c/hmops.c
@@ -26,14 +26,8 @@
26 26
27#define sign(a) ((a) < 0 ? -1 : 1) 27#define sign(a) ((a) < 0 ? -1 : 1)
28 28
29#define SCI_REAL_OR_CMPLX 1 29/* SCI_IMPLICIT_POLY is not used elsewhere in C code ... maybe fortran */
30#define SCI_POLYNOMIAL 2 30#define SCI_IMPLICIT_POLY 129
31#define SCI_BOOLEAN 4
32#define SCI_SP_BOOLEAN 6
33#define SCI_INTEGER 8
34#define SCI_IMPLICIT_POLY 129
35#define SCI_STRING sci_strings
36#define SCI_MLIST sci_mlist
37#define NOT_REAL_or_CMPLX_or_BOOL_or_INT -1 31#define NOT_REAL_or_CMPLX_or_BOOL_or_INT -1
38#define OLD_HYPERMAT -2 32#define OLD_HYPERMAT -2
39 33
@@ -89,7 +83,7 @@ static int get_hmat(int num, HyperMat *H)
89 if ( *istk(il) < 0 ) 83 if ( *istk(il) < 0 )
90 il = iadr(*istk(il+1)); 84 il = iadr(*istk(il+1));
91 85
92 if ( *istk(il) != SCI_MLIST ) 86 if ( *istk(il) != sci_mlist )
93 return 0; 87 return 0;
94 else if ( *istk(il+1) != 3 ) /* a hm mlist must have 3 fields */ 88 else if ( *istk(il+1) != 3 ) /* a hm mlist must have 3 fields */
95 return 0; 89 return 0;
@@ -103,7 +97,7 @@ static int get_hmat(int num, HyperMat *H)
103 /* test if the first field is a matrix string with 3 components 97 /* test if the first field is a matrix string with 3 components
104 * and that the first is "hm" (ie 17 22 in scilab char code) 98 * and that the first is "hm" (ie 17 22 in scilab char code)
105 */ 99 */
106 if ( (*istk(il1) != SCI_STRING) | ((*istk(il1+1))*(*istk(il1+2)) != 3) ) 100 if ( (*istk(il1) != sci_strings) | ((*istk(il1+1))*(*istk(il1+2)) != 3) )
107 return 0; 101 return 0;
108 else if ( *istk(il1+5)-1 != 2 ) /* 1 str must have 2 chars */ 102 else if ( *istk(il1+5)-1 != 2 ) /* 1 str must have 2 chars */
109 return 0; 103 return 0;
@@ -112,7 +106,7 @@ static int get_hmat(int num, HyperMat *H)
112 106
113 107
114 /* get the 2d field */ 108 /* get the 2d field */
115 if ( *istk(il2) == SCI_REAL_OR_CMPLX && *istk(il2+3) == 0 ) 109 if ( *istk(il2) == sci_matrix && *istk(il2+3) == 0 )
116 { 110 {
117 /* this is an old hypermat (the dim field is an array of doubles) */ 111 /* this is an old hypermat (the dim field is an array of doubles) */
118 H->type = OLD_HYPERMAT; 112 H->type = OLD_HYPERMAT;
@@ -121,7 +115,7 @@ static int get_hmat(int num, HyperMat *H)
121 return 2; 115 return 2;
122 } 116 }
123 117
124 if ( (*istk(il2) != SCI_INTEGER) | (*istk(il2+3) != I_INT32) ) 118 if ( (*istk(il2) != sci_ints) | (*istk(il2+3) != I_INT32) )
125 return 0; 119 return 0;
126 120
127 121
@@ -137,25 +131,25 @@ static int get_hmat(int num, HyperMat *H)
137 /* get the 3d field */ 131 /* get the 3d field */
138 switch ( *istk(il3) ) 132 switch ( *istk(il3) )
139 { 133 {
140 case (SCI_REAL_OR_CMPLX): 134 case (sci_matrix):
141 H->size = (*istk(il3+1))*(*istk(il3+2)); 135 H->size = (*istk(il3+1))*(*istk(il3+2));
142 H->type = SCI_REAL_OR_CMPLX; 136 H->type = sci_matrix;
143 H->it = *istk(il3+3); 137 H->it = *istk(il3+3);
144 H->R = stk(sadr(il3+4)); 138 H->R = stk(sadr(il3+4));
145 if ( H->it == 1 ) 139 if ( H->it == 1 )
146 H->I = H->R + H->size; 140 H->I = H->R + H->size;
147 return 1; 141 return 1;
148 142
149 case (SCI_BOOLEAN): 143 case (sci_boolean):
150 H->size = (*istk(il3+1))*(*istk(il3+2)); 144 H->size = (*istk(il3+1))*(*istk(il3+2));
151 H->type = SCI_BOOLEAN; 145 H->type = sci_boolean;
152 H->it = 0; /* not used */ 146 H->it = 0; /* not used */
153 H->P = (void *) istk(il3+3); 147 H->P = (void *) istk(il3+3);
154 return 1; 148 return 1;
155 149
156 case (SCI_INTEGER): 150 case (sci_ints):
157 H->size = (*istk(il3+1))*(*istk(il3+2)); 151 H->size = (*istk(il3+1))*(*istk(il3+2));
158 H->type = SCI_INTEGER; 152 H->type = sci_ints;
159 H->it = *istk(il3+3); 153 H->it = *istk(il3+3);
160 H->P = (void *) istk(il3+4); 154 H->P = (void *) istk(il3+4);
161 return 1; 155 return 1;
@@ -176,7 +170,7 @@ int C2F(ishm)()
176 if ( *istk(il) < 0 ) 170 if ( *istk(il) < 0 )
177 il = iadr(*istk(il+1)); 171 il = iadr(*istk(il+1));
178 172
179 if ( *istk(il) != SCI_MLIST ) 173 if ( *istk(il) != sci_mlist )
180 return 0; 174 return 0;
181 else if ( *istk(il+1) != 3 ) /* a hm mlist must have 3 fields */ 175 else if ( *istk(il+1) != 3 ) /* a hm mlist must have 3 fields */
182 return 0; 176 return 0;
@@ -189,7 +183,7 @@ int C2F(ishm)()
189 /* test if the first field is a matrix string with 3 components 183 /* test if the first field is a matrix string with 3 components
190 * and that the first is "hm" (ie 17 22 in scilab char code) 184 * and that the first is "hm" (ie 17 22 in scilab char code)
191 */ 185 */
192 if ( (*istk(il1) != SCI_STRING) | ((*istk(il1+1))*(*istk(il1+2)) != 3) ) 186 if ( (*istk(il1) != sci_strings) | ((*istk(il1+1))*(*istk(il1+2)) != 3) )
193 return 0; 187 return 0;
194 else if ( *istk(il1+5)-1 != 2 ) /* 1 str must have 2 chars */ 188 else if ( *istk(il1+5)-1 != 2 ) /* 1 str must have 2 chars */
195 return 0; 189 return 0;
@@ -211,7 +205,7 @@ static int get_mat_as_hmat(int num, HyperMat *H)
211 205
212 type = *istk(il); 206 type = *istk(il);
213 207
214 if (type == SCI_REAL_OR_CMPLX || type == SCI_BOOLEAN || type == SCI_INTEGER) 208 if (type == sci_matrix || type == sci_boolean || type == sci_ints)
215 { 209 {
216 210
217 /* needed for Jpc stuff (putlhsvar) ? */ 211 /* needed for Jpc stuff (putlhsvar) ? */
@@ -226,19 +220,19 @@ static int get_mat_as_hmat(int num, HyperMat *H)
226 dims[1] = *istk(il+2); 220 dims[1] = *istk(il+2);
227 H->size = dims[0]*dims[1]; 221 H->size = dims[0]*dims[1];
228 H->dims = dims; 222 H->dims = dims;
229 if (type == SCI_REAL_OR_CMPLX) 223 if (type == sci_matrix)
230 { 224 {
231 H->it = *istk(il+3); 225 H->it = *istk(il+3);
232 H->R = stk(sadr(il+4)); 226 H->R = stk(sadr(il+4));
233 if (H->it == 1) 227 if (H->it == 1)
234 H->I = H->R + H->size; 228 H->I = H->R + H->size;
235 } 229 }
236 else if (type == SCI_BOOLEAN) 230 else if (type == sci_boolean)
237 { 231 {
238 H->it = 0; 232 H->it = 0;
239 H->P = (void *) istk(il+3); 233 H->P = (void *) istk(il+3);
240 } 234 }
241 else /* type = SCI_INTEGER */ 235 else /* type = sci_ints */
242 { 236 {
243 H->it = *istk(il+3); 237 H->it = *istk(il+3);
244 H->P = (void *) istk(il+4); 238 H->P = (void *) istk(il+4);
@@ -269,19 +263,19 @@ static int cre_hmat(int pos, HyperMat *H)
269 263
270 switch (H->type) 264 switch (H->type)
271 { 265 {
272 case (SCI_REAL_OR_CMPLX): 266 case (sci_matrix):
273 CreateListCVarFrom(pos,3,MATRIX_OF_DOUBLE_DATATYPE, &H->it, &H->size, &one , &lr, &lc, &lar, &lac); 267 CreateListCVarFrom(pos,3,MATRIX_OF_DOUBLE_DATATYPE, &H->it, &H->size, &one , &lr, &lc, &lar, &lac);
274 H->R = stk(lr); 268 H->R = stk(lr);
275 if ( H->it == 1) 269 if ( H->it == 1)
276 H->I = stk(lc); 270 H->I = stk(lc);
277 return 1; 271 return 1;
278 272
279 case (SCI_BOOLEAN): 273 case (sci_boolean):
280 CreateListVarFrom(pos, 3,MATRIX_OF_BOOLEAN_DATATYPE, &H->size, &one, &lr, &lar); 274 CreateListVarFrom(pos, 3,MATRIX_OF_BOOLEAN_DATATYPE, &H->size, &one, &lr, &lar);
281 H->P = (void *) istk(lr); 275 H->P = (void *) istk(lr);
282 return 1; 276 return 1;
283 277
284 case (SCI_INTEGER): 278 case (sci_ints):
285 lr = H->it; 279 lr = H->it;
286 CreateListVarFrom(pos, 3,MATRIX_OF_VARIABLE_SIZE_INTEGER_DATATYPE, &H->size, &one, &lr, &lar); 280 CreateListVarFrom(pos, 3,MATRIX_OF_VARIABLE_SIZE_INTEGER_DATATYPE, &H->size, &one, &lr, &lar);
287 H->P = (void *) istk(lr); 281 H->P = (void *) istk(lr);
@@ -307,7 +301,7 @@ static int get_sci_bool_sparse(int num, SciBoolSparse *M)
307 if ( *istk(il) < 0 ) 301 if ( *istk(il) < 0 )
308 il = iadr(*istk(il+1)); 302 il = iadr(*istk(il+1));
309 303
310 if ( *istk(il) != SCI_SP_BOOLEAN ) 304 if ( *istk(il) != sci_boolean_sparse )
311 return 0; 305 return 0;
312 306
313 /* needed for Jpc stuff (putlhsvar) */ 307 /* needed for Jpc stuff (putlhsvar) */
@@ -404,7 +398,7 @@ static int create_index_vector(int pos, int pos_ind, int *mn,
404 398
405 switch ( GetType(pos) ) 399 switch ( GetType(pos) )
406 { 400 {
407 case (SCI_REAL_OR_CMPLX): 401 case (sci_matrix):
408 402
409 GetRhsVar(pos,MATRIX_OF_DOUBLE_DATATYPE, &m, &n, &l); 403 GetRhsVar(pos,MATRIX_OF_DOUBLE_DATATYPE, &m, &n, &l);
410 if ( m == -1 ) /* implicit index : */ 404 if ( m == -1 ) /* implicit index : */
@@ -427,7 +421,7 @@ static int create_index_vector(int pos, int pos_ind, int *mn,
427 return ( index_convert(td, ti, *mn, ind_max) ); 421 return ( index_convert(td, ti, *mn, ind_max) );
428 } 422 }
429 423
430 case (SCI_INTEGER): 424 case (sci_ints):
431 425
432 GetRhsVar(pos,MATRIX_OF_VARIABLE_SIZE_INTEGER_DATATYPE, &m, &n, (int *)&IV); 426 GetRhsVar(pos,MATRIX_OF_VARIABLE_SIZE_INTEGER_DATATYPE, &m, &n, (int *)&IV);
433 427
@@ -448,7 +442,7 @@ static int create_index_vector(int pos, int pos_ind, int *mn,
448 return 1; 442 return 1;
449 } 443 }
450 444
451 case (SCI_POLYNOMIAL): 445 case (sci_poly):
452 446
453 il = iadr( *Lstk( pos + Top - Rhs ) ); 447 il = iadr( *Lstk( pos + Top - Rhs ) );
454 if ( *istk(il) < 0 ) il = iadr( *istk(il+1) ); 448 if ( *istk(il) < 0 ) il = iadr( *istk(il+1) );
@@ -463,7 +457,7 @@ static int create_index_vector(int pos, int pos_ind, int *mn,
463 ti = (int *)td; 457 ti = (int *)td;
464 return ( index_convert(td, ti, *mn, ind_max) ); 458 return ( index_convert(td, ti, *mn, ind_max) );
465 459
466 case (SCI_IMPLICIT_POLY): /* p1:p2:p3 */ 460 case (sci_implicit_poly ): /* p1:p2:p3 */
467 461
468 il = iadr( *Lstk( pos + Top - Rhs ) ); 462 il = iadr( *Lstk( pos + Top - Rhs ) );
469 if ( *istk(il) < 0 ) il = iadr( *istk(il+1) ); 463 if ( *istk(il) < 0 ) il = iadr( *istk(il+1) );
@@ -501,7 +495,7 @@ static int create_index_vector(int pos, int pos_ind, int *mn,
501 return 1; 495 return 1;
502 } 496 }
503 497
504 case (SCI_BOOLEAN) : 498 case (sci_boolean) :
505 499
506 GetRhsVar(pos,MATRIX_OF_BOOLEAN_DATATYPE, &m, &n, &l); 500 GetRhsVar(pos,MATRIX_OF_BOOLEAN_DATATYPE, &m, &n, &l);
507 if ( m*n != nmax ) 501 if ( m*n != nmax )
@@ -524,10 +518,10 @@ static int create_index_vector(int pos, int pos_ind, int *mn,
524 *ind_max = ti[*mn-1] + 1; 518 *ind_max = ti[*mn-1] + 1;
525 return 1; 519 return 1;
526 520
527 case (SCI_MLIST) : /* Try if it is an hypermat of BOOLEANS */ 521 case (sci_mlist) : /* Try if it is an hypermat of BOOLEANS */
528 522
529 GetHMat(pos, &H); 523 GetHMat(pos, &H);
530 if ( H.type != SCI_BOOLEAN || H.size != nmax) 524 if ( H.type != sci_boolean || H.size != nmax)
531 return 0; 525 return 0;
532 P = (int *) H.P; 526 P = (int *) H.P;
533 *ind_max = 0; 527 *ind_max = 0;
@@ -550,7 +544,7 @@ static int create_index_vector(int pos, int pos_ind, int *mn,
550 return 1; 544 return 1;
551 545
552 546
553 case (SCI_SP_BOOLEAN) : 547 case (sci_boolean_sparse) :
554 548
555 GetSciBoolSparse(pos, &B); 549 GetSciBoolSparse(pos, &B);
556 if ( B.m*B.n != nmax ) 550 if ( B.m*B.n != nmax )
@@ -737,16 +731,16 @@ int C2F(intehm)()
737 n = 1; 731 n = 1;
738 switch (H.type) 732 switch (H.type)
739 { 733 {
740 case (SCI_REAL_OR_CMPLX): 734 case (sci_matrix):
741 CreateCVar(dec+Rhs,MATRIX_OF_DOUBLE_DATATYPE, &(H.it), &m, &n, &lr, &lc); 735 CreateCVar(dec+Rhs,MATRIX_OF_DOUBLE_DATATYPE, &(H.it), &m, &n, &lr, &lc);
742 He.R = stk(lr); 736 He.R = stk(lr);
743 if ( H.it == 1 ) He.I = stk(lc); 737 if ( H.it == 1 ) He.I = stk(lc);
744 break; 738 break;
745 case (SCI_BOOLEAN): 739 case (sci_boolean):
746 CreateVar(dec+Rhs,MATRIX_OF_BOOLEAN_DATATYPE, &m, &n, &lr); 740 CreateVar(dec+Rhs,MATRIX_OF_BOOLEAN_DATATYPE, &m, &n, &lr);
747 He.P = (void *) istk(lr); 741 He.P = (void *) istk(lr);
748 break; 742 break;
749 case (SCI_INTEGER): 743 case (sci_ints):
750 lr = H.it; 744 lr = H.it;
751 CreateVar(dec+Rhs,MATRIX_OF_VARIABLE_SIZE_INTEGER_DATATYPE, &m, &n, &lr); 745 CreateVar(dec+Rhs,MATRIX_OF_VARIABLE_SIZE_INTEGER_DATATYPE, &m, &n, &lr);
752 He.P = (void *) istk(lr); 746 He.P = (void *) istk(lr);
@@ -761,7 +755,7 @@ int C2F(intehm)()
761 /* fill the resulting hypermatrix or matrix */ 755 /* fill the resulting hypermatrix or matrix */
762 switch ( H.type ) 756 switch ( H.type )
763 { 757 {
764 case (SCI_REAL_OR_CMPLX) : 758 case (sci_matrix) :
765 for ( k = 0 ; k < ntot ; k++ ) 759 for ( k = 0 ; k < ntot ; k++ )
766 He.R[k] = H.R[j[k]]; 760 He.R[k] = H.R[j[k]];
767 if (H.it == 1) 761 if (H.it == 1)
@@ -769,13 +763,13 @@ int C2F(intehm)()
769 He.I[k] = H.I[j[k]]; 763 He.I[k] = H.I[j[k]];
770 break; 764 break;
771 765
772 case (SCI_BOOLEAN) : /* (sci_boolean stored with 4 bytes) */ 766 case (sci_boolean) : /* (sci_boolean stored with 4 bytes) */
773 Pe = (int *) He.P ; P = (int *) H.P; 767 Pe = (int *) He.P ; P = (int *) H.P;
774 for ( k = 0 ; k < ntot ; k++ ) 768 for ( k = 0 ; k < ntot ; k++ )
775 Pe[k] = P[j[k]]; 769 Pe[k] = P[j[k]];
776 break; 770 break;
777 771
778 case (SCI_INTEGER) : 772 case (sci_ints) :
779 if ( H.it == I_INT32 || H.it == I_UINT32 ) 773 if ( H.it == I_INT32 || H.it == I_UINT32 )
780 { 774 {
781 Pe = (int *) He.P; P = (int *) H.P; 775 Pe = (int *) He.P; P = (int *) H.P;
@@ -928,7 +922,7 @@ int C2F(intihm)()
928 /* modify in place the hypermatrix A */ 922 /* modify in place the hypermatrix A */
929 switch ( A.type ) 923 switch ( A.type )
930 { 924 {
931 case (SCI_REAL_OR_CMPLX) : 925 case (sci_matrix) :
932 if ( B_is_scalar ) 926 if ( B_is_scalar )
933 { 927 {
934 for ( k = 0 ; k < ntot ; k++ ) A.R[j[k]] = B.R[0]; 928 for ( k = 0 ; k < ntot ; k++ ) A.R[j[k]] = B.R[0];
@@ -943,7 +937,7 @@ int C2F(intihm)()
943 } 937 }
944 break; 938 break;
945 939
946 case (SCI_BOOLEAN) : 940 case (sci_boolean) :
947 PA = (int *) A.P ; PB = (int *) B.P; 941 PA = (int *) A.P ; PB = (int *) B.P;
948 if ( B_is_scalar ) 942 if ( B_is_scalar )
949 for ( k = 0 ; k < ntot ; k++ ) PA[j[k]] = PB[0]; 943 for ( k = 0 ; k < ntot ; k++ ) PA[j[k]] = PB[0];
@@ -951,7 +945,7 @@ int C2F(intihm)()
951 for ( k = 0 ; k < ntot ; k++ ) PA[j[k]] = PB[k]; 945 for ( k = 0 ; k < ntot ; k++ ) PA[j[k]] = PB[k];
952 break; 946 break;
953 947
954 case (SCI_INTEGER) : 948 case (sci_ints) :
955 if ( A.it == I_INT32 || A.it == I_UINT32 ) 949 if ( A.it == I_INT32 || A.it == I_UINT32 )
956 { 950 {
957 PA = (int *) A.P ; PB = (int *) B.P; 951 PA = (int *) A.P ; PB = (int *) B.P;
diff --git a/scilab/modules/differential_equations/license.txt b/scilab/modules/differential_equations/license.txt
index 4283bfd..e8f0e84 100644
--- a/scilab/modules/differential_equations/license.txt
+++ b/scilab/modules/differential_equations/license.txt
@@ -9,3 +9,13 @@ This module file is licensed as described in the file COPYING, which
9you should have received as part of this distribution. The terms 9you should have received as part of this distribution. The terms
10are also available at 10are also available at
11http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt 11http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
12
13
14TWODQ:
15======
16
17File: src/fortran/twodq.f
18
19Copyright: BARNHILL,ROBERT,UNIV. OF UTAH
20
21License: Public domain (like cmlib)
diff --git a/scilab/modules/fileio/Makefile.am b/scilab/modules/fileio/Makefile.am
index 393d031..9bdd7ac 100644
--- a/scilab/modules/fileio/Makefile.am
+++ b/scilab/modules/fileio/Makefile.am
@@ -84,32 +84,11 @@ sci_gateway/c/sci_newest.c \
84sci_gateway/c/sci_get_absolute_file_path.c \ 84sci_gateway/c/sci_get_absolute_file_path.c \
85sci_gateway/c/sci_getrelativefilename.c 85sci_gateway/c/sci_getrelativefilename.c
86 86
87if HDF5
88FILEIO_SOURCES += src/c/h5_fileManagement.c \
89src/c/h5_writeDataToFile.c \
90src/c/h5_readDataFromFile.c
91
92#GATEWAY_SOURCES += \
93#sci_gateway/c/sci_import_from_hdf5.c
94
95GATEWAY_CPP_SOURCES = \
96sci_gateway/cpp/sci_export_to_hdf5.cpp \
97sci_gateway/cpp/sci_import_from_hdf5.cpp
98
99else
100
101GATEWAY_CPP_SOURCES = \
102sci_gateway/cpp/sci_no_hdf5.cpp
103
104endif
105
106
107libscifileio_la_CXXFLAGS= -I$(srcdir)/includes/ \ 87libscifileio_la_CXXFLAGS= -I$(srcdir)/includes/ \
108 -I$(srcdir)/src/c/ \ 88 -I$(srcdir)/src/c/ \
109 -I$(top_srcdir)/libs/MALLOC/includes/ \ 89 -I$(top_srcdir)/libs/MALLOC/includes/ \
110 -I$(top_srcdir)/modules/api_scilab/includes \ 90 -I$(top_srcdir)/modules/api_scilab/includes \
111 -I$(top_srcdir)/modules/output_stream/includes \ 91 -I$(top_srcdir)/modules/output_stream/includes
112 $(HDF5_CFLAGS)
113 92
114libscifileio_la_CFLAGS= -I$(srcdir)/includes/ \ 93libscifileio_la_CFLAGS= -I$(srcdir)/includes/ \
115 -I$(srcdir)/src/c/ \ 94 -I$(srcdir)/src/c/ \
@@ -118,12 +97,11 @@ libscifileio_la_CFLAGS= -I$(srcdir)/includes/ \
118 -I$(top_srcdir)/modules/io/includes \ 97 -I$(top_srcdir)/modules/io/includes \
119 -I$(top_srcdir)/modules/api_scilab/includes \ 98 -I$(top_srcdir)/modules/api_scilab/includes \
120 -I$(top_srcdir)/modules/string/includes \ 99 -I$(top_srcdir)/modules/string/includes \
121 -I$(top_srcdir)/modules/localization/includes \ 100 -I$(top_srcdir)/modules/localization/includes
122 $(HDF5_CFLAGS)
123 101
124pkglib_LTLIBRARIES = libscifileio.la 102pkglib_LTLIBRARIES = libscifileio.la
125 103
126libscifileio_la_LDFLAGS = -version-info $(SCILAB_LIBRARY_VERSION) $(HDF5_LIBS) 104libscifileio_la_LDFLAGS = -version-info $(SCILAB_LIBRARY_VERSION)
127 105
128libscifileio_la_SOURCES = $(FILEIO_SOURCES) $(GATEWAY_SOURCES) $(GATEWAY_CPP_SOURCES) 106libscifileio_la_SOURCES = $(FILEIO_SOURCES) $(GATEWAY_SOURCES) $(GATEWAY_CPP_SOURCES)
129 107
diff --git a/scilab/modules/fileio/Makefile.in b/scilab/modules/fileio/Makefile.in
index 4966757..d710901 100644
--- a/scilab/modules/fileio/Makefile.in
+++ b/scilab/modules/fileio/Makefile.in
@@ -55,13 +55,9 @@ PRE_UNINSTALL = :
55POST_UNINSTALL = : 55POST_UNINSTALL = :
56build_triplet = @build@ 56build_triplet = @build@
57host_triplet = @host@ 57host_triplet = @host@
58@HDF5_TRUE@am__append_1 = src/c/h5_fileManagement.c \
59@HDF5_TRUE@src/c/h5_writeDataToFile.c \
60@HDF5_TRUE@src/c/h5_readDataFromFile.c
61
62DIST_COMMON = $(libscifileio_la_include_HEADERS) $(srcdir)/Makefile.am \ 58DIST_COMMON = $(libscifileio_la_include_HEADERS) $(srcdir)/Makefile.am \
63 $(srcdir)/Makefile.in $(top_srcdir)/Makefile.incl.am 59 $(srcdir)/Makefile.in $(top_srcdir)/Makefile.incl.am
64@NEED_JAVA_TRUE@am__append_2 = java 60@NEED_JAVA_TRUE@am__append_1 = java
65subdir = modules/fileio 61subdir = modules/fileio
66ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 62ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
67am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \ 63am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
@@ -101,50 +97,7 @@ libscifileio_la_DEPENDENCIES = \
101 $(top_builddir)/libs/MALLOC/libscimalloc.la \ 97 $(top_builddir)/libs/MALLOC/libscimalloc.la \
102 $(top_builddir)/modules/output_stream/libscioutput_stream.la \ 98 $(top_builddir)/modules/output_stream/libscioutput_stream.la \
103 $(top_builddir)/libs/libst/libscilibst.la 99 $(top_builddir)/libs/libst/libscilibst.la
104am__libscifileio_la_SOURCES_DIST = src/c/FileExist.c \ 100am__objects_1 = libscifileio_la-FileExist.lo \
105 src/c/scanf_functions.c src/c/do_xxscanf.c src/c/findfiles.c \
106 src/c/Status2Mode.c src/c/addfile.c src/c/delfile.c \
107 src/c/filesmanagement.c src/c/getfiledesc.c \
108 src/c/getfileinfo.c src/c/getfiletype.c src/c/mclearerr.c \
109 src/c/mclose.c src/c/meof.c src/c/merror.c src/c/mget.c \
110 src/c/mgeti.c src/c/mgetstr.c src/c/mopen.c src/c/mput.c \
111 src/c/mputi.c src/c/mputstr.c src/c/mseek.c src/c/mtell.c \
112 src/c/diary.c src/c/readline.c src/c/getdrives.c \
113 src/c/deleteafile.c src/c/getshortpathname.c \
114 src/c/getlongpathname.c src/c/FindFileExtension.c \
115 src/c/URIFileToFilename.c src/c/createdirectory.c \
116 src/c/isdir.c src/c/isDrive.c src/c/removedir.c src/c/cluni0.c \
117 src/c/scicurdir.c src/c/fullpath.c src/c/fileinfo.c \
118 src/c/getrelativefilename.c src/c/h5_fileManagement.c \
119 src/c/h5_writeDataToFile.c src/c/h5_readDataFromFile.c \
120 sci_gateway/c/gw_fileio.c sci_gateway/c/sci_mfprintf.c \
121 sci_gateway/c/sci_mscanf.c sci_gateway/c/sci_msscanf.c \
122 sci_gateway/c/sci_mfscanf.c sci_gateway/c/sci_fprintfMat.c \
123 sci_gateway/c/sci_fscanfMat.c sci_gateway/c/sci_findfiles.c \
124 sci_gateway/c/sci_maxfiles.c sci_gateway/c/sci_getdrives.c \
125 sci_gateway/c/sci_fullpath.c sci_gateway/c/sci_deletefile.c \
126 sci_gateway/c/sci_pathsep.c sci_gateway/c/sci_filesep.c \
127 sci_gateway/c/sci_getshortpathname.c \
128 sci_gateway/c/sci_getlongpathname.c \
129 sci_gateway/c/sci_fileext.c sci_gateway/c/sci_isdir.c \
130 sci_gateway/c/sci_removedir.c sci_gateway/c/sci_createdir.c \
131 sci_gateway/c/sci_chdir.c sci_gateway/c/sci_getcwd.c \
132 sci_gateway/c/sci_mclearerr.c sci_gateway/c/sci_mclose.c \
133 sci_gateway/c/sci_merror.c sci_gateway/c/sci_mget.c \
134 sci_gateway/c/sci_mgetstr.c sci_gateway/c/sci_moef.c \
135 sci_gateway/c/sci_mopen.c sci_gateway/c/sci_mput.c \
136 sci_gateway/c/sci_mputstr.c sci_gateway/c/sci_mseek.c \
137 sci_gateway/c/sci_mtell.c sci_gateway/c/sci_fileinfo.c \
138 sci_gateway/c/sci_newest.c \
139 sci_gateway/c/sci_get_absolute_file_path.c \
140 sci_gateway/c/sci_getrelativefilename.c \
141 sci_gateway/cpp/sci_no_hdf5.cpp \
142 sci_gateway/cpp/sci_export_to_hdf5.cpp \
143 sci_gateway/cpp/sci_import_from_hdf5.cpp
144@HDF5_TRUE@am__objects_1 = libscifileio_la-h5_fileManagement.lo \
145@HDF5_TRUE@ libscifileio_la-h5_writeDataToFile.lo \
146@HDF5_TRUE@ libscifileio_la-h5_readDataFromFile.lo
147am__objects_2 = libscifileio_la-FileExist.lo \
148 libscifileio_la-scanf_functions.lo \ 101 libscifileio_la-scanf_functions.lo \
149 libscifileio_la-do_xxscanf.lo libscifileio_la-findfiles.lo \ 102 libscifileio_la-do_xxscanf.lo libscifileio_la-findfiles.lo \
150 libscifileio_la-Status2Mode.lo libscifileio_la-addfile.lo \ 103 libscifileio_la-Status2Mode.lo libscifileio_la-addfile.lo \
@@ -167,8 +120,8 @@ am__objects_2 = libscifileio_la-FileExist.lo \
167 libscifileio_la-isDrive.lo libscifileio_la-removedir.lo \ 120 libscifileio_la-isDrive.lo libscifileio_la-removedir.lo \
168 libscifileio_la-cluni0.lo libscifileio_la-scicurdir.lo \ 121 libscifileio_la-cluni0.lo libscifileio_la-scicurdir.lo \
169 libscifileio_la-fullpath.lo libscifileio_la-fileinfo.lo \ 122 libscifileio_la-fullpath.lo libscifileio_la-fileinfo.lo \
170 libscifileio_la-getrelativefilename.lo $(am__objects_1) 123 libscifileio_la-getrelativefilename.lo
171am__objects_3 = libscifileio_la-gw_fileio.lo \ 124am__objects_2 = libscifileio_la-gw_fileio.lo \
172 libscifileio_la-sci_mfprintf.lo libscifileio_la-sci_mscanf.lo \ 125 libscifileio_la-sci_mfprintf.lo libscifileio_la-sci_mscanf.lo \
173 libscifileio_la-sci_msscanf.lo libscifileio_la-sci_mfscanf.lo \ 126 libscifileio_la-sci_msscanf.lo libscifileio_la-sci_mfscanf.lo \
174 libscifileio_la-sci_fprintfMat.lo \ 127 libscifileio_la-sci_fprintfMat.lo \
@@ -193,16 +146,11 @@ am__objects_3 = libscifileio_la-gw_fileio.lo \
193 libscifileio_la-sci_fileinfo.lo libscifileio_la-sci_newest.lo \ 146 libscifileio_la-sci_fileinfo.lo libscifileio_la-sci_newest.lo \
194 libscifileio_la-sci_get_absolute_file_path.lo \ 147 libscifileio_la-sci_get_absolute_file_path.lo \
195 libscifileio_la-sci_getrelativefilename.lo 148 libscifileio_la-sci_getrelativefilename.lo
196@HDF5_FALSE@am__objects_4 = libscifileio_la-sci_no_hdf5.lo 149am_libscifileio_la_OBJECTS = $(am__objects_1) $(am__objects_2)
197@HDF5_TRUE@am__objects_4 = libscifileio_la-sci_export_to_hdf5.lo \
198@HDF5_TRUE@ libscifileio_la-sci_import_from_hdf5.lo
199am_libscifileio_la_OBJECTS = $(am__objects_2) $(am__objects_3) \
200 $(am__objects_4)
201libscifileio_la_OBJECTS = $(am_libscifileio_la_OBJECTS) 150libscifileio_la_OBJECTS = $(am_libscifileio_la_OBJECTS)
202libscifileio_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ 151libscifileio_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
203 $(LIBTOOLFLAGS) --mode=link $(CXXLD) \ 152 $(LIBTOOLFLAGS) --mode=link $(CCLD) $(libscifileio_la_CFLAGS) \
204 $(libscifileio_la_CXXFLAGS) $(CXXFLAGS) \ 153 $(CFLAGS) $(libscifileio_la_LDFLAGS) $(LDFLAGS) -o $@
205 $(libscifileio_la_LDFLAGS) $(LDFLAGS) -o $@
206DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/modules/core/includes 154DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/modules/core/includes
207depcomp = $(SHELL) $(top_srcdir)/config/depcomp 155depcomp = $(SHELL) $(top_srcdir)/config/depcomp
208am__depfiles_maybe = depfiles 156am__depfiles_maybe = depfiles
@@ -215,17 +163,8 @@ CCLD = $(CC)
215LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ 163LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
216 --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ 164 --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
217 $(LDFLAGS) -o $@ 165 $(LDFLAGS) -o $@
218CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
219 $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
220LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
221 --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
222 $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
223CXXLD = $(CXX)
224CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
225 --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
226 $(LDFLAGS) -o $@
227SOURCES = $(libscifileio_la_SOURCES) 166SOURCES = $(libscifileio_la_SOURCES)
228DIST_SOURCES = $(am__libscifileio_la_SOURCES_DIST) 167DIST_SOURCES = $(libscifileio_la_SOURCES)
229libscifileio_la_etcDATA_INSTALL = $(INSTALL_DATA) 168libscifileio_la_etcDATA_INSTALL = $(INSTALL_DATA)
230libscifileio_la_rootDATA_INSTALL = $(INSTALL_DATA) 169libscifileio_la_rootDATA_INSTALL = $(INSTALL_DATA)
231libscifileio_la_sci_gatewayDATA_INSTALL = $(INSTALL_DATA) 170libscifileio_la_sci_gatewayDATA_INSTALL = $(INSTALL_DATA)
@@ -456,20 +395,48 @@ target_alias = @target_alias@
456top_build_prefix = @top_build_prefix@ 395top_build_prefix = @top_build_prefix@
457top_builddir = @top_builddir@ 396top_builddir = @top_builddir@
458top_srcdir = @top_srcdir@ 397top_srcdir = @top_srcdir@
459FILEIO_SOURCES = src/c/FileExist.c src/c/scanf_functions.c \ 398FILEIO_SOURCES = src/c/FileExist.c \
460 src/c/do_xxscanf.c src/c/findfiles.c src/c/Status2Mode.c \ 399src/c/scanf_functions.c \
461 src/c/addfile.c src/c/delfile.c src/c/filesmanagement.c \ 400src/c/do_xxscanf.c \
462 src/c/getfiledesc.c src/c/getfileinfo.c src/c/getfiletype.c \ 401src/c/findfiles.c \
463 src/c/mclearerr.c src/c/mclose.c src/c/meof.c src/c/merror.c \ 402src/c/Status2Mode.c \
464 src/c/mget.c src/c/mgeti.c src/c/mgetstr.c src/c/mopen.c \ 403src/c/addfile.c \
465 src/c/mput.c src/c/mputi.c src/c/mputstr.c src/c/mseek.c \ 404src/c/delfile.c \
466 src/c/mtell.c src/c/diary.c src/c/readline.c src/c/getdrives.c \ 405src/c/filesmanagement.c \
467 src/c/deleteafile.c src/c/getshortpathname.c \ 406src/c/getfiledesc.c \
468 src/c/getlongpathname.c src/c/FindFileExtension.c \ 407src/c/getfileinfo.c \
469 src/c/URIFileToFilename.c src/c/createdirectory.c \ 408src/c/getfiletype.c \
470 src/c/isdir.c src/c/isDrive.c src/c/removedir.c src/c/cluni0.c \ 409src/c/mclearerr.c \
471 src/c/scicurdir.c src/c/fullpath.c src/c/fileinfo.c \ 410src/c/mclose.c \
472 src/c/getrelativefilename.c $(am__append_1) 411src/c/meof.c \
412src/c/merror.c \
413src/c/mget.c \
414src/c/mgeti.c \
415src/c/mgetstr.c \
416src/c/mopen.c \
417src/c/mput.c \
418src/c/mputi.c \
419src/c/mputstr.c \
420src/c/mseek.c \
421src/c/mtell.c \
422src/c/diary.c \
423src/c/readline.c \
424src/c/getdrives.c \
425src/c/deleteafile.c \
426src/c/getshortpathname.c \
427src/c/getlongpathname.c \
428src/c/FindFileExtension.c \
429src/c/URIFileToFilename.c \
430src/c/createdirectory.c \
431src/c/isdir.c \
432src/c/isDrive.c \
433src/c/removedir.c \
434src/c/cluni0.c \
435src/c/scicurdir.c \
436src/c/fullpath.c \
437src/c/fileinfo.c \
438src/c/getrelativefilename.c
439
473GATEWAY_SOURCES = \ 440GATEWAY_SOURCES = \
474sci_gateway/c/gw_fileio.c \ 441sci_gateway/c/gw_fileio.c \
475sci_gateway/c/sci_mfprintf.c \ 442sci_gateway/c/sci_mfprintf.c \
@@ -509,22 +476,11 @@ sci_gateway/c/sci_newest.c \
509sci_gateway/c/sci_get_absolute_file_path.c \ 476sci_gateway/c/sci_get_absolute_file_path.c \
510sci_gateway/c/sci_getrelativefilename.c 477sci_gateway/c/sci_getrelativefilename.c
511 478
512@HDF5_FALSE@GATEWAY_CPP_SOURCES = \
513@HDF5_FALSE@sci_gateway/cpp/sci_no_hdf5.cpp
514
515
516#GATEWAY_SOURCES += \
517#sci_gateway/c/sci_import_from_hdf5.c
518@HDF5_TRUE@GATEWAY_CPP_SOURCES = \
519@HDF5_TRUE@sci_gateway/cpp/sci_export_to_hdf5.cpp \
520@HDF5_TRUE@sci_gateway/cpp/sci_import_from_hdf5.cpp
521
522libscifileio_la_CXXFLAGS = -I$(srcdir)/includes/ \ 479libscifileio_la_CXXFLAGS = -I$(srcdir)/includes/ \
523 -I$(srcdir)/src/c/ \ 480 -I$(srcdir)/src/c/ \
524 -I$(top_srcdir)/libs/MALLOC/includes/ \ 481 -I$(top_srcdir)/libs/MALLOC/includes/ \
525 -I$(top_srcdir)/modules/api_scilab/includes \ 482 -I$(top_srcdir)/modules/api_scilab/includes \
526 -I$(top_srcdir)/modules/output_stream/includes \ 483 -I$(top_srcdir)/modules/output_stream/includes
527 $(HDF5_CFLAGS)
528 484
529libscifileio_la_CFLAGS = -I$(srcdir)/includes/ \ 485libscifileio_la_CFLAGS = -I$(srcdir)/includes/ \
530 -I$(srcdir)/src/c/ \ 486 -I$(srcdir)/src/c/ \
@@ -533,11 +489,10 @@ libscifileio_la_CFLAGS = -I$(srcdir)/includes/ \
533 -I$(top_srcdir)/modules/io/includes \ 489 -I$(top_srcdir)/modules/io/includes \
534 -I$(top_srcdir)/modules/api_scilab/includes \ 490 -I$(top_srcdir)/modules/api_scilab/includes \
535 -I$(top_srcdir)/modules/string/includes \ 491 -I$(top_srcdir)/modules/string/includes \
536 -I$(top_srcdir)/modules/localization/includes \ 492 -I$(top_srcdir)/modules/localization/includes
537 $(HDF5_CFLAGS)
538 493
539pkglib_LTLIBRARIES = libscifileio.la 494pkglib_LTLIBRARIES = libscifileio.la
540libscifileio_la_LDFLAGS = -version-info $(SCILAB_LIBRARY_VERSION) $(HDF5_LIBS) 495libscifileio_la_LDFLAGS = -version-info $(SCILAB_LIBRARY_VERSION)
541libscifileio_la_SOURCES = $(FILEIO_SOURCES) $(GATEWAY_SOURCES) $(GATEWAY_CPP_SOURCES) 496libscifileio_la_SOURCES = $(FILEIO_SOURCES) $(GATEWAY_SOURCES) $(GATEWAY_CPP_SOURCES)
542 497
543# For the code check (splint) 498# For the code check (splint)
@@ -607,7 +562,7 @@ SPLINT_OPTIONS = -weak -booltype BOOL
607#### the procedure will be the same with Microsoft Windows (C) 562#### the procedure will be the same with Microsoft Windows (C)
608#### and Linux/Unix 563#### and Linux/Unix
609####################################################################### 564#######################################################################
610TARGETS_ALL = $(am__append_2) 565TARGETS_ALL = $(am__append_1)
611 566
612################ MACROS ###################### 567################ MACROS ######################
613# Rule to build a macro 568# Rule to build a macro
@@ -661,7 +616,7 @@ HELP_CHAPTERLANG = en_US fr_FR pt_BR
661all: all-am 616all: all-am
662 617
663.SUFFIXES: 618.SUFFIXES:
664.SUFFIXES: .sci .bin .c .cpp .lo .o .obj 619.SUFFIXES: .sci .bin .c .lo .o .obj
665$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.incl.am $(am__configure_deps) 620$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.incl.am $(am__configure_deps)
666 @for dep in $?; do \ 621 @for dep in $?; do \
667 case '$(am__configure_deps)' in \ 622 case '$(am__configure_deps)' in \
@@ -750,9 +705,6 @@ distclean-compile:
750@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscifileio_la-getrelativefilename.Plo@am__quote@ 705@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscifileio_la-getrelativefilename.Plo@am__quote@
751@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscifileio_la-getshortpathname.Plo@am__quote@ 706@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscifileio_la-getshortpathname.Plo@am__quote@
752@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscifileio_la-gw_fileio.Plo@am__quote@ 707@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscifileio_la-gw_fileio.Plo@am__quote@
753@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscifileio_la-h5_fileManagement.Plo@am__quote@
754@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscifileio_la-h5_readDataFromFile.Plo@am__quote@
755@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscifileio_la-h5_writeDataToFile.Plo@am__quote@
756@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscifileio_la-isDrive.Plo@am__quote@ 708@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscifileio_la-isDrive.Plo@am__quote@
757@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscifileio_la-isdir.Plo@am__quote@ 709@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscifileio_la-isdir.Plo@am__quote@
758@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscifileio_la-mclearerr.Plo@am__quote@ 710@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscifileio_la-mclearerr.Plo@am__quote@
@@ -774,7 +726,6 @@ distclean-compile:
774@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscifileio_la-sci_chdir.Plo@am__quote@ 726@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscifileio_la-sci_chdir.Plo@am__quote@
775@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscifileio_la-sci_createdir.Plo@am__quote@ 727@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscifileio_la-sci_createdir.Plo@am__quote@
776@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscifileio_la-sci_deletefile.Plo@am__quote@ 728@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscifileio_la-sci_deletefile.Plo@am__quote@
777@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscifileio_la-sci_export_to_hdf5.Plo@am__quote@
778@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscifileio_la-sci_fileext.Plo@am__quote@ 729@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscifileio_la-sci_fileext.Plo@am__quote@
779@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscifileio_la-sci_fileinfo.Plo@am__quote@ 730@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscifileio_la-sci_fileinfo.Plo@am__quote@
780@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscifileio_la-sci_filesep.Plo@am__quote@ 731@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscifileio_la-sci_filesep.Plo@am__quote@
@@ -788,7 +739,6 @@ distclean-compile:
788@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscifileio_la-sci_getlongpathname.Plo@am__quote@ 739@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscifileio_la-sci_getlongpathname.Plo@am__quote@
789@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscifileio_la-sci_getrelativefilename.Plo@am__quote@ 740@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscifileio_la-sci_getrelativefilename.Plo@am__quote@
790@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscifileio_la-sci_getshortpathname.Plo@am__quote@ 741@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscifileio_la-sci_getshortpathname.Plo@am__quote@
791@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscifileio_la-sci_import_from_hdf5.Plo@am__quote@
792@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscifileio_la-sci_isdir.Plo@am__quote@ 742@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscifileio_la-sci_isdir.Plo@am__quote@
793@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscifileio_la-sci_maxfiles.Plo@am__quote@ 743@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscifileio_la-sci_maxfiles.Plo@am__quote@
794@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscifileio_la-sci_mclearerr.Plo@am__quote@ 744@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscifileio_la-sci_mclearerr.Plo@am__quote@
@@ -807,7 +757,6 @@ distclean-compile:
807@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscifileio_la-sci_msscanf.Plo@am__quote@ 757@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscifileio_la-sci_msscanf.Plo@am__quote@
808@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscifileio_la-sci_mtell.Plo@am__quote@ 758@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscifileio_la-sci_mtell.Plo@am__quote@
809@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscifileio_la-sci_newest.Plo@am__quote@ 759@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscifileio_la-sci_newest.Plo@am__quote@
810@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscifileio_la-sci_no_hdf5.Plo@am__quote@
811@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscifileio_la-sci_pathsep.Plo@am__quote@ 760@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscifileio_la-sci_pathsep.Plo@am__quote@
812@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscifileio_la-sci_removedir.Plo@am__quote@ 761@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscifileio_la-sci_removedir.Plo@am__quote@
813@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscifileio_la-scicurdir.Plo@am__quote@ 762@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscifileio_la-scicurdir.Plo@am__quote@
@@ -1120,27 +1069,6 @@ libscifileio_la-getrelativefilename.lo: src/c/getrelativefilename.c
1120@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 1069@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1121@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscifileio_la_CFLAGS) $(CFLAGS) -c -o libscifileio_la-getrelativefilename.lo `test -f 'src/c/getrelativefilename.c' || echo '$(srcdir)/'`src/c/getrelativefilename.c 1070@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscifileio_la_CFLAGS) $(CFLAGS) -c -o libscifileio_la-getrelativefilename.lo `test -f 'src/c/getrelativefilename.c' || echo '$(srcdir)/'`src/c/getrelativefilename.c
1122 1071
1123libscifileio_la-h5_fileManagement.lo: src/c/h5_fileManagement.c
1124@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscifileio_la_CFLAGS) $(CFLAGS) -MT libscifileio_la-h5_fileManagement.lo -MD -MP -MF $(DEPDIR)/libscifileio_la-h5_fileManagement.Tpo -c -o libscifileio_la-h5_fileManagement.lo `test -f 'src/c/h5_fileManagement.c' || echo '$(srcdir)/'`src/c/h5_fileManagement.c
1125@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libscifileio_la-h5_fileManagement.Tpo $(DEPDIR)/libscifileio_la-h5_fileManagement.Plo
1126@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/c/h5_fileManagement.c' object='libscifileio_la-h5_fileManagement.lo' libtool=yes @AMDEPBACKSLASH@
1127@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1128@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscifileio_la_CFLAGS) $(CFLAGS) -c -o libscifileio_la-h5_fileManagement.lo `test -f 'src/c/h5_fileManagement.c' || echo '$(srcdir)/'`src/c/h5_fileManagement.c
1129
1130libscifileio_la-h5_writeDataToFile.lo: src/c/h5_writeDataToFile.c
1131@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscifileio_la_CFLAGS) $(CFLAGS) -MT libscifileio_la-h5_writeDataToFile.lo -MD -MP -MF $(DEPDIR)/libscifileio_la-h5_writeDataToFile.Tpo -c -o libscifileio_la-h5_writeDataToFile.lo `test -f 'src/c/h5_writeDataToFile.c' || echo '$(srcdir)/'`src/c/h5_writeDataToFile.c
1132@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libscifileio_la-h5_writeDataToFile.Tpo $(DEPDIR)/libscifileio_la-h5_writeDataToFile.Plo
1133@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/c/h5_writeDataToFile.c' object='libscifileio_la-h5_writeDataToFile.lo' libtool=yes @AMDEPBACKSLASH@
1134@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1135@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscifileio_la_CFLAGS) $(CFLAGS) -c -o libscifileio_la-h5_writeDataToFile.lo `test -f 'src/c/h5_writeDataToFile.c' || echo '$(srcdir)/'`src/c/h5_writeDataToFile.c
1136
1137libscifileio_la-h5_readDataFromFile.lo: src/c/h5_readDataFromFile.c
1138@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscifileio_la_CFLAGS) $(CFLAGS) -MT libscifileio_la-h5_readDataFromFile.lo -MD -MP -MF $(DEPDIR)/libscifileio_la-h5_readDataFromFile.Tpo -c -o libscifileio_la-h5_readDataFromFile.lo `test -f 'src/c/h5_readDataFromFile.c' || echo '$(srcdir)/'`src/c/h5_readDataFromFile.c
1139@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libscifileio_la-h5_readDataFromFile.Tpo $(DEPDIR)/libscifileio_la-h5_readDataFromFile.Plo
1140@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/c/h5_readDataFromFile.c' object='libscifileio_la-h5_readDataFromFile.lo' libtool=yes @AMDEPBACKSLASH@
1141@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1142@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscifileio_la_CFLAGS) $(CFLAGS) -c -o libscifileio_la-h5_readDataFromFile.lo `test -f 'src/c/h5_readDataFromFile.c' || echo '$(srcdir)/'`src/c/h5_readDataFromFile.c
1143
1144libscifileio_la-gw_fileio.lo: sci_gateway/c/gw_fileio.c 1072libscifileio_la-gw_fileio.lo: sci_gateway/c/gw_fileio.c
1145@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscifileio_la_CFLAGS) $(CFLAGS) -MT libscifileio_la-gw_fileio.lo -MD -MP -MF $(DEPDIR)/libscifileio_la-gw_fileio.Tpo -c -o libscifileio_la-gw_fileio.lo `test -f 'sci_gateway/c/gw_fileio.c' || echo '$(srcdir)/'`sci_gateway/c/gw_fileio.c 1073@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscifileio_la_CFLAGS) $(CFLAGS) -MT libscifileio_la-gw_fileio.lo -MD -MP -MF $(DEPDIR)/libscifileio_la-gw_fileio.Tpo -c -o libscifileio_la-gw_fileio.lo `test -f 'sci_gateway/c/gw_fileio.c' || echo '$(srcdir)/'`sci_gateway/c/gw_fileio.c
1146@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libscifileio_la-gw_fileio.Tpo $(DEPDIR)/libscifileio_la-gw_fileio.Plo 1074@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libscifileio_la-gw_fileio.Tpo $(DEPDIR)/libscifileio_la-gw_fileio.Plo
@@ -1400,48 +1328,6 @@ libscifileio_la-sci_getrelativefilename.lo: sci_gateway/c/sci_getrelativefilenam
1400@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 1328@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1401@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscifileio_la_CFLAGS) $(CFLAGS) -c -o libscifileio_la-sci_getrelativefilename.lo `test -f 'sci_gateway/c/sci_getrelativefilename.c' || echo '$(srcdir)/'`sci_gateway/c/sci_getrelativefilename.c 1329@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscifileio_la_CFLAGS) $(CFLAGS) -c -o libscifileio_la-sci_getrelativefilename.lo `test -f 'sci_gateway/c/sci_getrelativefilename.c' || echo '$(srcdir)/'`sci_gateway/c/sci_getrelativefilename.c
1402 1330
1403.cpp.o:
1404@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
1405@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
1406@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
1407@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1408@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
1409
1410.cpp.obj:
1411@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
1412@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
1413@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
1414@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1415@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
1416
1417.cpp.lo:
1418@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
1419@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
1420@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
1421@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1422@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
1423
1424libscifileio_la-sci_no_hdf5.lo: sci_gateway/cpp/sci_no_hdf5.cpp
1425@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscifileio_la_CXXFLAGS) $(CXXFLAGS) -MT libscifileio_la-sci_no_hdf5.lo -MD -MP -MF $(DEPDIR)/libscifileio_la-sci_no_hdf5.Tpo -c -o libscifileio_la-sci_no_hdf5.lo `test -f 'sci_gateway/cpp/sci_no_hdf5.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_no_hdf5.cpp
1426@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/libscifileio_la-sci_no_hdf5.Tpo $(DEPDIR)/libscifileio_la-sci_no_hdf5.Plo
1427@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='sci_gateway/cpp/sci_no_hdf5.cpp' object='libscifileio_la-sci_no_hdf5.lo' libtool=yes @AMDEPBACKSLASH@
1428@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1429@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscifileio_la_CXXFLAGS) $(CXXFLAGS) -c -o libscifileio_la-sci_no_hdf5.lo `test -f 'sci_gateway/cpp/sci_no_hdf5.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_no_hdf5.cpp
1430
1431libscifileio_la-sci_export_to_hdf5.lo: sci_gateway/cpp/sci_export_to_hdf5.cpp
1432@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscifileio_la_CXXFLAGS) $(CXXFLAGS) -MT libscifileio_la-sci_export_to_hdf5.lo -MD -MP -MF $(DEPDIR)/libscifileio_la-sci_export_to_hdf5.Tpo -c -o libscifileio_la-sci_export_to_hdf5.lo `test -f 'sci_gateway/cpp/sci_export_to_hdf5.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_export_to_hdf5.cpp
1433@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/libscifileio_la-sci_export_to_hdf5.Tpo $(DEPDIR)/libscifileio_la-sci_export_to_hdf5.Plo
1434@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='sci_gateway/cpp/sci_export_to_hdf5.cpp' object='libscifileio_la-sci_export_to_hdf5.lo' libtool=yes @AMDEPBACKSLASH@
1435@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1436@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscifileio_la_CXXFLAGS) $(CXXFLAGS) -c -o libscifileio_la-sci_export_to_hdf5.lo `test -f 'sci_gateway/cpp/sci_export_to_hdf5.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_export_to_hdf5.cpp
1437
1438libscifileio_la-sci_import_from_hdf5.lo: sci_gateway/cpp/sci_import_from_hdf5.cpp
1439@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscifileio_la_CXXFLAGS) $(CXXFLAGS) -MT libscifileio_la-sci_import_from_hdf5.lo -MD -MP -MF $(DEPDIR)/libscifileio_la-sci_import_from_hdf5.Tpo -c -o libscifileio_la-sci_import_from_hdf5.lo `test -f 'sci_gateway/cpp/sci_import_from_hdf5.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_import_from_hdf5.cpp
1440@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/libscifileio_la-sci_import_from_hdf5.Tpo $(DEPDIR)/libscifileio_la-sci_import_from_hdf5.Plo
1441@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='sci_gateway/cpp/sci_import_from_hdf5.cpp' object='libscifileio_la-sci_import_from_hdf5.lo' libtool=yes @AMDEPBACKSLASH@
1442@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1443@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscifileio_la_CXXFLAGS) $(CXXFLAGS) -c -o libscifileio_la-sci_import_from_hdf5.lo `test -f 'sci_gateway/cpp/sci_import_from_hdf5.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_import_from_hdf5.cpp
1444
1445mostlyclean-libtool: 1331mostlyclean-libtool:
1446 -rm -f *.lo 1332 -rm -f *.lo
1447 1333
diff --git a/scilab/modules/fileio/fileio.vcproj b/scilab/modules/fileio/fileio.vcproj
index f2f99a5..54a8cd0 100644
--- a/scilab/modules/fileio/fileio.vcproj
+++ b/scilab/modules/fileio/fileio.vcproj
@@ -6,7 +6,7 @@
6 ProjectGUID="{4FC72D4A-80EE-4B1A-8724-0201C1A35621}" 6 ProjectGUID="{4FC72D4A-80EE-4B1A-8724-0201C1A35621}"
7 RootNamespace="fileio" 7 RootNamespace="fileio"
8 Keyword="Win32Proj" 8 Keyword="Win32Proj"
9 9 TargetFrameworkVersion="0"
10 > 10 >
11 <Platforms> 11 <Platforms>
12 <Platform 12 <Platform
@@ -44,8 +44,8 @@
44 <Tool 44 <Tool
45 Name="VCCLCompilerTool" 45 Name="VCCLCompilerTool"
46 Optimization="0" 46 Optimization="0"
47 AdditionalIncludeDirectories="includes;src/c;../../libs/MALLOC/includes;../../libs/hdf5/include;../windows_tools/includes;../api_scilab/includes;../core/includes;../string/includes;../output_stream/includes;../io/includes;../localization/includes;../../libs/intl" 47 AdditionalIncludeDirectories="includes;src/c;../../libs/MALLOC/includes;../windows_tools/includes;../api_scilab/includes;../core/includes;../string/includes;../output_stream/includes;../io/includes;../localization/includes;../../libs/intl"
48 PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;FILEIO_EXPORTS;_HDF5USEDLL_;WIN32" 48 PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;FILEIO_EXPORTS"
49 MinimalRebuild="true" 49 MinimalRebuild="true"
50 BasicRuntimeChecks="0" 50 BasicRuntimeChecks="0"
51 RuntimeLibrary="3" 51 RuntimeLibrary="3"
@@ -128,8 +128,8 @@
128 <Tool 128 <Tool
129 Name="VCCLCompilerTool" 129 Name="VCCLCompilerTool"
130 Optimization="0" 130 Optimization="0"
131 AdditionalIncludeDirectories="includes;src/c;../../libs/MALLOC/includes;../../libs/hdf5/include;../windows_tools/includes;../api_scilab/includes;../core/includes;../string/includes;../output_stream/includes;../io/includes;../localization/includes;../../libs/intl" 131 AdditionalIncludeDirectories="includes;src/c;../../libs/MALLOC/includes;../windows_tools/includes;../api_scilab/includes;../core/includes;../string/includes;../output_stream/includes;../io/includes;../localization/includes;../../libs/intl"
132 PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;FILEIO_EXPORTS;_HDF5USEDLL_;WIN32" 132 PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;FILEIO_EXPORTS"
133 MinimalRebuild="true" 133 MinimalRebuild="true"
134 BasicRuntimeChecks="0" 134 BasicRuntimeChecks="0"
135 RuntimeLibrary="3" 135 RuntimeLibrary="3"
@@ -214,8 +214,8 @@
214 InlineFunctionExpansion="1" 214 InlineFunctionExpansion="1"
215 FavorSizeOrSpeed="1" 215 FavorSizeOrSpeed="1"
216 WholeProgramOptimization="false" 216 WholeProgramOptimization="false"
217 AdditionalIncludeDirectories="includes;src/c;../../libs/MALLOC/includes;../../libs/hdf5/include;../windows_tools/includes;../api_scilab/includes;../core/includes;../string/includes;../output_stream/includes;../io/includes;../localization/includes;../../libs/intl" 217 AdditionalIncludeDirectories="includes;src/c;../../libs/MALLOC/includes;../windows_tools/includes;../api_scilab/includes;../core/includes;../string/includes;../output_stream/includes;../io/includes;../localization/includes;../../libs/intl"
218 PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;FILEIO_EXPORTS;_HDF5USEDLL_;WIN32" 218 PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;FILEIO_EXPORTS"
219 StringPooling="true" 219 StringPooling="true"
220 RuntimeLibrary="2" 220 RuntimeLibrary="2"
221 EnableEnhancedInstructionSet="0" 221 EnableEnhancedInstructionSet="0"
@@ -305,8 +305,8 @@
305 InlineFunctionExpansion="1" 305 InlineFunctionExpansion="1"
306 FavorSizeOrSpeed="1" 306 FavorSizeOrSpeed="1"
307 WholeProgramOptimization="false" 307 WholeProgramOptimization="false"
308 AdditionalIncludeDirectories="includes;src/c;../../libs/MALLOC/includes;../../libs/hdf5/include;../windows_tools/includes;../api_scilab/includes;../core/includes;../string/includes;../output_stream/includes;../io/includes;../localization/includes;../../libs/intl" 308 AdditionalIncludeDirectories="includes;src/c;../../libs/MALLOC/includes;../windows_tools/includes;../api_scilab/includes;../core/includes;../string/includes;../output_stream/includes;../io/includes;../localization/includes;../../libs/intl"
309 PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;FILEIO_EXPORTS;_HDF5USEDLL_;WIN32" 309 PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;FILEIO_EXPORTS"
310 StringPooling="true" 310 StringPooling="true"
311 RuntimeLibrary="2" 311 RuntimeLibrary="2"
312 EnableEnhancedInstructionSet="0" 312 EnableEnhancedInstructionSet="0"
@@ -465,18 +465,6 @@
465 > 465 >
466 </File> 466 </File>
467 <File 467 <File
468 RelativePath=".\src\c\h5_fileManagement.c"
469 >
470 </File>
471 <File
472 RelativePath=".\src\c\h5_readDataFromFile.c"
473 >
474 </File>
475 <File
476 RelativePath=".\src\c\h5_writeDataToFile.c"
477 >
478 </File>
479 <File
480 RelativePath=".\src\c\isdir.c" 468 RelativePath=".\src\c\isdir.c"
481 > 469 >
482 </File> 470 </File>
@@ -561,42 +549,6 @@
561 > 549 >
562 </File> 550 </File>
563 <File 551 <File
564 RelativePath=".\sci_gateway\cpp\sci_export_to_hdf5.cpp"
565 >
566 <FileConfiguration
567 Name="Debug|Win32"
568 >
569 <Tool
570 Name="VCCLCompilerTool"
571 CompileAs="0"
572 />
573 </FileConfiguration>
574 <FileConfiguration
575 Name="Debug|x64"
576 >
577 <Tool
578 Name="VCCLCompilerTool"
579 CompileAs="0"
580 />
581 </FileConfiguration>
582 <FileConfiguration
583 Name="Release|Win32"
584 >
585 <Tool
586 Name="VCCLCompilerTool"
587 CompileAs="0"
588 />
589 </FileConfiguration>
590 <FileConfiguration
591 Name="Release|x64"
592 >
593 <Tool
594 Name="VCCLCompilerTool"
595 CompileAs="0"
596 />
597 </FileConfiguration>
598 </File>
599 <File
600 RelativePath=".\sci_gateway\c\sci_fileext.c" 552 RelativePath=".\sci_gateway\c\sci_fileext.c"
601 > 553 >
602 </File> 554 </File>
@@ -649,18 +601,6 @@
649 > 601 >
650 </File> 602 </File>
651 <File 603 <File
652 RelativePath=".\sci_gateway\cpp\sci_import_from_hdf5.cpp"
653 >
654 <FileConfiguration
655 Name="Debug|x64"
656 >
657 <Tool
658 Name="VCCLCompilerTool"
659 CompileAs="0"
660 />
661 </FileConfiguration>
662 </File>
663 <File
664 RelativePath=".\sci_gateway\c\sci_isdir.c" 604 RelativePath=".\sci_gateway\c\sci_isdir.c"
665 > 605 >
666 </File> 606 </File>
@@ -843,22 +783,6 @@
843 > 783 >
844 </File> 784 </File>
845 <File 785 <File
846 RelativePath=".\includes\h5_attributeConstants.h"
847 >
848 </File>
849 <File
850 RelativePath=".\includes\h5_fileManagement.h"
851 >
852 </File>
853 <File
854 RelativePath=".\includes\h5_readDataFromFile.h"
855 >
856 </File>
857 <File
858 RelativePath=".\includes\h5_writeDataToFile.h"
859 >
860 </File>
861 <File
862 RelativePath=".\includes\isdir.h" 786 RelativePath=".\includes\isdir.h"
863 > 787 >
864 </File> 788 </File>
@@ -998,10 +922,6 @@
998 > 922 >
999 </File> 923 </File>
1000 <File 924 <File
1001 RelativePath="..\..\bin\hdf5dll.lib"
1002 >
1003 </File>
1004 <File
1005 RelativePath=".\Makefile.am" 925 RelativePath=".\Makefile.am"
1006 > 926 >
1007 </File> 927 </File>
diff --git a/scilab/modules/fileio/includes/gw_fileio.h b/scilab/modules/fileio/includes/gw_fileio.h
index 6f23b4a..b4fc879 100644
--- a/scilab/modules/fileio/includes/gw_fileio.h
+++ b/scilab/modules/fileio/includes/gw_fileio.h
@@ -51,9 +51,6 @@ int sci_fileinfo(char *fname,unsigned long fname_len);
51int sci_newest(char *fname,unsigned long fname_len); 51int sci_newest(char *fname,unsigned long fname_len);
52int sci_getrelativefilename(char *fname, unsigned long l); 52int sci_getrelativefilename(char *fname, unsigned long l);
53int sci_get_absolute_file_path(char *fname,unsigned long fname_len); 53int sci_get_absolute_file_path(char *fname,unsigned long fname_len);
54int sci_export_to_hdf5(char *fname,unsigned long fname_len);
55int sci_import_from_hdf5(char *fname,unsigned long fname_len);
56
57/*--------------------------------------------------------------------------*/ 54/*--------------------------------------------------------------------------*/
58#endif /* __GW_FILEIO_H__ */ 55#endif /* __GW_FILEIO_H__ */
59/*--------------------------------------------------------------------------*/ 56/*--------------------------------------------------------------------------*/
diff --git a/scilab/modules/fileio/includes/h5_readDataFromFile.h b/scilab/modules/fileio/includes/h5_readDataFromFile.h
deleted file mode 100644
index ac06da4..0000000
--- a/scilab/modules/fileio/includes/h5_readDataFromFile.h
+++ /dev/null
@@ -1,60 +0,0 @@
1/*
2 * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
3 * Copyright (C) 2009-2009 - DIGITEO - Bruno JOFRET
4 *
5 * This file must be used under the terms of the CeCILL.
6 * This source file is licensed as described in the file COPYING, which
7 * you should have received as part of this distribution. The terms
8 * are also available at
9 * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
10 *
11 */
12
13#ifndef __H5_READDATATOFILE_H__
14#define __H5_READDATATOFILE_H__
15
16#include <hdf5.h>
17
18int isComplexData(int _iDatasetId);
19
20int getVariableNames(int _iFile, char **pstNameList);
21
22int getDataSetId(int _iFile);
23
24int getDataSetIdFromName(int _iFile, char *_pstName);
25
26int getDataSetDims(int _iDatasetId, int *_piRows, int *_piCols);
27
28int getScilabTypeFromDataSet(int _iDatasetId);
29
30int getDatasetPrecision(int _iDatasetId, int* _piPrec);
31
32int getSparseDimension(int _iDatasetId, int* _piRows, int * _piCols, int* _piNbItem);
33
34int readDoubleMatrix(int _iDatasetId, int _iRows, int _iCols, double *_pdblData);
35int readDoubleComplexMatrix(int _iDatasetId, int _iRows, int _iCols, double *_pdblReal, double *_pdblImg);
36
37int readStringMatrix(int _iDatasetId, int _iRows, int _iCols, char **_pstData);
38
39int readBooleanMatrix(int _iDatasetId, int _iRows, int _iCols, int* _piData);
40
41int readPolyMatrix(int _iDatasetId, char* _pstVarname, int _iRows, int _iCols, int* _piNbCoef, double **_pdblData);
42int readPolyComplexMatrix(int _iDatasetId, char* _pstVarname, int _iRows, int _iCols, int* _piNbCoef, double **_pdblReal, double **_pdblImg);
43
44int readInterger8Matrix(int _iDatasetId, int _iRows, int _iCols, char* _pcData);
45int readInterger16Matrix(int _iDatasetId, int _iRows, int _iCols, short* _psData);
46int readInterger32Matrix(int _iDatasetId, int _iRows, int _iCols, int* _piData);
47int readInterger64Matrix(int _iDatasetId, int _iRows, int _iCols, long long* _pllData);
48
49int readSparseComplexMatrix(int _iDatasetId, int _iRows, int _iCols, int _iNbItem, int* _piNbItemRow, int* _piColPos, double *_pdblReal, double *_pdblImg);
50int readSparseMatrix(int _iDatasetId, int _iRows, int _iCols, int _iNbItem, int* _piNbItemRow, int* _piColPos, double *_pdblReal);
51
52int readBooleanSparseMatrix(int _iDatasetId, int _iRows, int _iCols, int _iNbItem, int* _piNbItemRow, int* _piColPos);
53
54int getListItemReferences(int _iDatasetId, hobj_ref_t** _piItemRef);
55
56int getListItemDataset(int _iDatasetId, void* _piItemRef, int _iItemPos, int* _piItemDataset);
57
58int deleteListItemReferences(int _iDatasetId, void* _piItemRef);
59
60#endif /* !__H5_READDATATOFILE_H__ */
diff --git a/scilab/modules/fileio/includes/h5_writeDataToFile.h b/scilab/modules/fileio/includes/h5_writeDataToFile.h
deleted file mode 100644
index 7945879..0000000
--- a/scilab/modules/fileio/includes/h5_writeDataToFile.h
+++ /dev/null
@@ -1,44 +0,0 @@
1/*
2 * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
3 * Copyright (C) 2009-2009 - DIGITEO - Bruno JOFRET
4 *
5 * This file must be used under the terms of the CeCILL.
6 * This source file is licensed as described in the file COPYING, which
7 * you should have received as part of this distribution. The terms
8 * are also available at
9 * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
10 *
11 */
12
13#ifndef __H5_WRITEDATATOFILE_H__
14#define __H5_WRITEDATATOFILE_H__
15
16char* createGroupName(char* _pstGroupName);
17char* createPathName(char* _pstGroupName, int _iIndex);
18
19
20int writeDoubleMatrix(int _iFile, char* _pstDatasetName, int _iRows, int _iCols, double *_pdblData);
21int writeDoubleComplexMatrix(int _iFile, char* _pstDatasetName, int _iRows, int _iCols, double *_pdblReal, double *_pdblImg);
22
23int writeStringMatrix(int _iFile, char* _pstDatasetName, int _iRows, int _iCols, char **_pstData);
24
25int writeBooleanMatrix(int _iFile, char* _pstDatasetName, int _iRows, int _iCols, int *_piData);
26
27int writePolyMatrix(int _iFile, char* _pstDatasetName, char* _pstVarName, int _iRows, int _iCols, int* _piNbCoef, double** _pdblData);
28int writePolyComplexMatrix(int _iFile, char* _pstDatasetName, char* _pstVarName, int _iRows, int _iCols, int* _piNbCoef, double** _pdblReal, double** _pdblImg);
29
30int writeInterger8Matrix(int _iFile, char* _pstDatasetName, int _iRows, int _iCols, char* _piData8);
31int writeInterger16Matrix(int _iFile, char* _pstDatasetName, int _iRows, int _iCols, short* _piData16);
32int writeInterger32Matrix(int _iFile, char* _pstDatasetName, int _iRows, int _iCols, int* _piData32);
33int writeInterger64Matrix(int _iFile, char* _pstDatasetName, int _iRows, int _iCols, long long* _piData64);
34
35int writeSparseMatrix(int _iFile, char* _pstDatasetName, int _iRows, int _iCols, int _iNbItem, int* _piNbItemRow, int* _piColPos, double* _pdblReal);
36int writeSparseComplexMatrix(int _iFile, char* _pstDatasetName, int _iRows, int _iCols, int _iNbItem, int* _piNbItemRow, int* _piColPos, double* _pdblReal, double* _pdblImg);
37
38int writeBooleanSparseMatrix(int _iFile, char* _pstDatasetName, int _iRows, int _iCols, int _iNbItem, int* _piNbItemRow, int* _piColPos);
39
40void* openList(int _iFile, char* pstDatasetName, int _iNbItem);
41int addItemInList(int _iFile, void* _pvList, int _iPos, char* _pstItemName);
42int closeList(int _iFile, void* _pvList, char* _pstListName, int _iNbItem, int _iVarType);
43
44#endif /* !__H5_WRITEDATATOFILE_H__ */
diff --git a/scilab/modules/fileio/sci_gateway/c/gw_fileio.c b/scilab/modules/fileio/sci_gateway/c/gw_fileio.c
index f275ec8e..1159bd8 100644
--- a/scilab/modules/fileio/sci_gateway/c/gw_fileio.c
+++ b/scilab/modules/fileio/sci_gateway/c/gw_fileio.c
@@ -17,7 +17,7 @@
17/*--------------------------------------------------------------------------*/ 17/*--------------------------------------------------------------------------*/
18/* interface function */ 18/* interface function */
19/*--------------------------------------------------------------------------*/ 19/*--------------------------------------------------------------------------*/
20#define FILEIO_TAB_SIZE 38 20#define FILEIO_TAB_SIZE 36
21static gw_generic_table Tab[FILEIO_TAB_SIZE]={ 21static gw_generic_table Tab[FILEIO_TAB_SIZE]={
22 {sci_mopen, "mopen"}, 22 {sci_mopen, "mopen"},
23 {sci_mputstr, "mputstr"}, 23 {sci_mputstr, "mputstr"},
@@ -54,9 +54,7 @@ static gw_generic_table Tab[FILEIO_TAB_SIZE]={
54 {sci_fileinfo,"fileinfo"}, 54 {sci_fileinfo,"fileinfo"},
55 {sci_newest,"newest"}, 55 {sci_newest,"newest"},
56 {sci_getrelativefilename,"getrelativefilename"}, 56 {sci_getrelativefilename,"getrelativefilename"},
57 {sci_get_absolute_file_path,"get_absolute_file_path"}, 57 {sci_get_absolute_file_path,"get_absolute_file_path"}
58 {sci_export_to_hdf5,"export_to_hdf5"},
59 {sci_import_from_hdf5,"import_from_hdf5"}
60 }; 58 };
61/*--------------------------------------------------------------------------*/ 59/*--------------------------------------------------------------------------*/
62int gw_fileio(void) 60int gw_fileio(void)
diff --git a/scilab/modules/fileio/sci_gateway/fileio_gateway.xml b/scilab/modules/fileio/sci_gateway/fileio_gateway.xml
index b45ecdb..f044885 100644
--- a/scilab/modules/fileio/sci_gateway/fileio_gateway.xml
+++ b/scilab/modules/fileio/sci_gateway/fileio_gateway.xml
@@ -70,6 +70,4 @@
70<PRIMITIVE gatewayId="34" primitiveId="34" primitiveName="newest" /> 70<PRIMITIVE gatewayId="34" primitiveId="34" primitiveName="newest" />
71<PRIMITIVE gatewayId="34" primitiveId="35" primitiveName="getrelativefilename" /> 71<PRIMITIVE gatewayId="34" primitiveId="35" primitiveName="getrelativefilename" />
72<PRIMITIVE gatewayId="34" primitiveId="36" primitiveName="get_absolute_file_path" /> 72<PRIMITIVE gatewayId="34" primitiveId="36" primitiveName="get_absolute_file_path" />
73<PRIMITIVE gatewayId="34" primitiveId="37" primitiveName="export_to_hdf5" />
74<PRIMITIVE gatewayId="34" primitiveId="38" primitiveName="import_from_hdf5" />
75</GATEWAY> 73</GATEWAY>
diff --git a/scilab/modules/fileio/src/c/DllmainFileio.c b/scilab/modules/fileio/src/c/DllmainFileio.c
index 47a2667..ce4a942 100644
--- a/scilab/modules/fileio/src/c/DllmainFileio.c
+++ b/scilab/modules/fileio/src/c/DllmainFileio.c
@@ -14,8 +14,6 @@
14#include <windows.h> 14#include <windows.h>
15/*--------------------------------------------------------------------------*/ 15/*--------------------------------------------------------------------------*/
16#pragma comment(lib,"../../bin/libintl.lib") 16#pragma comment(lib,"../../bin/libintl.lib")
17#pragma comment(lib,"../../bin/hdf5dll.lib")
18#pragma comment(lib,"../../bin/hdf5_cppdll.lib")
19/*--------------------------------------------------------------------------*/ 17/*--------------------------------------------------------------------------*/
20int WINAPI DllMain (HINSTANCE hInstance , DWORD reason, PVOID pvReserved) 18int WINAPI DllMain (HINSTANCE hInstance , DWORD reason, PVOID pvReserved)
21{ 19{
diff --git a/scilab/modules/graphics/help/en_US/Graphics.xml b/scilab/modules/graphics/help/en_US/Graphics.xml
index 66b90c4..b265a74 100644
--- a/scilab/modules/graphics/help/en_US/Graphics.xml
+++ b/scilab/modules/graphics/help/en_US/Graphics.xml
@@ -22,111 +22,145 @@
22 <title>2d plotting</title> 22 <title>2d plotting</title>
23 <variablelist> 23 <variablelist>
24 <varlistentry> 24 <varlistentry>
25 <term>plot2d</term> 25 <term><link linkend="plot2d">plot2d</link></term>
26 <listitem> 26 <listitem>
27 <para>plot a curve</para> 27 <para>Plot a curve</para>
28 <para><emphasis role="bold">Example:</emphasis></para>
29 <para><imagedata fileref="../images/plot2d.png" /></para>
28 </listitem> 30 </listitem>
29 </varlistentry> 31 </varlistentry>
30 <varlistentry> 32 <varlistentry>
31 <term>plot2d2</term> 33 <term><link linkend="plot2d2">plot2d2</link></term>
32 <listitem> 34 <listitem>
33 <para>plot a curve as step function</para> 35 <para>Plot a curve as step function</para>
36 <para><emphasis role="bold">Example:</emphasis></para>
37 <para><imagedata fileref="../images/plot2d2.png" /></para>
34 </listitem> 38 </listitem>
35 </varlistentry> 39 </varlistentry>
36 <varlistentry> 40 <varlistentry>
37 <term>plot2d3</term> 41 <term><link linkend="plot2d3">plot2d3</link></term>
38 <listitem> 42 <listitem>
39 <para>plot a curve with vertical bars</para> 43 <para>Plot a curve with vertical bars</para>
44 <para><emphasis role="bold">Example:</emphasis></para>
45 <para><imagedata fileref="../images/plot2d3.png" /></para>
40 </listitem> 46 </listitem>
41 </varlistentry> 47 </varlistentry>
42 <varlistentry> 48 <varlistentry>
43 <term>plot2d4</term> 49 <term><link linkend="plot2d4">plot2d4</link></term>
44 <listitem> 50 <listitem>
45 <para>plot a curve with arrows</para> 51 <para>Plot a curve with arrows</para>
52 <para><emphasis role="bold">Example:</emphasis></para>
53 <para><imagedata fileref="../images/plot2d4.png" /></para>
46 </listitem> 54 </listitem>
47 </varlistentry> 55 </varlistentry>
48 <varlistentry> 56 <varlistentry>
49 <term>fplot2d</term> 57 <term><link linkend="fplot2d">fplot2d</link></term>
50 <listitem> 58 <listitem>
51 <para>plot a curve defined by a function</para> 59 <para>Plot a curve defined by a function</para>
60 <para><emphasis role="bold">Example:</emphasis></para>
61 <para><imagedata fileref="../images/fplot2d.png" /></para>
52 </listitem> 62 </listitem>
53 </varlistentry> 63 </varlistentry>
54 <varlistentry> 64 <varlistentry>
55 <term>champ</term> 65 <term><link linkend="champ">champ</link></term>
56 <listitem> 66 <listitem>
57 <para>2D vector field</para> 67 <para>2D vector field</para>
68 <para><emphasis role="bold">Example:</emphasis></para>
69 <para><imagedata fileref="../images/champ.png" /></para>
58 </listitem> 70 </listitem>
59 </varlistentry> 71 </varlistentry>
60 <varlistentry> 72 <varlistentry>
61 <term>champ1</term> 73 <term><link linkend="champ1">champ1</link></term>
62 <listitem> 74 <listitem>
63 <para>2D vector field with colored arrows</para> 75 <para>2D vector field with colored arrows</para>
76 <para><emphasis role="bold">Example:</emphasis></para>
77 <para><imagedata fileref="../images/champ1.png" /></para>
64 </listitem> 78 </listitem>
65 </varlistentry> 79 </varlistentry>
66 <varlistentry> 80 <varlistentry>
67 <term>fchamp</term> 81 <term><link linkend="fchamp">fchamp</link></term>
68 <listitem> 82 <listitem>
69 <para>direction field of a 2D first order ODE</para> 83 <para>Direction field of a 2D first order ODE</para>
84 <para><emphasis role="bold">Example:</emphasis></para>
85 <para><imagedata fileref="../images/fchamp.png" /></para>
70 </listitem> 86 </listitem>
71 </varlistentry> 87 </varlistentry>
72 <varlistentry> 88 <varlistentry>
73 <term>contour2d</term> 89 <term><link linkend="contour2d">contour2d</link></term>
74 <listitem> 90 <listitem>
75 <para>level curves of a surface on a 2D plot</para> 91 <para>Level curves of a surface on a 2D plot</para>
76 </listitem> 92 </listitem>
77 </varlistentry> 93 </varlistentry>
78 <varlistentry> 94 <varlistentry>
79 <term>fcontour2d</term> 95 <term><link linkend="fcontour2d">fcontour2d</link></term>
80 <listitem> 96 <listitem>
81 <para>level curves of a surface defined by a function on a 2D plot</para> 97 <para>Level curves of a surface defined by a function on a 2D plot</para>
98 <para><emphasis role="bold">Example:</emphasis></para>
99 <para><imagedata fileref="../images/fcontour2d.png" /></para>
82 </listitem> 100 </listitem>
83 </varlistentry> 101 </varlistentry>
84 <varlistentry> 102 <varlistentry>
85 <term>grayplot</term> 103 <term><link linkend="grayplot">grayplot</link></term>
86 <listitem> 104 <listitem>
87 <para>2D plot of a surface using colors</para> 105 <para>2D plot of a surface using colors</para>
106 <para><emphasis role="bold">Example:</emphasis></para>
107 <para><imagedata fileref="../images/grayplot.png" /></para>
88 </listitem> 108 </listitem>
89 </varlistentry> 109 </varlistentry>
90 <varlistentry> 110 <varlistentry>
91 <term>fgrayplot</term> 111 <term><link linkend="fgrayplot">fgrayplot</link></term>
92 <listitem> 112 <listitem>
93 <para>2D plot of a surface defined by a function using colors</para> 113 <para>2D plot of a surface defined by a function using colors</para>
114 <para><emphasis role="bold">Example:</emphasis></para>
115 <para><imagedata fileref="../images/fgrayplot.png" /></para>
94 </listitem> 116 </listitem>
95 </varlistentry> 117 </varlistentry>
96 <varlistentry> 118 <varlistentry>
97 <term>Sgrayplot</term> 119 <term><link linkend="Sgrayplot">Sgrayplot</link></term>
98 <listitem> 120 <listitem>
99 <para>smooth 2D plot of a surface using colors</para> 121 <para>Smooth 2D plot of a surface using colors</para>
122 <para><emphasis role="bold">Example:</emphasis></para>
123 <para><imagedata fileref="../images/Sgrayplot.png" /></para>
100 </listitem> 124 </listitem>
101 </varlistentry> 125 </varlistentry>
102 <varlistentry> 126 <varlistentry>
103 <term>Sfgrayplot</term> 127 <term><link linkend="Sfgrayplot">Sfgrayplot</link></term>
104 <listitem> 128 <listitem>
105 <para>smooth 2D plot of a surface defined by a function using colors</para> 129 <para>Smooth 2D plot of a surface defined by a function using colors</para>
130 <para><emphasis role="bold">Example:</emphasis></para>
131 <para><imagedata fileref="../images/Sfgrayplot.png" /></para>
106 </listitem> 132 </listitem>
107 </varlistentry> 133 </varlistentry>
108 <varlistentry> 134 <varlistentry>
109 <term>xgrid</term> 135 <term><link linkend="xgrid">xgrid</link></term>
110 <listitem> 136 <listitem>
111 <para>add a grid on a 2D plot</para> 137 <para>Add a grid on a 2D plot</para>
138 <para><emphasis role="bold">Example:</emphasis></para>
139 <para><imagedata fileref="../images/xgrid.png" /></para>
112 </listitem> 140 </listitem>
113 </varlistentry> 141 </varlistentry>
114 <varlistentry> 142 <varlistentry>
115 <term>errbar</term> 143 <term><link linkend="errbar">errbar</link></term>
116 <listitem> 144 <listitem>
117 <para>add vertical error bars on a 2D plot</para> 145 <para>Add vertical error bars on a 2D plot</para>
146 <para><emphasis role="bold">Example:</emphasis></para>
147 <para><imagedata fileref="../images/errbar.png" /></para>
118 </listitem> 148 </listitem>
119 </varlistentry> 149 </varlistentry>
120 <varlistentry> 150 <varlistentry>
121 <term>histplot</term> 151 <term><link linkend="histplot">histplot</link></term>
122 <listitem> 152 <listitem>
123 <para>plot a histogram</para> 153 <para>Plot a histogram</para>
154 <para><emphasis role="bold">Example:</emphasis></para>
155 <para><imagedata fileref="../images/histplot.png" /></para>
124 </listitem> 156 </listitem>
125 </varlistentry> 157 </varlistentry>
126 <varlistentry> 158 <varlistentry>
127 <term>Matplot</term> 159 <term><link linkend="Matplot">Matplot</link></term>
128 <listitem> 160 <listitem>
129 <para>2D plot of a matrix using colors</para> 161 <para>2D plot of a matrix using colors</para>
162 <para><emphasis role="bold">Example:</emphasis></para>
163 <para><imagedata fileref="../images/Matplot.png" /></para>
130 </listitem> 164 </listitem>
131 </varlistentry> 165 </varlistentry>
132 </variablelist> 166 </variablelist>
@@ -135,75 +169,99 @@
135 <title>3d plotting</title> 169 <title>3d plotting</title>
136 <variablelist> 170 <variablelist>
137 <varlistentry> 171 <varlistentry>
138 <term>plot3d</term> 172 <term><link linkend="plot3d">plot3d</link></term>
139 <listitem> 173 <listitem>
140 <para>plot a surface</para> 174 <para>Plot a surface</para>
175 <para><emphasis role="bold">Example:</emphasis></para>
176 <para><imagedata fileref="../images/plot3d.png" /></para>
141 </listitem> 177 </listitem>
142 </varlistentry> 178 </varlistentry>
143 <varlistentry> 179 <varlistentry>
144 <term>plot3d1</term> 180 <term><link linkend="plot3d1">plot3d1</link></term>
145 <listitem> 181 <listitem>
146 <para>plot a surface with gray or color level</para> 182 <para>Plot a surface with gray or color level</para>
183 <para><emphasis role="bold">Example:</emphasis></para>
184 <para><imagedata fileref="../images/plot3d1.png" /></para>
147 </listitem> 185 </listitem>
148 </varlistentry> 186 </varlistentry>
149 <varlistentry> 187 <varlistentry>
150 <term>fplot3d</term> 188 <term><link linkend="fplot3d">fplot3d</link></term>
151 <listitem> 189 <listitem>
152 <para>plot a surface defined by a function</para> 190 <para>Plot a surface defined by a function</para>
191 <para><emphasis role="bold">Example:</emphasis></para>
192 <para><imagedata fileref="../images/fplot3d.png" /></para>
153 </listitem> 193 </listitem>
154 </varlistentry> 194 </varlistentry>
155 <varlistentry> 195 <varlistentry>
156 <term>fplot3d1</term> 196 <term><link linkend="fplot3d1">fplot3d1</link></term>
157 <listitem> 197 <listitem>
158 <para>plot a surface defined by a function with gray or color level</para> 198 <para>Plot a surface defined by a function with gray or color level</para>
199 <para><emphasis role="bold">Example:</emphasis></para>
200 <para><imagedata fileref="../images/fplot3d1.png" /></para>
159 </listitem> 201 </listitem>
160 </varlistentry> 202 </varlistentry>
161 <varlistentry> 203 <varlistentry>
162 <term>param3d</term> 204 <term><link linkend="param3d">param3d</link></term>
163 <listitem> 205 <listitem>
164 <para>plot one curve</para> 206 <para>Plot one curve</para>
207 <para><emphasis role="bold">Example:</emphasis></para>
208 <para><imagedata fileref="../images/param3d.png" /></para>
165 </listitem> 209 </listitem>
166 </varlistentry> 210 </varlistentry>
167 <varlistentry> 211 <varlistentry>
168 <term>param3d1</term> 212 <term><link linkend="param3d1">param3d1</link></term>
169 <listitem> 213 <listitem>
170 <para>plots curves</para> 214 <para>Plots curves</para>
215 <para><emphasis role="bold">Example:</emphasis></para>
216 <para><imagedata fileref="../images/param3d1.png" /></para>
171 </listitem> 217 </listitem>
172 </varlistentry> 218 </varlistentry>
173 <varlistentry> 219 <varlistentry>
174 <term>contour</term> 220 <term><link linkend="contour">contour</link></term>
175 <listitem> 221 <listitem>
176 <para>level curves on a 3D surface</para> 222 <para>Level curves on a 3D surface</para>
223 <para><emphasis role="bold">Example:</emphasis></para>
224 <para><imagedata fileref="../images/contour.png" /></para>
177 </listitem> 225 </listitem>
178 </varlistentry> 226 </varlistentry>
179 <varlistentry> 227 <varlistentry>
180 <term>fcontour</term> 228 <term><link linkend="fcontour">fcontour</link></term>
181 <listitem> 229 <listitem>
182 <para>level curves on a 3D surface defined by a function</para> 230 <para>Level curves on a 3D surface defined by a function</para>
231 <para><emphasis role="bold">Example:</emphasis></para>
232 <para><imagedata fileref="../images/fcontour.png" /></para>
183 </listitem> 233 </listitem>
184 </varlistentry> 234 </varlistentry>
185 <varlistentry> 235 <varlistentry>
186 <term>hist3d</term> 236 <term><link linkend="hist3d">hist3d</link></term>
187 <listitem> 237 <listitem>
188 <para>3D representation of a histogram</para> 238 <para>3D representation of a histogram</para>
239 <para><emphasis role="bold">Example:</emphasis></para>
240 <para><imagedata fileref="../images/hist3d.png" /></para>
189 </listitem> 241 </listitem>
190 </varlistentry> 242 </varlistentry>
191 <varlistentry> 243 <varlistentry>
192 <term>genfac3d</term> 244 <term><link linkend="genfac3d">genfac3d</link></term>
193 <listitem> 245 <listitem>
194 <para>compute facets of a 3D surface</para> 246 <para>Compute facets of a 3D surface</para>
247 <para><emphasis role="bold">Example:</emphasis></para>
248 <para><imagedata fileref="../images/genfac3d.png" /></para>
195 </listitem> 249 </listitem>
196 </varlistentry> 250 </varlistentry>
197 <varlistentry> 251 <varlistentry>
198 <term>eval3dp</term> 252 <term><link linkend="eval3dp">eval3dp</link></term>
199 <listitem> 253 <listitem>
200 <para>compute facets of a 3D surface</para> 254 <para>Compute facets of a 3D surface</para>
255 <para><emphasis role="bold">Example:</emphasis></para>
256 <para><imagedata fileref="../images/eval3dp.png" /></para>
201 </listitem> 257 </listitem>
202 </varlistentry> 258 </varlistentry>
203 <varlistentry> 259 <varlistentry>
204 <term>geom3d</term> 260 <term><link linkend="geom3d">geom3d</link></term>
205 <listitem> 261 <listitem>
206 <para>projection from 3D on 2D after a 3D plot</para> 262 <para>Projection from 3D on 2D after a 3D plot</para>
263 <para><emphasis role="bold">Example:</emphasis></para>
264 <para><imagedata fileref="../images/geom3d.png" /></para>
207 </listitem> 265 </listitem>
208 </varlistentry> 266 </varlistentry>
209 </variablelist> 267 </variablelist>
@@ -212,39 +270,39 @@
212 <title>Line and polygon plotting</title> 270 <title>Line and polygon plotting</title>
213 <variablelist> 271 <variablelist>
214 <varlistentry> 272 <varlistentry>
215 <term>xpoly</term> 273 <term><link linkend="xpoly">xpoly</link></term>
216 <listitem> 274 <listitem>
217 <para>draw a polyline or a polygon</para> 275 <para>Draw a polyline or a polygon</para>
218 </listitem> 276 </listitem>
219 </varlistentry> 277 </varlistentry>
220 <varlistentry> 278 <varlistentry>
221 <term>xpolys</term> 279 <term><link linkend="xpolys">xpolys</link></term>
222 <listitem> 280 <listitem>
223 <para>draw a set of polylines or polygons</para> 281 <para>Draw a set of polylines or polygons</para>
224 </listitem> 282 </listitem>
225 </varlistentry> 283 </varlistentry>
226 <varlistentry> 284 <varlistentry>
227 <term>xrpoly</term> 285 <term><link linkend="xrpoly">xrpoly</link></term>
228 <listitem> 286 <listitem>
229 <para>draw a regular polygon</para> 287 <para>Draw a regular polygon</para>
230 </listitem> 288 </listitem>
231 </varlistentry> 289 </varlistentry>
232 <varlistentry> 290 <varlistentry>
233 <term>xsegs</term> 291 <term><link linkend="xsegs">xsegs</link></term>
234 <listitem> 292 <listitem>
235 <para>draw unconnected segments</para> 293 <para>Draw unconnected segments</para>
236 </listitem> 294 </listitem>
237 </varlistentry> 295 </varlistentry>
238 <varlistentry> 296 <varlistentry>
239 <term>xfpoly</term> 297 <term><link linkend="xfpoly">xfpoly</link></term>
240 <listitem> 298 <listitem>
241 <para>fill a polygon</para> 299 <para>Fill a polygon</para>
242 </listitem> 300 </listitem>
243 </varlistentry> 301 </varlistentry>
244 <varlistentry> 302 <varlistentry>
245 <term>xfpolys</term> 303 <term><link linkend="xfpolys">xfpolys</link></term>
246 <listitem> 304 <listitem>
247 <para>fill a set of polygons</para> 305 <para>Fill a set of polygons</para>
248 </listitem> 306 </listitem>
249 </varlistentry> 307 </varlistentry>
250 </variablelist> 308 </variablelist>
@@ -253,21 +311,21 @@
253 <title>Rectangle plotting</title> 311 <title>Rectangle plotting</title>
254 <variablelist> 312 <variablelist>
255 <varlistentry> 313 <varlistentry>
256 <term>xrect</term> 314 <term><link linkend="xrect">xrect</link></term>
257 <listitem> 315 <listitem>
258 <para>draw a rectangle</para> 316 <para>Draw a rectangle</para>
259 </listitem> 317 </listitem>
260 </varlistentry> 318 </varlistentry>
261 <varlistentry> 319 <varlistentry>
262 <term>xfrect</term> 320 <term><link linkend="xfrect">xfrect</link></term>
263 <listitem> 321 <listitem>
264 <para>fill a rectangle</para> 322 <para>Fill a rectangle</para>
265 </listitem> 323 </listitem>
266 </varlistentry> 324 </varlistentry>
267 <varlistentry> 325 <varlistentry>
268 <term>xrects</term> 326 <term><link linkend="xrects">xrects</link></term>
269 <listitem> 327 <listitem>
270 <para>draw or fill a set of rectangles</para> 328 <para>Draw or fill a set of rectangles</para>
271 </listitem> 329 </listitem>
272 </varlistentry> 330 </varlistentry>
273 </variablelist> 331 </variablelist>
@@ -276,27 +334,27 @@
276 <title>Arc plotting</title> 334 <title>Arc plotting</title>
277 <variablelist> 335 <variablelist>
278 <varlistentry> 336 <varlistentry>
279 <term>xarc</term> 337 <term><link linkend="xarc">xarc</link></term>
280 <listitem> 338 <listitem>
281 <para>draw a part of an ellipse</para> 339 <para>Draw a part of an ellipse</para>
282 </listitem> 340 </listitem>
283 </varlistentry> 341 </varlistentry>
284 <varlistentry> 342 <varlistentry>
285 <term>xarcs</term> 343 <term><link linkend="xarcs">xarcs</link></term>
286 <listitem> 344 <listitem>
287 <para>draw parts of a set of ellipses</para> 345 <para>Draw parts of a set of ellipses</para>
288 </listitem> 346 </listitem>
289 </varlistentry> 347 </varlistentry>
290 <varlistentry> 348 <varlistentry>
291 <term>xfarc</term> 349 <term><link linkend="xfarc">xfarc</link></term>
292 <listitem> 350 <listitem>
293 <para>fill a part of an ellipse</para> 351 <para>Fill a part of an ellipse</para>
294 </listitem> 352 </listitem>
295 </varlistentry> 353 </varlistentry>
296 <varlistentry> 354 <varlistentry>
297 <term>xfarcs</term> 355 <term><link linkend="xfarcs">xfarcs</link></term>
298 <listitem> 356 <listitem>
299 <para>fill parts of a set of ellipses</para> 357 <para>Fill parts of a set of ellipses</para>
300 </listitem> 358 </listitem>
301 </varlistentry> 359 </varlistentry>
302 </variablelist> 360 </variablelist>
@@ -305,9 +363,9 @@
305 <title>Arrow plotting</title> 363 <title>Arrow plotting</title>
306 <variablelist> 364 <variablelist>
307 <varlistentry> 365 <varlistentry>
308 <term>xarrows</term> 366 <term><link linkend="xarrows">xarrows</link></term>
309 <listitem> 367 <listitem>
310 <para>draw a set of arrows</para> 368 <para>Draw a set of arrows</para>
311 </listitem> 369 </listitem>
312 </varlistentry> 370 </varlistentry>
313 </variablelist> 371 </variablelist>
@@ -316,39 +374,43 @@
316 <title>Strings</title> 374 <title>Strings</title>
317 <variablelist> 375 <variablelist>
318 <varlistentry> 376 <varlistentry>
319 <term>xstring</term> 377 <term><link linkend="xstring">xstring</link></term>
320 <listitem> 378 <listitem>
321 <para>draw strings</para> 379 <para>Draw strings</para>
322 </listitem> 380 </listitem>
323 </varlistentry> 381 </varlistentry>
324 <varlistentry> 382 <varlistentry>
325 <term>xstringl</term> 383 <term><link linkend="xstringl">xstringl</link></term>
326 <listitem> 384 <listitem>
327 <para>compute a box which surrounds strings</para> 385 <para>Compute a box which surrounds strings</para>
328 </listitem> 386 </listitem>
329 </varlistentry> 387 </varlistentry>
330 <varlistentry> 388 <varlistentry>
331 <term>xstringb</term> 389 <term><link linkend="xstringb">xst