From b944c5507b261b733f49c613899b0e05dffe766e Mon Sep 17 00:00:00 2001 From: "dmy@lab" Date: Tue, 10 Mar 2015 17:52:17 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=E6=B2=A1=E6=9C=89?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E6=96=B0=E5=A2=9E=E7=9A=84=E7=BA=BF=E8=B7=AF?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: dmy@lab --- Script/FileData.py | 95 ++++++++++++++++++----------------- Script/main.py | 3 +- testHasttable/cimexporter.cpp | 2 +- 3 files changed, 51 insertions(+), 49 deletions(-) diff --git a/Script/FileData.py b/Script/FileData.py index 9b5f020..321a233 100644 --- a/Script/FileData.py +++ b/Script/FileData.py @@ -115,7 +115,7 @@ class MergeReconfigFile: # 合并重构用文件 def __merge(self, fileList): indLine = 1 #序号 indTrans=1 - indNode = 1 + indNode = 2 indGround = 1 addNum = 1 # offsetNodeNum = {} #记录每个一个文件在新文件里节点的偏移量 @@ -154,8 +154,11 @@ class MergeReconfigFile: # 合并重构用文件 addNum += len(ipsodata.GetNodePower()) #用一个总的头节点把之前所有线路的头节点连接起来 for b in self.__balanceNodeOffset: - self.__mergedIpsoLine.append ([indLine, 1 , 1 + b, 0.01, 0.01, 0, 0]) + self.__mergedIpsoLine.append ([indLine, 1 , b, 0.01, 0.01, 0, 0]) + self.__basicInfo[0][1]+=1 indLine+=1 + self.__mergedIpsoLoad.insert(0,[1, n[1], 1,n[3], 0, 0, 0, 0, 0, 0]) + self.__basicInfo[0][0]+=1 def __GetLineName(self, filePath): baseName = os.path.basename(filePath) @@ -172,12 +175,11 @@ class MergeReconfigFile: # 合并重构用文件 def Output(self, fileOutDir): #输出到文件 #输出节点映射 - self.__outputNodeName(fileOutDir) - with open(fileOutDir + '_Merged.txt', 'w') as f: + with open(fileOutDir, 'w') as f: for b in self.__basicInfo: f.write('%d %d 1 1e-5 1\n' % (b[0], b[1])) f.write('0\n') - f.write('1 1 1.5\n') + f.write('1 1 1.05\n') f.write('0\n') for b in self.__mergedIpsoLine: f.write('%d %d %d %f %f %f %f\n' % (b[0], b[1], b[2],b[3],b[4],b[5],b[6])) @@ -191,7 +193,7 @@ class MergeReconfigFile: # 合并重构用文件 f.write('0\n') f.write('0\n') f.write('0\n') - for n in self.__node: + for n in self.__mergedIpsoLoad: f.write('%d %d %d %d %.10f %.10f %.10f %.10f %.10f %.10f\n' % (n[0], n[1], n[2], n[3], n[4], n[5], n[6], n[7], n[8], n[9])) #负荷单位是kW f.write('0\n') f.write('1 1 1 1 -100 100 0 0 0 0\n') @@ -214,47 +216,46 @@ class MergeReconfigFile: # 合并重构用文件 f.write('0\n') f.write('0\n') f.write('0\n') - with open(fileOutDir, 'w') as f: - for b in self.__basicInfo: - f.write('%d,%d' % (b[0], b[1])) - f.write(',1,1,1\n') - f.write('0\n') - for s in self.__mergedIpsoBalance: - f.write('%d,%d,%.10f\n' % (s[0], s[1], s[2])) - f.write('0\n') - for b in self.__mergedIpsoLine: - f.write('%d,%d,%d,%.10f,%.10f,%.10f,%.10f\n' % (b[0], b[1], b[2], b[3], b[4], b[5], b[6])) - f.write('0\n') - f.write('0\n') - f.write('0\n') - for g in self.__mergedIpsoGround: - f.write('%d,%d,%.10f,%.10f\n' % (g[0], g[1], g[2], g[3])) - f.write('0\n') - f.write('0\n') - f.write('0\n') - for b in self.__mergedIpsoLoad: - f.write('%d,%d,%d,%d,%.10f,%.10f,%.10f,%.10f,%.10f,%.10f\n' % ( - b[0], b[1], b[2], b[3], b[4], b[5], b[6], b[7], b[8], b[9])) - f.write('0\n') - f.write('0\n') - f.write('0\n') - for b in self.__mergedIpsoBalance: - f.write('%d,%d,%d,%d,%.10f,%.10f,%.10f\n' % (b[0], 1, b[1], 1, 1, -100, 100)) - f.write('0\n') - f.write('0\n') - f.write('0\n') - f.write('0\n') - f.write('0\n') - f.write('0\n') - f.write('0\n') - f.write('0\n') - f.write('0\n') - f.write('0\n') - f.write('0\n') - f.write('0\n') - f.write('0\n') - f.write('0\n') - f.write('0\n') + # with open(fileOutDir, 'w') as f: + # for b in self.__basicInfo: + # f.write('%d,%d' % (b[0], b[1])) + # f.write(',1,1,1\n') + # f.write('0\n') + # for s in self.__mergedIpsoBalance: + # f.write('%d,%d,%.10f\n' % (s[0], s[1], s[2])) + # f.write('0\n') + # for b in self.__mergedIpsoLine: + # f.write('%d,%d,%d,%.10f,%.10f,%.10f,%.10f\n' % (b[0], b[1], b[2], b[3], b[4], b[5], b[6])) + # f.write('0\n') + # f.write('0\n') + # f.write('0\n') + # for g in self.__mergedIpsoGround: + # f.write('%d,%d,%.10f,%.10f\n' % (g[0], g[1], g[2], g[3])) + # f.write('0\n') + # f.write('0\n') + # f.write('0\n') + # for b in self.__mergedIpsoLoad: + # f.write('%d,%d,%d,%d,%.10f,%.10f,%.10f,%.10f,%.10f,%.10f\n' % (b[0], b[1], b[2], b[3], b[4], b[5], b[6], b[7], b[8], b[9])) + # f.write('0\n') + # f.write('0\n') + # f.write('0\n') + # for b in self.__mergedIpsoBalance: + # f.write('%d,%d,%d,%d,%.10f,%.10f,%.10f\n' % (b[0], 1, b[1], 1, 1, -100, 100)) + # f.write('0\n') + # f.write('0\n') + # f.write('0\n') + # f.write('0\n') + # f.write('0\n') + # f.write('0\n') + # f.write('0\n') + # f.write('0\n') + # f.write('0\n') + # f.write('0\n') + # f.write('0\n') + # f.write('0\n') + # f.write('0\n') + # f.write('0\n') + # f.write('0\n') def GetReverseMap(self): #通过新的节点号返回原来的节点号 return self.__reverseDic; diff --git a/Script/main.py b/Script/main.py index 9938a41..7e96505 100644 --- a/Script/main.py +++ b/Script/main.py @@ -4,5 +4,6 @@ from FileData import * if __name__=='__main__': 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\702高尔夫I线.txt"] m=MergeReconfigFile(fileList) - m.Output(r'D:\MyPro\cimforreduceloss\testHasttable\output\merge') \ No newline at end of file + 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 502d49f..59f74b4 100644 --- a/testHasttable/cimexporter.cpp +++ b/testHasttable/cimexporter.cpp @@ -374,7 +374,7 @@ void CIMExporter::idToNumber(QList &s)//把所有元件的标识进行编号 T _t=*ite; _t.fromNum=this->numberIt(_t.fromID); _t.toNum=this->numberIt(_t.toID); - std::cout<<"id "<<_t.id.toStdString()<<" "<<_t.fromNum<<" "<<_t.toNum<