IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 2207


Ignore:
Timestamp:
Oct 26, 2004, 3:17:53 PM (22 years ago)
Author:
gusciora
Message:

More macros for parameters.

Location:
trunk/psLib/src
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/psLib/src/dataManip/psConstants.h

    r2206 r2207  
    66 *  @author GLG, MHPCC
    77 *
    8  *  @version $Revision: 1.15 $ $Name: not supported by cvs2svn $
    9  *  @date $Date: 2004-10-27 01:15:47 $
     8 *  @version $Revision: 1.16 $ $Name: not supported by cvs2svn $
     9 *  @date $Date: 2004-10-27 01:17:53 $
    1010 *
    1111 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    5454p_psMemSetPersistent(VEC, true); \
    5555p_psMemSetPersistent(VEC->data.V, true); \
    56 for (psS32 i=0;i<N;i++) { \
     56for (int i=0;i<N;i++) { \
    5757    VEC->data.F32[i] = 1.0; \
    5858} \
    … …  
    6262p_psMemSetPersistent(VEC, true); \
    6363p_psMemSetPersistent(VEC->data.V, true); \
    64 for (psS32 i=0;i<N;i++) { \
     64for (int i=0;i<N;i++) { \
    6565    VEC->data.F64[i] = 1.0; \
    6666} \
    … …  
    7070p_psMemSetPersistent(VEC, true); \
    7171p_psMemSetPersistent(VEC->data.V, true); \
    72 for (psS32 i=0;i<N;i++) { \
     72for (int i=0;i<N;i++) { \
    7373    VEC->data.F32[i] = (float) i; \
    7474} \
    … …  
    7878p_psMemSetPersistent(VEC, true); \
    7979p_psMemSetPersistent(VEC->data.V, true); \
    80 for (psS32 i=0;i<N;i++) { \
     80for (int i=0;i<N;i++) { \
    8181    VEC->data.F64[i] = (float) i; \
    8282} \
    … …  
    114114}
    115115
    116 
    117 
    118116/** Preprocessor macro to generate error for zero length vector */
    119 #define PS_CHECK_EMPTY_VECTOR_RETURN_NULL(NAME) \
     117#define PS_CHECK_EMPTY_VECTOR(NAME, RVAL) \
    120118if (NAME->n < 1) { \
    121119    psError(__func__,"Unallowable operation: %s has zero n value.", #NAME); \
    122     return(NULL); \
    123 } \
    124 
    125 /** Preprocessor macro to generate error for zero length vector */
    126 #define PS_CHECK_EMPTY_VECTOR_RETURN_F0(NAME) \
    127 if (NAME->n < 1) { \
    128     psError(__func__,"Unallowable operation: %s has zero n value.", #NAME); \
    129     return(0.0); \
    130 } \
     120    return(RVAL); \
     121} \
     122
     123
    131124
    132125/** Preprocessor macro to generate error on differing size vectors */
    … …  
    190183
    191184#define PS_PRINT_VECTOR(NAME) \
    192 for (psS32 my_i=0;my_i<NAME->n;my_i++) { \
     185for (int my_i=0;my_i<NAME->n;my_i++) { \
    193186    printf("%s->data.F32[%d] is %f\n", #NAME, my_i, NAME->data.F32[my_i]); \
    194187} \
    … …  
    197190#define PS_VECTOR_F64_TO_F32(X64, X32) \
    198191psVector *X32 = psVectorAlloc(X64->n, PS_TYPE_F32); \
    199 for (psS32 i=0;i<X64->n;i++) { \
     192for (int i=0;i<X64->n;i++) { \
    200193    X32->data.F32[i] = (float) X64->data.F64[i]; \
    201194} \
    … …  
    203196#define PS_VECTOR_F32_TO_F64(X32, X64) \
    204197psVector *X64 = psVectorAlloc(X32->n, PS_TYPE_F64); \
    205 for (psS32 i=0;i<X32->n;i++) { \
     198for (int i=0;i<X32->n;i++) { \
    206199    X64->data.F64[i] = (float) X32->data.F32[i]; \
    207200} \

  • trunk/psLib/src/dataManip/psMinimize.c

    r2206 r2207  
    99 *  @author GLG, MHPCC
    1010 *
    11  *  @version $Revision: 1.62 $ $Name: not supported by cvs2svn $
    12  *  @date $Date: 2004-10-27 01:15:47 $
     11 *  @version $Revision: 1.63 $ $Name: not supported by cvs2svn $
     12 *  @date $Date: 2004-10-27 01:17:53 $
    1313 *
    1414 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    427427    PS_CHECK_NULL_PTR(min, NULL);
    428428    PS_CHECK_NULL_VECTOR(params, NULL);
    429     PS_CHECK_EMPTY_VECTOR_RETURN_NULL(params);
     429    PS_CHECK_EMPTY_VECTOR(params, NULL);
    430430    PS_CHECK_NULL_PTR(x, NULL);
    431431    PS_CHECK_NULL_VECTOR(y, NULL);
    432     PS_CHECK_EMPTY_VECTOR_RETURN_NULL(y);
     432    PS_CHECK_EMPTY_VECTOR(y, NULL);
    433433    PS_CHECK_VECTOR_SIZE_EQUAL_RETURN_NULL(x, y);
    434434    if (paramMask != NULL) {
    … …  
    857857    PS_CHECK_NULL_1DPOLY_RETURN_NULL(myPoly);
    858858    PS_CHECK_NULL_VECTOR(y, NULL);
    859     PS_CHECK_EMPTY_VECTOR_RETURN_NULL(y);
     859    PS_CHECK_EMPTY_VECTOR(y, NULL);
    860860    psVector *x64 = NULL;
    861861    psVector *y64 = NULL;
    … …  
    13201320{
    13211321    PS_CHECK_NULL_VECTOR(params, NULL);
    1322     PS_CHECK_EMPTY_VECTOR_RETURN_NULL(params);
     1322    PS_CHECK_EMPTY_VECTOR(params, NULL);
    13231323    PS_CHECK_NULL_PTR(min, NULL);
    13241324    PS_CHECK_NULL_PTR(coords, NULL);

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

    r2206 r2207  
    66 *  @author GLG, MHPCC
    77 *
    8  *  @version $Revision: 1.15 $ $Name: not supported by cvs2svn $
    9  *  @date $Date: 2004-10-27 01:15:47 $
     8 *  @version $Revision: 1.16 $ $Name: not supported by cvs2svn $
     9 *  @date $Date: 2004-10-27 01:17:53 $
    1010 *
    1111 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    5454p_psMemSetPersistent(VEC, true); \
    5555p_psMemSetPersistent(VEC->data.V, true); \
    56 for (psS32 i=0;i<N;i++) { \
     56for (int i=0;i<N;i++) { \
    5757    VEC->data.F32[i] = 1.0; \
    5858} \
    … …  
    6262p_psMemSetPersistent(VEC, true); \
    6363p_psMemSetPersistent(VEC->data.V, true); \
    64 for (psS32 i=0;i<N;i++) { \
     64for (int i=0;i<N;i++) { \
    6565    VEC->data.F64[i] = 1.0; \
    6666} \
    … …  
    7070p_psMemSetPersistent(VEC, true); \
    7171p_psMemSetPersistent(VEC->data.V, true); \
    72 for (psS32 i=0;i<N;i++) { \
     72for (int i=0;i<N;i++) { \
    7373    VEC->data.F32[i] = (float) i; \
    7474} \
    … …  
    7878p_psMemSetPersistent(VEC, true); \
    7979p_psMemSetPersistent(VEC->data.V, true); \
    80 for (psS32 i=0;i<N;i++) { \
     80for (int i=0;i<N;i++) { \
    8181    VEC->data.F64[i] = (float) i; \
    8282} \
    … …  
    114114}
    115115
    116 
    117 
    118116/** Preprocessor macro to generate error for zero length vector */
    119 #define PS_CHECK_EMPTY_VECTOR_RETURN_NULL(NAME) \
     117#define PS_CHECK_EMPTY_VECTOR(NAME, RVAL) \
    120118if (NAME->n < 1) { \
    121119    psError(__func__,"Unallowable operation: %s has zero n value.", #NAME); \
    122     return(NULL); \
    123 } \
    124 
    125 /** Preprocessor macro to generate error for zero length vector */
    126 #define PS_CHECK_EMPTY_VECTOR_RETURN_F0(NAME) \
    127 if (NAME->n < 1) { \
    128     psError(__func__,"Unallowable operation: %s has zero n value.", #NAME); \
    129     return(0.0); \
    130 } \
     120    return(RVAL); \
     121} \
     122
     123
    131124
    132125/** Preprocessor macro to generate error on differing size vectors */
    … …  
    190183
    191184#define PS_PRINT_VECTOR(NAME) \
    192 for (psS32 my_i=0;my_i<NAME->n;my_i++) { \
     185for (int my_i=0;my_i<NAME->n;my_i++) { \
    193186    printf("%s->data.F32[%d] is %f\n", #NAME, my_i, NAME->data.F32[my_i]); \
    194187} \
    … …  
    197190#define PS_VECTOR_F64_TO_F32(X64, X32) \
    198191psVector *X32 = psVectorAlloc(X64->n, PS_TYPE_F32); \
    199 for (psS32 i=0;i<X64->n;i++) { \
     192for (int i=0;i<X64->n;i++) { \
    200193    X32->data.F32[i] = (float) X64->data.F64[i]; \
    201194} \
    … …  
    203196#define PS_VECTOR_F32_TO_F64(X32, X64) \
    204197psVector *X64 = psVectorAlloc(X32->n, PS_TYPE_F64); \
    205 for (psS32 i=0;i<X32->n;i++) { \
     198for (int i=0;i<X32->n;i++) { \
    206199    X64->data.F64[i] = (float) X32->data.F32[i]; \
    207200} \

  • trunk/psLib/src/math/psMinimize.c

    r2206 r2207  
    99 *  @author GLG, MHPCC
    1010 *
    11  *  @version $Revision: 1.62 $ $Name: not supported by cvs2svn $
    12  *  @date $Date: 2004-10-27 01:15:47 $
     11 *  @version $Revision: 1.63 $ $Name: not supported by cvs2svn $
     12 *  @date $Date: 2004-10-27 01:17:53 $
    1313 *
    1414 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    427427    PS_CHECK_NULL_PTR(min, NULL);
    428428    PS_CHECK_NULL_VECTOR(params, NULL);
    429     PS_CHECK_EMPTY_VECTOR_RETURN_NULL(params);
     429    PS_CHECK_EMPTY_VECTOR(params, NULL);
    430430    PS_CHECK_NULL_PTR(x, NULL);
    431431    PS_CHECK_NULL_VECTOR(y, NULL);
    432     PS_CHECK_EMPTY_VECTOR_RETURN_NULL(y);
     432    PS_CHECK_EMPTY_VECTOR(y, NULL);
    433433    PS_CHECK_VECTOR_SIZE_EQUAL_RETURN_NULL(x, y);
    434434    if (paramMask != NULL) {
    … …  
    857857    PS_CHECK_NULL_1DPOLY_RETURN_NULL(myPoly);
    858858    PS_CHECK_NULL_VECTOR(y, NULL);
    859     PS_CHECK_EMPTY_VECTOR_RETURN_NULL(y);
     859    PS_CHECK_EMPTY_VECTOR(y, NULL);
    860860    psVector *x64 = NULL;
    861861    psVector *y64 = NULL;
    … …  
    13201320{
    13211321    PS_CHECK_NULL_VECTOR(params, NULL);
    1322     PS_CHECK_EMPTY_VECTOR_RETURN_NULL(params);
     1322    PS_CHECK_EMPTY_VECTOR(params, NULL);
    13231323    PS_CHECK_NULL_PTR(min, NULL);
    13241324    PS_CHECK_NULL_PTR(coords, NULL);

  • trunk/psLib/src/sysUtils/psSysUtilsErrors.h

    r1905 r2207  
    77 *  @author Robert DeSonia, MHPCC
    88 *
    9  *  @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
    10  *  @date $Date: 2004-09-27 20:38:02 $
     9 *  @version $Revision: 1.10 $ $Name: not supported by cvs2svn $
     10 *  @date $Date: 2004-10-27 01:17:53 $
    1111 *
    1212 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    4747#define PS_ERRORTEXT_psTrace_FAILED_TO_ADD_COMPONENT "Failed to set trace level (%d) to '%s'."
    4848#define PS_ERRORTEXT_psErrorCode_NULL_ERRORDESCRIPTION "Specified psErrorDescription pointer can not be NULL."
    49 #define PS_ERRORTEXT_psErrorCode_ERRORCODE_REGISTER_FAILED "Failed to add input psErrorDescription at array index %d"
     49#define PS_ERRORTEXT_psErrorCode_ERRORCODE_REGISTER_FAILED "Failed to add input psErrorDescription at array index %d."
    5050//~End
    5151
Note: See TracChangeset for help on using the changeset viewer.