Changeset 1258

Timestamp:

Jul 22, 2004, 9:46:24 AM (22 years ago)

Author:

harman

Message:

Added more functions

Location:

trunk/psLib

Files:

• src/astro/psTime.c (modified) (2 diffs)
• src/astronomy/psTime.c (modified) (2 diffs)
• test/astronomy/tst_psTime_01.c (modified) (5 diffs)

trunk/psLib/src/astro/psTime.c

@@ -12 +12 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-07-22 01:02:53 $
+ *  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-07-22 19:46:24 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -432 +432 @@
     }
 
-    // Back to 1969
     n = time->tm_year + 1900 - 1;
     epoch = (time->tm_year - 70) * SEC_PER_YEAR + ((n/4 - n/100 + n/400) -

trunk/psLib/src/astronomy/psTime.c

@@ -12 +12 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-07-22 01:02:53 $
+ *  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-07-22 19:46:24 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -432 +432 @@
     }
 
-    // Back to 1969
     n = time->tm_year + 1900 - 1;
     epoch = (time->tm_year - 70) * SEC_PER_YEAR + ((n/4 - n/100 + n/400) -

trunk/psLib/test/astronomy/tst_psTime_01.c

@@ -21 +21 @@
  *  @author  Ross Harman, MHPCC
  *
- *  @version $Revision: 1.2 $  $Name: not supported by cvs2svn $
- *  @date  $Date: 2004-07-22 01:03:18 $
+ *  @version $Revision: 1.3 $  $Name: not supported by cvs2svn $
+ *  @date  $Date: 2004-07-22 19:45:58 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -30 +30 @@
 #include "pslib.h"
 #include "psTest.h"
+#include <string.h>
 
 int main(int argc, char* argv[])
@@ -35 +36 @@
     psTime time;
     psTime testTime;
+    char *testString = "2004/07/21,18:22:24.272";
 
     // Test time was taken at July 21, 2004 at 18:22:24.272044
@@ -49 +51 @@
     //Test B - Print test time
     printPositiveTestHeader(stdout,"psTime", "Print test time");
-    printf("Test time: July 21, 2004 at 18:22:24.272044\n");
     printf("Test time: Seconds = %ld Microseconds = %ld\n", (long)testTime.tv_sec, (long)testTime.tv_usec);
     printFooter(stdout, "psTime", "Print test time", true);
@@ -58 +59 @@
     char *isoString;
     isoString = psTimeToISO(testTime);
-    printf("ISO = %s\n", isoString);
+    if(strncmp(isoString, testString, 256)) {
+        printf("ERROR - ISO string incorrect\n");
+        printf("Expected: %s\n", testString);
+        printf("Returned: %s\n", isoString);
+    }
     printFooter(stdout, "psTime", "Convert psTime to ISO time", true);