Changeset 6891 for trunk/pois/src/poisKernelBasisFunctions.c

Timestamp:

Apr 18, 2006, 12:42:12 PM (20 years ago)

Author:

Paul Price

Message:

Updating to psLib rel11. Most changes are setting the 'n' element of the vector or array upon allocation. Needed to change the way the image subsets are done: not sure why we switched back to the old method of trim regions, but it seems we did.

File:

• trunk/pois/src/poisKernelBasisFunctions.c (modified) (1 diff)

trunk/pois/src/poisKernelBasisFunctions.c

@@ -14 +14 @@
     int yKernelHalfSize = config->yKernel; // Half size of kernel in y
     int spatialOrder = config->spatialOrder; // Order of spatial variations
-        
+
     // Number of basis functions
     int nBF = (2 * xKernelHalfSize + 1) * (2 * yKernelHalfSize + 1) * (spatialOrder + 1) *
-        (spatialOrder + 2) / 2;
+        (spatialOrder + 2) / 2;
 
-    psArray *array = psArrayAlloc(nBF); // Array to hold the basis functions
+    psArray *array = psArrayAlloc(nBF); // Array to hold the basis functions
+    array->n = nBF;
 
-    int num = 0;                        // Kernel parameter number
+    int num = 0;                        // Kernel parameter number
 
     // Put the (u,v) = (0,0) component right at the start of the list for convenience
     for (int order = 0; order <= spatialOrder; order++) {
-        for (int i = 0; i <= order; i++) {
-            int j = order - i;
-            poisKernelBasis *kernel = psAlloc(sizeof(poisKernelBasis));
-            kernel->u = 0;
-            kernel->v = 0;
-            kernel->xOrder = i;
-            kernel->yOrder = j;
+        for (int i = 0; i <= order; i++) {
+            int j = order - i;
+            poisKernelBasis *kernel = psAlloc(sizeof(poisKernelBasis));
+            kernel->u = 0;
+            kernel->v = 0;
+            kernel->xOrder = i;
+            kernel->yOrder = j;
 
-            // Stuff into the array
-            array->data[num] = kernel;
+            // Stuff into the array
+            array->data[num] = kernel;
 
-            psTrace("pois.kernelBasisFunctions", 3, "--> %d: (%d,%d) x^%d y^%d\n", i, kernel->u,
-                    kernel->v, kernel->xOrder, kernel->yOrder);
-            num++;
-        }
+            psTrace("pois.kernelBasisFunctions", 3, "--> %d: (%d,%d) x^%d y^%d\n", i, kernel->u,
+                    kernel->v, kernel->xOrder, kernel->yOrder);
+            num++;
+        }
     }
 
     // Iterate over (u,v)
     for (int u = -xKernelHalfSize; u <= xKernelHalfSize; u++) {
-        for (int v = -yKernelHalfSize; v <= yKernelHalfSize; v++) {
+        for (int v = -yKernelHalfSize; v <= yKernelHalfSize; v++) {
 
-            // Already did (u,v) = (0,0): it's at the start, so skip it now.
-            if ((u != 0) || (v != 0)) {
+            // Already did (u,v) = (0,0): it's at the start, so skip it now.
+            if ((u != 0) || (v != 0)) {
 
-                // Iterate over spatial order
-                for (int order = 0; order <= spatialOrder; order++) {
+                // Iterate over spatial order
+                for (int order = 0; order <= spatialOrder; order++) {
 
-                    for (int i = 0; i <= order; i++) {
-                        int j = order - i;
-                        poisKernelBasis *kernel = psAlloc(sizeof(poisKernelBasis));
+                    for (int i = 0; i <= order; i++) {
+                        int j = order - i;
+                        poisKernelBasis *kernel = psAlloc(sizeof(poisKernelBasis));
 
-                        kernel->u = u;
-                        kernel->v = v;
-                        kernel->xOrder = i;
-                        kernel->yOrder = j;
+                        kernel->u = u;
+                        kernel->v = v;
+                        kernel->xOrder = i;
+                        kernel->yOrder = j;
 
-                        // Stuff into the array
-                        array->data[num] = kernel;
+                        // Stuff into the array
+                        array->data[num] = kernel;
 
-                        psTrace("pois.kernelBasisFunctions", 3, "--> %d: (%d,%d) x^%d y^%d\n", num,
-                                kernel->u, kernel->v, kernel->xOrder, kernel->yOrder);
-                        num++;
-                    }
-                } // Iterating over spatial order
-            } // Except (u,v) = (0,0)
-        }
+                        psTrace("pois.kernelBasisFunctions", 3, "--> %d: (%d,%d) x^%d y^%d\n", num,
+                                kernel->u, kernel->v, kernel->xOrder, kernel->yOrder);
+                        num++;
+                    }
+                } // Iterating over spatial order
+            } // Except (u,v) = (0,0)
+        }
     } // Iterating over (u,v)