Changeset 3712 for trunk/psLib/test/astronomy/tst_psTime_03.c

Timestamp:

Apr 18, 2005, 4:13:53 PM (21 years ago)

Author:

evanalst

Message:

Modify the psTime data structure. (SDR-13)

File:

• trunk/psLib/test/astronomy/tst_psTime_03.c (modified) (9 diffs)

trunk/psLib/test/astronomy/tst_psTime_03.c

@@ -19 +19 @@
  *  @author  Ross Harman, MHPCC
  *
- *  @version $Revision: 1.15 $  $Name: not supported by cvs2svn $
- *  @date  $Date: 2005-04-18 23:30:54 $
+ *  @version $Revision: 1.16 $  $Name: not supported by cvs2svn $
+ *  @date  $Date: 2005-04-19 02:13:53 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -30 +30 @@
 
 #define PRINT_TIME(TEXT,TIME) \
-printf("%s Seconds = %lld Microseconds = %u\n", TEXT, (long long int)TIME->sec, TIME->usec);
+printf("%s Seconds = %lld Nanoseconds = %u\n", TEXT, (long long int)TIME->sec, TIME->nsec);
 
 psS32 main(psS32 argc, char* argv[])
@@ -44 +44 @@
     time1a = psTimeAlloc(PS_TIME_TAI);
     time1a->sec  = 1;
-    time1a->usec = 111111;
+    time1a->nsec = 111111000;
     timeOut1 = psTimeMath(time1a, time1b);
-    if(timeOut1->sec!=2 && timeOut1->usec!=222222) {
-        printf("ERROR: Incorrect time, %lld:%u. Expected 2:222222\n",(long long int)timeOut1->sec, timeOut1->usec);
+    if(timeOut1->sec!=2 && timeOut1->nsec!=222222000) {
+        printf("ERROR: Incorrect time, %lld:%u. Expected 2:222222000\n",(long long int)timeOut1->sec, timeOut1->nsec);
     }
     printFooter(stdout, "psTime", "Test A - Add two times", true);
 
 
-    // Test B - Add two times with overflow in microseconds
+    // Test B - Add two times with overflow in nanoseconds
     printPositiveTestHeader(stdout, "psTime", "Test B - Add two times with overflow in microseconds");
     psTime *time2a = NULL;
@@ -59 +59 @@
     time2a = psTimeAlloc(PS_TIME_TAI);
     time2a->sec  = 6;
-    time2a->usec = 600001;
+    time2a->nsec = 600001000;
     timeOut2 = psTimeMath(time2a, time2b);
-    if(timeOut2->sec!=12 && timeOut2->usec!=100002) {
-        printf("ERROR: Incorrect time, %lld:%u. Expected 12:100002\n",(long long int)timeOut2->sec, timeOut2->usec);
+    if(timeOut2->sec!=12 && timeOut2->nsec!=100002000) {
+        printf("ERROR: Incorrect time, %lld:%u. Expected 12:100002000\n",(long long int)timeOut2->sec, timeOut2->nsec);
     }
     printFooter(stdout, "psTime", "Test B - Add two times with overflow in microseconds", true);
@@ -74 +74 @@
     time3a = psTimeAlloc(PS_TIME_TAI);
     time3a->sec  = 3;
-    time3a->usec = 333333;
+    time3a->nsec = 333333000;
     timeOut3 = psTimeMath(time3a, time3b);
-    if(timeOut3->sec!=2 && timeOut3->usec!=222222) {
-        printf("ERROR: Incorrect time, %lld:%u. Expected 2:222222\n",(long long int)timeOut3->sec, timeOut3->usec);
+    if(timeOut3->sec!=2 && timeOut3->nsec!=222222000) {
+        printf("ERROR: Incorrect time, %lld:%u. Expected 2:222222000\n",(long long int)timeOut3->sec, timeOut3->nsec);
     }
     printFooter(stdout, "psTime", "Test C - Subtract two times", true);
 
 
-    // Test D - Subtact two times with underflow in microseconds
-    printPositiveTestHeader(stdout, "psTime", "Test D - Subtact two times with underflow in microseconds");
+    // Test D - Subtact two times with underflow in nanoseconds
+    printPositiveTestHeader(stdout, "psTime", "Test D - Subtact two times with underflow in nanoseconds");
     psTime *time4a = NULL;
     psF64 time4b = -2.000003;
@@ -89 +89 @@
     time4a = psTimeAlloc(PS_TIME_TAI);
     time4a->sec  = 5;
-    time4a->usec = 1;
+    time4a->nsec = 1000;
     timeOut4 = psTimeMath(time4a, time4b);
-    if(timeOut4->sec!=2 && timeOut4->usec!=999997) {
-        printf("ERROR: Incorrect time, %lld:%u. Expected 2:999997\n",(long long int)timeOut4->sec, timeOut4->usec);
-    }
-    printFooter(stdout, "psTime", "Test D - Subtact two times with underflow in microseconds", true);
+    if(timeOut4->sec!=2 && timeOut4->nsec!=999997000) {
+        printf("ERROR: Incorrect time, %lld:%u. Expected 2:999997000\n",(long long int)timeOut4->sec, timeOut4->nsec);
+    }
+    printFooter(stdout, "psTime", "Test D - Subtact two times with underflow in nanoseconds", true);
 
 
@@ -105 +105 @@
     time5b = psTimeAlloc(PS_TIME_TAI);
     time5a->sec  = 8;
-    time5a->usec = 8;
+    time5a->nsec = 8000;
     time5b->sec  = 7;
-    time5b->usec = 7;
+    time5b->nsec = 7000;
     timeOut5 = psTimeDelta(time5a, time5b);
     if(fabs(timeOut5-1.000001) > FLT_EPSILON) {
@@ -123 +123 @@
     time6b = psTimeAlloc(PS_TIME_TAI);
     time6a->sec  = 8;
-    time6a->usec = 1;
+    time6a->nsec = 1000;
     time6b->sec  = 7;
-    time6b->usec = 7;
+    time6b->nsec = 7000;
     timeOut6 = psTimeDelta(time6a, time6b);
     if(fabs(timeOut6-0.999994) > FLT_EPSILON) {
@@ -140 +140 @@
     time20b = psTimeAlloc(PS_TIME_UTC);
     time20a->sec = 1090434113;
-    time20a->usec = 272044;
+    time20a->nsec = 272044000;
     time20b->sec = 1090434112;
-    time20b->usec = 272044;
+    time20b->nsec = 272044000;
     timeOut20 = psTimeDelta(time20a, time20b);
     if(fabs(timeOut20-1.000000000) > FLT_EPSILON) {