86c86
< m_switch_ptr_vector.push_back(s);
---
> m_switches.push_back(s);
112,113c112,113
< for(int i = 0; i < m_switch_ptr_vector.size(); i++){
< m_switch_ptr_vector[i]->clearBuffers();
---
> for(int i = 0; i < m_switches.size(); i++){
> m_switches[i]->clearBuffers();
123c123
< deletePointers(m_switch_ptr_vector);
---
> deletePointers(m_switches);
135,136c135,136
< assert(src < m_switch_ptr_vector.size());
< assert(m_switch_ptr_vector[src] != NULL);
---
> assert(src < m_switches.size());
> assert(m_switches[src] != NULL);
140c140
< m_switch_ptr_vector[src]->addOutPort(m_fromNetQueues[dest],
---
> m_switches[src]->addOutPort(m_fromNetQueues[dest],
145c145
< m_endpoint_switches[dest] = m_switch_ptr_vector[src];
---
> m_endpoint_switches[dest] = m_switches[src];
155c155
< m_switch_ptr_vector[dest]->addInPort(m_toNetQueues[src]);
---
> m_switches[dest]->addInPort(m_toNetQueues[src]);
180,181c180,181
< m_switch_ptr_vector[dest]->addInPort(queues);
< m_switch_ptr_vector[src]->addOutPort(queues, routing_table_entry,
---
> m_switches[dest]->addInPort(queues);
> m_switches[src]->addOutPort(queues, routing_table_entry,
242c242
< for (int i = 0; i < m_switch_ptr_vector.size(); i++) {
---
> for (int i = 0; i < m_switches.size(); i++) {
244c244
< m_switch_ptr_vector[i]->getThrottles();
---
> m_switches[i]->getThrottles();
284,285c284,285
< for (int i = 0; i < m_switch_ptr_vector.size(); i++) {
< m_switch_ptr_vector[i]->printStats(out);
---
> for (int i = 0; i < m_switches.size(); i++) {
> m_switches[i]->printStats(out);
292,293c292,293
< for (int i = 0; i < m_switch_ptr_vector.size(); i++) {
< m_switch_ptr_vector[i]->clearStats();
---
> for (int i = 0; i < m_switches.size(); i++) {
> m_switches[i]->clearStats();
317,318c317,318
< for (unsigned int i = 0; i < m_switch_ptr_vector.size(); i++) {
< if (m_switch_ptr_vector[i]->functionalRead(pkt)) {
---
> for (unsigned int i = 0; i < m_switches.size(); i++) {
> if (m_switches[i]->functionalRead(pkt)) {
337,338c337,338
< for (unsigned int i = 0; i < m_switch_ptr_vector.size(); i++) {
< num_functional_writes += m_switch_ptr_vector[i]->functionalWrite(pkt);
---
> for (unsigned int i = 0; i < m_switches.size(); i++) {
> num_functional_writes += m_switches[i]->functionalWrite(pkt);