Refactored some common functions for metric calculations. Updated the documentation.

[debian/gnuradio] / gr-trellis / src / lib / trellis_viterbi_combined_s.cc

diff --git a/gr-trellis/src/lib/trellis_viterbi_combined_s.cc b/gr-trellis/src/lib/trellis_viterbi_combined_s.cc
index b664f6e95581f034d80d25610e3ae43a6e01738b..320189296e0fe27f8e234975108078f37cd707aa 100644 (file)
--- a/gr-trellis/src/lib/trellis_viterbi_combined_s.cc
+++ b/gr-trellis/src/lib/trellis_viterbi_combined_s.cc
@@ -114,7 +114,7 @@ void viterbi_algorithm_combined(int I, int S, int O,
 
   alphai=0;
   for(int k=0;k<K;k++) {
-      calc_metric_f(O, D, TABLE, &(in[k*D]), metric,TYPE); // calc metrics
+      calc_metric(O, D, TABLE, &(in[k*D]), metric,TYPE); // calc metrics
       norm=INF;
       for(int j=0;j<S;j++) { // for each next state do ACS
           minm=INF;