diff --git a/Script/FileData.py b/Script/FileData.py index 321a233..4c2c8dc 100644 --- a/Script/FileData.py +++ b/Script/FileData.py @@ -125,6 +125,8 @@ class MergeReconfigFile: # 合并重构用文件 self.__basicInfo[0][0] += len(ipsodata.GetNodePower()) self.__basicInfo[0][1] += len(ipsodata.GetLine()) self.__basicInfo[0][1] += len(ipsodata.GetTrans()) + if len(ipsodata.GetNodePower())-len(ipsodata.GetLine())-len(ipsodata.GetTrans())>1: + print('%s is not radial.'%(f) ) #序号 变电站节点编号 for s in ipsodata.GetBalance(): diff --git a/Script/main.py b/Script/main.py index 7e96505..ed02722 100644 --- a/Script/main.py +++ b/Script/main.py @@ -1,9 +1,21 @@ __author__ = 'dmy' from FileData import * +import os +def prepareFiles(): + _dir=r'D:\MyPro\cimforreduceloss\testHasttable\output\pan' + entries=os.listdir(_dir) + files=[] + for e in entries: + if e.endswith('.txt'): + files.append(_dir+'/'+ e) + return files + + if __name__=='__main__': fileList=[r"D:\MyPro\cimforreduceloss\testHasttable\output\pan\701港前南线.txt",r"D:\MyPro\cimforreduceloss\testHasttable\output\pan\702高尔夫I线.txt"] + fileList=prepareFiles() # 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 59f74b4..79b7960 100644 --- a/testHasttable/cimexporter.cpp +++ b/testHasttable/cimexporter.cpp @@ -159,9 +159,25 @@ void CIMExporter::exportTo(const QString& path,const QString &rootID) writer<sw->b1<sw->b2<id<<"\t"; -// writer<<0<<"\r\n"; + } + + //输出DG,算作短支路 + for(QList::iterator ite=this->dg.begin(); + ite!=this->dg.end(); + ite++) + { + if(ite->dispose) + { + continue; + } + writer<fromNum<toNum<dg->r<dg->x<dg->b1<dg->b2<