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(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 +#include TopologyRecorder::TopologyRecorder(const QHash& elementHT, QObject *parent):eleHT(elementHT) { } TopologyRecorder::~TopologyRecorder() { + const QHash &ht=this->eleHT; std::cout<<"total tf"<tfs.length()< > s; + for(QVector::iterator ite=this->tfs.begin(); + ite!=this->tfs.end(); + ite++) + { + PowerTransformer *pf=static_cast(ht[*ite]); + QString container; + container=pf->getEquipmentMemberOf_EquipmentContainer(); + s[container].push_back(*ite); + } + std::cout<<"container "< keys=s.keys(); + for(QList::iterator ite=keys.begin(); + ite!=keys.end(); + ite++) + { + QString k=*ite; + std::cout<(ht[k]); + std::cout<<", "<getNamingDescription().toStdString(); + QVector v=s[k]; + foreach (QString n, v) { + std::cout<<", "<(ht[n]); + std::cout<<"("<getNamingDescription().toStdString()<<")"; + } + std::cout<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"<getID().toStdString()<getNamingDescription().toStdString()<getLength()<getNamingDescription().toStdString()<isEquipmentNeeded(container)) + { + std::cout<<"not belong"<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;