Changeset 2204 for trunk/psLib/test/dataManip/tst_psMinimize05.c

Timestamp:

Oct 26, 2004, 2:57:34 PM (22 years ago)

Author:

desonia

Message:

converted native C types to ps Types, where practical.

File:

• trunk/psLib/test/dataManip/tst_psMinimize05.c (modified) (9 diffs)

trunk/psLib/test/dataManip/tst_psMinimize05.c

@@ -15 +15 @@
 #define ERROR_TOLERANCE 0.10
 float expectedParm[NUM_PARAMS];
-int testStatus = true;
+psS32 testStatus = true;
 
 /*****************************************************************************
@@ -32 +32 @@
     float coordData = 0.0;
     float expData = 0.0;
-    int i;
+    psS32 i;
 
     for (i=0;i<N;i++) {
@@ -62 +62 @@
 
 
-int t00()
-{
-    int currentId = psMemGetId();
-    int memLeaks = 0;
-    int i = 0;
+psS32 t00()
+{
+    psS32 currentId = psMemGetId();
+    psS32 memLeaks = 0;
+    psS32 i = 0;
     psArray *myCoords;
     psVector *myParams;
@@ -81 +81 @@
     myCoords = psArrayAlloc(N);
     for (i=0;i<N;i++) {
-        myCoords->data[i] = (psPTR *) psVectorAlloc(2, PS_TYPE_F32);
+        myCoords->data[i] = (psPtr *) psVectorAlloc(2, PS_TYPE_F32);
         ((psVector *) (myCoords->data[i]))->data.F32[0] = (float) (i+10);
         ((psVector *) (myCoords->data[i]))->data.F32[1] = (float) (i+3);
@@ -137 +137 @@
 }
 
-int t01()
-{
-    int currentId = psMemGetId();
-    int memLeaks = 0;
-    int i = 0;
+psS32 t01()
+{
+    psS32 currentId = psMemGetId();
+    psS32 memLeaks = 0;
+    psS32 i = 0;
     psArray *myCoords;
     psVector *myParams;
@@ -154 +154 @@
     myCoords = psArrayAlloc(N);
     for (i=0;i<N;i++) {
-        myCoords->data[i] = (psPTR *) psVectorAlloc(2, PS_TYPE_F32);
+        myCoords->data[i] = (psPtr *) psVectorAlloc(2, PS_TYPE_F32);
         ((psVector *) (myCoords->data[i]))->data.F32[0] = (float) (i+10);
         ((psVector *) (myCoords->data[i]))->data.F32[1] = (float) (i+3);
@@ -208 +208 @@
 }
 
-int t02()
-{
-    int currentId = psMemGetId();
-    int memLeaks = 0;
-    int i = 0;
+psS32 t02()
+{
+    psS32 currentId = psMemGetId();
+    psS32 memLeaks = 0;
+    psS32 i = 0;
     psArray *myCoords;
     psVector *myParams;
@@ -227 +227 @@
     myCoords = psArrayAlloc(N);
     for (i=0;i<N;i++) {
-        myCoords->data[i] = (psPTR *) psVectorAlloc(2, PS_TYPE_F32);
+        myCoords->data[i] = (psPtr *) psVectorAlloc(2, PS_TYPE_F32);
         ((psVector *) (myCoords->data[i]))->data.F32[0] = (float) (i+10);
         ((psVector *) (myCoords->data[i]))->data.F32[1] = (float) (i+3);
@@ -269 +269 @@
 }
 
-int main()
+psS32 main()
 {
     t00();