[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] r4385 - gnuradio/trunk/gr-trellis/src/lib
|
From: |
michaelld |
|
Subject: |
[Commit-gnuradio] r4385 - gnuradio/trunk/gr-trellis/src/lib |
|
Date: |
Mon, 5 Feb 2007 13:29:40 -0700 (MST) |
Author: michaelld
Date: 2007-02-05 13:29:40 -0700 (Mon, 05 Feb 2007)
New Revision: 4385
Added:
gnuradio/trunk/gr-trellis/src/lib/generate_trellis.py
Removed:
gnuradio/trunk/gr-trellis/src/lib/build_utils.py
gnuradio/trunk/gr-trellis/src/lib/build_utils_codes.py
gnuradio/trunk/gr-trellis/src/lib/generate_common.py
Modified:
gnuradio/trunk/gr-trellis/src/lib/Makefile.am
gnuradio/trunk/gr-trellis/src/lib/generate_all.py
gnuradio/trunk/gr-trellis/src/lib/trellis_encoder_bb.cc
gnuradio/trunk/gr-trellis/src/lib/trellis_encoder_bi.cc
gnuradio/trunk/gr-trellis/src/lib/trellis_encoder_bs.cc
gnuradio/trunk/gr-trellis/src/lib/trellis_encoder_ii.cc
gnuradio/trunk/gr-trellis/src/lib/trellis_encoder_si.cc
gnuradio/trunk/gr-trellis/src/lib/trellis_encoder_ss.cc
gnuradio/trunk/gr-trellis/src/lib/trellis_metrics_c.cc
gnuradio/trunk/gr-trellis/src/lib/trellis_metrics_f.cc
gnuradio/trunk/gr-trellis/src/lib/trellis_metrics_i.cc
gnuradio/trunk/gr-trellis/src/lib/trellis_metrics_s.cc
gnuradio/trunk/gr-trellis/src/lib/trellis_viterbi_b.cc
gnuradio/trunk/gr-trellis/src/lib/trellis_viterbi_combined_b.cc
gnuradio/trunk/gr-trellis/src/lib/trellis_viterbi_combined_i.cc
gnuradio/trunk/gr-trellis/src/lib/trellis_viterbi_combined_s.cc
gnuradio/trunk/gr-trellis/src/lib/trellis_viterbi_i.cc
gnuradio/trunk/gr-trellis/src/lib/trellis_viterbi_s.cc
Log:
Fix for ticket:29 . Newly generated .cc,.h,.i files are also checked
in, with the "warning" message at the top.
Modified: gnuradio/trunk/gr-trellis/src/lib/Makefile.am
===================================================================
--- gnuradio/trunk/gr-trellis/src/lib/Makefile.am 2007-02-05 18:56:43 UTC
(rev 4384)
+++ gnuradio/trunk/gr-trellis/src/lib/Makefile.am 2007-02-05 20:29:40 UTC
(rev 4385)
@@ -1,5 +1,5 @@
#
-# Copyright 2004,2005,2006 Free Software Foundation, Inc.
+# Copyright 2004,2005,2006,2007 Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
@@ -21,8 +21,6 @@
include $(top_srcdir)/Makefile.common
-include Makefile.gen
-
# Install this stuff so that it ends up as the gnuradio.trellis module
# This usually ends up at:
# ${prefix}/lib/python${python_version}/site-packages/gnuradio
@@ -34,28 +32,60 @@
SWIGPYTHONARGS = $(SWIGPYTHONFLAGS) $(STD_DEFINES_AND_INCLUDES)
-ALL_IFILES = \
- $(LOCAL_IFILES) \
- $(NON_LOCAL_IFILES)
+# ----------------------------------------------------------------
+# these scripts generate trellis codes from template files
-NON_LOCAL_IFILES = \
- $(GNURADIO_I)
+CODE_GENERATOR = \
+ generate_all.py \
+ generate_trellis.py \
+ trellis_encoder_XX.cc.t \
+ trellis_encoder_XX.h.t \
+ trellis_encoder_XX.i.t \
+ trellis_metrics_X.cc.t \
+ trellis_metrics_X.h.t \
+ trellis_metrics_X.i.t \
+ trellis_viterbi_combined_X.cc.t \
+ trellis_viterbi_combined_X.h.t \
+ trellis_viterbi_combined_X.i.t \
+ trellis_viterbi_X.cc.t \
+ trellis_viterbi_X.h.t \
+ trellis_viterbi_X.i.t
+include Makefile.gen
-LOCAL_IFILES = \
- $(top_srcdir)/gr-trellis/src/lib/trellis.i
+$(GENERATED_H) $(GENERATED_I) $(GENERATED_CC): $(CODE_GENERATOR)
+ PYTHONPATH=$(top_srcdir)/gnuradio-core/src/python \
+ srcdir=$(srcdir) $(PYTHON) $(srcdir)/generate_all.py
-
# These files are built by SWIG. The first is the C++ glue.
# The second is the python wrapper that loads the _trellis shared library
# and knows how to call our extensions.
-BUILT_SOURCES = \
- trellis.cc \
+SWIG_BUILT_SOURCES = \
+ trellis.cc \
trellis.py
+BUILT_SOURCES = \
+ $(GENERATED_H) \
+ $(GENERATED_I) \
+ $(GENERATED_CC) \
+ $(SWIG_BUILT_SOURCES)
+
+ALL_IFILES = \
+ $(LOCAL_IFILES) \
+ $(NON_LOCAL_IFILES)
+
+NON_LOCAL_IFILES = \
+ $(GNURADIO_I)
+
+LOCAL_IFILES = \
+ $(top_srcdir)/gr-trellis/src/lib/trellis.i
+
+EXTRA_DIST = \
+ $(CODE_GENERATOR)
+
# This gets trellis.py installed in the right place
-ourpython_PYTHON = \
+ourpython_PYTHON = \
trellis.py
ourlib_LTLIBRARIES = _trellis.la
@@ -81,7 +111,7 @@
_trellis_la_LIBADD = \
$(PYTHON_LDFLAGS) \
$(GNURADIO_CORE_LIBS) \
- -lstdc++
+ -lstdc++
trellis.cc trellis.py: $(ALL_IFILES) $(grinclude_HEADERS)
$(SWIG) $(SWIGPYTHONARGS) -module trellis -o trellis.cc $(LOCAL_IFILES)
@@ -97,10 +127,9 @@
trellis_permutation.h \
trellis_siso_type.h \
trellis_siso_f.h \
- trellis_siso_combined_f.h \
- $(GENERATED_H)
+ trellis_siso_combined_f.h \
+ $(GENERATED_H)
-
# These swig headers get installed in ${prefix}/include/gnuradio/swig
swiginclude_HEADERS = \
$(LOCAL_IFILES) \
@@ -112,11 +141,9 @@
trellis_siso_combined_f.i \
trellis_generated.i
+CLEANFILES = $(BUILT_SOURCES) *.pyc
-
-MOSTLYCLEANFILES = $(BUILT_SOURCES) *.pyc
-
# Don't distribute output of swig
dist-hook:
- @for file in $(BUILT_SOURCES); do echo $(RM) $(distdir)/$$file; done
- @for file in $(BUILT_SOURCES); do $(RM) $(distdir)/$$file; done
+ @for file in $(SWIG_BUILT_SOURCES); do echo $(RM) $(distdir)/$$file;
done
+ @for file in $(SWIG_BUILT_SOURCES); do $(RM) $(distdir)/$$file; done
Deleted: gnuradio/trunk/gr-trellis/src/lib/build_utils.py
Deleted: gnuradio/trunk/gr-trellis/src/lib/build_utils_codes.py
Modified: gnuradio/trunk/gr-trellis/src/lib/generate_all.py
===================================================================
--- gnuradio/trunk/gr-trellis/src/lib/generate_all.py 2007-02-05 18:56:43 UTC
(rev 4384)
+++ gnuradio/trunk/gr-trellis/src/lib/generate_all.py 2007-02-05 20:29:40 UTC
(rev 4385)
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Copyright 2004 Free Software Foundation, Inc.
+# Copyright 2006,2007 Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
@@ -22,12 +22,11 @@
from build_utils import output_glue
-import generate_common
+import generate_trellis
def generate_all ():
- generate_common.generate ()
+ generate_trellis.generate ()
output_glue ('trellis')
-
if __name__ == '__main__':
generate_all ()
Deleted: gnuradio/trunk/gr-trellis/src/lib/generate_common.py
Added: gnuradio/trunk/gr-trellis/src/lib/generate_trellis.py
===================================================================
--- gnuradio/trunk/gr-trellis/src/lib/generate_trellis.py
(rev 0)
+++ gnuradio/trunk/gr-trellis/src/lib/generate_trellis.py 2007-02-05
20:29:40 UTC (rev 4385)
@@ -0,0 +1,117 @@
+#!/usr/bin/env python
+#
+# Copyright 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 2, 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.
+#
+
+from build_utils import expand_template, copyright, open_and_log_name
+from build_utils_codes import *
+import re
+
+# regular blocks
+
+other_roots = [
+ 'trellis_encoder_XX',
+ 'trellis_metrics_X',
+ 'trellis_viterbi_X',
+ 'trellis_viterbi_combined_X',
+ ]
+
+other_signatures = (
+ ['bb','bs','bi','ss','si','ii'],
+ ['s','i','f','c'],
+ ['b','s','i'],
+ ['b','s','i'],
+ )
+
+
+def is_byte (code3):
+ if i_code (code3) == 'b' or o_code (code3) == 'b':
+ return '1'
+ else:
+ return '0'
+
+
+def is_short (code3):
+ if i_code (code3) == 's' or o_code (code3) == 's':
+ return '1'
+ else:
+ return '0'
+
+
+def is_int (code3):
+ if i_code (code3) == 'i' or o_code (code3) == 'i':
+ return '1'
+ else:
+ return '0'
+
+
+def is_float (code3):
+ if i_code (code3) == 'f' or o_code (code3) == 'f':
+ return '1'
+ else:
+ return '0'
+
+
+def is_complex (code3):
+ if i_code (code3) == 'c' or o_code (code3) == 'c':
+ return '1'
+ else:
+ return '0'
+
+
+def standard_dict (name, code3):
+ d = {}
+ d['NAME'] = name
+ d['GUARD_NAME'] = 'INCLUDED_%s_H' % name.upper ()
+ d['BASE_NAME'] = re.sub ('^trellis_', '', name)
+ d['SPTR_NAME'] = '%s_sptr' % name
+ d['WARNING'] = 'WARNING: this file is machine generated. Edits will be
over written'
+ d['COPYRIGHT'] = copyright
+ d['TYPE'] = i_type (code3)
+ d['I_TYPE'] = i_type (code3)
+ d['O_TYPE'] = o_type (code3)
+ d['TAP_TYPE'] = tap_type (code3)
+ d['IS_BYTE'] = is_byte (code3)
+ d['IS_SHORT'] = is_short (code3)
+ d['IS_INT'] = is_int (code3)
+ d['IS_FLOAT'] = is_float (code3)
+ d['IS_COMPLEX'] = is_complex (code3)
+ return d
+
+
+def expand_h_cc_i (root, sig):
+ # root looks like 'gr_vector_sink_X'
+ name = re.sub ('X+', sig, root)
+ d = standard_dict (name, sig)
+ expand_template (d, root + '.h.t')
+ expand_template (d, root + '.cc.t')
+ expand_template (d, root + '.i.t')
+
+
+def generate ():
+ i=0
+ for r in other_roots :
+ for s in other_signatures[i]:
+ expand_h_cc_i (r, s)
+ i=i+1
+
+
+if __name__ == '__main__':
+ generate ()
Modified: gnuradio/trunk/gr-trellis/src/lib/trellis_encoder_bb.cc
===================================================================
--- gnuradio/trunk/gr-trellis/src/lib/trellis_encoder_bb.cc 2007-02-05
18:56:43 UTC (rev 4384)
+++ gnuradio/trunk/gr-trellis/src/lib/trellis_encoder_bb.cc 2007-02-05
20:29:40 UTC (rev 4385)
@@ -20,6 +20,8 @@
* Boston, MA 02110-1301, USA.
*/
+// WARNING: this file is machine generated. Edits will be over written
+
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
@@ -50,7 +52,7 @@
gr_vector_const_void_star &input_items,
gr_vector_void_star &output_items)
{
- int ST_tmp;
+ int ST_tmp=0;
assert (input_items.size() == output_items.size());
int nstreams = input_items.size();
Modified: gnuradio/trunk/gr-trellis/src/lib/trellis_encoder_bi.cc
===================================================================
--- gnuradio/trunk/gr-trellis/src/lib/trellis_encoder_bi.cc 2007-02-05
18:56:43 UTC (rev 4384)
+++ gnuradio/trunk/gr-trellis/src/lib/trellis_encoder_bi.cc 2007-02-05
20:29:40 UTC (rev 4385)
@@ -20,6 +20,8 @@
* Boston, MA 02110-1301, USA.
*/
+// WARNING: this file is machine generated. Edits will be over written
+
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
@@ -50,7 +52,7 @@
gr_vector_const_void_star &input_items,
gr_vector_void_star &output_items)
{
- int ST_tmp;
+ int ST_tmp=0;
assert (input_items.size() == output_items.size());
int nstreams = input_items.size();
Modified: gnuradio/trunk/gr-trellis/src/lib/trellis_encoder_bs.cc
===================================================================
--- gnuradio/trunk/gr-trellis/src/lib/trellis_encoder_bs.cc 2007-02-05
18:56:43 UTC (rev 4384)
+++ gnuradio/trunk/gr-trellis/src/lib/trellis_encoder_bs.cc 2007-02-05
20:29:40 UTC (rev 4385)
@@ -20,6 +20,8 @@
* Boston, MA 02110-1301, USA.
*/
+// WARNING: this file is machine generated. Edits will be over written
+
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
@@ -50,7 +52,7 @@
gr_vector_const_void_star &input_items,
gr_vector_void_star &output_items)
{
- int ST_tmp;
+ int ST_tmp=0;
assert (input_items.size() == output_items.size());
int nstreams = input_items.size();
Modified: gnuradio/trunk/gr-trellis/src/lib/trellis_encoder_ii.cc
===================================================================
--- gnuradio/trunk/gr-trellis/src/lib/trellis_encoder_ii.cc 2007-02-05
18:56:43 UTC (rev 4384)
+++ gnuradio/trunk/gr-trellis/src/lib/trellis_encoder_ii.cc 2007-02-05
20:29:40 UTC (rev 4385)
@@ -20,6 +20,8 @@
* Boston, MA 02110-1301, USA.
*/
+// WARNING: this file is machine generated. Edits will be over written
+
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
@@ -50,7 +52,7 @@
gr_vector_const_void_star &input_items,
gr_vector_void_star &output_items)
{
- int ST_tmp;
+ int ST_tmp=0;
assert (input_items.size() == output_items.size());
int nstreams = input_items.size();
Modified: gnuradio/trunk/gr-trellis/src/lib/trellis_encoder_si.cc
===================================================================
--- gnuradio/trunk/gr-trellis/src/lib/trellis_encoder_si.cc 2007-02-05
18:56:43 UTC (rev 4384)
+++ gnuradio/trunk/gr-trellis/src/lib/trellis_encoder_si.cc 2007-02-05
20:29:40 UTC (rev 4385)
@@ -20,6 +20,8 @@
* Boston, MA 02110-1301, USA.
*/
+// WARNING: this file is machine generated. Edits will be over written
+
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
@@ -50,7 +52,7 @@
gr_vector_const_void_star &input_items,
gr_vector_void_star &output_items)
{
- int ST_tmp;
+ int ST_tmp=0;
assert (input_items.size() == output_items.size());
int nstreams = input_items.size();
Modified: gnuradio/trunk/gr-trellis/src/lib/trellis_encoder_ss.cc
===================================================================
--- gnuradio/trunk/gr-trellis/src/lib/trellis_encoder_ss.cc 2007-02-05
18:56:43 UTC (rev 4384)
+++ gnuradio/trunk/gr-trellis/src/lib/trellis_encoder_ss.cc 2007-02-05
20:29:40 UTC (rev 4385)
@@ -20,6 +20,8 @@
* Boston, MA 02110-1301, USA.
*/
+// WARNING: this file is machine generated. Edits will be over written
+
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
@@ -50,7 +52,7 @@
gr_vector_const_void_star &input_items,
gr_vector_void_star &output_items)
{
- int ST_tmp;
+ int ST_tmp=0;
assert (input_items.size() == output_items.size());
int nstreams = input_items.size();
Modified: gnuradio/trunk/gr-trellis/src/lib/trellis_metrics_c.cc
===================================================================
--- gnuradio/trunk/gr-trellis/src/lib/trellis_metrics_c.cc 2007-02-05
18:56:43 UTC (rev 4384)
+++ gnuradio/trunk/gr-trellis/src/lib/trellis_metrics_c.cc 2007-02-05
20:29:40 UTC (rev 4385)
@@ -20,6 +20,8 @@
* Boston, MA 02110-1301, USA.
*/
+// WARNING: this file is machine generated. Edits will be over written
+
#ifndef HAVE_CONFIG_H
#include "config.h"
#endif
Modified: gnuradio/trunk/gr-trellis/src/lib/trellis_metrics_f.cc
===================================================================
--- gnuradio/trunk/gr-trellis/src/lib/trellis_metrics_f.cc 2007-02-05
18:56:43 UTC (rev 4384)
+++ gnuradio/trunk/gr-trellis/src/lib/trellis_metrics_f.cc 2007-02-05
20:29:40 UTC (rev 4385)
@@ -20,6 +20,8 @@
* Boston, MA 02110-1301, USA.
*/
+// WARNING: this file is machine generated. Edits will be over written
+
#ifndef HAVE_CONFIG_H
#include "config.h"
#endif
Modified: gnuradio/trunk/gr-trellis/src/lib/trellis_metrics_i.cc
===================================================================
--- gnuradio/trunk/gr-trellis/src/lib/trellis_metrics_i.cc 2007-02-05
18:56:43 UTC (rev 4384)
+++ gnuradio/trunk/gr-trellis/src/lib/trellis_metrics_i.cc 2007-02-05
20:29:40 UTC (rev 4385)
@@ -20,6 +20,8 @@
* Boston, MA 02110-1301, USA.
*/
+// WARNING: this file is machine generated. Edits will be over written
+
#ifndef HAVE_CONFIG_H
#include "config.h"
#endif
Modified: gnuradio/trunk/gr-trellis/src/lib/trellis_metrics_s.cc
===================================================================
--- gnuradio/trunk/gr-trellis/src/lib/trellis_metrics_s.cc 2007-02-05
18:56:43 UTC (rev 4384)
+++ gnuradio/trunk/gr-trellis/src/lib/trellis_metrics_s.cc 2007-02-05
20:29:40 UTC (rev 4385)
@@ -20,6 +20,8 @@
* Boston, MA 02110-1301, USA.
*/
+// WARNING: this file is machine generated. Edits will be over written
+
#ifndef HAVE_CONFIG_H
#include "config.h"
#endif
Modified: gnuradio/trunk/gr-trellis/src/lib/trellis_viterbi_b.cc
===================================================================
--- gnuradio/trunk/gr-trellis/src/lib/trellis_viterbi_b.cc 2007-02-05
18:56:43 UTC (rev 4384)
+++ gnuradio/trunk/gr-trellis/src/lib/trellis_viterbi_b.cc 2007-02-05
20:29:40 UTC (rev 4385)
@@ -20,6 +20,8 @@
* Boston, MA 02110-1301, USA.
*/
+// WARNING: this file is machine generated. Edits will be over written
+
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
@@ -106,7 +108,7 @@
for(int j=0;j<S;j++) { // for each next state do ACS
minm=INF;
minmi=0;
- for(int i=0;i<PS[j].size();i++) {
+ for(unsigned int i=0;i<PS[j].size();i++) {
//int i0 = j*I+i;
if((mm=alpha[alphai*S+PS[j][i]]+in[k*O+OS[PS[j][i]*I+PI[j][i]]])<minm)
minm=mm,minmi=i;
Modified: gnuradio/trunk/gr-trellis/src/lib/trellis_viterbi_combined_b.cc
===================================================================
--- gnuradio/trunk/gr-trellis/src/lib/trellis_viterbi_combined_b.cc
2007-02-05 18:56:43 UTC (rev 4384)
+++ gnuradio/trunk/gr-trellis/src/lib/trellis_viterbi_combined_b.cc
2007-02-05 20:29:40 UTC (rev 4385)
@@ -20,6 +20,8 @@
* Boston, MA 02110-1301, USA.
*/
+// WARNING: this file is machine generated. Edits will be over written
+
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
@@ -119,8 +121,8 @@
for(int j=0;j<S;j++) { // for each next state do ACS
minm=INF;
minmi=0;
- for(int i=0;i<PS[j].size();i++) {
- int i0 = j*I+i;
+ for(unsigned int i=0;i<PS[j].size();i++) {
+ //int i0 = j*I+i;
if((mm=alpha[alphai*S+PS[j][i]]+metric[OS[PS[j][i]*I+PI[j][i]]])<minm)
minm=mm,minmi=i;
}
Modified: gnuradio/trunk/gr-trellis/src/lib/trellis_viterbi_combined_i.cc
===================================================================
--- gnuradio/trunk/gr-trellis/src/lib/trellis_viterbi_combined_i.cc
2007-02-05 18:56:43 UTC (rev 4384)
+++ gnuradio/trunk/gr-trellis/src/lib/trellis_viterbi_combined_i.cc
2007-02-05 20:29:40 UTC (rev 4385)
@@ -20,6 +20,8 @@
* Boston, MA 02110-1301, USA.
*/
+// WARNING: this file is machine generated. Edits will be over written
+
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
@@ -119,8 +121,8 @@
for(int j=0;j<S;j++) { // for each next state do ACS
minm=INF;
minmi=0;
- for(int i=0;i<PS[j].size();i++) {
- int i0 = j*I+i;
+ for(unsigned int i=0;i<PS[j].size();i++) {
+ //int i0 = j*I+i;
if((mm=alpha[alphai*S+PS[j][i]]+metric[OS[PS[j][i]*I+PI[j][i]]])<minm)
minm=mm,minmi=i;
}
Modified: gnuradio/trunk/gr-trellis/src/lib/trellis_viterbi_combined_s.cc
===================================================================
--- gnuradio/trunk/gr-trellis/src/lib/trellis_viterbi_combined_s.cc
2007-02-05 18:56:43 UTC (rev 4384)
+++ gnuradio/trunk/gr-trellis/src/lib/trellis_viterbi_combined_s.cc
2007-02-05 20:29:40 UTC (rev 4385)
@@ -20,6 +20,8 @@
* Boston, MA 02110-1301, USA.
*/
+// WARNING: this file is machine generated. Edits will be over written
+
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
@@ -119,8 +121,8 @@
for(int j=0;j<S;j++) { // for each next state do ACS
minm=INF;
minmi=0;
- for(int i=0;i<PS[j].size();i++) {
- int i0 = j*I+i;
+ for(unsigned int i=0;i<PS[j].size();i++) {
+ //int i0 = j*I+i;
if((mm=alpha[alphai*S+PS[j][i]]+metric[OS[PS[j][i]*I+PI[j][i]]])<minm)
minm=mm,minmi=i;
}
Modified: gnuradio/trunk/gr-trellis/src/lib/trellis_viterbi_i.cc
===================================================================
--- gnuradio/trunk/gr-trellis/src/lib/trellis_viterbi_i.cc 2007-02-05
18:56:43 UTC (rev 4384)
+++ gnuradio/trunk/gr-trellis/src/lib/trellis_viterbi_i.cc 2007-02-05
20:29:40 UTC (rev 4385)
@@ -20,6 +20,8 @@
* Boston, MA 02110-1301, USA.
*/
+// WARNING: this file is machine generated. Edits will be over written
+
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
@@ -106,7 +108,7 @@
for(int j=0;j<S;j++) { // for each next state do ACS
minm=INF;
minmi=0;
- for(int i=0;i<PS[j].size();i++) {
+ for(unsigned int i=0;i<PS[j].size();i++) {
//int i0 = j*I+i;
if((mm=alpha[alphai*S+PS[j][i]]+in[k*O+OS[PS[j][i]*I+PI[j][i]]])<minm)
minm=mm,minmi=i;
Modified: gnuradio/trunk/gr-trellis/src/lib/trellis_viterbi_s.cc
===================================================================
--- gnuradio/trunk/gr-trellis/src/lib/trellis_viterbi_s.cc 2007-02-05
18:56:43 UTC (rev 4384)
+++ gnuradio/trunk/gr-trellis/src/lib/trellis_viterbi_s.cc 2007-02-05
20:29:40 UTC (rev 4385)
@@ -20,6 +20,8 @@
* Boston, MA 02110-1301, USA.
*/
+// WARNING: this file is machine generated. Edits will be over written
+
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
@@ -106,7 +108,7 @@
for(int j=0;j<S;j++) { // for each next state do ACS
minm=INF;
minmi=0;
- for(int i=0;i<PS[j].size();i++) {
+ for(unsigned int i=0;i<PS[j].size();i++) {
//int i0 = j*I+i;
if((mm=alpha[alphai*S+PS[j][i]]+in[k*O+OS[PS[j][i]*I+PI[j][i]]])<minm)
minm=mm,minmi=i;
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Commit-gnuradio] r4385 - gnuradio/trunk/gr-trellis/src/lib,
michaelld <=