Changeset 21471 for trunk/psModules/test/objects/tap_pmSourceSky.c

Timestamp:

Feb 13, 2009, 12:41:28 PM (17 years ago)

Author:

giebink

Message:

Account for weight(s) to variance(s) change

File:

• trunk/psModules/test/objects/tap_pmSourceSky.c (modified) (7 diffs)

trunk/psModules/test/objects/tap_pmSourceSky.c

@@ -153 +153 @@
         psMemId id = psMemGetId();
         pmSource *src = pmSourceAlloc();
-        src->weight = psImageAlloc(TEST_NUM_COLS, TEST_NUM_ROWS, PS_TYPE_F32);
-        for (int i =0 ; i < src->weight->numRows ; i++) {
-            for (int j = 0 ; j < src->weight->numCols ; j++) {
-                src->weight->data.F32[i][j] = (float) (i + j);
+        src->variance = psImageAlloc(TEST_NUM_COLS, TEST_NUM_ROWS, PS_TYPE_F32);
+        for (int i =0 ; i < src->variance->numRows ; i++) {
+            for (int j = 0 ; j < src->variance->numCols ; j++) {
+                src->variance->data.F32[i][j] = (float) (i + j);
             }
         }
@@ -168 +168 @@
 
 
-    // Call pmSourceLocalSkyVariance() with NULL pmSource->weight input parameter
+    // Call pmSourceLocalSkyVariance() with NULL pmSource->variance input parameter
     {
         psMemId id = psMemGetId();
@@ -175 +175 @@
         src->peak = pmPeakAlloc(1, 2, 3.0, PM_PEAK_LONE);
         bool rc = pmSourceLocalSkyVariance(src, PS_STAT_SAMPLE_MEAN, 10.0, 1, 2);
-        ok(rc == false, "pmSourceLocalSkyVariance() returned FALSE with NULL pmSource->weight input parameter");
+        ok(rc == false, "pmSourceLocalSkyVariance() returned FALSE with NULL pmSource->variance input parameter");
         psFree(src);
         ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
@@ -185 +185 @@
         psMemId id = psMemGetId();
         pmSource *src = pmSourceAlloc();
-        src->weight = psImageAlloc(TEST_NUM_COLS, TEST_NUM_ROWS, PS_TYPE_F32);
-        for (int i =0 ; i < src->weight->numRows ; i++) {
-            for (int j = 0 ; j < src->weight->numCols ; j++) {
-                src->weight->data.F32[i][j] = (float) (i + j);
+        src->variance = psImageAlloc(TEST_NUM_COLS, TEST_NUM_ROWS, PS_TYPE_F32);
+        for (int i =0 ; i < src->variance->numRows ; i++) {
+            for (int j = 0 ; j < src->variance->numCols ; j++) {
+                src->variance->data.F32[i][j] = (float) (i + j);
             }
         }
@@ -203 +203 @@
         psMemId id = psMemGetId();
         pmSource *src = pmSourceAlloc();
-        src->weight = psImageAlloc(TEST_NUM_COLS, TEST_NUM_ROWS, PS_TYPE_F32);
-        for (int i =0 ; i < src->weight->numRows ; i++) {
-            for (int j = 0 ; j < src->weight->numCols ; j++) {
-                src->weight->data.F32[i][j] = (float) (i + j);
+        src->variance = psImageAlloc(TEST_NUM_COLS, TEST_NUM_ROWS, PS_TYPE_F32);
+        for (int i =0 ; i < src->variance->numRows ; i++) {
+            for (int j = 0 ; j < src->variance->numCols ; j++) {
+                src->variance->data.F32[i][j] = (float) (i + j);
             }
         }
@@ -221 +221 @@
         psMemId id = psMemGetId();
         pmSource *src = pmSourceAlloc();
-        src->weight = psImageAlloc(TEST_NUM_COLS, TEST_NUM_ROWS, PS_TYPE_F32);
-        for (int i =0 ; i < src->weight->numRows ; i++) {
-            for (int j = 0 ; j < src->weight->numCols ; j++) {
-                src->weight->data.F32[i][j] = (float) (i + j);
+        src->variance = psImageAlloc(TEST_NUM_COLS, TEST_NUM_ROWS, PS_TYPE_F32);
+        for (int i =0 ; i < src->variance->numRows ; i++) {
+            for (int j = 0 ; j < src->variance->numCols ; j++) {
+                src->variance->data.F32[i][j] = (float) (i + j);
             }
         }
@@ -245 +245 @@
         psMemId id = psMemGetId();
         pmSource *src = pmSourceAlloc();
-        src->weight = psImageAlloc(TEST_NUM_COLS, TEST_NUM_ROWS, PS_TYPE_F32);
+        src->variance = psImageAlloc(TEST_NUM_COLS, TEST_NUM_ROWS, PS_TYPE_F32);
         src->maskObj = psImageAlloc(TEST_NUM_COLS, TEST_NUM_ROWS, PS_TYPE_MASK);
         psF32 mean = 0.0;
-        for (int i = 0 ; i < src->weight->numRows ; i++) {
-            for (int j = 0 ; j < src->weight->numCols ; j++) {
-                src->weight->data.F32[i][j] = (float) (i + j);
+        for (int i = 0 ; i < src->variance->numRows ; i++) {
+            for (int j = 0 ; j < src->variance->numCols ; j++) {
+                src->variance->data.F32[i][j] = (float) (i + j);
                 mean+= (float) (i + j);
                 src->maskObj->data.U8[i][j] = 0;