Updated documentation and grc/python examples in gr-trellis.

Removed weird pyhton examples and made them grc files.

Author: anastas

gr-trellis/doc/gr-trellis.xml

@@ -176,8 +176,8 @@ private:
   int d_O;
   std::vector<int> d_NS;
   std::vector<int> d_OS;
-  std::vector<int> d_PS;
-  std::vector<int> d_PI;
+  std::vector< std::vector< int> > d_PS;
+  std::vector< std::vector< int> > d_PI;
   std::vector<int> d_TMi;
   std::vector<int> d_TMl;
   void generate_PS_PI ();
@@ -195,8 +195,8 @@ public:
   int O () const { return d_O; }
   const std::vector<int> & NS () const { return d_NS; }
   const std::vector<int> & OS () const { return d_OS; }
-  const std::vector<int> & PS () const { return d_PS; }
-  const std::vector<int> & PI () const { return d_PI; }
+  const std::vector< std::vector< int> > & PS () const { return d_PS; }
+  const std::vector< std::vector< int> > & PI () const { return d_PI; }
   const std::vector<int> & TMi () const { return d_TMi; }
   const std::vector<int> & TMl () const { return d_TMl; }
 };

gr-trellis/examples/grc/CMakeLists.txt

@@ -20,13 +20,18 @@
 ## Configure GRC examples to point to the right fsm_files directory
 set(FSM_FILE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/${GR_PKG_TRELLIS_EXAMPLES_DIR}/fsm_files/")
 configure_file(
-    "${CMAKE_CURRENT_SOURCE_DIR}/pccc.grc"
-    "${CMAKE_CURRENT_BINARY_DIR}/pccc.grc"
+    "${CMAKE_CURRENT_SOURCE_DIR}/tcm.grc"
+    "${CMAKE_CURRENT_BINARY_DIR}/tcm.grc"
+)
+
+configure_file(
+    "${CMAKE_CURRENT_SOURCE_DIR}/viterbi_equalization.grc"
+    "${CMAKE_CURRENT_BINARY_DIR}/viterbi_equalization.grc"
 )
 
 configure_file(
-    "${CMAKE_CURRENT_SOURCE_DIR}/pccc1.grc"
-    "${CMAKE_CURRENT_BINARY_DIR}/pccc1.grc"
+    "${CMAKE_CURRENT_SOURCE_DIR}/turbo_equalization.grc"
+    "${CMAKE_CURRENT_BINARY_DIR}/turbo_equalization.grc"
 )
 
 configure_file(
@@ -35,8 +40,8 @@ configure_file(
 )
 
 configure_file(
-    "${CMAKE_CURRENT_SOURCE_DIR}/sccc1.grc"
-    "${CMAKE_CURRENT_BINARY_DIR}/sccc1.grc"
+    "${CMAKE_CURRENT_SOURCE_DIR}/pccc.grc"
+    "${CMAKE_CURRENT_BINARY_DIR}/pccc.grc"
 )
 
 configure_file(
@@ -46,11 +51,12 @@ configure_file(
 
 install(
     FILES
-    ${CMAKE_CURRENT_BINARY_DIR}/interference_cancellation.grc
-    ${CMAKE_CURRENT_BINARY_DIR}/pccc.grc
-    ${CMAKE_CURRENT_BINARY_DIR}/pccc1.grc
-    ${CMAKE_CURRENT_BINARY_DIR}/sccc1.grc
+    ${CMAKE_CURRENT_BINARY_DIR}/tcm.grc
+    ${CMAKE_CURRENT_BINARY_DIR}/viterbi_equalization.grc
+    ${CMAKE_CURRENT_BINARY_DIR}/turbo_equalization.grc
     ${CMAKE_CURRENT_BINARY_DIR}/sccc.grc
+    ${CMAKE_CURRENT_BINARY_DIR}/pccc.grc
+    ${CMAKE_CURRENT_BINARY_DIR}/interference_cancellation.grc
     readme.txt
     DESTINATION ${GR_PKG_TRELLIS_EXAMPLES_DIR}
     COMPONENT "trellis-examples"