Changeset 42493 for branches/eam_branches/ipp-20230313/psLib/test/math

Timestamp:

Aug 15, 2023, 4:59:00 AM (3 years ago)

Author:

eugene

Message:

fixing tests so they compile (need to address some API changes to psPlaneTranformAlloc, psImageMapFit; fix unused vars, etc)

Location:

branches/eam_branches/ipp-20230313/psLib/test/math

Files:

• Makefile.am (modified) (1 diff)
• tap_psMinimizeLMM.c (modified) (4 diffs)
• tap_psMinimizePowell.c (modified) (2 diffs)
• tap_psPolyFit_IRLS.c (added)
• tap_psSparse.c (modified) (4 diffs)

branches/eam_branches/ipp-20230313/psLib/test/math/Makefile.am

@@ -23 +23 @@
         tap_psMatrix07 \
         tap_psMatrix08 \
+        tap_psPolyFit_IRLS \
         tap_psPolyFit1D \
         tap_psPolyFit2D \

branches/eam_branches/ipp-20230313/psLib/test/math/tap_psMinimizeLMM.c

@@ -53 +53 @@
 
 #define NUM_ITER 10
-#define TOL  20.0
+#define MIN_TOL  20.0
+#define MAX_TOL  40.0
 psS32 main(psS32 argc, char* argv[])
 {
@@ -64 +65 @@
     {
         psMemId id = psMemGetId();
-        psMinimization *tmp = psMinimizationAlloc(NUM_ITER, TOL);
+        psMinimization *tmp = psMinimizationAlloc(NUM_ITER, MIN_TOL, MAX_TOL);
         ok(tmp != NULL, "psMinimizationAlloc() returned non-NULL");
         skip_start(tmp == NULL, 5, "Skipping tests because psMinimizationAlloc() failed");
         ok(tmp->maxIter == NUM_ITER, "psMinimizationAlloc() properly set ->maxIter");
-        ok(tmp->tol == TOL, "psMinimizationAlloc() properly set ->tol");
+        ok(tmp->minTol == MIN_TOL, "psMinimizationAlloc() properly set ->tol");
+        ok(tmp->maxTol == MAX_TOL, "psMinimizationAlloc() properly set ->tol");
         ok(tmp->value == 0.0, "psMinimizationAlloc() properly set ->value");
         ok(tmp->iter == 0, "psMinimizationAlloc() properly set ->iter (%d)", tmp->iter);
@@ -96 +98 @@
         psMemId id = psMemGetId();
         psRandom *rng = psRandomAllocSpecific(PS_RANDOM_TAUS, 1); // Random number generator; using known seed
-        psMinimization *min = psMinimizationAlloc(NUM_ITERATIONS, ERR_TOL);
+        psMinimization *min = psMinimizationAlloc(NUM_ITERATIONS, ERR_TOL, 100);
         psArray *ordinates = psArrayAlloc(NUM_DATA_POINTS);
         psVector *coordinates = psVectorAlloc(NUM_DATA_POINTS, PS_TYPE_F32);
@@ -204 +206 @@
         psMemId id = psMemGetId();
         psRandom *rng = psRandomAllocSpecific(PS_RANDOM_TAUS, 1); // Random number generator; using known seed
-        psMinimization *min = psMinimizationAlloc(NUM_ITERATIONS, ERR_TOL);
+        psMinimization *min = psMinimizationAlloc(NUM_ITERATIONS, ERR_TOL, 100);
         psArray *ordinates = psArrayAlloc(NUM_DATA_POINTS);
         psVector *coordinates = psVectorAlloc(NUM_DATA_POINTS, PS_TYPE_F32);

branches/eam_branches/ipp-20230313/psLib/test/math/tap_psMinimizePowell.c

@@ -81 +81 @@
         psVector *myParams = psVectorAlloc(NUM_PARAMS, PS_TYPE_F32);
         psVector *myParamMask = psVectorAlloc(NUM_PARAMS, PS_TYPE_U8);
-        psMinimization *min = psMinimizationAlloc(100, 0.01);
+        psMinimization *min = psMinimizationAlloc(100, 0.01, 0.1);
         psArray *myCoords = psArrayAlloc(N);
 
@@ -136 +136 @@
         psMemId id = psMemGetId();
         psVector *myParams = psVectorAlloc(NUM_PARAMS, PS_TYPE_F32);
-        psMinimization *min = psMinimizationAlloc(100, 0.01);
+        psMinimization *min = psMinimizationAlloc(100, 0.01, 0.1);
         psArray *myCoords = psArrayAlloc(N);
         psVector *myParamMask = psVectorAlloc(NUM_PARAMS, PS_TYPE_U8);

branches/eam_branches/ipp-20230313/psLib/test/math/tap_psSparse.c

@@ -1 @@
-    #include <stdio.h>
+#include <stdio.h>
 #include <string.h>
 #include <pslib.h>
@@ -227 +227 @@
         // test the support functions: LowerProduct
         fVec = psSparseBorderLowerProduct(NULL, border, xRef);
-        is_float(fVec->n, 1.0, "f dimen: %d", fVec->n);
+        is_int(fVec->n, 1.0, "f dimen: %d", fVec->n);
         is_float(fVec->data.F32[0], 0.3, "f(0): %f", fVec->data.F32[0]);
         psFree(fVec);
@@ -233 +233 @@
         // test the support functions: Upper Product
         fVec = psSparseBorderUpperProduct(NULL, border, yRef);
-        is_float(fVec->n, 2.0, "f dimen: %d", fVec->n);
+        is_int(fVec->n, 2.0, "f dimen: %d", fVec->n);
         is_float(fVec->data.F32[0], 0.05, "f(0): %f", fVec->data.F32[0]);
         is_float(fVec->data.F32[1], 0.10, "f(0): %f", fVec->data.F32[1]);
@@ -240 +240 @@
         // test the support functions: Square Product
         fVec = psSparseBorderSquareProduct(NULL, border, yRef);
-        is_float(fVec->n, 1.0, "f dimen: %d", fVec->n);
+        is_int(fVec->n, 1.0, "f dimen: %d", fVec->n);
         is_float(fVec->data.F32[0], 0.25, "f(0): %f", fVec->data.F32[0]);
         psFree(fVec);