From 89b3446e74a27b304de51e5aa4f4eedd7d43e22b Mon Sep 17 00:00:00 2001 From: Razvan Deaconescu Date: Fri, 19 Aug 2011 23:15:59 +0300 Subject: [PATCH] ppf: Update julian.py. Indentation, package import, comments. --- ppf/db/julian.py | 75 +++++++++++++++++++++++++----------------------- 1 file changed, 39 insertions(+), 36 deletions(-) diff --git a/ppf/db/julian.py b/ppf/db/julian.py index 30835f8..d771119 100644 --- a/ppf/db/julian.py +++ b/ppf/db/julian.py @@ -1,52 +1,55 @@ -#!/usr/bin/env python +""" +Convert various formats to Julian float format. Classes and methods are +imported from sidereal module. + +2010, Razvan Deaconescu, razvan.deaconescu@cs.pub.ro +""" import sys import sidereal -from datetime import datetime, date, time - -# -# arguments are standard date string "YYYY-MM-DD" -# and standard time string "HH:MM:SS.ss..." -# - -def stringToJulian(date, time): - d = sidereal.parseDate(date) - t = sidereal.parseTime(time) - dt = datetime.combine(d, t) - return sidereal.JulianDate.fromDatetime(dt) +import datetime def datetimeToJulian(datetime): - return sidereal.JulianDate.fromDatetime(datetime) - -# -# arguments are standard date/time fields -# + """ Convert datetime to Julian format. """ + return sidereal.JulianDate.fromDatetime(datetime) -def fieldsToJulian(year, month, day, hour, minute, second, millisecond, microsecond = 0): - d = date(year, month, day) - t = time(hour, minute, second, millisecond * 1000 + microsecond) - dt = datetime.combine(d, t) - return sidereal.JulianDate.fromDatetime(dt) - -# -# argument is a julian date number -# +def stringToJulian(date, time): + """ + Convert string formated date and time to Julian format. + Arguments are standard date string "YYYY-MM-DD" and standard time + string "HH:MM:SS.ss...". + """ + + d = sidereal.parseDate(date) + t = sidereal.parseTime(time) + dt = datetime.datetime.combine(d, t) + return datetimeToJulian(dt) + +def fieldsToJulian(year, month, day, hour, minute, second, + millisecond, microsecond = 0): + """ Convert date fields/list to Julian format. """ + d = datetime.date(year, month, day) + t = datetime.time(hour, minute, second, millisecond * 1000 + microsecond) + dt = datetime.datetime.combine(d, t) + return datetimeToJulian(dt) def julianToDatetime(jd): + """ Convert Julian format to datetime. """ julianDate = sidereal.JulianDate(jd) return julianDate.datetime() -# -# test case for Julian Date conversion functions -# - def main(): - jd = stringToJulian("2000-01-01", "12:00:00.00") - print "getJulianFromDatime: ", float(jd) + """ + Use case for Julian Date conversion functions. + """ + + jd = stringToJulian("2000-01-01", "12:00:00.00") + print "getJulianFromDatime: ", float(jd) + + jd = fieldsToJulian(2000, 1, 1, 12, 0, 0, 0, 0) + print "getJulianFromFields: ", float(jd) - jd = fieldsToJulian(2000, 1, 1, 12, 0, 0, 0, 0) - print "getJulianFromFields: ", float(jd) if __name__ == "__main__": - sys.exit(main()) + sys.exit(main()) -- 2.20.1