diff --git a/Script/20150313.obj b/Script/20150313.obj
new file mode 100644
index 0000000..51466f5
Binary files /dev/null and b/Script/20150313.obj differ
diff --git a/Script/FileData.py b/Script/FileData.py
index 84e954f..d74ea12 100644
--- a/Script/FileData.py
+++ b/Script/FileData.py
@@ -167,9 +167,8 @@ class MergeReconfigFile:  # 合并重构用文件
                 indCap+=1
             #先给PG和QG赋值
             node = ipsodata.GetNodePower()
-            #序号        节点编号        节点有功        节点无功     负荷有功     负荷无功
             for n in ipsodata.GetNodePower():
-                self.__mergedIpsoLoad.append([indNode, n[1], n[2] + addNum, n[3], n[4], n[5], n[6], n[7], 0, 0])
+                self.__mergedIpsoLoad.append([indNode, n[1], n[2] + addNum, n[3], n[4], n[5], n[6]*1, n[7]*1, 0, 0])
                 self.__nodePlace[n[2] + addNum]=f
                 indNode += 1
             # self.__addNumDic[lineName] = len(ipsodata.GetNodePower())  #每条线路的节点数
diff --git a/Script/main.py b/Script/main.py
index 9aa7f8c..88bf73e 100644
--- a/Script/main.py
+++ b/Script/main.py
@@ -2,6 +2,7 @@ __author__ = 'dmy'
 
 from FileData import *
 import os
+import pickle
 def prepareFiles():
     _dir=r'D:\MyPro\cimforreduceloss\testHasttable\output\pan'
     entries=os.listdir(_dir)
@@ -23,7 +24,15 @@ if __name__=='__main__':
     # 713泰林东甲线
     fileList=[r"D:\MyPro\cimforreduceloss\testHasttable\output\pan\701港前南线.txt",r"D:\MyPro\cimforreduceloss\testHasttable\output\pan\702高尔夫I线.txt"]
     fileList=[r"D:\MyPro\cimforreduceloss\testHasttable\output\pan\727泰林东乙线.txt",r"D:\MyPro\cimforreduceloss\testHasttable\output\pan\714泰林西乙线.txt",r"D:\MyPro\cimforreduceloss\testHasttable\output\pan\730泰港乙线.txt",r"D:\MyPro\cimforreduceloss\testHasttable\output\pan\713泰林东甲线.txt",r"D:\MyPro\cimforreduceloss\testHasttable\output\pan\724创业乙线.txt",r"D:\MyPro\cimforreduceloss\testHasttable\output\pan\706林港Ⅱ线.txt",r"D:\MyPro\cimforreduceloss\testHasttable\output\pan\705林港I线.txt"]
-    fileList=prepareFiles()
+    # fileList=prepareFiles()
+    # serializeFile=open('20150313.obj','wb')
+    # pickle.dump(fileList,serializeFile)
+    # serializeFile.close()
+
+    serializeFile=open('20150313.obj','rb')
+    fileList=pickle.load(serializeFile)
+    serializeFile.close()
+
     # fileList=[r"D:\MyPro\cimforreduceloss\testHasttable\output\pan\702高尔夫I线.txt"]
     m=MergeReconfigFile(fileList)
     m.Output(r'D:\MyPro\cimforreduceloss\testHasttable\output\merge\merged.txt')
\ No newline at end of file
diff --git a/testHasttable/cimexporter.cpp b/testHasttable/cimexporter.cpp
index ab0397b..ebbbf93 100644
--- a/testHasttable/cimexporter.cpp
+++ b/testHasttable/cimexporter.cpp
@@ -297,10 +297,7 @@ void CIMExporter::exportTo(const QString& path,const QString &rootID)
             ite++)
         {
             //保存到节点注入功率中
-            nodePQ.push_back(CIMExporter::NodePQ(ite->toNum,-ite->dg->getPG(0.999)/1000*0.5,-ite->dg->getQG(0.999)/1000*0.5) );//capapcity的单位是kVA
-//            writer<<ite->fromNum<<"\t";
-//            writer<<ite->toNum<<"\t";
-//            writer<<ite->dg->capacity<<"\r\n";
+            //nodePQ.push_back(CIMExporter::NodePQ(ite->toNum,-ite->dg->getPG(0.95)/1000*0.5,-ite->dg->getQG(0.95)/1000*0.5) );//capapcity的单位是kVA
         }
 
         //iPso 开始输出注入功率