Changeset 515 for trunk/src

Timestamp:

Aug 24, 2006, 10:04:28 AM (18 years ago)

Author:

dkearney

Message:

added units of days (d), hours (h), minutes (min), /m2.
minutes units was not added to tcl because tcl thinks it milli-in's
added a few simple tests to test day/hour/minute/second conversions
adjusted python's queue module to get condor working mostly.
adjustments to a few make files

Location:

trunk/src/core

Files:

• RpUnits.cc (modified) (2 diffs)
• RpUnitsStd.cc (modified) (1 diff)
• RpUnitsStd.h (modified) (1 diff)

trunk/src/core/RpUnits.cc

@@ -1723 +1723 @@
  * Defines the following units:
  *   seconds  (s)
+ *   minutes  (min)
+ *   hours    (h)
+ *   days     (d)
  *
+ *   month and year are not included because simple 
+ *   day->month conversions may be misleading
+ *   month->year conversions may be included in the future
+ * 
  * Return codes: 0 success, anything else is error
  */
@@ -1730 +1737 @@
 RpUnitsPreset::addPresetTime () {
 
-    RpUnits* seconds    = RpUnits::define("s", NULL, RP_TYPE_TIME);
-
-    RpUnits::makeMetric(seconds);
+    RpUnits* second    = RpUnits::define("s", NULL, RP_TYPE_TIME);
+    RpUnits* minute    = RpUnits::define("min", second, RP_TYPE_TIME);
+    RpUnits* hour      = RpUnits::define("h", second, RP_TYPE_TIME);
+    RpUnits* day       = RpUnits::define("d", second, RP_TYPE_TIME);
+
+    RpUnits::makeMetric(second);
 
     // add time definitions
+
+    RpUnits::define(second, minute, sec2min, min2sec);
+    RpUnits::define(second, hour, sec2hour, hour2sec);
+    RpUnits::define(second, day, sec2day, day2sec);
 
     return 0;

trunk/src/core/RpUnitsStd.cc

@@ -302 +302 @@
 }
 
+/****************************************
+ * TIME CONVERSIONS
+ ****************************************/
+
+double sec2min (double sec)
+{
+    return (sec/60.00);
+}
+
+double min2sec (double min)
+{
+    return (min*60.00);
+}
+
+double sec2hour (double sec)
+{
+    return (sec/3600.00);
+}
+
+double hour2sec (double hour)
+{
+    return (hour*3600.00);
+}
+
+double sec2day (double sec)
+{
+    return (sec/86400.00);
+}
+
+double day2sec (double day)
+{
+    return (day*86400.00);
+}
+
+
+
 #ifdef __cplusplus
 }

trunk/src/core/RpUnitsStd.h

@@ -85 +85 @@
 
 
+
+double sec2min    (double sec);
+double min2sec    (double min);
+double sec2hour   (double sec);
+double hour2sec   (double hour);
+double sec2day (double sec);
+double day2sec (double day);
+
 #ifdef __cplusplus
 }