Changeset 25834 for branches/pap/psModules/src/imcombine/pmSubtraction.c

Timestamp:

Oct 13, 2009, 11:30:52 PM (17 years ago)

Author:

Paul Price

Message:

Reworked dual convolution equation setup. Fixing up debugging (output of individual kernel basis functions). Not working yet --- the corresponding k1 and k2 terms appear anti-correllated: when k1_i is strongly positive, k2_i is strongly negative.

File:

• branches/pap/psModules/src/imcombine/pmSubtraction.c (modified) (2 diffs)

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

@@ -964 +964 @@
 }
 
-#if 0
+#if 1
 psArray *pmSubtractionKernelSolutions(const pmSubtractionKernels *kernels, float x, float y, bool wantDual)
 {
@@ -972 +972 @@
     PS_ASSERT_FLOAT_WITHIN_RANGE(y, -1.0, 1.0, NULL);
 
-    psArray *images = psArrayAlloc(kernels->solution1->n - 1); // Images of each kernel to return
-    psVector *fakeSolution = psVectorAlloc(kernels->solution1->n, PS_TYPE_F64); // Fake solution vector
-    psVectorInit(fakeSolution, 0.0);
-
-    for (int i = 0; i < kernels->solution1->n - 1; i++) {
-        fakeSolution->data.F64[i] = kernels->solution1->data.F64[i];
+    psVector *solution = wantDual ? kernels->solution2 : kernels->solution1; // Solution of interest
+    psVector *backup = psVectorCopy(NULL, solution, PS_TYPE_F64);  // Backup version
+
+    int num = wantDual ? solution->n - 1 : solution->n; // Number of kernel basis functions
+
+    psArray *images = psArrayAlloc(num); // Images of each kernel to return
+    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);
-        fakeSolution->data.F64[i] = 0.0;
-    }
-
-    psFree(fakeSolution);
+        solution->data.F64[i] = 0.0;
+    }
+    psVectorCopy(solution, backup, PS_TYPE_F64);
+    psFree(backup);
 
     return images;