summaryrefslogtreecommitdiffstats
path: root/scilab/modules
diff options
context:
space:
mode:
authorAllan CORNET <allan.cornet@scilab.org>2010-05-11 14:46:44 +0200
committerClément DAVID <clement.david@scilab.org>2010-05-18 15:19:19 +0200
commit6a839c07a973171c966b25aa9d1480e0e34b7234 (patch)
tree37d45771ffa91ce0a93bf4c8be2869d04231d27d /scilab/modules
parent32a34749ffef095d1203bc2e028e590e82dce5a1 (diff)
downloadscilab-6a839c07a973171c966b25aa9d1480e0e34b7234.zip
scilab-6a839c07a973171c966b25aa9d1480e0e34b7234.tar.gz
bug 4857 update help file of gsort about complex and overloading
Change-Id: I353a63795db2e6ace96c31ea5e51c4c21060d8ba
Diffstat (limited to 'scilab/modules')
-rw-r--r--scilab/modules/elementary_functions/help/en_US/gsort.xml10
-rw-r--r--scilab/modules/elementary_functions/help/fr_FR/gsort.xml11
2 files changed, 21 insertions, 0 deletions
diff --git a/scilab/modules/elementary_functions/help/en_US/gsort.xml b/scilab/modules/elementary_functions/help/en_US/gsort.xml
index 5118b79..3bb7109 100644
--- a/scilab/modules/elementary_functions/help/en_US/gsort.xml
+++ b/scilab/modules/elementary_functions/help/en_US/gsort.xml
@@ -166,6 +166,12 @@
166 magnitude, i.e., abs(<literal>v</literal>) . Only <literal>'g'</literal> 166 magnitude, i.e., abs(<literal>v</literal>) . Only <literal>'g'</literal>
167 as second argument is managed with complex.</para> 167 as second argument is managed with complex.</para>
168 168
169 <para>With complex numbers, <literal>gsort</literal> can be overloaded
170 </para>
171
172 <para>see macro:
173 SCI/modules/elementary_functions/macros/%_gsort.sci</para>
174
169 <para>if <literal>v</literal> have <literal>%nan</literal> or 175 <para>if <literal>v</literal> have <literal>%nan</literal> or
170 <literal>%inf</literal> as elements. gsort places these at the beginning 176 <literal>%inf</literal> as elements. gsort places these at the beginning
171 with <literal>'i'</literal> or at the end with <literal>'d'</literal> 177 with <literal>'i'</literal> or at the end with <literal>'d'</literal>
@@ -208,6 +214,10 @@ gsort(v,'lc','i')
208 <simplelist type="inline"> 214 <simplelist type="inline">
209 <member><link linkend="find">find</link></member> 215 <member><link linkend="find">find</link></member>
210 </simplelist> 216 </simplelist>
217 <simplelist type="inline">
218 <member><link linkend="overloading">overloading</link></member>
219 </simplelist>
220
211 </refsection> 221 </refsection>
212 222
213 <refsection> 223 <refsection>
diff --git a/scilab/modules/elementary_functions/help/fr_FR/gsort.xml b/scilab/modules/elementary_functions/help/fr_FR/gsort.xml
index eac547d..a263d3f 100644
--- a/scilab/modules/elementary_functions/help/fr_FR/gsort.xml
+++ b/scilab/modules/elementary_functions/help/fr_FR/gsort.xml
@@ -159,6 +159,12 @@
159 complexe. Seule l'option <literal>'g'</literal> est accessible avec des 159 complexe. Seule l'option <literal>'g'</literal> est accessible avec des
160 nombres complexes.</para> 160 nombres complexes.</para>
161 161
162 <para>Pour les nombres complexes, <literal>gsort</literal> peut être
163 surchargé. </para>
164
165 <para>voir la macro:
166 SCI/modules/elementary_functions/macros/%_gsort.sci</para>
167
162 <para>Si <literal>A</literal> contient des <literal>%nan</literal> ou des 168 <para>Si <literal>A</literal> contient des <literal>%nan</literal> ou des
163 <literal>%inf</literal> ceux ci seront placés en début avec l'argument 169 <literal>%inf</literal> ceux ci seront placés en début avec l'argument
164 <literal>'i'</literal> ou à la fin avec l'argument 170 <literal>'i'</literal> ou à la fin avec l'argument
@@ -201,6 +207,11 @@ gsort(A,'lc','i')
201 <simplelist type="inline"> 207 <simplelist type="inline">
202 <member><link linkend="find">find</link></member> 208 <member><link linkend="find">find</link></member>
203 </simplelist> 209 </simplelist>
210
211 <simplelist type="inline">
212 <member><link linkend="overloading">overloading</link></member>
213 </simplelist>
214
204 </refsection> 215 </refsection>
205 216
206 <refsection> 217 <refsection>