Changeset 5530 for trunk/psLib/src/math

Timestamp:

Nov 16, 2005, 1:07:10 PM (21 years ago)

Author:

desonia

Message:

removed *(type*)& syntax for setting const values of struts.

Location:

trunk/psLib/src/math

Files:

• psMinimize.c (modified) (4 diffs)
• psMinimize.h (modified) (2 diffs)
• psStats.c (modified) (4 diffs)

trunk/psLib/src/math/psMinimize.c

@@ -10 +10 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.144 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-10-28 19:15:04 $
+ *  @version $Revision: 1.145 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-11-16 23:06:19 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -17 +17 @@
  *  XXX: must follow coding name standards on local functions.
  *  XXX: put local functions in front.
- * 
+ *
  */
 /*****************************************************************************/
@@ -596 +596 @@
     psMinimization *min = psAlloc(sizeof(psMinimization));
     psMemSetDeallocator(min, (psFreeFunc)minimizationFree);
-    *(int*)&min->maxIter = maxIter;
-    *(float*)&min->tol = tol;
+    P_PSMINIMIZATION_SET_MAXITER(min,maxIter);
+    P_PSMINIMIZATION_SET_TOL(min,tol);
     min->value = 0.0;
     min->iter = 0;
@@ -1164 +1164 @@
         for (i=0;i<numDims;i++) {
             if (myParamMask->data.U8[i] == 0) {
-                *(int*)&dummyMin.maxIter = PS_MINIMIZE_POWELL_LINEMIN_MAX_ITERATIONS;
+                P_PSMINIMIZATION_SET_MAXITER((&dummyMin),PS_MINIMIZE_POWELL_LINEMIN_MAX_ITERATIONS);
                 *(float*)&dummyMin.tol = PS_MINIMIZE_POWELL_LINEMIN_ERROR_TOLERANCE;
                 mul = p_psLineMin(&dummyMin,

trunk/psLib/src/math/psMinimize.h

@@ -8 +8 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.59 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-09-29 02:16:19 $
+ *  @version $Revision: 1.60 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-11-16 23:06:19 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -52 +52 @@
 psMinimization;
 
-/** Allocates a psMinimization structure.
- *
- *  @return psMinimization* :   a new psMinimization struct
-*/
-psMinimization *psMinimizationAlloc(
-    int maxIter,                       ///< Number of minimization iterations to perform.
-    float tol                          ///< Requested error tolerance
-);
+#define P_PSMINIMIZATION_SET_MAXITER(m,val) *(int*)&m->maxIter = val
+        #define P_PSMINIMIZATION_SET_TOL(m,val) *(float*)&m->tol = val
+
+
+                /** Allocates a psMinimization structure.
+                 *
+                 *  @return psMinimization* :   a new psMinimization struct
+                */
+                psMinimization *psMinimizationAlloc(
+                    int maxIter,                       ///< Number of minimization iterations to perform.
+                    float tol                          ///< Requested error tolerance
+                );
 
 /** Checks the type of a particular pointer.

trunk/psLib/src/math/psStats.c

@@ -17 +17 @@
 *
 *
-*  @version $Revision: 1.150 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-11-15 20:10:32 $
+*  @version $Revision: 1.151 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-11-16 23:06:19 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -2334 +2334 @@
     newHist = (psHistogram* ) psAlloc(sizeof(psHistogram));
     psMemSetDeallocator(newHist, (psFreeFunc) histogramFree);
-    newHist->bounds = psVectorAlloc(n + 1, PS_TYPE_F32);
-    *(int *)&newHist->bounds->n = newHist->bounds->nalloc;
+    psVector* newBounds = psVectorAlloc(n + 1, PS_TYPE_F32);
+    newHist->bounds = newBounds;
+    newBounds->n = newHist->bounds->nalloc;
 
     // Calculate the bounds for each bin.
@@ -2343 +2344 @@
     binSize += FLT_EPSILON;
     for (i = 0; i < n + 1; i++) {
-        newHist->bounds->data.F32[i] = lower + (binSize * (psF32)i);
+        newBounds->data.F32[i] = lower + (binSize * (psF32)i);
     }
 
@@ -2383 +2384 @@
     newHist = (psHistogram* ) psAlloc(sizeof(psHistogram));
     psMemSetDeallocator(newHist, (psFreeFunc) histogramFree);
-    newHist->bounds = psVectorAlloc(bounds->n, PS_TYPE_F32);
-    *(int *)&newHist->bounds->n = newHist->bounds->nalloc;
+    psVector* newBounds = psVectorAlloc(bounds->n, PS_TYPE_F32);
+    newHist->bounds = newBounds;
+    newBounds->n = newHist->bounds->nalloc;
     for (i = 0; i < bounds->n; i++) {
-        newHist->bounds->data.F32[i] = bounds->data.F32[i];
+        newBounds->data.F32[i] = bounds->data.F32[i];
     }