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

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

diff --git a/gr-trellis/src/lib/trellis_viterbi_combined_i.cc b/gr-trellis/src/lib/trellis_viterbi_combined_i.cc
index a92e7b35db9edbf16798b5316282511430e2b701..150f80a14e9ead43fa0a2df30b8b50ecba9ad8a4 100644 (file)
--- a/gr-trellis/src/lib/trellis_viterbi_combined_i.cc
+++ b/gr-trellis/src/lib/trellis_viterbi_combined_i.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;