IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
Aug 6, 2004, 2:06:06 PM (22 years ago)
Author:
desonia
Message:

another attempt to get astyle to get it right.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/psLib/src/math/psMatrix.h

    r974 r1407  
     1
    12/** @file  psMatrix.h
    23 *
    … …  
    2122 *  @author Ross Harman, MHPCC
    2223 *
    23  *  @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
    24  *  @date $Date: 2004-06-10 01:58:06 $
     24 *  @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
     25 *  @date $Date: 2004-08-07 00:06:06 $
    2526 *
    2627 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    2829
    2930#ifndef PSMATRIX_H
    30 #define PSMATRIX_H
     31#    define PSMATRIX_H
    3132
    3233/// @addtogroup Matrix
    … …  
    4243 *  @return  psImage*: Pointer to LU decomposed psImage.
    4344 */
    44 psImage *psMatrixLUD(
    45     psImage *outImage,  ///< Image to return, or NULL.
    46     psVector *outPerm,  ///< Output permutation vector used by psMatrixLUSolve.
    47     psImage *inImage    ///< Image to decompose.
    48 );
     45psImage *psMatrixLUD(psImage * outImage,        // /< Image to return, or NULL.
     46                     psVector * outPerm,        // /< Output permutation vector used by psMatrixLUSolve.
     47                     psImage * inImage  // /< Image to decompose.
     48                    );
    4949
    5050/** LU Solution of psImage matrix.
    … …  
    5757 *  @return  psVector*: Pointer to psVector solution of matrix equation.
    5858 */
    59 psVector *psMatrixLUSolve(
    60     psVector *outVector,        ///< Vector to return, or NULL.
    61     const psImage *luImage,     ///< LU-decomposed matrix.
    62     const psVector *inVector,   ///< Vector right-hand-side of equation.
    63     const psVector *inPerm      ///< Permutation vector resulting from psMatrixLUD function.
    64 );
     59psVector *psMatrixLUSolve(psVector * outVector, // /< Vector to return, or NULL.
     60                          const psImage * luImage,      // /< LU-decomposed matrix.
     61                          const psVector * inVector,    // /< Vector right-hand-side of equation.
     62                          const psVector * inPerm       // /< Permutation vector resulting from psMatrixLUD
     63                          // function.
     64                         );
    6565
    6666/** Invert psImage matrix.
    … …  
    7373 *  @return  psImage*: Pointer to inverted psImage.
    7474 */
    75 psImage *psMatrixInvert(
    76     psImage *outImage,      ///< Image to return, or NULL for in-place substitution.
    77     const psImage *inImage, ///< Image to be inverted
    78     float *restrict det     ///< Determinant to return, or NULL
    79 );
     75psImage *psMatrixInvert(psImage * outImage,     // /< Image to return, or NULL for in-place substitution.
     76                        const psImage * inImage,        // /< Image to be inverted
     77                        float *restrict det     // /< Determinant to return, or NULL
     78                       );
    8079
    8180/** Calculate psImage matrix determinant.
    … …  
    8786 *  @return  float: Determinant from psImage.
    8887 */
    89 float* psMatrixDeterminant(
    90     const psImage *restrict inMatrix    ///< Image used to calculate determinant.
    91 );
     88float *psMatrixDeterminant(const psImage * restrict inMatrix    // /< Image used to calculate determinant.
     89                          );
    9290
    9391/** Performs psImage matrix multiplication.
    … …  
    10098 *  @return  psImage*: Pointer to resulting psImage.
    10199 */
    102 psImage *psMatrixMultiply(
    103     psImage *outImage,  ///< Matrix to return, or NULL.
    104     psImage *inImage1,  ///< First input image.
    105     psImage *inImage2   ///< Second input image.
    106 );
     100psImage *psMatrixMultiply(psImage * outImage,   // /< Matrix to return, or NULL.
     101                          psImage * inImage1,   // /< First input image.
     102                          psImage * inImage2    // /< Second input image.
     103                         );
    107104
    108105/** Transpose matrix.
    … …  
    115112 *  @return  psImage*: Pointer to transposed psImage.
    116113 */
    117 psImage *psMatrixTranspose(
    118     psImage *outImage,      ///< Image to return, or NULL
    119     const psImage *inImage  ///< Image to transpose
    120 );
     114psImage *psMatrixTranspose(psImage * outImage,  // /< Image to return, or NULL
     115                           const psImage * inImage      // /< Image to transpose
     116                          );
    121117
    122118/** Calculate matrix eigenvectors.
    … …  
    128124 *  @return  psImage*: Pointer to matrix of Eigenvectors.
    129125 */
    130 psImage *psMatrixEigenvectors(
    131     psImage *outImage,  ///< Eigenvectors to return, or NULL.
    132     psImage *inImage    ///< Input image.
    133 );
     126psImage *psMatrixEigenvectors(psImage * outImage,       // /< Eigenvectors to return, or NULL.
     127                              psImage * inImage // /< Input image.
     128                             );
    134129
    135130/** Convert matrix to vector.
    … …  
    142137 *  @return  psVector*: Pointer to psVector.
    143138 */
    144 psVector *psMatrixToVector(
    145     psVector *outVector,    ///< Vector to return, or NULL.
    146     psImage *inImage        ///< Image to convert.
    147 );
     139psVector *psMatrixToVector(psVector * outVector,        // /< Vector to return, or NULL.
     140                           psImage * inImage    // /< Image to convert.
     141                          );
    148142
    149143/** Convert vector to matrix.
    … …  
    156150 *  @return  psVector*: Pointer to psIamge.
    157151 */
    158 psImage *psVectorToMatrix(
    159     psImage *outImage,  ///< Matrix to return, or NULL.
    160     psVector *inVector  ///< Vector to convert.
    161 );
     152psImage *psVectorToMatrix(psImage * outImage,   // /< Matrix to return, or NULL.
     153                          psVector * inVector   // /< Vector to convert.
     154                         );
    162155
    163156/// @}
Note: See TracChangeset for help on using the changeset viewer.