Changeset 25841

Timestamp:

Oct 14, 2009, 12:50:17 PM (17 years ago)

Author:

Paul Price

Message:

Working on dual convolution.... not happy yet.

Location:

branches/pap/psModules/src/imcombine

Files:

• pmSubtraction.c (modified) (7 diffs)
• pmSubtractionAnalysis.c (modified) (1 diff)
• pmSubtractionEquation.c (modified) (1 diff)
• pmSubtractionKernels.c (modified) (1 diff)

branches/pap/psModules/src/imcombine/pmSubtraction.c

@@ -70 +70 @@
                               const pmSubtractionKernels *kernels, // Kernel basis functions
                               const psImage *polyValues, // Spatial polynomial values
+                              bool normalise,            // Add normalisation?
                               bool wantDual // Want the dual (second) kernel?
                               )
@@ -178 +179 @@
     }
 
-    // Put in the normalisation component
-    kernel->kernel[0][0] += (wantDual ? 1.0 : p_pmSubtractionSolutionNorm(kernels));
+    if (normalise) {
+        // Put in the normalisation component
+        kernel->kernel[0][0] += (wantDual ? 1.0 : p_pmSubtractionSolutionNorm(kernels));
+    }
 
     return kernel;
@@ -349 +352 @@
     )
 {
-    *kernelImage = solvedKernel(*kernelImage, kernels, polyValues, wantDual);
+    *kernelImage = solvedKernel(*kernelImage, kernels, polyValues, true, wantDual);
     if (variance || subMask) {
         *kernelVariance = varianceKernel(*kernelVariance, *kernelImage);
@@ -466 +469 @@
     psKernel *kernel;                   // Kernel to use
     if (!preKernel) {
-        kernel = solvedKernel(NULL, kernels, polyValues, wantDual);
+        kernel = solvedKernel(NULL, kernels, polyValues, true, wantDual);
     } else {
         kernel = psMemIncrRefCounter(preKernel);
@@ -916 +919 @@
 
     psImage *polyValues = p_pmSubtractionPolynomial(NULL, kernels->spatialOrder, x, y); // Solved polynomial
-    psKernel *kernel = solvedKernel(NULL, kernels, polyValues, wantDual); // The appropriate kernel
+    psKernel *kernel = solvedKernel(NULL, kernels, polyValues, true, wantDual); // The appropriate kernel
     psFree(polyValues);
 
@@ -947 +950 @@
     psImage *polyValues = p_pmSubtractionPolynomial(NULL, kernels->spatialOrder, x, y);
 
-    psKernel *kernel = solvedKernel(NULL, kernels, polyValues, wantDual); // The appropriate kernel
+    psKernel *kernel = solvedKernel(NULL, kernels, polyValues, true, wantDual); // The appropriate kernel
     psFree(polyValues);
 
@@ -977 +980 @@
     int num = wantDual ? solution->n - 1 : solution->n; // Number of kernel basis functions
 
-    psArray *images = psArrayAlloc(num); // Images of each kernel to return
+    psImage *polyValues = p_pmSubtractionPolynomial(NULL, kernels->spatialOrder, x, y); // Solved polynomial
+    psArray *images = psArrayAlloc(num + 1); // Images of each kernel to return
+
+    // The whole kernel
+    {
+        psKernel *kernel = solvedKernel(NULL, kernels, polyValues, true, wantDual); // The appropriate kernel
+        images->data[0] = psMemIncrRefCounter(kernel->image);
+        psFree(kernel);
+    }
+
+    // The parts
     psVectorInit(solution, 0.0);
-
     for (int i = 0; i < num; i++) {
         solution->data.F64[i] = backup->data.F64[i];
-        images->data[i] = pmSubtractionKernelImage(kernels, x, y, wantDual);
+        psKernel *kernel = solvedKernel(NULL, kernels, polyValues, false, wantDual); // The appropriate kernel
+#if 0
+        int size = kernels->size;
+        double sum = 0.0;
+        for (int v = -size; v <= size; v++) {
+            for (int u = -size; u <= size; u++) {
+                sum += kernel->kernel[v][u];
+            }
+        }
+        fprintf(stderr, "Kernel %d: %lf\n", i, sum);
+#endif
+        images->data[i + 1] = psMemIncrRefCounter(kernel->image);
+        psFree(kernel);
         solution->data.F64[i] = 0.0;
     }
+    psFree(polyValues);
     psVectorCopy(solution, backup, PS_TYPE_F64);
     psFree(backup);

branches/pap/psModules/src/imcombine/pmSubtractionAnalysis.c

@@ -16 +16 @@
 #define KERNEL_MOSAIC 2                 // Half-number of kernel instances in the mosaic image
 
-//#define TESTING
+#define TESTING
 
 bool pmSubtractionAnalysis(psMetadata *analysis, psMetadata *header,

branches/pap/psModules/src/imcombine/pmSubtractionEquation.c

@@ -1388 +1388 @@
 
 
-#if 0
+#if 1
         for (int i = 0; i < numParams; i++) {
             double aVal1 = 0.0, bVal1 = 0.0;

branches/pap/psModules/src/imcombine/pmSubtractionKernels.c

@@ -170 +170 @@
                     moment *= PS_SQR(sum);
                 }
+
+
+#if 0
+                double sum = 0.0;   // Sum of kernel component
+                for (int v = -size; v <= size; v++) {
+                    for (int u = -size; u <= size; u++) {
+                        sum += kernel->kernel[v][u];
+                    }
+                }
+                fprintf(stderr, "%d sum: %lf\n", index, sum);
+#endif
 
                 kernels->widths->data.F32[index] = fwhms->data.F32[i];