1 files changed, 30 insertions, 47 deletions

diff --git a/src/calendar.cpp b/src/calendar.cpp
index 8af1851..6731692 100644
--- a/src/calendar.cpp
+++ b/src/calendar.cpp
@@ -7,36 +7,47 @@
 /*以下为"calendar.h规定之量*/
 double day = 86400;
 double delta = 1e-11;
-
-/*计算需要用的类的实例化*/
 Julian julian;
 parameter p;
 
-void radToDMS(const char *message, int lowerBound, int upperBound,
-              double radians) {
-    // Convert radians to degrees
-    double degrees = radians * 180.0 / M_PI;
+pair<double, double> getSunPos(time_t time) {
+    double t = julian.getJulianKiloYear(time);
 
-    while (degrees < lowerBound)
-        degrees += (upperBound - lowerBound);
-    while (degrees >= upperBound)
-        degrees -= (upperBound - lowerBound);
+    pair<double, double> sun = p.sun_longitude(t);
+    radToDMS("Sun longitude:\t\t", 0, 360, sun.first);
+    radToDMS("Sun latitude:\t\t", -90, 90, sun.second);
 
-    // Calculate degrees, minutes, and seconds
-    int deg = static_cast<int>(degrees);
-    double min_sec = (degrees - deg) * 60.0;
-    int min = static_cast<int>(min_sec);
-    double sec = (min_sec - min) * 60.0;
+    double alpha, delta;                          // 太阳赤经赤纬
+    double lambda = sun.first, beta = sun.second; // 太阳黄经黄纬
+    // 黄赤交角epsilon
+    double epsilon = p.get_epsilon(t);
+    radToDMS("Ecliptic Obliquity:\t\t", 0, 90, epsilon);
 
-    // Output the result
-    printf("%s: %d°%d'%06.3f''\n", message, deg, min, sec);
+    delta =
+        asin(sin(epsilon) * sin(lambda) * cos(beta) + cos(epsilon) * sin(beta));
+    alpha = atan2(
+        (cos(epsilon) * sin(lambda) * cos(beta) - sin(epsilon) * sin(beta)),
+        (cos(lambda) * cos(beta)));
+    radToDMS("Sun right ascension:\t\t", 0, 360, alpha);
+    radToDMS("Sun declination:\t\t", -90, 90, delta);
+    // 时角
+    double H = p.getHourAngle(t, LONGITUDE, LATITUDE, alpha);
+    double A, h; //方位角和高度角
+    h = asin(sin(LATITUDE) * sin(delta) + cos(LATITUDE) * cos(delta) * cos(H));
+    A = atan2(-cos(delta) * sin(H),
+              cos(LATITUDE) * sin(delta) - sin(LATITUDE) * cos(delta) * cos(H));
+    A += M_PI;
+    // 转换为角度制输出
+    radToDMS("Hour angle:\t\t", 0, 360, H);
+    radToDMS("Azimuth:\t\t", 0, 360, A);
+    radToDMS("Elevation:\t\t", -90, 90, h);
 }
 
 int main(int argc, char *argv[]) {
     Date date;
     if (argc != 2) {
         printf("Input the time you want to calculate in <YYYY-MM-DD,HH:MM:SS> "
-               "format: ");
+               "format:\t\t");
         scanf("%d-%d-%d,%d:%d:%d", &date.tm_year, &date.tm_mon, &date.tm_mday,
               &date.tm_hour, &date.tm_min, &date.tm_sec);
     } else {
@@ -48,34 +59,6 @@ int main(int argc, char *argv[]) {
     date.tm_isdst = -1;
 
     time_t time = mktime(&date);
-    double t = julian.getJulianKiloYear(time);
-
-    pair<double, double> sun = p.sun_longitude(t);
-    radToDMS("Sun longitude: ", 0, 360, sun.first);
-    radToDMS("Sun latitude: ", -90, 90, sun.second);
-
-    double alpha, delta;                          // 太阳赤经赤纬
-    double lambda = sun.first, beta = sun.second; // 太阳黄经黄纬
-    // 黄赤交角epsilon，23°26'21.448''转换为弧度
-    double epsilon = (23.0 + 26.0 / 60.0 + 21.448 / 3600.0) * M_PI / 180.0;
-
-    delta =
-        asin(sin(epsilon) * sin(lambda) * cos(beta) + cos(epsilon) * sin(beta));
-    alpha = atan2(
-        (cos(epsilon) * sin(lambda) * cos(beta) - sin(epsilon) * sin(beta)),
-        (cos(epsilon) * cos(beta)));
-    radToDMS("Sun right ascension: ", 0, 360, alpha);
-    radToDMS("Sun declination: ", -90, 90, delta);
-    // 时角
-    double H = p.getHourAngle(t, LONGITUDE, LATITUDE, alpha);
-    double A, h; //方位角和高度角
-    h = asin(sin(LATITUDE) * sin(delta) + cos(LATITUDE) * cos(delta) * cos(H));
-    A = atan2(-cos(delta) * sin(H),
-              cos(LATITUDE) * sin(delta) - sin(LATITUDE) * cos(delta) * cos(H));
-    A += M_PI;
-    // 转换为角度制输出
-    radToDMS("Hour angle: ", 0, 360, H);
-    radToDMS("Azimuth: ", 0, 360, A);
-    radToDMS("Elevation: ", 0, 90, h);
+    getSunPos(time);
     return 0;
 }