[Commit-gnuradio] r4995 - in gnuradio/branches/developers/jcorgan/hier2/gnuradio-core/src: lib/runtime python/gnuradio/gr

[jcorgan]

Author: jcorgan
Date: 2007-04-13 13:57:44 -0600 (Fri, 13 Apr 2007)
New Revision: 4995

Modified:
   
gnuradio/branches/developers/jcorgan/hier2/gnuradio-core/src/lib/runtime/gr_simple_flowgraph_detail.cc
   
gnuradio/branches/developers/jcorgan/hier2/gnuradio-core/src/python/gnuradio/gr/qa_hier_block2.py
Log:
Work in progress.  'define_component' technique has been removed from 
gr.hier_block2, and QA passes. No Python scripts dependent on hier_block2.py 
have been modified yet.

Modified: 
gnuradio/branches/developers/jcorgan/hier2/gnuradio-core/src/lib/runtime/gr_simple_flowgraph_detail.cc
===================================================================
--- 
gnuradio/branches/developers/jcorgan/hier2/gnuradio-core/src/lib/runtime/gr_simple_flowgraph_detail.cc
      2007-04-13 19:29:34 UTC (rev 4994)
+++ 
gnuradio/branches/developers/jcorgan/hier2/gnuradio-core/src/lib/runtime/gr_simple_flowgraph_detail.cc
      2007-04-13 19:57:44 UTC (rev 4995)
@@ -68,13 +68,14 @@
 gr_simple_flowgraph_detail::disconnect(const gr_endpoint &src, const 
gr_endpoint &dst)
 {
   for (gr_edge_viter_t p = d_edges.begin(); p != d_edges.end(); p++) {
-    if ((*p)->src().block() == src.block() && (*p)->src().port() == src.port() 
&&
-       (*p)->dst().block() == dst.block() && (*p)->dst().port() == dst.port())
+    if (src.block() == (*p)->src().block() && src.port() == (*p)->src().port() 
&& 
+       dst.block() == (*p)->dst().block() && dst.port() == (*p)->dst().port()) 
{
       d_edges.erase(p);
-    return;
+      return;
+    }
   }
 
-  throw std::runtime_error("edge to disconnect not found");
+  throw std::invalid_argument("edge to disconnect not found");
 }
 
 void

Modified: 
gnuradio/branches/developers/jcorgan/hier2/gnuradio-core/src/python/gnuradio/gr/qa_hier_block2.py
===================================================================
--- 
gnuradio/branches/developers/jcorgan/hier2/gnuradio-core/src/python/gnuradio/gr/qa_hier_block2.py
   2007-04-13 19:29:34 UTC (rev 4994)
+++ 
gnuradio/branches/developers/jcorgan/hier2/gnuradio-core/src/python/gnuradio/gr/qa_hier_block2.py
   2007-04-13 19:57:44 UTC (rev 4995)
@@ -116,7 +116,7 @@
        hblock.connect(nop1, 0, nop2, 0)
         hblock.disconnect(nop1, 0, nop2, 0)
 
-    def dont_test_013_disconnect_not_connected(self):
+    def test_013_disconnect_not_connected(self):
        hblock = gr.hier_block2("test_block", 
                                gr.io_signature(1,1,gr.sizeof_int), 
                                gr.io_signature(1,1,gr.sizeof_int))
@@ -144,7 +144,7 @@
         self.assertEquals(expected, actual1)
         self.assertEquals(expected, actual2)
 
-    def dont_test_015_connect_disconnect(self):
+    def test_015_connect_disconnect(self):
         expected = (1.0, 2.0, 3.0, 4.0)
         hblock = gr.hier_block2("test_block",
                                 gr.io_signature(0,0,0),