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<getID().toStdString()<getName()=="ACLineSegment" && p->getID()=="AC-591840") + if(p->getName()=="ACLineSegment" && p->getID()=="AC-591839") { ACLineSegment *ac=static_cast(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<reachedTerminal[anotherTerminal]=0; - // std::cout<<"anotherTerminal"<(ht[anotherTerminal]); QString ce; ce=anotherTerminalP->getConductingEquipment(); - // std::cout< fromTo; QString terminalA; QString terminalB; @@ -62,7 +59,6 @@ bool TopologyRecorder::startWithNode(const QString& node) ACLineSegment *AC=static_cast(ht[acID]); if(!AC) { - // std::cout<<"can not find "<getTerminalA(); @@ -83,7 +79,6 @@ bool TopologyRecorder::startWithNode(const QString& node) QString swID=ce; fromTo.first=node; fromTo.second=swID; - Breaker *SW=static_cast(ht[swID]); if(!SW) { @@ -121,7 +116,6 @@ bool TopologyRecorder::startWithNode(const QString& node) if(!Dis) { -// std::cout<<"can not SW "<branch.push_back(fromTo); QString nextTerminal; nextTerminal=(terminalA==anotherTerminal)?terminalB:terminalA; - // std::cout<<"new Terminal"<(ht[nextTerminal]); if(!nextTerminalP) { - // std::cout<<"can not terminal "<getConnectivityNode(); - // std::cout<<"next node"<startWithNode(nextNode); } else