From 2675d4521550ed92840c0f6d5f92a27f4a16e964 Mon Sep 17 00:00:00 2001
From: "dmy@lab" <dmy@lab.lab>
Date: Fri, 13 Mar 2015 22:35:03 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E5=BA=8F=E5=88=97=E8=AF=9D=E6=96=B9?=
 =?UTF-8?q?=E6=B3=95=E4=BF=9D=E5=AD=98=E6=80=BB=E7=9A=84=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?list?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: dmy@lab <dmy@lab.lab>
---
 Script/20150313.obj           | Bin 0 -> 3753 bytes
 Script/FileData.py            |   3 +--
 Script/main.py                |  11 ++++++++++-
 testHasttable/cimexporter.cpp |   5 +----
 4 files changed, 12 insertions(+), 7 deletions(-)
 create mode 100644 Script/20150313.obj

diff --git a/Script/20150313.obj b/Script/20150313.obj
new file mode 100644
index 0000000000000000000000000000000000000000..51466f5d118f66a0b7fc37a44f488574bbb083b8
GIT binary patch
literal 3753
zcmZo*jxA)+h;U|LU~sXD@vRIf%8yCT%uUNLDoRZ$O-{|pFD{NLNi8n%NGvWXNleN~
zjma-9DJU(8DM-xIH#abRwr11Q-oEF%_Un~YloT>XxRGztj`dGFd!P1BhZ)91zO#&;
zZQB2A<9wJ&%n|P7I?L$g>KRWrOnJIwwI|Fp7V_O?{A_FAi<vuNCb5zqT*l8J!PNr~
zE;jNFGkLmm|FaESJU!ulWGCN`CNFpFf3jm1%#R%8JIfT}tVgX2V1{u<xR4u>rqAY0
zf3{;i+=pD`yUPq>)T7pgFn4j2A6({7S2R9d+72^`hkR#QJlnkCY3r8fQ#Qd2<0aoP
zONe1lcFu$u#z%o+&-e8`pVfloGJdiH%+TQ3yy;JuY=JpTfNW<O8a|u0;pzN7q<9o0
z-!P+RTc$r>H2v9}T`-pkk?%*Nm+cc@^fbXt5+>gy<0m`jJe?1BlL+}9G=AE;_Q{S7
zNRcQS;Ynt0G&Fv;dBd}L)1T~^gJhl<`Q9`Ed9xLsD8$M4rU}HGNC{tpd~cdSy!m43
zekAiG$#<OD)7C9dcFaPmB&EnV%p7VMq6(3w#ITOppi&=E_{fkSo95t*2~V`L<eOyi
zw148$jZ<M6NsjFL!_WfkrapN6Ay0l-S;Fcyc>SRe;Yw~!vV>Gdo?$RQDw6FmBLhe|
zjg(fE$PRiV!>7H|pY56ebCxnCCaq|E-U)9tsgQ3HsE~fPZ3)axs$}PEBjcxg8bE2Q
zXBSfQM2-BQH+c%qKS)8ZPQK$zkQ@h3V;bZ;&g^N&wwIF@Ar;k{<Qr!GWLM9#DeI98
z(<0xe=8yvR$&NWlA*W5g<18SKLo!T<e8+(rWY6YJf3b8wl4o_vcbp}ty6i&^IXwyt
g1BKiUWW)5yHq6)n;xeRQGoZjQh|7=+GfdS30E{>)WdHyG

literal 0
HcmV?d00001

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 开始输出注入功率