1 files changed, 9 insertions, 47 deletions

diff --git a/src/parameters.cpp b/src/parameters.cpp
index fdcefd1..ff57305 100644
--- a/src/parameters.cpp
+++ b/src/parameters.cpp
@@ -5,8 +5,7 @@
 #include <utility>
 using namespace std;
 
-void radToDMS(const char *message, int lowerBound, int upperBound,
-              double radians) {
+string radToDMS(int lowerBound, int upperBound, double radians) {
     // Convert radians to degrees
     double degrees = radians * 180.0 / M_PI;
 
@@ -15,17 +14,19 @@ void radToDMS(const char *message, int lowerBound, int upperBound,
     while (degrees >= upperBound)
         degrees -= (upperBound - lowerBound);
 
-    bool flag = degrees < 0;
-    if (flag)
-        degrees = -degrees;
     // 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;
+    if (degrees < 0) {
+        min = -min;
+        sec = -sec;
+    }
 
-    // Output the result
-    printf("%s: %c%d°%d'%06.3f''\n", message, flag ? '-' : ' ', deg, min, sec);
+    char buf[100];
+    sprintf(buf, "%4d°%2d'%06.3f''", deg, min, sec);
+    return string(buf);
 }
 
 // 计算地球日心黄经
@@ -205,51 +206,12 @@ pair<double, double> parameter::sun_longitude(double t) {
     return make_pair(L, -B);
 }
 
-// 计算月球地心黄经，外部调用，返回角度制
-double parameter::moon_longitude(double t) {
-    double T = 10 * t;
-    vector<double> angles = get_angle(T);
-    double a, b, c, d, moon_longitude_a;
-
-    double L = 218.3164591 + 481267.88134236 * T - 0.0013268 * T * T +
-               T * T * T / 538841 - T * T * T * T / 65194000; //月球平黄经
-    double EI = 0, sita = 0;
-    double E = 1 - 0.002516 * T - 0.0000074 * T * T; //地球离心率
-
-    for (int i = 0; i < moon_size; i++) {
-        sita = moon_longitude_parameters[i][0] * angles[0] +
-               moon_longitude_parameters[i][1] * angles[1] +
-               moon_longitude_parameters[i][2] * angles[2] +
-               moon_longitude_parameters[i][3] * angles[3];
-        sita *= M_PI / 180;
-        EI += moon_longitude_parameters[i][4] * sin(sita) *
-              pow(E, fabs(moon_longitude_parameters[i][1]));
-    }
-
-    //地外行星影响月球地心黄经修正项
-    double a1, a2;
-    a1 = 119.75 + 131.849 * T;
-    a2 = 53.09 + 479264.290 * T;
-
-    EI += 3958.0 * sin(a1 * M_PI / 180);
-    EI += 1962.0 * sin((L - angles[3]) * M_PI / 180);
-    EI += 318.0 * sin(a2 * M_PI / 180);
-
-    L += EI / 1000000;
-    L += 180 / M_PI * nutation(T); //地球章动修正
-
-    while (L < 0)
-        L += 360;
-    while (L >= 360)
-        L -= 360;
-    return L;
-}
-
 double parameter::getHourAngle(double julianKiloYear, double longitude,
                                double latitude, double alpha) {
     double T = julianKiloYear * 10;
     double GST = 280.46061837 + 360.98564736629 * 36525 * T +
                  0.000387933 * T * T - T * T * T / 38710000;
+    GST += nutation(T) * cos(epsilon);
     GST *= M_PI / 180;
     return GST + longitude - alpha; // 返回弧度制
 }