From 8a994253b9373ecf4c3a0e11c42331c21f770e94 Mon Sep 17 00:00:00 2001
From: "facat@lab.com" <facat@lab.com>
Date: Sat, 3 Jan 2015 22:22:54 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E4=BA=86=E4=B8=80=E4=BA=9B=E5=8F=98?=
 =?UTF-8?q?=E5=8E=8B=E5=99=A8=E7=BB=9F=E8=AE=A1=E7=9A=84=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: facat@lab.com <facat@lab.com>
---
 testHasttable/elementhashtable.cpp |  2 +-
 testHasttable/topologyrecorder.cpp | 41 ++++++++++++++++++++++++++++--
 2 files changed, 40 insertions(+), 3 deletions(-)

diff --git a/testHasttable/elementhashtable.cpp b/testHasttable/elementhashtable.cpp
index 1e55ac6..e4d2704 100644
--- a/testHasttable/elementhashtable.cpp
+++ b/testHasttable/elementhashtable.cpp
@@ -82,7 +82,7 @@ bool ElementHashtable::GoPath()
         ite++)
     {
         BasicElementInfo *p=zwht[*ite];
-        if(p->getName()=="ACLineSegment" && p->getID()=="AC-591839")
+        if(p->getName()=="ACLineSegment" && p->getID()=="AC-591821")
         {
             ACLineSegment *ac=static_cast<ACLineSegment *>(p);//BusbarSection也就是线路头节点
             QString acTerminal=ac->getTerminalB();
diff --git a/testHasttable/topologyrecorder.cpp b/testHasttable/topologyrecorder.cpp
index 056892c..fda4e21 100644
--- a/testHasttable/topologyrecorder.cpp
+++ b/testHasttable/topologyrecorder.cpp
@@ -1,12 +1,43 @@
 #include "topologyrecorder.h"
 #include <iostream>
+#include <QList>
 TopologyRecorder::TopologyRecorder(const QHash<QString,BasicElementInfo *>& elementHT, QObject *parent):eleHT(elementHT)
 {
 }
 
 TopologyRecorder::~TopologyRecorder()
 {
+    const QHash<QString,BasicElementInfo*> &ht=this->eleHT;
     std::cout<<"total tf"<<this->tfs.length()<<std::endl;
+    //统计一下每个Container下有多少个变压器
+    QHash<QString,QVector<QString> > s;
+    for(QVector<QString>::iterator ite=this->tfs.begin();
+        ite!=this->tfs.end();
+        ite++)
+    {
+        PowerTransformer *pf=static_cast<PowerTransformer *>(ht[*ite]);
+        QString container;
+        container=pf->getEquipmentMemberOf_EquipmentContainer();
+        s[container].push_back(*ite);
+    }
+    std::cout<<"container "<<s.keys().length()<<std::endl;
+    QList<QString> keys=s.keys();
+    for(QList<QString>::iterator ite=keys.begin();
+        ite!=keys.end();
+        ite++)
+    {
+        QString k=*ite;
+        std::cout<<k.toStdString();
+        Substation *sb=static_cast<Substation *>(ht[k]);
+        std::cout<<", "<<sb->getNamingDescription().toStdString();
+        QVector<QString> v=s[k];
+        foreach (QString n, v) {
+           std::cout<<", "<<n.toStdString();
+           PowerTransformer *pf=static_cast<PowerTransformer *>(ht[n]);
+           std::cout<<"("<<pf->getNamingDescription().toStdString()<<")";
+        }
+        std::cout<<std::endl;
+    }
 }
 
 bool TopologyRecorder::isEquipmentNeeded(const QString& substatinID)
@@ -20,7 +51,7 @@ bool TopologyRecorder::isEquipmentNeeded(const QString& substatinID)
     else
     {
         QString feederID=sfd->getSubstationMemberOf_Feeder();
-        return feederID=="FD-2056"||sfd->getNamingDescription()=="V馈线站";
+        return feederID=="FD-2014"||sfd->getNamingDescription()=="V馈线站";
     }
     return false;
 }
@@ -72,6 +103,8 @@ bool TopologyRecorder::startWithNode(const QString& node)
             terminalB=AC->getTerminalB();
             std::cout<<"find"<<AC->getID().toStdString()<<std::endl;
             std::cout<<AC->getNamingDescription().toStdString()<<std::endl;
+            //把线路长度也输出来看一下
+            std::cout<<AC->getLength()<<std::endl;
             foundEle=AC;
             typ=TopologyRecorder::Type::AC;
         }
@@ -168,6 +201,10 @@ bool TopologyRecorder::startWithNode(const QString& node)
                 else
                 {
                     std::cout<<"encounter "<<sfd->getNamingDescription().toStdString()<<std::endl;
+                    if(!this->isEquipmentNeeded(container))
+                    {
+                        std::cout<<"not belong"<<std::endl;
+                    }
                 }
             }
             continue;
@@ -182,7 +219,7 @@ bool TopologyRecorder::startWithNode(const QString& node)
             equipmentContainer=tf->getEquipmentMemberOf_EquipmentContainer();
             if(this->isEquipmentNeeded(equipmentContainer))
             {
-                this->tfs.push_back(tf->getNamingDescription());
+                this->tfs.push_back(tfID);
                 fromTo.first=node;
                 fromTo.second=tfID;
                 foundEle=tf;