[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] r7002 - gnuradio/branches/developers/jcorgan/t202/gnur
|
From: |
jcorgan |
|
Subject: |
[Commit-gnuradio] r7002 - gnuradio/branches/developers/jcorgan/t202/gnuradio-core/src/python/gnuradio/gr |
|
Date: |
Mon, 19 Nov 2007 11:35:12 -0700 (MST) |
Author: jcorgan
Date: 2007-11-19 11:35:12 -0700 (Mon, 19 Nov 2007)
New Revision: 7002
Modified:
gnuradio/branches/developers/jcorgan/t202/gnuradio-core/src/python/gnuradio/gr/benchmark_filters.py
gnuradio/branches/developers/jcorgan/t202/gnuradio-core/src/python/gnuradio/gr/qa_add_and_friends.py
gnuradio/branches/developers/jcorgan/t202/gnuradio-core/src/python/gnuradio/gr/qa_add_v_and_friends.py
gnuradio/branches/developers/jcorgan/t202/gnuradio-core/src/python/gnuradio/gr/qa_agc.py
gnuradio/branches/developers/jcorgan/t202/gnuradio-core/src/python/gnuradio/gr/qa_argmax.py
gnuradio/branches/developers/jcorgan/t202/gnuradio-core/src/python/gnuradio/gr/qa_bin_statistics.py
Log:
Work in progress. qa_bin_statistics.py is segfaulting.
Modified:
gnuradio/branches/developers/jcorgan/t202/gnuradio-core/src/python/gnuradio/gr/benchmark_filters.py
===================================================================
---
gnuradio/branches/developers/jcorgan/t202/gnuradio-core/src/python/gnuradio/gr/benchmark_filters.py
2007-11-19 18:13:49 UTC (rev 7001)
+++
gnuradio/branches/developers/jcorgan/t202/gnuradio-core/src/python/gnuradio/gr/benchmark_filters.py
2007-11-19 18:35:12 UTC (rev 7002)
@@ -1,4 +1,24 @@
#!/usr/bin/env python
+#
+# Copyright 2005,2006,2007 Free Software Foundation, Inc.
+#
+# This file is part of GNU Radio
+#
+# GNU Radio is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3, or (at your option)
+# any later version.
+#
+# GNU Radio is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GNU Radio; see the file COPYING. If not, write to
+# the Free Software Foundation, Inc., 51 Franklin Street,
+# Boston, MA 02110-1301, USA.
+#
import time
import random
@@ -16,15 +36,15 @@
def benchmark(name, creator, dec, ntaps, total_test_size, block_size):
block_size = 32768
- fg = gr.flow_graph()
+ tb = gr.top_block()
taps = make_random_complex_tuple(ntaps)
src = gr.vector_source_c(make_random_complex_tuple(block_size), True)
head = gr.head(gr.sizeof_gr_complex, int(total_test_size))
op = creator(dec, taps)
dst = gr.null_sink(gr.sizeof_gr_complex)
- fg.connect(src, head, op, dst)
+ tb.connect(src, head, op, dst)
start = time.time()
- fg.run()
+ tb.run()
stop = time.time()
delta = stop - start
print "%16s: taps: %4d input: %4g, time: %6.3f taps/sec: %10.4g" % (
Modified:
gnuradio/branches/developers/jcorgan/t202/gnuradio-core/src/python/gnuradio/gr/qa_add_and_friends.py
===================================================================
---
gnuradio/branches/developers/jcorgan/t202/gnuradio-core/src/python/gnuradio/gr/qa_add_and_friends.py
2007-11-19 18:13:49 UTC (rev 7001)
+++
gnuradio/branches/developers/jcorgan/t202/gnuradio-core/src/python/gnuradio/gr/qa_add_and_friends.py
2007-11-19 18:35:12 UTC (rev 7002)
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Copyright 2004 Free Software Foundation, Inc.
+# Copyright 2004,2007 Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
@@ -25,38 +25,38 @@
class test_head (gr_unittest.TestCase):
def setUp (self):
- self.fg = gr.flow_graph ()
+ self.tb = gr.top_block ()
def tearDown (self):
- self.fg = None
+ self.tb = None
def help_ii (self, src_data, exp_data, op):
for s in zip (range (len (src_data)), src_data):
src = gr.vector_source_i (s[1])
- self.fg.connect (src, (op, s[0]))
+ self.tb.connect (src, (op, s[0]))
dst = gr.vector_sink_i ()
- self.fg.connect (op, dst)
- self.fg.run ()
+ self.tb.connect (op, dst)
+ self.tb.run ()
result_data = dst.data ()
self.assertEqual (exp_data, result_data)
def help_ff (self, src_data, exp_data, op):
for s in zip (range (len (src_data)), src_data):
src = gr.vector_source_f (s[1])
- self.fg.connect (src, (op, s[0]))
+ self.tb.connect (src, (op, s[0]))
dst = gr.vector_sink_f ()
- self.fg.connect (op, dst)
- self.fg.run ()
+ self.tb.connect (op, dst)
+ self.tb.run ()
result_data = dst.data ()
self.assertEqual (exp_data, result_data)
def help_cc (self, src_data, exp_data, op):
for s in zip (range (len (src_data)), src_data):
src = gr.vector_source_c (s[1])
- self.fg.connect (src, (op, s[0]))
+ self.tb.connect (src, (op, s[0]))
dst = gr.vector_sink_c ()
- self.fg.connect (op, dst)
- self.fg.run ()
+ self.tb.connect (op, dst)
+ self.tb.run ()
result_data = dst.data ()
self.assertEqual (exp_data, result_data)
Modified:
gnuradio/branches/developers/jcorgan/t202/gnuradio-core/src/python/gnuradio/gr/qa_add_v_and_friends.py
===================================================================
---
gnuradio/branches/developers/jcorgan/t202/gnuradio-core/src/python/gnuradio/gr/qa_add_v_and_friends.py
2007-11-19 18:13:49 UTC (rev 7001)
+++
gnuradio/branches/developers/jcorgan/t202/gnuradio-core/src/python/gnuradio/gr/qa_add_v_and_friends.py
2007-11-19 18:35:12 UTC (rev 7002)
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Copyright 2004 Free Software Foundation, Inc.
+# Copyright 2004,2007 Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
@@ -25,21 +25,21 @@
class test_add_v_and_friends(gr_unittest.TestCase):
def setUp(self):
- self.fg = gr.flow_graph()
+ self.tb = gr.top_block()
def tearDown(self):
- self.fg = None
+ self.tb = None
def help_ss(self, size, src_data, exp_data, op):
for s in zip(range (len (src_data)), src_data):
src = gr.vector_source_s(s[1])
srcv = gr.stream_to_vector(gr.sizeof_short, size)
- self.fg.connect(src, srcv)
- self.fg.connect(srcv, (op, s[0]))
+ self.tb.connect(src, srcv)
+ self.tb.connect(srcv, (op, s[0]))
rhs = gr.vector_to_stream(gr.sizeof_short, size)
dst = gr.vector_sink_s()
- self.fg.connect(op, rhs, dst)
- self.fg.run()
+ self.tb.connect(op, rhs, dst)
+ self.tb.run()
result_data = dst.data()
self.assertEqual(exp_data, result_data)
@@ -47,12 +47,12 @@
for s in zip(range (len (src_data)), src_data):
src = gr.vector_source_i(s[1])
srcv = gr.stream_to_vector(gr.sizeof_int, size)
- self.fg.connect(src, srcv)
- self.fg.connect(srcv, (op, s[0]))
+ self.tb.connect(src, srcv)
+ self.tb.connect(srcv, (op, s[0]))
rhs = gr.vector_to_stream(gr.sizeof_int, size)
dst = gr.vector_sink_i()
- self.fg.connect(op, rhs, dst)
- self.fg.run()
+ self.tb.connect(op, rhs, dst)
+ self.tb.run()
result_data = dst.data()
self.assertEqual(exp_data, result_data)
@@ -60,12 +60,12 @@
for s in zip(range (len (src_data)), src_data):
src = gr.vector_source_f(s[1])
srcv = gr.stream_to_vector(gr.sizeof_float, size)
- self.fg.connect(src, srcv)
- self.fg.connect(srcv, (op, s[0]))
+ self.tb.connect(src, srcv)
+ self.tb.connect(srcv, (op, s[0]))
rhs = gr.vector_to_stream(gr.sizeof_float, size)
dst = gr.vector_sink_f()
- self.fg.connect(op, rhs, dst)
- self.fg.run()
+ self.tb.connect(op, rhs, dst)
+ self.tb.run()
result_data = dst.data()
self.assertEqual(exp_data, result_data)
@@ -73,12 +73,12 @@
for s in zip(range (len (src_data)), src_data):
src = gr.vector_source_c(s[1])
srcv = gr.stream_to_vector(gr.sizeof_gr_complex, size)
- self.fg.connect(src, srcv)
- self.fg.connect(srcv, (op, s[0]))
+ self.tb.connect(src, srcv)
+ self.tb.connect(srcv, (op, s[0]))
rhs = gr.vector_to_stream(gr.sizeof_gr_complex, size)
dst = gr.vector_sink_c()
- self.fg.connect(op, rhs, dst)
- self.fg.run()
+ self.tb.connect(op, rhs, dst)
+ self.tb.run()
result_data = dst.data()
self.assertEqual(exp_data, result_data)
@@ -87,8 +87,8 @@
srcv = gr.stream_to_vector(gr.sizeof_short, len(src_data))
rhs = gr.vector_to_stream(gr.sizeof_short, len(src_data))
dst = gr.vector_sink_s()
- self.fg.connect(src, srcv, op, rhs, dst)
- self.fg.run()
+ self.tb.connect(src, srcv, op, rhs, dst)
+ self.tb.run()
result_data = dst.data()
self.assertEqual(exp_data, result_data)
@@ -97,8 +97,8 @@
srcv = gr.stream_to_vector(gr.sizeof_int, len(src_data))
rhs = gr.vector_to_stream(gr.sizeof_int, len(src_data))
dst = gr.vector_sink_i()
- self.fg.connect(src, srcv, op, rhs, dst)
- self.fg.run()
+ self.tb.connect(src, srcv, op, rhs, dst)
+ self.tb.run()
result_data = dst.data()
self.assertEqual(exp_data, result_data)
@@ -107,8 +107,8 @@
srcv = gr.stream_to_vector(gr.sizeof_float, len(src_data))
rhs = gr.vector_to_stream(gr.sizeof_float, len(src_data))
dst = gr.vector_sink_f()
- self.fg.connect(src, srcv, op, rhs, dst)
- self.fg.run()
+ self.tb.connect(src, srcv, op, rhs, dst)
+ self.tb.run()
result_data = dst.data()
self.assertEqual(exp_data, result_data)
@@ -117,8 +117,8 @@
srcv = gr.stream_to_vector(gr.sizeof_gr_complex, len(src_data))
rhs = gr.vector_to_stream(gr.sizeof_gr_complex, len(src_data))
dst = gr.vector_sink_c()
- self.fg.connect(src, srcv, op, rhs, dst)
- self.fg.run()
+ self.tb.connect(src, srcv, op, rhs, dst)
+ self.tb.run()
result_data = dst.data()
self.assertEqual(exp_data, result_data)
Modified:
gnuradio/branches/developers/jcorgan/t202/gnuradio-core/src/python/gnuradio/gr/qa_agc.py
===================================================================
---
gnuradio/branches/developers/jcorgan/t202/gnuradio-core/src/python/gnuradio/gr/qa_agc.py
2007-11-19 18:13:49 UTC (rev 7001)
+++
gnuradio/branches/developers/jcorgan/t202/gnuradio-core/src/python/gnuradio/gr/qa_agc.py
2007-11-19 18:35:12 UTC (rev 7002)
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Copyright 2004 Free Software Foundation, Inc.
+# Copyright 2004,2007 Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
@@ -28,15 +28,15 @@
class test_sig_source (gr_unittest.TestCase):
def setUp (self):
- self.fg = gr.flow_graph ()
+ self.tb = gr.top_block ()
def tearDown (self):
- self.fg = None
+ self.tb = None
def test_001(self):
''' Test the complex AGC loop (single rate input) '''
- fg = self.fg
+ tb = self.tb
expected_result = (
(100.000244140625+7.2191943445432116e-07j),
@@ -98,20 +98,20 @@
agc = gr.agc_cc(1e-3, 1, 1, 1000)
- fg.connect (src1, head)
- fg.connect (head, agc)
- fg.connect (agc, dst1)
+ tb.connect (src1, head)
+ tb.connect (head, agc)
+ tb.connect (agc, dst1)
if test_output == True:
- fg.connect (agc, gr.file_sink(gr.sizeof_gr_complex,
"test_agc_cc.dat"))
+ tb.connect (agc, gr.file_sink(gr.sizeof_gr_complex,
"test_agc_cc.dat"))
- fg.run ()
+ tb.run ()
dst_data = dst1.data ()
self.assertComplexTuplesAlmostEqual (expected_result, dst_data, 4)
def test_002(self):
''' Test the floating point AGC loop (single rate input) '''
- fg = self.fg
+ tb = self.tb
expected_result = (
7.2191943445432116e-07,
@@ -173,20 +173,20 @@
agc = gr.agc_ff(1e-3, 1, 1, 1000)
- fg.connect (src1, head)
- fg.connect (head, agc)
- fg.connect (agc, dst1)
+ tb.connect (src1, head)
+ tb.connect (head, agc)
+ tb.connect (agc, dst1)
if test_output == True:
- fg.connect (agc, gr.file_sink(gr.sizeof_float, "test_agc_ff.dat"))
+ tb.connect (agc, gr.file_sink(gr.sizeof_float, "test_agc_ff.dat"))
- fg.run ()
+ tb.run ()
dst_data = dst1.data ()
self.assertFloatTuplesAlmostEqual (expected_result, dst_data, 4)
def test_003(self):
''' Test the complex AGC loop (attack and decay rate inputs) '''
- fg = self.fg
+ tb = self.tb
expected_result = \
((100.000244140625+7.2191943445432116e-07j),
@@ -248,20 +248,20 @@
agc = gr.agc2_cc(1e-2, 1e-3, 1, 1, 1000)
- fg.connect (src1, head)
- fg.connect (head, agc)
- fg.connect (agc, dst1)
+ tb.connect (src1, head)
+ tb.connect (head, agc)
+ tb.connect (agc, dst1)
if test_output == True:
- fg.connect (agc, gr.file_sink(gr.sizeof_gr_complex,
"test_agc2_cc.dat"))
+ tb.connect (agc, gr.file_sink(gr.sizeof_gr_complex,
"test_agc2_cc.dat"))
- fg.run ()
+ tb.run ()
dst_data = dst1.data ()
self.assertComplexTuplesAlmostEqual (expected_result, dst_data, 4)
def test_004(self):
''' Test the floating point AGC loop (attack and decay rate inputs) '''
- fg = self.fg
+ tb = self.tb
expected_result = \
(7.2191943445432116e-07,
@@ -323,21 +323,21 @@
agc = gr.agc2_ff(1e-2, 1e-3, 1, 1, 1000)
- fg.connect (src1, head)
- fg.connect (head, agc)
- fg.connect (agc, dst1)
+ tb.connect (src1, head)
+ tb.connect (head, agc)
+ tb.connect (agc, dst1)
if test_output == True:
- fg.connect (agc, gr.file_sink(gr.sizeof_float, "test_agc2_ff.dat"))
+ tb.connect (agc, gr.file_sink(gr.sizeof_float, "test_agc2_ff.dat"))
- fg.run ()
+ tb.run ()
dst_data = dst1.data ()
self.assertFloatTuplesAlmostEqual (expected_result, dst_data, 4)
def test_005(self):
''' Test the complex AGC loop (attack and decay rate inputs) '''
- fg = self.fg
+ tb = self.tb
expected_result = \
((100.000244140625+7.2191943445432116e-07j),
@@ -399,14 +399,14 @@
agc = gr.agc2_cc(1e-2, 1e-3, 1, 1, 1000)
- fg.connect (src1, head)
- fg.connect (head, agc)
- fg.connect (agc, dst1)
+ tb.connect (src1, head)
+ tb.connect (head, agc)
+ tb.connect (agc, dst1)
if test_output == True:
- fg.connect (agc, gr.file_sink(gr.sizeof_gr_complex,
"test_agc2_cc.dat"))
+ tb.connect (agc, gr.file_sink(gr.sizeof_gr_complex,
"test_agc2_cc.dat"))
- fg.run ()
+ tb.run ()
dst_data = dst1.data ()
self.assertComplexTuplesAlmostEqual (expected_result, dst_data, 4)
@@ -419,12 +419,12 @@
src = gr.vector_source_c(input_data)
agc = gr.feedforward_agc_cc(16, 2.0)
dst = gr.vector_sink_c ()
- self.fg.connect (src, agc, dst)
+ self.tb.connect (src, agc, dst)
if test_output == True:
- self.fg.connect (agc, gr.file_sink(gr.sizeof_gr_complex,
"test_feedforward_cc.dat"))
+ self.tb.connect (agc, gr.file_sink(gr.sizeof_gr_complex,
"test_feedforward_cc.dat"))
- self.fg.run ()
+ self.tb.run ()
dst_data = dst.data ()
#self.assertComplexTuplesAlmostEqual (expected_result, dst_data, 4)
Modified:
gnuradio/branches/developers/jcorgan/t202/gnuradio-core/src/python/gnuradio/gr/qa_argmax.py
===================================================================
---
gnuradio/branches/developers/jcorgan/t202/gnuradio-core/src/python/gnuradio/gr/qa_argmax.py
2007-11-19 18:13:49 UTC (rev 7001)
+++
gnuradio/branches/developers/jcorgan/t202/gnuradio-core/src/python/gnuradio/gr/qa_argmax.py
2007-11-19 18:35:12 UTC (rev 7002)
@@ -27,15 +27,15 @@
class test_sig_source (gr_unittest.TestCase):
def setUp (self):
- self.fg = gr.flow_graph ()
+ self.tb = gr.top_block ()
def tearDown (self):
- self.fg = None
+ self.tb = None
def test_001(self):
- fg = self.fg
+ tb = self.tb
src1_data = (0,0.2,-0.3,0,12,0)
src2_data = (0,0.0,3.0,0,10,0)
@@ -43,28 +43,28 @@
src1 = gr.vector_source_f (src1_data)
s2v1 = gr.stream_to_vector(gr.sizeof_float, len(src1_data))
- fg.connect( src1, s2v1 )
+ tb.connect( src1, s2v1 )
src2 = gr.vector_source_f (src2_data)
s2v2 = gr.stream_to_vector(gr.sizeof_float, len(src1_data))
- fg.connect( src2, s2v2 )
+ tb.connect( src2, s2v2 )
src3 = gr.vector_source_f (src3_data)
s2v3 = gr.stream_to_vector(gr.sizeof_float, len(src1_data))
- fg.connect( src3, s2v3 )
+ tb.connect( src3, s2v3 )
dst1 = gr.vector_sink_s ()
dst2 = gr.vector_sink_s ()
argmax = gr.argmax_fs (len(src1_data))
- fg.connect (s2v1, (argmax, 0))
- fg.connect (s2v2, (argmax, 1))
- fg.connect (s2v3, (argmax, 2))
+ tb.connect (s2v1, (argmax, 0))
+ tb.connect (s2v2, (argmax, 1))
+ tb.connect (s2v3, (argmax, 2))
- fg.connect ((argmax,0), dst1)
- fg.connect ((argmax,1), dst2)
+ tb.connect ((argmax,0), dst1)
+ tb.connect ((argmax,1), dst2)
- fg.run ()
+ tb.run ()
index = dst1.data ()
source = dst2.data ()
self.assertEqual ( index, (4,))
Modified:
gnuradio/branches/developers/jcorgan/t202/gnuradio-core/src/python/gnuradio/gr/qa_bin_statistics.py
===================================================================
---
gnuradio/branches/developers/jcorgan/t202/gnuradio-core/src/python/gnuradio/gr/qa_bin_statistics.py
2007-11-19 18:13:49 UTC (rev 7001)
+++
gnuradio/branches/developers/jcorgan/t202/gnuradio-core/src/python/gnuradio/gr/qa_bin_statistics.py
2007-11-19 18:35:12 UTC (rev 7002)
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Copyright 2006 Free Software Foundation, Inc.
+# Copyright 2006,2007 Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
@@ -93,10 +93,10 @@
class test_bin_statistics(gr_unittest.TestCase):
def setUp(self):
- self.fg = gr.flow_graph ()
+ self.tb = gr.top_block ()
def tearDown(self):
- self.fg = None
+ self.tb = None
def test_001(self):
vlen = 4
@@ -122,8 +122,8 @@
src = gr.vector_source_f(src_data, False)
s2v = gr.stream_to_vector(gr.sizeof_float, vlen)
stats = gr.bin_statistics_f(vlen, msgq, tune, tune_delay, dwell_delay)
- self.fg.connect(src, s2v, stats)
- self.fg.run()
+ self.tb.connect(src, s2v, stats)
+ self.tb.run()
self.assertEqual(4, msgq.count())
for i in range(4):
m = parse_msg(msgq.delete_head())
@@ -150,8 +150,8 @@
src = gr.vector_source_f(src_data, False)
s2v = gr.stream_to_vector(gr.sizeof_float, vlen)
stats = gr.bin_statistics_f(vlen, msgq, tune, tune_delay, dwell_delay)
- self.fg.connect(src, s2v, stats)
- self.fg.run()
+ self.tb.connect(src, s2v, stats)
+ self.tb.run()
self.assertEqual(1, msgq.count())
for i in range(1):
m = parse_msg(msgq.delete_head())
@@ -180,8 +180,8 @@
src = gr.vector_source_f(src_data, False)
s2v = gr.stream_to_vector(gr.sizeof_float, vlen)
stats = gr.bin_statistics_f(vlen, msgq, tune, tune_delay, dwell_delay)
- self.fg.connect(src, s2v, stats)
- self.fg.run()
+ self.tb.connect(src, s2v, stats)
+ self.tb.run()
self.assertEqual(1, msgq.count())
for i in range(1):
m = parse_msg(msgq.delete_head())
@@ -213,8 +213,8 @@
src = gr.vector_source_f(src_data, False)
s2v = gr.stream_to_vector(gr.sizeof_float, vlen)
stats = gr.bin_statistics_f(vlen, msgq, tune, tune_delay, dwell_delay)
- self.fg.connect(src, s2v, stats)
- self.fg.run()
+ self.tb.connect(src, s2v, stats)
+ self.tb.run()
self.assertEqual(1, msgq.count())
for i in range(1):
m = parse_msg(msgq.delete_head())
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Commit-gnuradio] r7002 - gnuradio/branches/developers/jcorgan/t202/gnuradio-core/src/python/gnuradio/gr,
jcorgan <=