Changeset 7765

Timestamp:

Jun 29, 2006, 3:57:46 PM (20 years ago)

Author:

Paul Price

Message:

Removed macros to create static variables.
Removed PS_IMAGE_SET macros: use psImageInit.

File:

• trunk/psLib/src/math/psConstants.h (modified) (5 diffs)

trunk/psLib/src/math/psConstants.h

@@ -6 +6 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.91 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-06-30 01:06:29 $
+ *  @version $Revision: 1.92 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-06-30 01:57:46 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -24 +24 @@
  */
 
-#include<math.h> // for M_PI
-
-/*****************************************************************************
-These constants are used by various functions in the psLib.
- *****************************************************************************/
-#define PS_DETERMINE_BRACKET_STEP_SIZE 0.10
-#define PS_MAX_LMM_ITERATIONS 100
-#define PS_MAX_MINIMIZE_ITERATIONS 100
-#define PS_LEFT_SPLINE_DERIV 0.0
-#define PS_RIGHT_SPLINE_DERIV 0.0
+#include <math.h> // for M_PI
+
 /*****************************************************************************
 These are common mathimatical constants used by various functions in the psLib.
@@ -387 +379 @@
 } \
 
-// The following macros declare and allocate a static polynomial of the
-// specified order and type.
-
-#define PS_POLY_1D_DECLARE_ALLOC_STATIC(NAME, ORDER, TYPE) \
-static psPolynomial1D *(NAME) = NULL; \
-if ((NAME) == NULL) { \
-    (NAME) = psPolynomial1DAlloc(TYPE, ORDER); \
-    p_psMemSetPersistent((NAME), true); \
-    p_psMemSetPersistent((NAME)->coeff, true); \
-    p_psMemSetPersistent((NAME)->coeffErr, true); \
-    p_psMemSetPersistent((NAME)->mask, true); \
-} \
-
-#define PS_POLY_1D_D_DECLARE_ALLOC_STATIC(NAME, ORDER, TYPE) \
-static psPolynomial1D *(NAME) = NULL; \
-if ((NAME) == NULL) { \
-    (NAME) = psPolynomial1DAlloc(TYPE, ORDER); \
-    p_psMemSetPersistent((NAME), true); \
-} \
-
 #define PS_POLY_PRINT_1D(NAME) \
 printf("Poly %s: (nX) is (%d)\n", #NAME, NAME->nX);\
@@ -515 +487 @@
 }\
 
-#define PS_IMAGE_SET_U8(NAME, VALUE) \
-for (int i = 0 ; i < (NAME)->numRows ; i++) { \
-    for (int j = 0 ; j < (NAME)->numCols ; j++) { \
-        (NAME)->data.U8[i][j] = (VALUE); \
-    } \
-}\
-
-#define PS_IMAGE_SET_U16(NAME, VALUE) \
-for (int i = 0 ; i < (NAME)->numRows ; i++) { \
-    for (int j = 0 ; j < (NAME)->numCols ; j++) { \
-        (NAME)->data.U16[i][j] = (VALUE); \
-    } \
-}\
-
-#define PS_IMAGE_SET_U32(NAME, VALUE) \
-for (int i = 0 ; i < (NAME)->numRows ; i++) { \
-    for (int j = 0 ; j < (NAME)->numCols ; j++) { \
-        (NAME)->data.U32[i][j] = (VALUE); \
-    } \
-}\
-
-#define PS_IMAGE_SET_U64(NAME, VALUE) \
-for (int i = 0 ; i < (NAME)->numRows ; i++) { \
-    for (int j = 0 ; j < (NAME)->numCols ; j++) { \
-        (NAME)->data.U64[i][j] = (VALUE); \
-    } \
-}\
-
-#define PS_IMAGE_SET_S8(NAME, VALUE) \
-for (int i = 0 ; i < (NAME)->numRows ; i++) { \
-    for (int j = 0 ; j < (NAME)->numCols ; j++) { \
-        (NAME)->data.S8[i][j] = (VALUE); \
-    } \
-}\
-
-#define PS_IMAGE_SET_S16(NAME, VALUE) \
-for (int i = 0 ; i < (NAME)->numRows ; i++) { \
-    for (int j = 0 ; j < (NAME)->numCols ; j++) { \
-        (NAME)->data.S16[i][j] = (VALUE); \
-    } \
-}\
-
-#define PS_IMAGE_SET_S32(NAME, VALUE) \
-for (int i = 0 ; i < (NAME)->numRows ; i++) { \
-    for (int j = 0 ; j < (NAME)->numCols ; j++) { \
-        (NAME)->data.S32[i][j] = (VALUE); \
-    } \
-}\
-
-#define PS_IMAGE_SET_S64(NAME, VALUE) \
-for (int i = 0 ; i < (NAME)->numRows ; i++) { \
-    for (int j = 0 ; j < (NAME)->numCols ; j++) { \
-        (NAME)->data.S64[i][j] = (VALUE); \
-    } \
-}\
-
-#define PS_IMAGE_SET_F32(NAME, VALUE) \
-for (int i = 0 ; i < (NAME)->numRows ; i++) { \
-    for (int j = 0 ; j < (NAME)->numCols ; j++) { \
-        (NAME)->data.F32[i][j] = (VALUE); \
-    } \
-}\
-
-#define PS_IMAGE_SET_F64(NAME, VALUE) \
-for (int i = 0 ; i < (NAME)->numRows ; i++) { \
-    for (int j = 0 ; j < (NAME)->numCols ; j++) { \
-        (NAME)->data.F64[i][j] = (VALUE); \
-    } \
-}\
-
 /*****************************************************************************
     Misc. macros:
@@ -597 +499 @@
 ((A) * (A))
 
-#define PRINT_MEMLEAKS(NUM) \
-printf("A: ---------------------------------------- (ID: %d)\n", NUM); \
-memLeaks = psMemCheckLeaks(currentId,NULL,stderr,false); \
-printf("B: ---------------------------------------- (%d)\n", memLeaks); \
-
 # define PS_SWAP(X,Y) {double tmp=(X); (X) = (Y); (Y) = tmp;}