/[ascend]/trunk/models/measures.a4l
ViewVC logotype

Diff of /trunk/models/measures.a4l

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 820 by johnpye, Mon Mar 27 03:21:25 2006 UTC revision 821 by johnpye, Thu Aug 17 11:57:54 2006 UTC
# Line 128  slug = {14.5939*kilogram}; Line 128  slug = {14.5939*kilogram};
128    
129  yr = {31557600*second};  yr = {31557600*second};
130  wk = {604800*second};  wk = {604800*second};
131  dy = {86400*second};  d = {86400*second};
132  hr = {3600*second};  h = {3600*second};
133  min = {60*second};  min = {60*second};
134  sec = {second};  sec = {second};
135  s = {second};  s = {second};
# Line 139  ns = {second/1e9}; Line 139  ns = {second/1e9};
139  ps = {second/1e12};  ps = {second/1e12};
140  year = {yr};  year = {yr};
141  week = {wk};  week = {wk};
142  day = {dy};  day = {d};
143  hour = {hr};  hour = {h};
144  minute = {min};  minute = {min};
145  millisecond = {ms};  millisecond = {ms};
146  microsecond = {us};  microsecond = {us};
# Line 446  gpm = {gallon/minute}; Line 446  gpm = {gallon/minute};
446    
447  (* time variant conversions *)  (* time variant conversions *)
448    
449  MINIMUMWAGE = {5.15*USD/hr}; (* Dec 2005, see http://www.dol.gov/ *)  MINIMUMWAGE = {5.15*USD/h}; (* Dec 2005, see http://www.dol.gov/ *)
450  (*  (*
451  * conversions we'd like to see , but probably won't  * conversions we'd like to see , but probably won't
452  * milliHelen = {beauty/ship};  * milliHelen = {beauty/ship};

Legend:
Removed from v.820  
changed lines
  Added in v.821

john.pye@anu.edu.au
ViewVC Help
Powered by ViewVC 1.1.22