Changeset 3813 for trunk/pois/src

Timestamp:

Apr 29, 2005, 10:53:49 AM (21 years ago)

Author:

rhl

Message:

Make poisRejectStamps return a list of rejected stamps

Location:

trunk/pois/src

Files:

• pois.c (modified) (2 diffs)
• pois.h (modified) (1 diff)
• poisFindStamps.c (modified) (2 diffs)
• poisRejectStamps.c (modified) (6 diffs)

trunk/pois/src/pois.c

@@ -114 +114 @@
 
     // Iterate for a good solution
-    bool badStamps = true;              // Do we have bad stamps, such that we need to continue to iterate?
+    psList *badStamps = NULL;           // Do we have bad stamps, such that we need to continue to iterate?
     for (int iterNum = 0; iterNum < config->numIter && badStamps; iterNum++) {
         psTrace("pois", 1, "Iteration %d...\n", iterNum);
 
+        psFree(badStamps);              // left over from last iteration
+        
         // Find stamps
         stamps = poisFindStamps(stamps, refImage, mask, config);
@@ -175 +177 @@
     // If there was rejection on the last round, re-solve the equation using only the good stamps
     if (badStamps) {
+        psFree(badStamps);
         solution = poisSolveEquation(solution, stamps, config);
     }

trunk/pois/src/pois.h

@@ -173 +173 @@
 
 // Reject stamps, based on the deviations
-bool poisRejectStamps(psArray *stamps,  // Array of stamps
-                      psImage *mask,    // Mask image
-                      const psVector *deviations, // Vector of deviations for the stamps
-                      const poisConfig *config // Configuration
+psList *restrict poisRejectStamps(psArray *stamps,      // Array of stamps
+                                  psImage *mask,        // Mask image
+                                  const psVector *deviations, // Vector of deviations for the stamps
+                                  const poisConfig *config // Configuration
     );
 

trunk/pois/src/poisFindStamps.c

@@ -33 +33 @@
     if (stamps == NULL) {
         stamps = psArrayAlloc(nsx * nsy);
-        // Initialise
+                                        // Initialise; should be done by psArrayAlloc
         for (int i = 0; i < nsx * nsy; i++) {
-            stamps->data[i] = poisStampAlloc();
+            stamps->data[i] = NULL;
         }
     }
@@ -44 +44 @@
         for (int j = 0; j < nsy; j++) {
             poisStamp *stamp = stamps->data[num]; // The stamp
+            if (stamp == NULL) {
+                stamp = stamps->data[num] = poisStampAlloc();
+            }
 
             // Only find a new stamp if we need to

trunk/pois/src/poisRejectStamps.c

@@ -6 +6 @@
 #define SQUARE(x) ((x)*(x))
 
-bool poisRejectStamps(psArray *stamps,  // Array of stamps
-                      psImage *mask,    // Mask image
-                      const psVector *deviations, // Vector of deviations for the stamps
-                      const poisConfig *config // Configuration
+psList *restrict poisRejectStamps(psArray *stamps, // Array of stamps
+                                  psImage *mask,        // Mask image
+                                  const psVector *deviations, // Vector of deviations for the stamps
+                                  const poisConfig *config // Configuration
     )
 {
@@ -21 +21 @@
     assert(deviations->type.type == PS_TYPE_F32);
 
-    bool masked = false;                // Have we masked any stamps?
     psVector *devMask = psVectorAlloc(stamps->n, PS_TYPE_U8); // Mask for statistics
 
@@ -30 +29 @@
         poisStamp *stamp = stamps->data[i];     // The stamp
         // Only interested in the stamps that we're actually using
-        if (stamp->status == POIS_STAMP_USED) {
+        if (stamp != NULL && stamp->status == POIS_STAMP_USED) {
             meanDev += SQUARE(deviations->data.F32[i]);
             numDev++;
@@ -41 +40 @@
 
     // Reject stamps
+    psList *rejected = NULL;            // rejected stamps
     for (int s = 0; s < deviations->n; s++) {
         poisStamp *stamp = stamps->data[s];
+        if (stamp == NULL) {
+            continue;
+        }
+        
         if (stamp->status == POIS_STAMP_USED && fabsf(deviations->data.F32[s]) > limit) {
-            masked = true;
             psTrace("pois.rejectStamps", 1, "Rejecting stamp %d (%d,%d): %f\n", s, stamp->x, stamp->y,
                     deviations->data.F32[s]);
@@ -56 +59 @@
             
             // Mark stamp for replacement
-            stamp->status = POIS_STAMP_RESET;
+            stamps->data[s] = NULL;
+            
+            if (rejected == NULL) {
+                rejected = psListAlloc(stamp);
+            } else {
+                bool failed = psListAdd(rejected, PS_LIST_TAIL, stamp);
+                assert(!failed);
+            }
+            psFree(stamp);
         } // Bad stamps
     } // Iterating over stamps
@@ -62 +73 @@
     psFree(devMask);
 
-    return masked;
+    return rejected;
 }