Changeset 1615 for trunk/psLib/test/astronomy/tst_psTime_01.c

Timestamp:

Aug 24, 2004, 3:38:48 PM (22 years ago)

Author:

harman

Message:

Updated psTime for new version of SDRS

File:

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

trunk/psLib/test/astronomy/tst_psTime_01.c

@@ -21 +21 @@
  *  @author  Ross Harman, MHPCC
  *
- *  @version $Revision: 1.4 $  $Name: not supported by cvs2svn $
- *  @date  $Date: 2004-08-06 22:34:05 $
+ *  @version $Revision: 1.5 $  $Name: not supported by cvs2svn $
+ *  @date  $Date: 2004-08-25 01:38:42 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -34 +34 @@
 int main(int argc, char* argv[])
 {
-    psTime time;
-    psTime testTime;
-    char *testString = "2004/07/21,18:22:24.272";
+    psTime *time;
+    psTime *testTime;
+    char *testString = "2004-07-21T18:22:24.272Z";
+    time = (psTime*)psAlloc(sizeof(psTime));
 
     // Test time was taken at July 21, 2004 at 18:22:24.272044
-    testTime.tv_sec = 1090434144;
-    testTime.tv_usec = 272044;
+    testTime = (psTime*)psAlloc(sizeof(psTime));
+    testTime->sec = 1090434144;
+    testTime->usec = 272044;
+    testTime->type = PS_TIME_TAI;
 
 
     // Test A - Get current TAI time
     printPositiveTestHeader(stdout,"psTime", "Get current TAI time");
-    time = psTimeGetTime();
+    time = psTimeGetTime(PS_TIME_TAI);
     printFooter(stdout, "psTime", "Get current TAI time", true);
 
@@ -51 +54 @@
     //Test B - Print test time
     printPositiveTestHeader(stdout,"psTime", "Print test time");
-    printf("Test time: Seconds = %ld Microseconds = %ld\n", (long)testTime.tv_sec, (long)testTime.tv_usec);
+    printf("Test time: Seconds = %ld Microseconds = %ld\n", (long)testTime->sec, (long)testTime->usec);
     printFooter(stdout, "psTime", "Print test time", true);
 
@@ -70 +73 @@
     printPositiveTestHeader(stdout,"psTime", "Convert ISO time to psTime");
     time = psISOToTime(isoString);
-    printf("psTime: Seconds = %ld Microseconds = %ld\n", (long)time.tv_sec, (long)time.tv_usec);
+    printf("psTime: Seconds = %lld Microseconds = %d\n", (psS64)time->sec, (psU32)time->usec);
     psFree(isoString);
     printFooter(stdout, "psTime", "Convert ISO time to psTime", true);
 
 
-    // Test E - Convert psTime to UTC time
+    // Test E - Convert TAI to UTC time
     printPositiveTestHeader(stdout,"psTime", "Convert psTime time to UTC time");
-    time = psTimeToUTC(testTime);
-    printf("psTime: Seconds = %ld Microseconds = %ld\n", (long)time.tv_sec, (long)time.tv_usec);
+    time = psTimeConvert(testTime, PS_TIME_UTC);
+    printf("psTime: Seconds = %lld Microseconds = %d\n", (psS64)time->sec, (psU32)time->usec);
     printFooter(stdout, "psTime", "Convert psTime time to UTC time", true);
 
@@ -84 +87 @@
     // Test F - Convert UTC time to psTime
     printPositiveTestHeader(stdout,"psTime", "Convert UTC time to psTime");
-    time = psUTCToTime(time);
-    printf("psTime: Seconds = %ld Microseconds = %ld\n", (long)time.tv_sec, (long)time.tv_usec);
+    time->type = PS_TIME_UTC;
+    time = psTimeConvert(time, PS_TIME_TAI);
+    printf("psTime: Seconds = %lld Microseconds = %d\n", (psS64)time->sec, (psU32)time->usec);
     printFooter(stdout, "psTime", "Convert UTC time to psTime", true);
 
@@ -100 +104 @@
     printPositiveTestHeader(stdout,"psTime", "Convert MJD time to psTime");
     time = psMJDToTime(mjdTime);
-    printf("psTime: Seconds = %ld Microseconds = %ld\n", (long)time.tv_sec, (long)time.tv_usec);
+    printf("psTime: Seconds = %lld Microseconds = %d\n", (psS64)time->sec, (psU32)time->usec);
     printFooter(stdout, "psTime", "Convert MJD time to psTime", true);
 
@@ -115 +119 @@
     printPositiveTestHeader(stdout,"psTime", "Convert JD time to psTime");
     time = psJDToTime(jdTime);
-    printf("psTime: Seconds = %ld Microseconds = %ld\n", (long)time.tv_sec, (long)time.tv_usec);
+    printf("psTime: Seconds = %lld Microseconds = %d\n", (psS64)time->sec, (psU32)time->usec);
     printFooter(stdout, "psTime", "Convert JD time to psTime", true);
 
@@ -130 +134 @@
     printPositiveTestHeader(stdout,"psTime", "Convert timeval time to psTime");
     time = psTimevalToTime(&timevalTime);
-    printf("psTime: Seconds = %ld Microseconds = %ld\n", (long)time.tv_sec, (long)time.tv_usec);
+    printf("psTime: Seconds = %lld Microseconds = %d\n", (psS64)time->sec, (psU32)time->usec);
     printFooter(stdout, "psTime", "Convert timeval time to psTime", true);
 
@@ -151 +155 @@
     printPositiveTestHeader(stdout, "psTime", "Convert tm time to psTime");
     time = psTMToTime(tmTime);
-    printf("psTime: Seconds = %ld Microseconds = %ld\n", (long)time.tv_sec, (long)time.tv_usec);
+    printf("psTime: Seconds = %lld Microseconds = %d\n", (psS64)time->sec, (psU32)time->usec);
     printFooter(stdout, "psTime", "Convert tm time to psTime", true);