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

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)

File:

• branches/eam_branches/ipp-20230313/psLib/test/math/tap_psMinimizeLMM.c (modified) (4 diffs)

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);