summaryrefslogtreecommitdiffstats
path: root/scilab/modules/data_structures
diff options
context:
space:
mode:
Diffstat (limited to 'scilab/modules/data_structures')
-rw-r--r--scilab/modules/data_structures/Makefile.in5
-rw-r--r--scilab/modules/data_structures/data_structures.iss2
-rw-r--r--scilab/modules/data_structures/etc/data_structures.quit5
-rw-r--r--scilab/modules/data_structures/etc/data_structures.start5
-rw-r--r--scilab/modules/data_structures/help/en_US/hypermat.xml11
-rw-r--r--scilab/modules/data_structures/help/fr_FR/hypermat.xml11
-rw-r--r--scilab/modules/data_structures/help/pt_BR/hypermat.xml11
-rw-r--r--scilab/modules/data_structures/src/c/data_structures.vcproj6
-rw-r--r--scilab/modules/data_structures/src/fortran/data_structures_f.vfproj5
-rw-r--r--scilab/modules/data_structures/src/fortran/data_structures_f2c.vcproj2
-rw-r--r--scilab/modules/data_structures/version.xml2
11 files changed, 43 insertions, 22 deletions
diff --git a/scilab/modules/data_structures/Makefile.in b/scilab/modules/data_structures/Makefile.in
index da983a9..089c37d 100644
--- a/scilab/modules/data_structures/Makefile.in
+++ b/scilab/modules/data_structures/Makefile.in
@@ -194,6 +194,7 @@ AVALON_FRAMEWORK = @AVALON_FRAMEWORK@
194AWK = @AWK@ 194AWK = @AWK@
195BATIK = @BATIK@ 195BATIK = @BATIK@
196BLAS_LIBS = @BLAS_LIBS@ 196BLAS_LIBS = @BLAS_LIBS@
197BSH = @BSH@
197CC = @CC@ 198CC = @CC@
198CCDEPMODE = @CCDEPMODE@ 199CCDEPMODE = @CCDEPMODE@
199CFLAGS = @CFLAGS@ 200CFLAGS = @CFLAGS@
@@ -263,9 +264,11 @@ JGRAPHX = @JGRAPHX@
263JHALL = @JHALL@ 264JHALL = @JHALL@
264JHDF5 = @JHDF5@ 265JHDF5 = @JHDF5@
265JLATEXMATH = @JLATEXMATH@ 266JLATEXMATH = @JLATEXMATH@
267JLATEXMATH_FOP = @JLATEXMATH_FOP@
266JOGL = @JOGL@ 268JOGL = @JOGL@
267JROSETTA_API = @JROSETTA_API@ 269JROSETTA_API = @JROSETTA_API@
268JROSETTA_ENGINE = @JROSETTA_ENGINE@ 270JROSETTA_ENGINE = @JROSETTA_ENGINE@
271JUNIT = @JUNIT@
269LAPACK_LIBS = @LAPACK_LIBS@ 272LAPACK_LIBS = @LAPACK_LIBS@
270LD = @LD@ 273LD = @LD@
271LDFLAGS = @LDFLAGS@ 274LDFLAGS = @LDFLAGS@
@@ -323,6 +326,7 @@ PVM_ENABLE = @PVM_ENABLE@
323PVM_INCLUDE = @PVM_INCLUDE@ 326PVM_INCLUDE = @PVM_INCLUDE@
324PVM_LIB = @PVM_LIB@ 327PVM_LIB = @PVM_LIB@
325PYTHON = @PYTHON@ 328PYTHON = @PYTHON@
329QDOX = @QDOX@
326RANLIB = @RANLIB@ 330RANLIB = @RANLIB@
327RELOCATABLE = @RELOCATABLE@ 331RELOCATABLE = @RELOCATABLE@
328RT_LIB = @RT_LIB@ 332RT_LIB = @RT_LIB@
@@ -341,6 +345,7 @@ SWIG_JAVA = @SWIG_JAVA@
341SWIG_RUNTIME_LIBS_DIR = @SWIG_RUNTIME_LIBS_DIR@ 345SWIG_RUNTIME_LIBS_DIR = @SWIG_RUNTIME_LIBS_DIR@
342TCLTK_LIBS = @TCLTK_LIBS@ 346TCLTK_LIBS = @TCLTK_LIBS@
343TCL_INC_PATH = @TCL_INC_PATH@ 347TCL_INC_PATH = @TCL_INC_PATH@
348TESTNG = @TESTNG@
344TK_INC_PATH = @TK_INC_PATH@ 349TK_INC_PATH = @TK_INC_PATH@
345UMFPACK_ENABLE = @UMFPACK_ENABLE@ 350UMFPACK_ENABLE = @UMFPACK_ENABLE@
346UMFPACK_LIB = @UMFPACK_LIB@ 351UMFPACK_LIB = @UMFPACK_LIB@
diff --git a/scilab/modules/data_structures/data_structures.iss b/scilab/modules/data_structures/data_structures.iss
index ff04499..95c7dd6 100644
--- a/scilab/modules/data_structures/data_structures.iss
+++ b/scilab/modules/data_structures/data_structures.iss
@@ -28,8 +28,6 @@ Source: modules\{#DATASTRUCT}\sci_gateway\data_structures_gateway.xml; DestDir:
28Source: modules\{#DATASTRUCT}\etc\{#DATASTRUCT}.quit; DestDir: {app}\modules\{#DATASTRUCT}\etc; Components: {#COMPN_SCILAB} 28Source: modules\{#DATASTRUCT}\etc\{#DATASTRUCT}.quit; DestDir: {app}\modules\{#DATASTRUCT}\etc; Components: {#COMPN_SCILAB}
29Source: modules\{#DATASTRUCT}\etc\{#DATASTRUCT}.start; DestDir: {app}\modules\{#DATASTRUCT}\etc; Components: {#COMPN_SCILAB} 29Source: modules\{#DATASTRUCT}\etc\{#DATASTRUCT}.start; DestDir: {app}\modules\{#DATASTRUCT}\etc; Components: {#COMPN_SCILAB}
30; 30;
31Source: modules\{#DATASTRUCT}\help\addchapter.sce; DestDir: {app}\modules\{#DATASTRUCT}\help; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
32;
33;Source: modules\{#DATASTRUCT}\includes\*.h; DestDir: {app}\modules\{#DATASTRUCT}\includes; Components: {#COMPN_SCILAB} 31;Source: modules\{#DATASTRUCT}\includes\*.h; DestDir: {app}\modules\{#DATASTRUCT}\includes; Components: {#COMPN_SCILAB}
34; 32;
35Source: modules\{#DATASTRUCT}\macros\lib; DestDir: {app}\modules\{#DATASTRUCT}\macros; Components: {#COMPN_SCILAB} 33Source: modules\{#DATASTRUCT}\macros\lib; DestDir: {app}\modules\{#DATASTRUCT}\macros; Components: {#COMPN_SCILAB}
diff --git a/scilab/modules/data_structures/etc/data_structures.quit b/scilab/modules/data_structures/etc/data_structures.quit
index f582c9d..8a0f997 100644
--- a/scilab/modules/data_structures/etc/data_structures.quit
+++ b/scilab/modules/data_structures/etc/data_structures.quit
@@ -8,8 +8,3 @@
8// are also available at 8// are also available at
9// http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt 9// http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
10 10
11// Delete help chapter
12// =============================================================================
13if WITH_HELPTOOLS then
14 del_help_chapter("data_structures",%t);
15end
diff --git a/scilab/modules/data_structures/etc/data_structures.start b/scilab/modules/data_structures/etc/data_structures.start
index d7daf4d..fb401de 100644
--- a/scilab/modules/data_structures/etc/data_structures.start
+++ b/scilab/modules/data_structures/etc/data_structures.start
@@ -11,8 +11,3 @@
11// ============================================================================= 11// =============================================================================
12load("SCI/modules/data_structures/macros/lib"); 12load("SCI/modules/data_structures/macros/lib");
13 13
14// Add help chapter
15// =============================================================================
16if WITH_HELPTOOLS then
17 add_module_help_chapter("data_structures");
18end
diff --git a/scilab/modules/data_structures/help/en_US/hypermat.xml b/scilab/modules/data_structures/help/en_US/hypermat.xml
index 08e56b8..b4958b4 100644
--- a/scilab/modules/data_structures/help/en_US/hypermat.xml
+++ b/scilab/modules/data_structures/help/en_US/hypermat.xml
@@ -49,11 +49,20 @@
49 <literal>M('dims')</literal> and the vector of entries <literal>M('entries')</literal> such as 49 <literal>M('dims')</literal> and the vector of entries <literal>M('entries')</literal> such as
50 the leftmost subcripts vary first 50 the leftmost subcripts vary first
51 <literal>[M(1,1,..);..;M(n1,1,..);...;M(1,n2,..);..;M(n1,n2,..);...]</literal></para> 51 <literal>[M(1,1,..);..;M(n1,1,..);...;M(1,n2,..);..;M(n1,n2,..);...]</literal></para>
52 <para>Warning: If you build your own <literal>hypermat</literal>, you must be careful. The M('dims') entry must be a row vector whereas the M('entries') must be a column vector.</para>
52 </refsection> 53 </refsection>
53 <refsection> 54 <refsection>
54 <title>Examples</title> 55 <title>Examples</title>
55 <programlisting role="example"><![CDATA[ 56 <programlisting role="example"><![CDATA[
56M=hypermat([2 3 2 2],1:24) 57M = hypermat([2 3 2 2],1:24)
58disp(size(M('dims')))
59disp(size(M('entries')))
60
61M_own = mlist(['hm','dims','entries']);
62M_own('dims') = [2 3 2 2];
63M_own('entries') = [1:24]';
64disp(size(M_own('dims')))
65disp(size(M_own('entries')))
57 ]]></programlisting> 66 ]]></programlisting>
58 </refsection> 67 </refsection>
59 <refsection> 68 <refsection>
diff --git a/scilab/modules/data_structures/help/fr_FR/hypermat.xml b/scilab/modules/data_structures/help/fr_FR/hypermat.xml
index b4cad36..73204db 100644
--- a/scilab/modules/data_structures/help/fr_FR/hypermat.xml
+++ b/scilab/modules/data_structures/help/fr_FR/hypermat.xml
@@ -40,12 +40,21 @@
40 La structure de données M contient un champ <literal>M('dims')</literal> contenant les dimensions de l'hypermatrice et un champ contenant le vecteur des termes <literal>M('entries')</literal>, rangés tel que l'indice 40 La structure de données M contient un champ <literal>M('dims')</literal> contenant les dimensions de l'hypermatrice et un champ contenant le vecteur des termes <literal>M('entries')</literal>, rangés tel que l'indice
41 le plus à gauche varie en premier : 41 le plus à gauche varie en premier :
42 <literal>[M(1,1,..);..;M(n1,1,..);...;M(1,n2,..);..;M(n1,n2,..);...]</literal> 42 <literal>[M(1,1,..);..;M(n1,1,..);...;M(1,n2,..);..;M(n1,n2,..);...]</literal>
43 <para>Attention: Si vous construisez votre propre <literal>hypermat</literal>, vous devez faire attention. L'entrée M('dims') doit être un vecteur ligne alors que l'entrée M('entries') doit être un vecteur colonne.</para>
43 </para> 44 </para>
44 </refsection> 45 </refsection>
45 <refsection> 46 <refsection>
46 <title>Exemples</title> 47 <title>Exemples</title>
47 <programlisting role="example"><![CDATA[ 48 <programlisting role="example"><![CDATA[
48M=hypermat([2 3 2 2],1:24) 49M = hypermat([2 3 2 2],1:24)
50disp(size(M('dims')))
51disp(size(M('entries')))
52
53M_own = mlist(['hm','dims','entries']);
54M_own('dims') = [2 3 2 2];
55M_own('entries') = [1:24]';
56disp(size(M_own('dims')))
57disp(size(M_own('entries')))
49 ]]></programlisting> 58 ]]></programlisting>
50 </refsection> 59 </refsection>
51 <refsection> 60 <refsection>
diff --git a/scilab/modules/data_structures/help/pt_BR/hypermat.xml b/scilab/modules/data_structures/help/pt_BR/hypermat.xml
index bb75052..365699f 100644
--- a/scilab/modules/data_structures/help/pt_BR/hypermat.xml
+++ b/scilab/modules/data_structures/help/pt_BR/hypermat.xml
@@ -68,13 +68,22 @@
68 <literal>M('entries')</literal> tais que os ndices subescritos mais 68 <literal>M('entries')</literal> tais que os ndices subescritos mais
69 esquerda variam primeiro: 69 esquerda variam primeiro:
70 <literal>[M(1,1,..);..;M(n1,1,..);...;M(1,n2,..);..;M(n1,n2,..);...]</literal></para> 70 <literal>[M(1,1,..);..;M(n1,1,..);...;M(1,n2,..);..;M(n1,n2,..);...]</literal></para>
71 <para>Warning: If you build your own <literal>hypermat</literal>, you must be careful. The M('dims') entry must be a row vector whereas the M('entries') must be a column vector.</para>
71 </refsection> 72 </refsection>
72 73
73 <refsection> 74 <refsection>
74 <title>Exemplos</title> 75 <title>Exemplos</title>
75 76
76 <programlisting role="example"><![CDATA[ 77 <programlisting role="example"><![CDATA[
77M=hypermat([2 3 2 2],1:24) 78M = hypermat([2 3 2 2],1:24)
79disp(size(M('dims')))
80disp(size(M('entries')))
81
82M_own = mlist(['hm','dims','entries']);
83M_own('dims') = [2 3 2 2];
84M_own('entries') = [1:24]';
85disp(size(M_own('dims')))
86disp(size(M_own('entries')))
78 ]]></programlisting> 87 ]]></programlisting>
79 </refsection> 88 </refsection>
80 89
diff --git a/scilab/modules/data_structures/src/c/data_structures.vcproj b/scilab/modules/data_structures/src/c/data_structures.vcproj
index be56944..19b06f5 100644
--- a/scilab/modules/data_structures/src/c/data_structures.vcproj
+++ b/scilab/modules/data_structures/src/c/data_structures.vcproj
@@ -1,4 +1,4 @@
1<?xml version="1.0" encoding="Windows-1252"?> 1<?xml version="1.0" encoding="UTF-8"?>
2<VisualStudioProject 2<VisualStudioProject
3 ProjectType="Visual C++" 3 ProjectType="Visual C++"
4 Version="9,00" 4 Version="9,00"
@@ -43,7 +43,7 @@
43 /> 43 />
44 <Tool 44 <Tool
45 Name="VCCLCompilerTool" 45 Name="VCCLCompilerTool"
46 AdditionalOptions="/arch:IA32" 46 AdditionalOptions=""
47 Optimization="0" 47 Optimization="0"
48 AdditionalIncludeDirectories="../../includes;../../../core/includes;../../../string/includes;../../../output_stream/includes;../../../localization/includes;../../../../libs/MALLOC/includes;../../../../libs/intl;../../../api_scilab/includes" 48 AdditionalIncludeDirectories="../../includes;../../../core/includes;../../../string/includes;../../../output_stream/includes;../../../localization/includes;../../../../libs/MALLOC/includes;../../../../libs/intl;../../../api_scilab/includes"
49 PreprocessorDefinitions="_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE" 49 PreprocessorDefinitions="_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE"
@@ -195,7 +195,7 @@
195 /> 195 />
196 <Tool 196 <Tool
197 Name="VCCLCompilerTool" 197 Name="VCCLCompilerTool"
198 AdditionalOptions="/arch:IA32" 198 AdditionalOptions=""
199 Optimization="1" 199 Optimization="1"
200 InlineFunctionExpansion="1" 200 InlineFunctionExpansion="1"
201 FavorSizeOrSpeed="1" 201 FavorSizeOrSpeed="1"
diff --git a/scilab/modules/data_structures/src/fortran/data_structures_f.vfproj b/scilab/modules/data_structures/src/fortran/data_structures_f.vfproj
index cee3b38..e5bb58d 100644
--- a/scilab/modules/data_structures/src/fortran/data_structures_f.vfproj
+++ b/scilab/modules/data_structures/src/fortran/data_structures_f.vfproj
@@ -5,7 +5,7 @@
5 <Platform Name="x64"/></Platforms> 5 <Platform Name="x64"/></Platforms>
6 <Configurations> 6 <Configurations>
7 <Configuration Name="Debug|Win32" OutputDirectory="$(InputDir)$(ConfigurationName)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.lib;$(TargetPath)" ConfigurationType="typeStaticLibrary"> 7 <Configuration Name="Debug|Win32" OutputDirectory="$(InputDir)$(ConfigurationName)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.lib;$(TargetPath)" ConfigurationType="typeStaticLibrary">
8 <Tool Name="VFFortranCompilerTool" AdditionalOptions="/arch:IA32" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="../../includes;../../../core/includes;" AlternateParameterSyntax="false" F77RuntimeCompatibility="true" FPS4Libs="false" CallingConvention="callConventionCRef" ExternalNameUnderscore="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDebugDLL"/> 8 <Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="../../includes;../../../core/includes;" AlternateParameterSyntax="false" F77RuntimeCompatibility="true" FPS4Libs="false" CallingConvention="callConventionCRef" ExternalNameUnderscore="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDebugDLL"/>
9 <Tool Name="VFLibrarianTool" OutputFile="../../../../libs/data_structures_f.lib"/> 9 <Tool Name="VFLibrarianTool" OutputFile="../../../../libs/data_structures_f.lib"/>
10 <Tool Name="VFResourceCompilerTool"/> 10 <Tool Name="VFResourceCompilerTool"/>
11 <Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(IntDir)/$(InputName).tlb"/> 11 <Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(IntDir)/$(InputName).tlb"/>
@@ -20,7 +20,7 @@ del *.def &gt;nul
20cd .."/> 20cd .."/>
21 <Tool Name="VFManifestTool" SuppressStartupBanner="true"/></Configuration> 21 <Tool Name="VFManifestTool" SuppressStartupBanner="true"/></Configuration>
22 <Configuration Name="Release|Win32" OutputDirectory="$(InputDir)$(ConfigurationName)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.lib;$(TargetPath)" ConfigurationType="typeStaticLibrary"> 22 <Configuration Name="Release|Win32" OutputDirectory="$(InputDir)$(ConfigurationName)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.lib;$(TargetPath)" ConfigurationType="typeStaticLibrary">
23 <Tool Name="VFFortranCompilerTool" AdditionalOptions="/arch:IA32" SuppressStartupBanner="true" Optimization="optimizeMinSpace" AdditionalIncludeDirectories="../../includes;../../../core/includes;" PreprocessorDefinitions="WIN32" AlternateParameterSyntax="false" F77RuntimeCompatibility="true" FPS4Libs="false" CallingConvention="callConventionCRef" ExternalNameUnderscore="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDLL"/> 23 <Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" Optimization="optimizeMinSpace" AdditionalIncludeDirectories="../../includes;../../../core/includes;" PreprocessorDefinitions="WIN32" AlternateParameterSyntax="false" F77RuntimeCompatibility="true" FPS4Libs="false" CallingConvention="callConventionCRef" ExternalNameUnderscore="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDLL"/>
24 <Tool Name="VFLinkerTool" OutputFile="$(OutDir)/$(ProjectName)" SuppressStartupBanner="true"/> 24 <Tool Name="VFLinkerTool" OutputFile="$(OutDir)/$(ProjectName)" SuppressStartupBanner="true"/>
25 <Tool Name="VFLibrarianTool" OutputFile="../../../../libs/data_structures_f.lib"/> 25 <Tool Name="VFLibrarianTool" OutputFile="../../../../libs/data_structures_f.lib"/>
26 <Tool Name="VFResourceCompilerTool"/> 26 <Tool Name="VFResourceCompilerTool"/>
@@ -66,6 +66,7 @@ del *.def &gt;nul
66cd .."/></Configuration></Configurations> 66cd .."/></Configuration></Configurations>
67 <Files> 67 <Files>
68 <Filter Name="Header Files" Filter="fi;fd"/> 68 <Filter Name="Header Files" Filter="fi;fd"/>
69 <Filter Name="Library Dependencies"/>
69 <Filter Name="Resource Files" Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"/> 70 <Filter Name="Resource Files" Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"/>
70 <Filter Name="Source Files" Filter="f90;for;f;fpp;ftn;def;odl;idl"> 71 <Filter Name="Source Files" Filter="f90;for;f;fpp;ftn;def;odl;idl">
71 <File RelativePath="extractfields.f"/> 72 <File RelativePath="extractfields.f"/>
diff --git a/scilab/modules/data_structures/src/fortran/data_structures_f2c.vcproj b/scilab/modules/data_structures/src/fortran/data_structures_f2c.vcproj
index ecf333a..985e0b0 100644
--- a/scilab/modules/data_structures/src/fortran/data_structures_f2c.vcproj
+++ b/scilab/modules/data_structures/src/fortran/data_structures_f2c.vcproj
@@ -1,4 +1,4 @@
1<?xml version="1.0" encoding="Windows-1252"?> 1<?xml version="1.0" encoding="UTF-8"?>
2<VisualStudioProject 2<VisualStudioProject
3 ProjectType="Visual C++" 3 ProjectType="Visual C++"
4 Version="9,00" 4 Version="9,00"
diff --git a/scilab/modules/data_structures/version.xml b/scilab/modules/data_structures/version.xml
index fe000bc..0d551a4 100644
--- a/scilab/modules/data_structures/version.xml
+++ b/scilab/modules/data_structures/version.xml
@@ -8,5 +8,5 @@
8 --> 8 -->
9<!DOCTYPE MODULE_VERSION SYSTEM "../core/xml/version.dtd"> 9<!DOCTYPE MODULE_VERSION SYSTEM "../core/xml/version.dtd">
10<MODULE_VERSION name="data_structures"> 10<MODULE_VERSION name="data_structures">
11<VERSION major="5" minor="2" maintenance="0" revision="0" string="unstable-git" /> 11<VERSION major="5" minor="3" maintenance="0" revision="0" string="unstable-git" />
12</MODULE_VERSION> 12</MODULE_VERSION>