From 28e1df38fa107ca07ff3b92f455694890f840cd4 Mon Sep 17 00:00:00 2001
From: "facat@lab.com" <facat@lab.com>
Date: Sun, 28 Dec 2014 15:33:25 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=B8=80=E4=BA=9B=E4=B8=8D?=
 =?UTF-8?q?=E9=9C=80=E8=A6=81=E7=9A=84=E6=B3=A8=E9=87=8A?=
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 |  5 +----
 testHasttable/topologyrecorder.cpp | 11 +----------
 2 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/testHasttable/elementhashtable.cpp b/testHasttable/elementhashtable.cpp
index caa00c4..cd07539 100644
--- a/testHasttable/elementhashtable.cpp
+++ b/testHasttable/elementhashtable.cpp
@@ -82,10 +82,7 @@ bool ElementHashtable::GoPath()
         ite++)
     {
         BasicElementInfo *p=zwht[*ite];
-//        if(p->getName()=="ACLineSegment"){
-//            std::cout<<p->getID().toStdString()<<std::endl;
-//        }
-        if(p->getName()=="ACLineSegment" && p->getID()=="AC-591840")
+        if(p->getName()=="ACLineSegment" && p->getID()=="AC-591839")
         {
             ACLineSegment *ac=static_cast<ACLineSegment *>(p);//BusbarSection也就是线路头节点
             QString acTerminal=ac->getTerminalB();
diff --git a/testHasttable/topologyrecorder.cpp b/testHasttable/topologyrecorder.cpp
index a79fa7e..ffddda9 100644
--- a/testHasttable/topologyrecorder.cpp
+++ b/testHasttable/topologyrecorder.cpp
@@ -20,7 +20,7 @@ bool TopologyRecorder::isEquipmentNeeded(const QString& substatinID)
     else
     {
         QString feederID=sfd->getSubstationMemberOf_Feeder();
-        return feederID=="FD-2057"||sfd->getNamingDescription()=="V馈线站";
+        return feederID=="FD-2056"||sfd->getNamingDescription()=="V馈线站";
     }
     return false;
 }
@@ -41,15 +41,12 @@ bool TopologyRecorder::startWithNode(const QString& node)
         anotherTerminal=anotherTerminalVector.at(atI);
         if(this->reachedTerminal.contains(anotherTerminal))
         {
-            //            std::cout<<anotherTerminal.toStdString()<<"reached"<<std::endl; //@1
             continue;
         }
         this->reachedTerminal[anotherTerminal]=0;
-        //        std::cout<<"anotherTerminal"<<anotherTerminal.toStdString()<<std::endl;//@1
         Terminal *anotherTerminalP=static_cast<Terminal *>(ht[anotherTerminal]);
         QString ce;
         ce=anotherTerminalP->getConductingEquipment();
-        //        std::cout<<ce.toStdString()<<"from "<<anotherTerminal.toStdString() <<std::endl;//@1
         QPair<QString,QString> fromTo;
         QString terminalA;
         QString terminalB;
@@ -62,7 +59,6 @@ bool TopologyRecorder::startWithNode(const QString& node)
             ACLineSegment *AC=static_cast<ACLineSegment *>(ht[acID]);
             if(!AC)
             {
-                //                std::cout<<"can not find "<<acID.toStdString()<<std::endl;//@1
                 continue;
             }
             terminalA=AC->getTerminalA();
@@ -83,7 +79,6 @@ bool TopologyRecorder::startWithNode(const QString& node)
                     QString swID=ce;
                     fromTo.first=node;
                     fromTo.second=swID;
-
                     Breaker *SW=static_cast<Breaker *>(ht[swID]);
                     if(!SW)
                     {
@@ -121,7 +116,6 @@ bool TopologyRecorder::startWithNode(const QString& node)
 
                     if(!Dis)
                     {
-//                                        std::cout<<"can not SW "<<swID.toStdString()<<std::endl;//@1
                         continue;
                     }
                     //显示开关状态
@@ -192,15 +186,12 @@ bool TopologyRecorder::startWithNode(const QString& node)
             this->branch.push_back(fromTo);
             QString nextTerminal;
             nextTerminal=(terminalA==anotherTerminal)?terminalB:terminalA;
-            //            std::cout<<"new Terminal"<<nextTerminal.toStdString()<<std::endl;//@1
             Terminal *nextTerminalP=static_cast<Terminal *>(ht[nextTerminal]);
             if(!nextTerminalP)
             {
-                //                std::cout<<"can not terminal "<<nextTerminal.toStdString()<<std::endl;//@1
                 continue;
             }
             QString nextNode=nextTerminalP->getConnectivityNode();
-            //            std::cout<<"next node"<<nextNode.toStdString()<<"from"<<nextTerminal.toStdString()<<std::endl;//@1
             this->startWithNode(nextNode);
         }
         else