1 files changed, 91 insertions, 148 deletions

diff --git a/src/List.cpp b/src/List.cpp
index 99aa1a6..b4600bc 100644
--- a/src/List.cpp
+++ b/src/List.cpp
@@ -1,37 +1,32 @@
 #include "calendar.h"
 
-List::List()
-{
+List::List() {
     // 为方便初始化，链表头结点设为空节点，注意不要使用
-    head=new point(0,0,0,0,0,0,false,false,false,-1,-1,false,0);
-    tail=head;
+    head = new point(0, 0, 0, 0, 0, 0, false, false, false, -1, -1, false, 0);
+    tail = head;
 }
 
-List::~List()
-{
-    point* p=head;
-    while(p!=NULL)
-    {
-        point* q=p->next;
+List::~List() {
+    point *p = head;
+    while (p != NULL) {
+        point *q = p->next;
         delete p;
-        p=q;
+        p = q;
     }
-
 }
 
 // 链表尾部插入
-void List::append(Date* date,bool isShuo,bool isJieqi,bool isZhongqi,int JieqiIndex,double time)
-{
-    point* p=new point(date->tm_year+1900,date->tm_mon+1,date->tm_mday,date->tm_hour,date->tm_min,date->tm_sec,isShuo,isJieqi,isZhongqi,JieqiIndex,0,false,time);
-    tail->next=p;
-    tail=p;
+void List::append(Date *date, bool isShuo, bool isJieqi, bool isZhongqi,
+                  int JieqiIndex, double time) {
+    point *p = new point(date->tm_year + 1900, date->tm_mon + 1, date->tm_mday,
+                         date->tm_hour, date->tm_min, date->tm_sec, isShuo,
+                         isJieqi, isZhongqi, JieqiIndex, 0, false, time);
+    tail->next = p;
+    tail = p;
 
-    if(isShuo)
-    {
+    if (isShuo) {
         shuori_vec.push_back(p);
-    }
-    else if(isJieqi&&isZhongqi)
-    {
+    } else if (isJieqi && isZhongqi) {
         zhongqi_vec.push_back(p);
     }
 }
@@ -43,194 +38,142 @@ void List::append(Date* date,bool isShuo,bool isJieqi,bool isZhongqi,int JieqiIn
  * 这是今历沿用的顺治时宪历之规定，
  * 即朔日只要和中气同日，不论先后，该中气即算作下一月
  */
-void List::lunar_sort()
-{
-    point* cur,*pre;
+void List::lunar_sort() {
+    point *cur, *pre;
     bool flag;
-    do
-    {
-        flag=false;
-        pre=head;
-        do
-        {
-            cur=pre->next;
-            if(later(cur,cur->next))
-            {
-                flag=true;
-                pre->next=cur->next;
-                cur->next=cur->next->next;
-                pre->next->next=cur;
+    do {
+        flag = false;
+        pre = head;
+        do {
+            cur = pre->next;
+            if (later(cur, cur->next)) {
+                flag = true;
+                pre->next = cur->next;
+                cur->next = cur->next->next;
+                pre->next->next = cur;
             }
-            pre=pre->next;
-        }while(pre->next!=tail);
-    }while(flag);
+            pre = pre->next;
+        } while (pre->next != tail);
+    } while (flag);
 
-    for(pre=head;pre->next!=tail;pre=pre->next)
-    {
-        cur=pre->next;
-        if(cur->isZhongqi&&cur->next->isShuo&&cur->next->year==cur->year&&cur->next->mon==cur->mon&&cur->next->day==cur->day)
-        {
-            pre->next=cur->next;
-            cur->next=cur->next->next;
-            pre->next->next=cur;
+    for (pre = head; pre->next != tail; pre = pre->next) {
+        cur = pre->next;
+        if (cur->isZhongqi && cur->next->isShuo &&
+            cur->next->year == cur->year && cur->next->mon == cur->mon &&
+            cur->next->day == cur->day) {
+            pre->next = cur->next;
+            cur->next = cur->next->next;
+            pre->next->next = cur;
         }
     }
 }
 
-
-bool List::later(point* a,point* b)
-{
+bool List::later(point *a, point *b) {
     // 比较a是否比b晚
     // 比较年
-    if(a->year>b->year)
-    {
+    if (a->year > b->year) {
         return true;
-    }
-    else if(a->year<b->year)
-    {
+    } else if (a->year < b->year) {
         return false;
     }
     // 比较月
-    else if(a->mon>b->mon)
-    {
+    else if (a->mon > b->mon) {
         return true;
-    }
-    else if(a->mon<b->mon)
-    {
+    } else if (a->mon < b->mon) {
         return false;
     }
     // 比较日
-    else if(a->day>b->day)
-    {
+    else if (a->day > b->day) {
         return true;
-    }
-    else if(a->day<b->day)
-    {
+    } else if (a->day < b->day) {
         return false;
     }
     // 比较时
-    else if(a->hour>b->hour)
-    {
+    else if (a->hour > b->hour) {
         return true;
-    }
-    else if(a->hour<b->hour)
-    {
+    } else if (a->hour < b->hour) {
         return false;
     }
     // 比较分
-    else if(a->min>b->min)
-    {
+    else if (a->min > b->min) {
         return true;
-    }
-    else if(a->min<b->min)
-    {
+    } else if (a->min < b->min) {
         return false;
     }
     // 比较秒
-    else if(a->sec>b->sec)
-    {
+    else if (a->sec > b->sec) {
         return true;
-    }
-    else if(a->sec<b->sec)
-    {
+    } else if (a->sec < b->sec) {
         return false;
-    }
-    else
-    {
+    } else {
         return false;
     }
 }
 
 //置闰月
-void List::Run()
-{
-    point* cur;
-    int i=0,j=0;
-    int mon_index=11;
+void List::Run() {
+    point *cur;
+    int i = 0, j = 0;
+    int mon_index = 11;
     bool flag;
-    while(later(zhongqi_vec[12],shuori_vec[i]))
-    {
+    while (later(zhongqi_vec[12], shuori_vec[i])) {
         i++;
     }
 
-    if(i==13)
-    {
+    if (i == 13) {
         //冬至之间有13个朔日，置闰
-        for(j=0;j<shuori_vec.size()-1;j++)
-        {
-            flag=true;
-            cur=shuori_vec[j]->next;
-            while(cur!=shuori_vec[j+1])
-            {
-                if(cur->isZhongqi)
-                {
+        for (j = 0; j < shuori_vec.size() - 1; j++) {
+            flag = true;
+            cur = shuori_vec[j]->next;
+            while (cur != shuori_vec[j + 1]) {
+                if (cur->isZhongqi) {
                     //本月有中气，不置闰
-                    flag=false;
+                    flag = false;
                 }
-                cur=cur->next;
+                cur = cur->next;
             }
-            if(flag)
-            {
-                shuori_vec[j]->MonthIndex=mon_index;
-                shuori_vec[j]->RunYue=true;
+            if (flag) {
+                shuori_vec[j]->MonthIndex = mon_index;
+                shuori_vec[j]->RunYue = true;
                 j++;
                 break;
-            }
-            else
-            {
+            } else {
                 mon_index++;
-                if(mon_index==13)
-                {
-                    mon_index=1;
+                if (mon_index == 13) {
+                    mon_index = 1;
                 }
-                shuori_vec[j]->MonthIndex=mon_index;
-                shuori_vec[j]->RunYue=false;
+                shuori_vec[j]->MonthIndex = mon_index;
+                shuori_vec[j]->RunYue = false;
             }
         }
-
     }
     //冬至之间有12个朔日，不置闰
     //同时处理置闰完毕之后的朔日
-    for(;j<shuori_vec.size()-1;j++)
-    {
+    for (; j < shuori_vec.size() - 1; j++) {
         mon_index++;
-        if(mon_index==13)
-        {
-            mon_index=1;
+        if (mon_index == 13) {
+            mon_index = 1;
         }
-        shuori_vec[j]->MonthIndex=mon_index;
-        shuori_vec[j]->RunYue=false;
+        shuori_vec[j]->MonthIndex = mon_index;
+        shuori_vec[j]->RunYue = false;
     }
 }
 
 //输出链表内容
-void List::output()
-{
-    for(point* i=head->next;i!=NULL;i=i->next)
-    {
-        printf("%d-%02d-%02d %02d:%02d:%02d  ",i->year,i->mon,i->day,i->hour,i->min,i->sec);
-        if(i->isJieqi)
-        {
-            printf("%s",jieqi[i->JieqiIndex]);
-            if(i->isZhongqi)
-            {
-                printf("  中气");
-            }
-            printf("\n");
-        }
-        else if(i->isShuo)
-        {
+void List::output() {
+    for (point *i = head->next; i != NULL; i = i->next) {
+        printf("%d-%02d-%02d %02d:%02d:%02d  ", i->year, i->mon, i->day,
+               i->hour, i->min, i->sec);
+        if (i->isJieqi) {
+            printf("%s\n", jieqi[i->JieqiIndex]);
+        } else if (i->isShuo) {
             printf("朔日");
-            if(i->RunYue)
-            {
-                printf("  闰%d月",i->MonthIndex);
-            }
-            else
-            {
-                printf("  %d月",i->MonthIndex);
+            if (i->RunYue) {
+                printf("  闰%d月", i->MonthIndex);
+            } else {
+                printf("  %d月", i->MonthIndex);
             }
             printf("\n");
         }
     }
-
 }