[Octave-cvsupdate] SF.net SVN: octave:[10893] trunk/octave-forge/main/comm/inst

[<car...@us...>]

Revision: 10893
          http://octave.svn.sourceforge.net/octave/?rev=10893&view=rev
Author:   carandraug
Date:     2012-08-21 01:12:21 +0000 (Tue, 21 Aug 2012)
Log Message:
-----------
egolaydec/egolayenc: use egolaygen and avoid repeating code

Modified Paths:
--------------
    trunk/octave-forge/main/comm/inst/egolaydec.m
    trunk/octave-forge/main/comm/inst/egolayenc.m

Modified: trunk/octave-forge/main/comm/inst/egolaydec.m
===================================================================
--- trunk/octave-forge/main/comm/inst/egolaydec.m	2012-08-21 00:59:49 UTC (rev 10892)
+++ trunk/octave-forge/main/comm/inst/egolaydec.m	2012-08-21 01:12:21 UTC (rev 10893)
@@ -56,25 +56,10 @@
     error ("extended golay code is (24,12), use rx codeword of 24 bit column size");
   endif
 
-  I = eye (12);
-                                %P is 12x12 matrix
-  P = [1 0 0 0 1 1 1 0 1 1 0 1;
-       0 0 0 1 1 1 0 1 1 0 1 1;
-       0 0 1 1 1 0 1 1 0 1 0 1;
-       0 1 1 1 0 1 1 0 1 0 0 1;
-       1 1 1 0 1 1 0 1 0 0 0 1;
-       1 1 0 1 1 0 1 0 0 0 1 1;
-       1 0 1 1 0 1 0 0 0 1 1 1;
-       0 1 1 0 1 0 0 0 1 1 1 1;
-       1 1 0 1 0 0 0 1 1 1 0 1;
-       1 0 1 0 0 0 1 1 1 0 1 1;
-       0 1 0 0 0 1 1 1 0 1 1 1;
-       1 1 1 1 1 1 1 1 1 1 1 0;];
-
-  H = [I; P]; %partiy check matrix transpose.
-
   dec_error = [];
-  C         = zeros (size (R));
+  [~, P] = egolaygen ();
+  H      = [eye(12); P]; # parity check matrix transpose
+  C      = zeros (size (R));
 
   for rspn = 1:rows (R)
     RR   = R(rspn,:);

Modified: trunk/octave-forge/main/comm/inst/egolayenc.m
===================================================================
--- trunk/octave-forge/main/comm/inst/egolayenc.m	2012-08-21 00:59:49 UTC (rev 10892)
+++ trunk/octave-forge/main/comm/inst/egolayenc.m	2012-08-21 01:12:21 UTC (rev 10893)
@@ -43,20 +43,7 @@
     error("extended golay code is (24,12), use message  of column size 12");
   endif
 
-  I = eye (12);
-  P = [1 0 0 0 1 1 1 0 1 1 0 1;
-       0 0 0 1 1 1 0 1 1 0 1 1;
-       0 0 1 1 1 0 1 1 0 1 0 1;
-       0 1 1 1 0 1 1 0 1 0 0 1;
-       1 1 1 0 1 1 0 1 0 0 0 1;
-       1 1 0 1 1 0 1 0 0 0 1 1;
-       1 0 1 1 0 1 0 0 0 1 1 1;
-       0 1 1 0 1 0 0 0 1 1 1 1;
-       1 1 0 1 0 0 0 1 1 1 0 1;
-       1 0 1 0 0 0 1 1 1 0 1 1;
-       0 1 0 0 0 1 1 1 0 1 1 1;
-       1 1 1 1 1 1 1 1 1 1 1 0;];
-  G = [P I]; %generator.
+  G = egolaygen (); # generator
 
   C = mod (M * repmat (G, [1, rows(M)]), 2);
   C = C(:, 1:24);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.