Changeset 133 for trunk/SRC/Matrix/union.pro

Timestamp:

07/07/06 11:57:27 (18 years ago)

Author:

navarro

Message:

english and nicer header (1)

Location:

trunk/SRC/Matrix

Files:

• . (added)
• union.pro (moved) (moved from trunk/SRC/ToBeReviewed/MATRICE/union.pro) (1 diff)

trunk/SRC/Matrix/union.pro

@@ -3 +3 @@
 ;------------------------------------------------------------
 ;+
-; NAME:union
 ;
-; PURPOSE:calcule l''union de 2 matrices D'ENTIERS POSITIFS
+; @file_comments 
+; calculate tne union between 2 matrixes of whole numbers
 ;
-; CATEGORY:calcule sur les matrices
+; @categories calculation of matrixes
 ;
-; CALLING SEQUENCE:res=union(a,b)
-;
-; INPUTS:a et b:arrays of positive integers, which need
+; @param a {in}{required} arrays of positive integers, which need
 ;               not be sorted. Duplicate elements are ignored, as they have no
 ;               effect on the result
 ;
-; KEYWORD PARAMETERS:
+; @param b {in}{required} see a
 ;
-; OUTPUTS:tableau
+; @returns tableau
 ;
-; COMMON BLOCKS:
-;
-; SIDE EFFECTS:
-;
-; The empty set is denoted by an array with the first element equal to
+; @restrictions The empty set is denoted by an array with the first element equal to
 ; -1.
 ;
-; RESTRICTIONS:
-;
-; These functions will not be efficient on sparse sets with wide
+; @restrictions These functions will not be efficient on sparse sets with wide
 ; ranges, as they trade memory for efficiency. The HISTOGRAM function
 ; is used, which creates arrays of size equal to the range of the
 ; resulting set.
 ;
-; EXAMPLE:
+; @examples a = [2,4,6,8]
+;           b = [6,1,3,2]
+;           union(a,b) = [ 1, 2, 3, 4, 6, 8]  ; Elements in either set
 ;
-;   a = [2,4,6,8]
-;   b = [6,1,3,2]
-;   union(a,b) = [ 1, 2, 3, 4, 6, 8]  ; Elements in either set
+; @history  http://www.dfanning.com/tips/set_operations.html
 ;
-; MODIFICATION HISTORY: 
+; @version $Id$
 ;
-; http://www.dfanning.com/tips/set_operations.html
 ;-
 ;------------------------------------------------------------