[Commit-gnuradio] r3766 - gnuradio/branches/developers/jcorgan/cppwrap/gnuradio-examples/native

[jcorgan]

Author: jcorgan
Date: 2006-10-10 13:35:52 -0600 (Tue, 10 Oct 2006)
New Revision: 3766

Modified:
   
gnuradio/branches/developers/jcorgan/cppwrap/gnuradio-examples/native/gr_flow_graph.cc
Log:
Work in progress.

Renamed iterator variable names for clarity.


Modified: 
gnuradio/branches/developers/jcorgan/cppwrap/gnuradio-examples/native/gr_flow_graph.cc
===================================================================
--- 
gnuradio/branches/developers/jcorgan/cppwrap/gnuradio-examples/native/gr_flow_graph.cc
      2006-10-10 19:20:04 UTC (rev 3765)
+++ 
gnuradio/branches/developers/jcorgan/cppwrap/gnuradio-examples/native/gr_flow_graph.cc
      2006-10-10 19:35:52 UTC (rev 3766)
@@ -72,13 +72,13 @@
 
 void gr_flow_graph::check_dst_not_used(gr_endpoint_t dst)
 {
-    gr_edge_vector_iterator_t edge;
-    for(edge = d_edges.begin(); edge != d_edges.end(); edge++) {
+    gr_edge_vector_iterator_t edge_iter;
+    for(edge_iter = d_edges.begin(); edge_iter != d_edges.end(); edge_iter++) {
        // For readability
        gr_block_sptr dst_block = dst.first;
-       gr_block_sptr edge_block = edge->second.first;
+       gr_block_sptr edge_block = edge_iter->second.first;
        int dst_port = dst.second;
-       int edge_port = edge->second.second;
+       int edge_port = edge_iter->second.second;
        
        if (dst_block == edge_block && dst_port == edge_port)
            throw std::invalid_argument("gr_flow_graph::check_dst_not_used");
@@ -108,10 +108,10 @@
 
 void gr_flow_graph::disconnect_prim(gr_endpoint_t src, gr_endpoint_t dst)
 {
-    gr_edge_vector_iterator_t edge;
-    edge = find(d_edges.begin(), d_edges.end(), gr_edge_t(src, dst));
-    if (edge != d_edges.end())
-       d_edges.erase(edge);
+    gr_edge_vector_iterator_t edge_iter;
+    edge_iter = find(d_edges.begin(), d_edges.end(), gr_edge_t(src, dst));
+    if (edge_iter != d_edges.end())
+       d_edges.erase(edge_iter);
     else
        throw std::invalid_argument("gr_flow_graph::disconnect_prim");
 }
@@ -132,35 +132,35 @@
 
 void gr_flow_graph::create_block_list()
 {
-    gr_block_vector_iterator_t block;
-    gr_edge_vector_iterator_t edge;
+    gr_block_vector_iterator_t block_iter;
+    gr_edge_vector_iterator_t edge_iter;
 
     // TODO: use sort() and unique() instead
-    for(edge = d_edges.begin(); edge != d_edges.end(); edge++) {
-       gr_block_sptr src_block = edge->first.first;
-       gr_block_sptr dst_block = edge->second.first;
+    for(edge_iter = d_edges.begin(); edge_iter != d_edges.end(); edge_iter++) {
+       gr_block_sptr src_block = edge_iter->first.first;
+       gr_block_sptr dst_block = edge_iter->second.first;
 
-       block = find(d_blocks.begin(), d_blocks.end(), src_block);
-       if (block == d_blocks.end())
+       block_iter = find(d_blocks.begin(), d_blocks.end(), src_block);
+       if (block_iter == d_blocks.end())
            d_blocks.push_back(src_block);
 
-       block = find(d_blocks.begin(), d_blocks.end(), dst_block);
-       if (block == d_blocks.end())
+       block_iter = find(d_blocks.begin(), d_blocks.end(), dst_block);
+       if (block_iter == d_blocks.end())
            d_blocks.push_back(dst_block);
     }
 }
 
 void gr_flow_graph::validate()
 {
-    gr_block_vector_iterator_t block;
-    for(block = d_blocks.begin(); block != d_blocks.end(); block++) {
-       std::vector<int> used_inputs = calc_used_inputs(*block);
-       std::vector<int> used_outputs = calc_used_outputs(*block);
+    gr_block_vector_iterator_t block_iter;
+    for(block_iter = d_blocks.begin(); block_iter != d_blocks.end(); 
block_iter++) {
+       std::vector<int> used_inputs = calc_used_inputs(*block_iter);
+       std::vector<int> used_outputs = calc_used_outputs(*block_iter);
 
-       int ninputs = check_contiguity(*block, (*block)->input_signature(), 
used_inputs);
-       int noutputs = check_contiguity(*block, (*block)->output_signature(), 
used_outputs);
+       int ninputs = check_contiguity(*block_iter, 
(*block_iter)->input_signature(), used_inputs);
+       int noutputs = check_contiguity(*block_iter, 
(*block_iter)->output_signature(), used_outputs);
        
-       if (!(*block)->check_topology(ninputs, noutputs))
+       if (!(*block_iter)->check_topology(ninputs, noutputs))
            throw std::invalid_argument("gr_flow_graph::validate");
     }
 }
@@ -168,13 +168,13 @@
 // TODO: consolidate this and the next into one method
 std::vector<int> gr_flow_graph::calc_used_inputs(gr_block_sptr block)
 {
-    gr_edge_vector_iterator_t edge;
+    gr_edge_vector_iterator_t edge_iter;
     std::vector<int> result;
     
-    for(edge = d_edges.begin(); edge != d_edges.end(); edge++) {
-       gr_block_sptr dst_block = edge->second.first;
+    for(edge_iter = d_edges.begin(); edge_iter != d_edges.end(); edge_iter++) {
+       gr_block_sptr dst_block = edge_iter->second.first;
        if (dst_block == block)
-           result.push_back(edge->second.second);
+           result.push_back(edge_iter->second.second);
     }
     
     sort(result.begin(), result.end());
@@ -184,13 +184,13 @@
 
 std::vector<int> gr_flow_graph::calc_used_outputs(gr_block_sptr block)
 {
-    gr_edge_vector_iterator_t edge;
+    gr_edge_vector_iterator_t edge_iter;
     std::vector<int> result;
     
-    for(edge = d_edges.begin(); edge != d_edges.end(); edge++) {
-       gr_block_sptr src_block = edge->first.first;
+    for(edge_iter = d_edges.begin(); edge_iter != d_edges.end(); edge_iter++) {
+       gr_block_sptr src_block = edge_iter->first.first;
        if (src_block == block)
-           result.push_back(edge->first.second);
+           result.push_back(edge_iter->first.second);
     }
     
     sort(result.begin(), result.end());
@@ -199,7 +199,7 @@
 }
 
 int gr_flow_graph::check_contiguity(gr_block_sptr block, gr_io_signature_sptr 
sig,
-                                    std::vector<int> used_ports)
+                                   std::vector<int> used_ports)
 {
     int min_s = sig->min_streams();
     int l = used_ports.size();
@@ -225,13 +225,13 @@
 
 void gr_flow_graph::assign_details()
 {
-    gr_block_vector_iterator_t block;
-    for(block = d_blocks.begin(); block != d_blocks.end(); block++) {
-       int ninputs = calc_used_inputs(*block).size();
-       int noutputs = calc_used_outputs(*block).size();
+    gr_block_vector_iterator_t block_iter;
+    for(block_iter = d_blocks.begin(); block_iter != d_blocks.end(); 
block_iter++) {
+       int ninputs = calc_used_inputs(*block_iter).size();
+       int noutputs = calc_used_outputs(*block_iter).size();
 
        printf("Assigning detail with %i inputs and %i outputs\n", ninputs, 
noutputs);
-       (*block)->set_detail(gr_make_block_detail(ninputs, noutputs));
+       (*block_iter)->set_detail(gr_make_block_detail(ninputs, noutputs));
     }
 }