From feae41d9ead95ed163d4718d8eb2d9a079140d7a Mon Sep 17 00:00:00 2001
From: "dmy@lab" <dmy@lab.lab>
Date: Tue, 10 Mar 2015 19:05:27 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=9C=A8=E8=84=9A=E6=9C=AC=E4=B8=AD=E5=8A=A0?=
 =?UTF-8?q?=E5=85=A5=E9=9D=9E=E8=BE=90=E5=B0=84=E7=8A=B6=E7=BD=91=E7=BB=9C?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA=202.=E4=BF=AE=E5=A4=8D=E4=BA=86=E6=B2=A1?=
 =?UTF-8?q?=E6=9C=89=E6=8A=8ADG=E4=BD=9C=E4=B8=BA=E7=9F=AD=E6=94=AF?=
 =?UTF-8?q?=E8=B7=AF=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: dmy@lab <dmy@lab.lab>
---
 Script/FileData.py            |  2 ++
 Script/main.py                | 12 ++++++++++++
 testHasttable/cimexporter.cpp | 22 +++++++++++++++++++---
 testHasttable/task.txt        |  3 +--
 4 files changed, 34 insertions(+), 5 deletions(-)

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<<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;//数据间隔
         //输出变压器
diff --git a/testHasttable/task.txt b/testHasttable/task.txt
index b05fc0b..197a69d 100644
--- a/testHasttable/task.txt
+++ b/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,)