Changeset 1073 for trunk/psLib/src/math/psStats.c

Timestamp:

Jun 23, 2004, 1:00:17 PM (22 years ago)

Author:

desonia

Message:

Changed the means of deallocation of memory. ps_Alloc now registers an optional free function to handle any additional processing of a memory object.

File:

• trunk/psLib/src/math/psStats.c (modified) (12 diffs)

trunk/psLib/src/math/psStats.c

@@ -32 +32 @@
                            psStats *stats);
 #endif
+
+static void histogramFree(psHistogram *myHist);
 
 /******************************************************************************
@@ -68 +70 @@
 
 /******************************************************************************
-    psStatsFree(): This routine must free the psStats data structure.
- *****************************************************************************/
-void psStatsFree(psStats *stats)
-{
-    psFree(stats);
-}
-
-/******************************************************************************
 psHistogramAlloc(lower, upper, n): allocate a uniform histogram structure
 with the specifed upper and lower limits, and the specifed number of bins.
@@ -108 +102 @@
     // bins, then there are N+1 bounds to those bins.
     newHist = (psHistogram *) psAlloc(sizeof(psHistogram));
+    p_psMemSetDeallocator(newHist,(psFreeFcn)histogramFree);
     newHist->bounds = psVectorAlloc(n+1, PS_TYPE_F32);
     newHist->bounds->n = newHist->bounds->nalloc;
@@ -160 +155 @@
     // Allocate memory for the new histogram structure.
     newHist = (psHistogram *) psAlloc(sizeof(psHistogram));
+    p_psMemSetDeallocator(newHist,(psFreeFcn)histogramFree);
     newHist->bounds = psVectorAlloc(bounds->n, PS_TYPE_F32);
     newHist->bounds->n = newHist->bounds->nalloc;
@@ -182 +178 @@
 }
 
-void psHistogramFree(psHistogram *myHist)
-{
-    psVectorFree(myHist->bounds);
-    psVectorFree(myHist->nums);
-    psFree(myHist);
+static void histogramFree(psHistogram *myHist)
+{
+    psFree(myHist->bounds);
+    psFree(myHist->nums);
 }
 
@@ -618 +613 @@
 
         // Free temporary data buffers.
-        psStatsFree(stats2);
+        psFree(stats2);
 
         // Set the PS_STAT_ROBUST_FOR_SAMPLE bit in the stats structure.
@@ -688 +683 @@
 
     // Free the temporary data structures.
-    psVectorFree(unsortedVector);
-    psVectorFree(sortedVector);
+    psFree(unsortedVector);
+    psFree(sortedVector);
 }
 
@@ -775 +770 @@
 
         // Free temporary data buffers.
-        psStatsFree(stats2);
+        psFree(stats2);
 
         // Set the PS_STAT_ROBUST_FOR_SAMPLE bit in the stats structure.
@@ -840 +835 @@
 
     // Free the temporary data structures.
-    psVectorFree(unsortedVector);
-    psVectorFree(sortedVector);
+    psFree(unsortedVector);
+    psFree(sortedVector);
     // NOTE: This is the
 }
@@ -1043 +1038 @@
     }
 
-    psVectorFree(tmpMask);
+    psFree(tmpMask);
 }
 
@@ -1125 +1120 @@
             stats->robustLQ = stats->clippedMean;
         }
-        psStatsFree(tmpStats);
-        psHistogramFree(robustHistogram);
+        psFree(tmpStats);
+        psFree(robustHistogram);
         return;
     }
@@ -1200 +1195 @@
     stats->robustNfit = 0.0;
     stats->robustN50 = 0.0;
-    psStatsFree(tmpStats);
-    psHistogramFree(robustHistogram);
+    psFree(tmpStats);
+    psFree(robustHistogram);
 }