1 files changed, 62 insertions, 6 deletions

diff --git a/src/calendar.h b/src/calendar.h
index c87531d..b17e0d5 100644
--- a/src/calendar.h
+++ b/src/calendar.h
@@ -1,7 +1,6 @@
 #ifndef _CALENDAR_H_
 #define _CALENDAR_H_
 
-
 #include <iostream>
 #include <string>
 #include <ctime>
@@ -10,10 +9,38 @@
 #include <math.h>
 using namespace std;
 
-typedef struct tm Date;
-
 extern double pi;
 extern double delta;
+extern char jieqi[25][10];
+
+typedef struct tm Date;
+struct point
+{
+    int year,mon,day,hour,min,sec;
+    bool isShuo,isJieqi,isZhongqi;
+    int JieqiIndex,MonthIndex;
+    bool RunYue;
+    double time;
+    point* next;
+
+    point(int year,int mon,int day,int hour,int min,int sec,bool isShuo,bool isJieqi,bool isZhongqi,int JieqiIndex,int MonthIndex,bool RunYue,double time)
+    {
+        this->year=year;
+        this->mon=mon;
+        this->day=day;
+        this->hour=hour;
+        this->min=min;
+        this->sec=sec;
+        this->isShuo=isShuo;
+        this->isJieqi=isJieqi;
+        this->isZhongqi=isZhongqi;
+        this->JieqiIndex=JieqiIndex;
+        this->MonthIndex=MonthIndex;
+        this->RunYue=RunYue;
+        this->time=time;
+        this->next=NULL;
+    }
+};
 
 class Julian
 {
@@ -36,7 +63,8 @@ class Julian
 };
 
 
-class parameter{
+class parameter
+{
     private:
 
         // 计算地球日心黄经
@@ -53,9 +81,8 @@ class parameter{
         //获取章动有关角
         vector<double> get_angle(double T);
 
-
         //章动修正
-        double nution(double T);
+        double nutation(double T);
 
         //光行差修正，返回弧度制
         double aberration(double R);
@@ -66,6 +93,35 @@ class parameter{
     public:
 
         double sun_longitude(double t);
+
+        double moon_longitude(double t);
+};
+
+class List
+{
+    private:
+        point *head,*tail;//链表头尾指针
+
+        bool later(point* a,point* b);
+
+    public:
+        vector<point*> shuori_vec; //记录各朔日的地址
+        vector<point*> zhongqi_vec;//记录各中气的地址
+
+        List();
+        ~List();
+
+        // 链表尾部插入
+        void append(Date* date,bool isShuo,bool isJieqi,bool isZhongqi,int JieqiIndex,double time);
+        
+        //对链表进行“排序”
+        void lunar_sort();
+
+        //置闰月
+        void Run();
+
+        //输出链表内容
+        void output();
 };
 
 #endif