1.在脚本中加入非辐射状网络提示

2.修复了没有把DG作为短支路的bug

Signed-off-by: dmy@lab <dmy@lab.lab>

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():

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')

testHasttable/cimexporter.cpp

@@ -159,9 +159,25 @@ void CIMExporter::exportTo(const QString& path,const QString &rootID)
             writer<<ite->sw->b1<<seperator;
             writer<<ite->sw->b2<<seperator;
             writer<<endLine;
-//            writer<<"type"<<"\t";
-//            writer<<ite->id<<"\t";
-//            writer<<0<<"\r\n";
+        }
+
+        //输出DG，算作短支路
+        for(QList<DGStru>::iterator ite=this->dg.begin();
+            ite!=this->dg.end();
+            ite++)
+        {
+            if(ite->dispose)
+            {
+                continue;
+            }
+            writer<<seqN++<<seperator;
+            writer<<ite->fromNum<<seperator;
+            writer<<ite->toNum<<seperator;
+            writer<<ite->dg->r<<seperator;
+            writer<<ite->dg->x<<seperator;
+            writer<<ite->dg->b1<<seperator;
+            writer<<ite->dg->b2<<seperator;
+            writer<<endLine;
         }
         writer<<0<<endLine;//数据间隔
         //输出变压器

testHasttable/task.txt

@@ -1,5 +1,4 @@
-726制钢甲线,AC-671677,D:\Project\佛山项目\数据\搭网架参数文件\泰安\泰安负荷\726制钢甲线,(FD-2038)
-
+705林港I线,AC-591832,D:\Project\佛山项目\数据\搭网架参数文件\北滘\北滘负荷\705林港I线,(FD-2049,)
 
 709美的甲线,AC-671399,D:\Project\佛山项目\数据\搭网架参数文件\北滘\北滘负荷\709美的甲线、720美的乙线,(FD-2003,)
 720美的乙线,AC-671401,D:\Project\佛山项目\数据\搭网架参数文件\北滘\北滘负荷\709美的甲线、720美的乙线,(FD-2003,)