Learn how easy it is to sync an existing GitHub or Google Code repo to a SourceForge project! See Demo
Close
From: <adb014@us...>  20090514 22:04:07

Revision: 5826 http://octave.svn.sourceforge.net/octave/?rev=5826&view=rev Author: adb014 Date: 20090514 22:03:52 +0000 (Thu, 14 May 2009) Log Message:  Update the comms package for 3.1.55 Modified Paths:  trunk/octaveforge/main/comm/DESCRIPTION trunk/octaveforge/main/comm/src/galois.cc trunk/octaveforge/main/comm/src/galois.h trunk/octaveforge/main/comm/src/gf.cc trunk/octaveforge/main/comm/src/ovgalois.cc Modified: trunk/octaveforge/main/comm/DESCRIPTION ===================================================================  trunk/octaveforge/main/comm/DESCRIPTION 20090514 20:47:12 UTC (rev 5825) +++ trunk/octaveforge/main/comm/DESCRIPTION 20090514 22:03:52 UTC (rev 5826) @@ 1,11 +1,11 @@ Name: Communications Version: 1.0.9 Date: 20090503 +Version: 1.0.10 +Date: 20090514 Author: David Bateman Maintainer: David Bateman Title: Communications. Description: Digital Communications, Error Correcting Codes (Channel Code), Source Code functions, Modulation and Galois Fields Depends: octave (> 2.9.14), signal (>= 1.0.0) +Depends: octave (> 3.1.54), signal (>= 1.0.0) Autoload: yes License: GPL version 2 or later Url: http://octave.sf.net Modified: trunk/octaveforge/main/comm/src/galois.cc ===================================================================  trunk/octaveforge/main/comm/src/galois.cc 20090514 20:47:12 UTC (rev 5825) +++ trunk/octaveforge/main/comm/src/galois.cc 20090514 22:03:52 UTC (rev 5826) @@ 28,6 +28,8 @@ #include "galoisfield.h" #include "galoisdef.h" +#include <octave/baselu.cc> + galois_field_list stored_galois_fields; // galois class @@ 709,13 +711,13 @@ boolMatrix galois::all (int dim) const {  MX_ALL_OP (dim); + return do_mx_red_op<boolMatrix> (*this, dim, mx_inline_all); } boolMatrix galois::any (int dim) const {  MX_ANY_OP (dim); + return do_mx_red_op<boolMatrix> (*this, dim, mx_inline_any); } galois @@ 877,7 +879,7 @@ return retval; } template class base_lu <galois, int, Matrix, double>; +template class base_lu <galois>; void LU::factor (const galois& a, const pivot_type& typ) @@ 993,51 +995,7 @@ return u; } Matrix LU::P (void) const {  int a_nr = a_fact.rows ();  int a_nc = a_fact.cols ();  int n = (ptype == LU::ROW ? a_nr : a_nc);   Array<int> pvt (n);   for (int i = 0; i < n; i++)  pvt (i) = i;   for (int i = 0; i < ipvt.length(); i++)  {  int k = ipvt (i);   if (k != i)  {  int tmp = pvt (k);  pvt (k) = pvt (i);  pvt (i) = tmp;  }  }   Matrix p(n, n, 0.0);   for (int i = 0; i < n; i++)  p (i, pvt (i)) = 1.0;   return p; }  Array<int> LU::IP (void) const {  return Array<int> (ipvt); }  galois LU::A (void) const {  return galois (a_fact); }  galois galois::inverse (void) const { int info; @@ 1094,7 +1052,7 @@ LU fact (*this); if ( ! fact.singular()) {  galois A (fact.A()); + galois A (fact.a_fact); info = 0; retval(0,0) = A(0,0); @@ 1163,8 +1121,8 @@ return galois(); } else {  galois A (fact.A());  Array<int> IP (fact.IP()); + galois A (fact.a_fact); + Array<int> IP (fact.ipvt); // Resize the number of solution rows if needed if (nc > nr) @@ 1226,8 +1184,8 @@ return galois(); } else {  galois A (fact.A());  Array<int> IP (fact.IP()); + galois A (fact.a_fact); + Array<int> IP (fact.ipvt); // Apply row interchanges to the right hand sides. for (int j=0; j<IP.length(); j++) { Modified: trunk/octaveforge/main/comm/src/galois.h ===================================================================  trunk/octaveforge/main/comm/src/galois.h 20090514 20:47:12 UTC (rev 5825) +++ trunk/octaveforge/main/comm/src/galois.h 20090514 22:03:52 UTC (rev 5826) @@ 131,7 +131,7 @@ }; class LU : public base_lu <galois, int, Matrix, double> +LU : public base_lu <galois> { friend class galois; public: @@ 141,18 +141,18 @@ COL };  LU (void) : base_lu <galois, int, Matrix, double> () { } + LU (void) : base_lu <galois> () { } LU (const galois& a, const pivot_type& typ) { factor (a, typ); } LU (const galois& a) { factor (a, LU::ROW); }  LU (const LU& a) : base_lu <galois, int, Matrix, double> (a) { } + LU (const LU& a) : base_lu <galois> (a) { } LU& operator = (const LU& a) { if (this != &a)  base_lu <galois, int, Matrix, double> :: operator = (a); + base_lu <galois> :: operator = (a); return *this; } @@ 163,18 +163,12 @@ galois U (void) const;  Matrix P (void) const; + bool singular (void) const { return info != 0; }  bool singular (void) const { return info != 0; }  pivot_type type (void) const { return ptype; } private: void factor (const galois& a, const pivot_type& typ);  Array<int> IP (void) const;   galois A (void) const;  int info; pivot_type ptype; Modified: trunk/octaveforge/main/comm/src/gf.cc ===================================================================  trunk/octaveforge/main/comm/src/gf.cc 20090514 20:47:12 UTC (rev 5825) +++ trunk/octaveforge/main/comm/src/gf.cc 20090514 22:03:52 UTC (rev 5826) @@ 872,7 +872,9 @@ case 1: case 2: {  Matrix P = fact.P (); + // While we don't have sparse galois matrices converting the + // permutation matrix to a full matrix is the best we can do. + Matrix P = Matrix (fact.P ()); galois L = P.transpose () * fact.L (); retval(1) = new octave_galois (fact.U ()); retval(0) = new octave_galois (L); Modified: trunk/octaveforge/main/comm/src/ovgalois.cc ===================================================================  trunk/octaveforge/main/comm/src/ovgalois.cc 20090514 20:47:12 UTC (rev 5825) +++ trunk/octaveforge/main/comm/src/ovgalois.cc 20090514 22:03:52 UTC (rev 5826) @@ 369,12 +369,14 @@ case 2: { idx_vector i = idx (0).index_vector ();  idx_vector j = idx (1).index_vector ();  gval.set_index (i);  gval.set_index (j); + if (! error_state) + { + idx_vector j = idx (1).index_vector ();  ::assign (gval, rhs); + if (! error_state) + gval.assign (i, j, rhs); + } } break; @@ 382,9 +384,8 @@ { idx_vector i = idx (0).index_vector ();  gval.set_index (i);   ::assign (gval, rhs); + if (! error_state) + gval.assign (i, rhs); } break; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. 
From: <adb014@us...>  20110520 22:49:04

Revision: 8276 http://octave.svn.sourceforge.net/octave/?rev=8276&view=rev Author: adb014 Date: 20110520 22:48:58 +0000 (Fri, 20 May 2011) Log Message:  Update galois field C++ code in the communications package for Octave 3.4 Modified Paths:  trunk/octaveforge/main/comm/inst/gdftmtx.m trunk/octaveforge/main/comm/inst/gfft.m trunk/octaveforge/main/comm/inst/gifft.m trunk/octaveforge/main/comm/src/__gfweight__.cc trunk/octaveforge/main/comm/src/cyclgen.cc trunk/octaveforge/main/comm/src/cyclpoly.cc trunk/octaveforge/main/comm/src/galoisdef.h trunk/octaveforge/main/comm/src/galois.cc trunk/octaveforge/main/comm/src/galois.h trunk/octaveforge/main/comm/src/galoisfield.cc trunk/octaveforge/main/comm/src/galoisfield.h trunk/octaveforge/main/comm/src/gf.cc trunk/octaveforge/main/comm/src/ovgalois.cc trunk/octaveforge/main/comm/src/syndtable.cc Modified: trunk/octaveforge/main/comm/inst/gdftmtx.m ===================================================================  trunk/octaveforge/main/comm/inst/gdftmtx.m 20110520 10:42:54 UTC (rev 8275) +++ trunk/octaveforge/main/comm/inst/gdftmtx.m 20110520 22:48:58 UTC (rev 8276) @@ 54,7 +54,7 @@ endif mp = minpol(a);  if ((mp(1) ~= 1)  !isprimitive(mp)) + if ((mp(1) ~= 1)  !isprimitive(mp)) error("gdftmtx: argument must be a primitive nth root of unity"); endif Modified: trunk/octaveforge/main/comm/inst/gfft.m ===================================================================  trunk/octaveforge/main/comm/inst/gfft.m 20110520 10:42:54 UTC (rev 8275) +++ trunk/octaveforge/main/comm/inst/gfft.m 20110520 22:48:58 UTC (rev 8276) @@ 41,9 +41,9 @@ alph = gf(2, x.m, x.prim_poly); [nr,nc] = size(x);  if ((nc == 1) & (nr == n)) + if ((nc == 1) && (nr == n)) y = gdftmtx(alph) * x;  elseif ((nc == n) & (nr == 1)) + elseif ((nc == n) && (nr == 1)) y = (gdftmtx(alph) * x')'; else error ("gfft: argument must be a vector in GF(2^m) of length 2^m1"); Modified: trunk/octaveforge/main/comm/inst/gifft.m ===================================================================  trunk/octaveforge/main/comm/inst/gifft.m 20110520 10:42:54 UTC (rev 8275) +++ trunk/octaveforge/main/comm/inst/gifft.m 20110520 22:48:58 UTC (rev 8276) @@ 41,9 +41,9 @@ alph = gf(2, x.m, x.prim_poly); [nr,nc] = size(x);  if ((nc == 1) & (nr == n)) + if ((nc == 1) && (nr == n)) y = gdftmtx(1/alph) * x;  elseif ((nc == n) & (nr == 1)) + elseif ((nc == n) && (nr == 1)) y = (gdftmtx(1/alph) * x')'; else error ("gifft: argument must be a vector in GF(2^m) of length 2^m1"); Modified: trunk/octaveforge/main/comm/src/__gfweight__.cc ===================================================================  trunk/octaveforge/main/comm/src/__gfweight__.cc 20110520 10:42:54 UTC (rev 8275) +++ trunk/octaveforge/main/comm/src/__gfweight__.cc 20110520 22:48:58 UTC (rev 8276) @@ 80,7 +80,7 @@ flush_octave_stdout (); }  Array<char> codeword (n, 0); + Array<char> codeword (dim_vector (n, 1), 0); return octave_value((double)get_weight (codeword, gen, n  k + 1, 1, 0, n, k)); } Modified: trunk/octaveforge/main/comm/src/cyclgen.cc ===================================================================  trunk/octaveforge/main/comm/src/cyclgen.cc 20110520 10:42:54 UTC (rev 8275) +++ trunk/octaveforge/main/comm/src/cyclgen.cc 20110520 22:48:58 UTC (rev 8276) @@ 34,8 +34,8 @@ const Array<int>& x, const int& n) { int x_len = x.length ();  Array<int> si (n, 0);  Array<int> y (x_len, 0); + Array<int> si (dim_vector (n, 1), 0); + Array<int> y (dim_vector (x_len, 1), 0); for (int i=0; i < x_len; i++) { y(i) = si(0); @@ 65,15 +65,15 @@ static bool do_is_cyclic_polynomial (const Array<int>& a, const int& n, const int& m) {  Array<int> y (n+1, 0);  Array<int> x (nm+2, 0); + Array<int> y (dim_vector (n+1, 1), 0); + Array<int> x (dim_vector (nm+2, 1), 0); y(0) = 1; y(n) = 1; x(0) = 1; Array<int> b = filter_gf2 (y, a, x, n);  b.resize(n+1,0);  Array<int> p (m+1,0); + b.resize(dim_vector (n+1, 1), 0); + Array<int> p (dim_vector (m+1, 1), 0); p(0) = 1; Array<int> q = filter_gf2 (a, p, b, m); @@ 141,7 +141,7 @@ m = 1; while (n > (1<<(m+1))) m++;  pp.resize(n+1, 0); + pp.resize(dim_vector (n+1, 1), 0); if (args(1).is_scalar_type ()) { p = (unsigned long long)(args(1).int_value()); Modified: trunk/octaveforge/main/comm/src/cyclpoly.cc ===================================================================  trunk/octaveforge/main/comm/src/cyclpoly.cc 20110520 10:42:54 UTC (rev 8275) +++ trunk/octaveforge/main/comm/src/cyclpoly.cc 20110520 22:48:58 UTC (rev 8276) @@ 42,8 +42,8 @@ const Array<int>& x, const int& n) { int x_len = x.length ();  Array<int> si (n, 0);  Array<int> y (x_len, 0); + Array<int> si (dim_vector (n, 1), 0); + Array<int> y (dim_vector (x_len, 1), 0); for (int i=0; i < x_len; i++) { y(i) = si(0); @@ 73,9 +73,9 @@ static bool do_is_cyclic_polynomial (const unsigned long long& a1, const int& n, const int& m) {  Array<int> a (n+1,0);  Array<int> y (n+1, 0);  Array<int> x (nm+2, 0); + Array<int> a (dim_vector (n+1, 1),0); + Array<int> y (dim_vector (n+1, 1), 0); + Array<int> x (dim_vector (nm+2, 1), 0); y(0) = 1; y(n) = 1; x(0) = 1; @@ 83,8 +83,8 @@ a(i) = (a1 & (1UL << i) ? 1 : 0); Array<int> b = filter_gf2 (y, a, x, n);  b.resize(n+1,0);  Array<int> p (m+1,0); + b.resize(dim_vector (n+1, 1), 0); + Array<int> p (dim_vector (m+1, 1), 0); p(0) = 1; Array<int> q = filter_gf2 (a, p, b, m); Modified: trunk/octaveforge/main/comm/src/galoisdef.h ===================================================================  trunk/octaveforge/main/comm/src/galoisdef.h 20110520 10:42:54 UTC (rev 8275) +++ trunk/octaveforge/main/comm/src/galoisdef.h 20110520 22:48:58 UTC (rev 8276) @@ 128,14 +128,14 @@ { \ if ((m1_nr == 1 && m1_nc == 1) && (m2_nr > 0 && m2_nc > 0)) \ { \  r.resize(m2_nr,m2_nc); \ + r.resize(dim_vector(m2_nr,m2_nc)); \ for (int i=0; i<m2_nr; i++) \ for (int j=0; j<m2_nc; j++) \ r(i,j) = (int)m1(0,0) ^ (int)m2(i,j); \ } \ else if ((m2_nr == 1 && m2_nc == 1) && (m1_nr > 0 && m1_nc > 0)) \ { \  r.resize(m1_nr,m1_nc); \ + r.resize(dim_vector(m1_nr,m1_nc)); \ for (int i=0; i<m1_nr; i++) \ for (int j=0; j<m1_nc; j++) \ r(i,j) = (int)m1(i,j) ^ (int)m2(0,0); \ @@ 174,7 +174,7 @@ { \ if ((m1_nr == 1 && m1_nc == 1) && (m2_nr > 0 && m2_nc > 0)) \ { \  r.resize(m2_nr,m2_nc); \ + r.resize(dim_vector(m2_nr,m2_nc)); \ if (m1(0,0) == 0) \ { \ for (int i=0; i<m2_nr; i++) \ @@ 200,7 +200,7 @@ } \ else if ((m2_nr == 1 && m2_nc == 1) && (m1_nr > 0 && m1_nc > 0)) \ { \  r.resize(m1_nr,m1_nc); \ + r.resize(dim_vector(m1_nr,m1_nc)); \ if (m2(0,0) == 0) \ { \ for (int i=0; i<m1_nr; i++) \ @@ 270,7 +270,7 @@ \ if (m1_nr == m2_nr && m1_nc == m2_nc) \ { \  r.resize (m1_nr, m1_nc); \ + r.resize (m1_nr, m1_nc); \ \ for (int j = 0; j < m1_nc; j++) \ for (int i = 0; i < m1_nr; i++) \ @@ 280,14 +280,14 @@ { \ if ((m1_nr == 1 && m1_nc == 1) && (m2_nr > 0 && m2_nc > 0)) \ { \  r.resize(m2_nr,m2_nc); \ + r.resize(m2_nr,m2_nc); \ for (int i=0; i<m2_nr; i++) \ for (int j=0; j<m2_nc; j++) \ r(i, j) = C1 (m1(0, 0)) OP C2 (m2(i, j)); \ } \ else if ((m2_nr == 1 && m2_nc == 1) && (m1_nr > 0 && m1_nc > 0)) \ { \  r.resize(m1_nr,m1_nc); \ + r.resize(m1_nr,m1_nc); \ for (int i=0; i<m1_nr; i++) \ for (int j=0; j<m1_nc; j++) \ r(i, j) = C1 (m1(i, j)) OP C2 (m2(0, 0)); \ @@ 325,7 +325,7 @@ { \ if (m1_nr != 0  m1_nc != 0) \ { \  r.resize (m1_nr, m1_nc); \ + r.resize (m1_nr,m1_nc); \ \ for (int j = 0; j < m1_nc; j++) \ for (int i = 0; i < m1_nr; i++) \ @@ 339,7 +339,7 @@ { \ if ((m1_nr == 1 && m1_nc == 1) && (m2_nr > 0 && m2_nc > 0)) \ { \  r.resize(m2_nr,m2_nc); \ + r.resize(m2_nr,m2_nc); \ for (int i=0; i<m2_nr; i++) \ for (int j=0; j<m2_nc; j++) \ r(i, j) = (m1(0, 0) != ZERO) \ @@ 347,7 +347,7 @@ } \ else if ((m2_nr == 1 && m2_nc == 1) && (m1_nr > 0 && m1_nc > 0)) \ { \  r.resize(m1_nr,m1_nc); \ + r.resize(m1_nr,m1_nc); \ for (int i=0; i<m1_nr; i++) \ for (int j=0; j<m1_nc; j++) \ r(i, j) = (m1(i, j) != ZERO) \ @@ 374,7 +374,7 @@ { \ if ((nr == 1 && dim == 1)  dim == 1) \ { \  RET.resize (nr, 1); \ + RET.resize (dim_vector(nr, 1)); \ for (int i = 0; i < nr; i++) \ { \ RET (i, 0) = INIT_VAL; \ @@ 386,7 +386,7 @@ } \ else \ { \  RET.resize (1, nc); \ + RET.resize (dim_vector(1, nc)); \ for (int j = 0; j < nc; j++) \ { \ RET (0, j) = INIT_VAL; \ @@ 398,13 +398,13 @@ } \ } \ else if (nc == 0 && (nr == 0  (nr == 1 && dim == 1))) \  RET.resize (1, 1, MT_RESULT); \ + RET.resize (dim_vector(1, 1), MT_RESULT); \ else if (nr == 0 && (dim == 0  dim == 1)) \  RET.resize (1, nc, MT_RESULT); \ + RET.resize (dim_vector(1, nc), MT_RESULT); \ else if (nc == 0 && dim == 1) \  RET.resize (nr, 1, MT_RESULT); \ + RET.resize (dim_vector(nr, 1), MT_RESULT); \ else \  RET.resize (nr > 0, nc > 0); + RET.resize (dim_vector(nr > 0, nc > 0)); #endif Modified: trunk/octaveforge/main/comm/src/galois.cc ===================================================================  trunk/octaveforge/main/comm/src/galois.cc 20110520 10:42:54 UTC (rev 8275) +++ trunk/octaveforge/main/comm/src/galois.cc 20110520 22:48:58 UTC (rev 8276) @@ 34,7 +34,7 @@ // galois class galois::galois (const Array<int>& a, const int& _m, const int& _primpoly) : MArray2<int> (a.rows(), a.cols()), field (NULL) { +galois::galois (const Array<int>& a, const int& _m, const int& _primpoly) : MArray<int> (a.dims ()), field (NULL) { int _n = (1<<_m)  1; // Check the validity of the data in the matrix @@ 51,7 +51,7 @@ field = stored_galois_fields.create_galois_field(_m, _primpoly); } galois::galois (const MArray2<int>& a, const int& _m, const int& _primpoly) : MArray2<int> (a.rows(), a.cols()), field (NULL) { +galois::galois (const MArray<int>& a, const int& _m, const int& _primpoly) : MArray<int> (a.dims ()), field (NULL) { int _n = (1<<_m)  1; // Check the validity of the data in the matrix @@ 68,7 +68,7 @@ field = stored_galois_fields.create_galois_field(_m, _primpoly); } galois::galois (const Matrix& a, const int& _m, const int& _primpoly) : MArray2<int> (a.rows(), a.cols()), field (NULL) { +galois::galois (const Matrix& a, const int& _m, const int& _primpoly) : MArray<int> (a.dims()), field (NULL) { int _n = (1<<_m)  1; // Check the validity of the data in the matrix @@ 89,7 +89,7 @@ field = stored_galois_fields.create_galois_field(_m, _primpoly); } galois::galois (int nr, int nc, const int& val, const int& _m, const int& _primpoly) : MArray2<int> (nr, nc, val), field (NULL) { +galois::galois (int nr, int nc, const int& val, const int& _m, const int& _primpoly) : MArray<int> (dim_vector (nr, nc), val), field (NULL) { int _n = (1<<_m)  1; // Check the validity of the data in the matrix @@ 101,7 +101,7 @@ field = stored_galois_fields.create_galois_field(_m, _primpoly); } galois::galois (int nr, int nc, double val, const int& _m, const int& _primpoly) : MArray2<int> (nr, nc, (int)val), field (NULL) { +galois::galois (int nr, int nc, double val, const int& _m, const int& _primpoly) : MArray<int> (dim_vector (nr, nc), (int)val), field (NULL) { int _n = (1<<_m)  1; // Check the validity of the data in the matrix @@ 119,7 +119,7 @@ } galois :: galois (const galois& a) :  MArray2<int>(a) { + MArray<int>(a) { if (!a.have_field()) { gripe_copy_invalid_galois(); @@ 156,7 +156,7 @@ field = stored_galois_fields.create_galois_field(t.m(), t.primpoly()); // Copy the data  MArray2<int>::operator = (t); + MArray<int>::operator = (t); return *this; } @@ 227,7 +227,7 @@ galois galois::index (idx_vector& i, int resize_ok, const int& rfv) const {  galois retval(MArray2<int>::index(i, resize_ok, rfv), m(), primpoly()); + galois retval(MArray<int>::index(i, resize_ok, rfv), m(), primpoly()); return retval; } @@ 235,7 +235,7 @@ galois galois::index (idx_vector& i, idx_vector& j, int resize_ok, const int& rfv) const {  galois retval(MArray2<int>::index(i, j, resize_ok, rfv), m(), primpoly()); + galois retval(MArray<int>::index(i, j, resize_ok, rfv), m(), primpoly()); return retval; } @@ 258,7 +258,7 @@ int _n = (1<<m())  1; int r = rb.rows(); int c = rb.columns();  tmp.resize (r, c); + tmp.resize (dim_vector (r, c)); // Check the validity of the data in the matrix for (int i=0; i<r; i++) { @@ 285,7 +285,7 @@ int _n = (1<<rb.m())  1; int r = ra.rows(); int c = ra.columns();  retval.resize (r, c); + retval.resize (dim_vector(r, c)); if (ra.numel() < 1) return retval; @@ 349,7 +349,7 @@ if (nnr > 0 && nnc > 0) { int ndiag = (nnr < nnc) ? nnr : nnc;  retval.resize(ndiag, 1); + retval.resize(dim_vector(ndiag, 1)); if (k > 0) { @@ 397,7 +397,7 @@ int d1 = rows(); int d2 = cols();  a.resize(d2,d1); + a.resize(dim_vector(d2, d1)); for (int j = 0; j < d2; j++) for (int i = 0; i < d1; i++) a (j, i) = xelem (i, j); @@ 435,7 +435,7 @@ if (a_nr == 1 && a_nc == 1) {  result.resize(b_nr,b_nc,0); + result.resize(dim_vector(b_nr, b_nc), 0); int tmp = a.index_of(a(0,0)); for (int j = 0; j < b_nc; j++) for (int i = 0; i < b_nr; i++) @@ 711,13 +711,13 @@ boolMatrix galois::all (int dim) const {  return do_mx_red_op<boolMatrix> (*this, dim, mx_inline_all); + return do_mx_red_op<bool, int> (*this, dim, mx_inline_all); } boolMatrix galois::any (int dim) const {  return do_mx_red_op<boolMatrix> (*this, dim, mx_inline_any); + return do_mx_red_op<bool, int> (*this, dim, mx_inline_any); } galois @@ 890,7 +890,7 @@ ptype = typ; info = 0;  ipvt.resize (mn); + ipvt.resize (dim_vector (mn, 1)); a_fact = a; @@ 1126,7 +1126,7 @@ // Resize the number of solution rows if needed if (nc > nr)  retval.resize(b_nr+ncnr,b_nc,0); + retval.resize(dim_vector(b_nr+ncnr, b_nc), 0); //Solve L*X = B, overwriting B with X. int mn = (nc < nr ? nc : nr); @@ 1230,7 +1230,7 @@ // Resize the number of solution rows if needed if (nc < nr)  retval.resize(b_nr+ncnr,b_nc); + retval.resize(dim_vector(b_nr+ncnr, b_nc)); } } Modified: trunk/octaveforge/main/comm/src/galois.h ===================================================================  trunk/octaveforge/main/comm/src/galois.h 20110520 10:42:54 UTC (rev 8275) +++ trunk/octaveforge/main/comm/src/galois.h 20110520 22:48:58 UTC (rev 8276) @@ 56,12 +56,12 @@ typedef void (*solve_singularity_handler) (double rcond); class galois : public MArray2<int> +galois : public MArray<int> { public: galois (void) : field (NULL) { } galois (const Array<int>& a, const int& m=1, const int& primpoly=0);  galois (const MArray2<int>& a, const int& m=1, const int& primpoly=0); + galois (const MArray<int>& a, const int& m=1, const int& primpoly=0); galois (const Matrix& a, const int& m=1, const int& primpoly=0); galois (int nr, int nc, const int& val=0, const int& _m=1, const int& _primpoly=0); galois (int nr, int nc, double val=0., const int& _m=1, const int& _primpoly=0); Modified: trunk/octaveforge/main/comm/src/galoisfield.cc ===================================================================  trunk/octaveforge/main/comm/src/galoisfield.cc 20110520 10:42:54 UTC (rev 8275) +++ trunk/octaveforge/main/comm/src/galoisfield.cc 20110520 22:48:58 UTC (rev 8276) @@ 69,8 +69,8 @@ primpoly = default_galois_primpoly[m1]; // Setup the lookup table, etc  alpha_to.resize((1<<m));  index_of.resize((1<<m)); + alpha_to.resize(dim_vector (1<<m, 1)); + index_of.resize(dim_vector (1<<m, 1)); // Put an illegal value in index_of and if it is still there after fill // we have a reducible polynomial Modified: trunk/octaveforge/main/comm/src/galoisfield.h ===================================================================  trunk/octaveforge/main/comm/src/galoisfield.h 20110520 10:42:54 UTC (rev 8275) +++ trunk/octaveforge/main/comm/src/galoisfield.h 20110520 22:48:58 UTC (rev 8276) @@ 28,7 +28,6 @@ #include <string> #include "MArray.h" #include "MArray2.h" #include "mxdefs.h" #include "mxopdefs.h" Modified: trunk/octaveforge/main/comm/src/gf.cc ===================================================================  trunk/octaveforge/main/comm/src/gf.cc 20110520 10:42:54 UTC (rev 8275) +++ trunk/octaveforge/main/comm/src/gf.cc 20110520 22:48:58 UTC (rev 8276) @@ 502,7 +502,7 @@ galois filter(galois& b, galois& a, galois& x, galois& si) { int ab_len = (a.length() > b.length() ? a.length() : b.length());  b.resize(ab_len, 1, 0); + b.resize(dim_vector (ab_len, 1), 0); galois retval(x.length(), 1, 0, b.m(), b.primpoly()); int norm = a(0,0); @@ 523,7 +523,7 @@ } } if (a.length() > 1) {  a.resize(ab_len, 1, 0); + a.resize(dim_vector (ab_len, 1), 0); if (norm != 1) { int idx_norm = a.index_of(norm); @@ 1298,7 +1298,7 @@ genpoly(i,0) = genpoly.index_of(genpoly(i,0)); // Add space for parity block  msg.resize(nsym,n,0); + msg.resize(dim_vector (nsym, n), 0); // The code below basically finds the parity bits by treating the // message as a polynomial and dividing it by the generator polynomial. @@ 1814,7 +1814,7 @@ ColumnVector nerr(nsym,0); if (nn != n) {  code.resize(nsym,nn,0); + code.resize(dim_vector (nsym, nn),0); if (parity_at_end) for (int l = 0; l < nsym; l++) for (int i=n; i > 0; i) @@ 1829,7 +1829,7 @@ for (int l = 0; l < nsym; l++) for (int i=0; i > n; i) code(l,i) = code(l,i+nnn);  code.resize(nsym,n,0); + code.resize(dim_vector (nsym, n), 0); } if (parity_at_end) { @@ 1962,7 +1962,7 @@ found(0) = 1; galois c(1,m,0,m); c(0,0) == c.index_of(1);  Array<int> cs(1,1); + Array<int> cs(dim_vector (1, 1), 1); int nc = 1; @@ 1973,8 +1973,8 @@ if ((found(i) == 0) && (c.index_of(i+1) < idx)) idx = c.index_of(i+1);  c.resize(nc+1,m);  cs.resize(nc+1); + c.resize(dim_vector (nc+1, m)); + cs.resize(dim_vector (nc+1, 1)); c(nc,0) = idx; found(c.alpha_to(idx)1) = 1; cs(nc) = 1; @@ 2001,7 +2001,7 @@ int flag = 0; for (int l=0; l<cs(i); l++) { if (c(i,l) == j+1) {  f.resize(1,nf+cs(i)); + f.resize(dim_vector (1, nf+cs(i))); for (int ll=0; ll<cs(i); ll++) f(0,nf+ll) = c(i,ll); found(i) = 0; @@ 2229,7 +2229,7 @@ for (int lsym = 0; lsym < nsym; lsym++) { /* first form the syndromes */  Array<int> s(t2+1,0); + Array<int> s(dim_vector(t2+1, 1) ,0); bool syn_error = false; for (int i = 1; i <= t2; i++) { @@ 2249,8 +2249,9 @@ if (syn_error) { /* if there are errors, try to correct them */ int q, u;  Array<int> d(t2+2), l(t2+2), u_lu(t2+2), reg(t2+2);  Array2<int> elp(t2+2,t2+2); + Array<int> d(dim_vector (t2+2, 1)), l(dim_vector (t2+2, 1)), + u_lu(dim_vector (t2+2, 1)), reg(dim_vector (t2+2, 1)), + elp(dim_vector (t2+2, t2+2)); /* convert syndrome from polynomial form to index form */ for (int i = 1; i <= t2; i++) @@ 2348,7 +2349,7 @@ u++; if (l(u) <= t) {/* Can correct errors */ int count;  Array<int> loc(t+2); + Array<int> loc(dim_vector (t+2, 1)); /* put elp into index form */ for (int i = 0; i <= l(u); i++) Modified: trunk/octaveforge/main/comm/src/ovgalois.cc ===================================================================  trunk/octaveforge/main/comm/src/ovgalois.cc 20110520 10:42:54 UTC (rev 8275) +++ trunk/octaveforge/main/comm/src/ovgalois.cc 20110520 22:48:58 UTC (rev 8276) @@ 29,10 +29,6 @@ #include "galois.h" #include "ovgalois.h" #if ! defined (HAVE_OCTAVE_29) && ! defined (HAVE_OCTAVE_30) extern int Vstruct_levels_to_print; #endif  #include <octave/byteswap.h> #include <octave/lsoctascii.h> @@ 47,7 +43,7 @@ return octave_value (); } galois retval (gval);  retval.resize (dv(0), dv(1)); + retval.resize (dv); return new octave_galois (retval); } @@ 205,10 +201,6 @@ void octave_galois::print_raw (std::ostream& os, bool) const {  unwind_protect::begin_frame ("octave_galois_print");   unwind_protect_int (Vstruct_levels_to_print);  bool first = true; int m = gval.m(); int primpoly = gval.primpoly(); @@ 256,8 +248,6 @@ octave_print_internal (os, data, false, current_print_indent_level ()); newline (os);   unwind_protect::run_frame ("octave_galois_print"); } bool @@ 267,7 +257,13 @@ indent (os); + // Vstruct_levels_to_print was made static in Octave 3.4, which means + // the name_tag might be printed on a seperate line when it shouldn't be. +#if 0 if (Vstruct_levels_to_print < 0) +#else + if (false) +#endif os << name << " = "; else { @@ 731,7 +727,7 @@ OCTAVE_LOCAL_BUFFER (hsize_t, maxdims, rank); H5Sget_simple_extent_dims (space_id, hdims, maxdims);  MArray2<int> m (hdims[1], hdims[0]); + MArray<int> m (dim_vector (hdims[1], hdims[0])); int *re = m.fortran_vec (); if (H5Dread (data_hid, H5T_NATIVE_UINT, H5S_ALL, H5S_ALL, Modified: trunk/octaveforge/main/comm/src/syndtable.cc ===================================================================  trunk/octaveforge/main/comm/src/syndtable.cc 20110520 10:42:54 UTC (rev 8275) +++ trunk/octaveforge/main/comm/src/syndtable.cc 20110520 22:48:58 UTC (rev 8276) @@ 31,22 +31,22 @@ #define COL_MAJ(N) (N / (SIZEOF_INT << 3)) #define COL_MIN(N) (N % (SIZEOF_INT << 3)) Array2<int> get_errs (const int& nmin, const int& nmax, const int &nerrs) +Array<int> get_errs (const int& nmin, const int& nmax, const int &nerrs) {  Array2<int> pos; + Array<int> pos; int cols = COL_MAJ(nmax)+1; OCTAVE_QUIT; if (nerrs == 1) {  pos.resize(nmaxnmin,cols,0); + pos.resize(dim_vector (nmaxnmin, cols), 0); for (int i = nmin; i < nmax; i++) { pos(inmin,COL_MAJ(i)) = (1<<COL_MIN(i)); } } else { for (int i = nmin; i < nmax  nerrs + 1; i++) {  Array2<int> new_pos = get_errs(i+1, nmax, nerrs1); + Array<int> new_pos = get_errs(i+1, nmax, nerrs1); int l = pos.rows();  pos.resize(l+new_pos.rows(),cols,0); + pos.resize(dim_vector (l+new_pos.rows(), cols), 0); for (int j=0; j<new_pos.rows(); j++) { for (int k=0; k<cols; k++) pos(l+j,k) = new_pos(j,k); @@ 117,7 +117,7 @@ while (nfilled != 0) { // Get all possible combinations of nerrs bit errors in n bits  Array2<int> errpos = get_errs(0, n, nerrs); + Array<int> errpos = get_errs(0, n, nerrs); // Calculate the syndrome with the error vectors just calculated for (int j = 0; j < errpos.rows(); j++) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. 
From: <adb014@us...>  20110522 19:32:50

Revision: 8278 http://octave.svn.sourceforge.net/octave/?rev=8278&view=rev Author: adb014 Date: 20110522 19:32:41 +0000 (Sun, 22 May 2011) Log Message:  More updates for the communications package for 3.4 Modified Paths:  trunk/octaveforge/main/comm/DESCRIPTION trunk/octaveforge/main/comm/INDEX trunk/octaveforge/main/comm/inst/comms.m trunk/octaveforge/main/comm/inst/deintrlv.m trunk/octaveforge/main/comm/inst/lz77deco.m trunk/octaveforge/main/comm/inst/lz77enco.m trunk/octaveforge/main/comm/inst/marcumq.m trunk/octaveforge/main/comm/src/gf.cc Added Paths:  trunk/octaveforge/main/comm/inst/@galois/ trunk/octaveforge/main/comm/inst/@galois/conv.m trunk/octaveforge/main/comm/inst/@galois/convmtx.m trunk/octaveforge/main/comm/inst/@galois/deconv.m trunk/octaveforge/main/comm/inst/@galois/det.m trunk/octaveforge/main/comm/inst/@galois/dftmtx.m trunk/octaveforge/main/comm/inst/@galois/diag.m trunk/octaveforge/main/comm/inst/@galois/exp.m trunk/octaveforge/main/comm/inst/@galois/fft.m trunk/octaveforge/main/comm/inst/@galois/filter.m trunk/octaveforge/main/comm/inst/@galois/ifft.m trunk/octaveforge/main/comm/inst/@galois/inv.m trunk/octaveforge/main/comm/inst/@galois/inverse.m trunk/octaveforge/main/comm/inst/@galois/isequal.m trunk/octaveforge/main/comm/inst/@galois/log.m trunk/octaveforge/main/comm/inst/@galois/lu.m trunk/octaveforge/main/comm/inst/@galois/prod.m trunk/octaveforge/main/comm/inst/@galois/rank.m trunk/octaveforge/main/comm/inst/@galois/reshape.m trunk/octaveforge/main/comm/inst/@galois/roots.m trunk/octaveforge/main/comm/inst/@galois/sqrt.m trunk/octaveforge/main/comm/inst/@galois/sum.m trunk/octaveforge/main/comm/inst/@galois/sumsq.m Removed Paths:  trunk/octaveforge/main/comm/inst/gconv.m trunk/octaveforge/main/comm/inst/gconvmtx.m trunk/octaveforge/main/comm/inst/gdeconv.m trunk/octaveforge/main/comm/inst/gdftmtx.m trunk/octaveforge/main/comm/inst/gifft.m trunk/octaveforge/main/comm/inst/gisequal.m trunk/octaveforge/main/comm/inst/groots.m Modified: trunk/octaveforge/main/comm/DESCRIPTION ===================================================================  trunk/octaveforge/main/comm/DESCRIPTION 20110522 12:49:42 UTC (rev 8277) +++ trunk/octaveforge/main/comm/DESCRIPTION 20110522 19:32:41 UTC (rev 8278) @@ 1,11 +1,11 @@ Name: Communications Version: 1.0.10 Date: 20090514 +Version: 1.0.11 +Date: 20100521 Author: David Bateman Maintainer: David Bateman Title: Communications. Description: Digital Communications, Error Correcting Codes (Channel Code), Source Code functions, Modulation and Galois Fields Depends: octave (>= 3.2), signal (>= 1.0.0), image +Depends: octave (>= 3.4), signal (>= 1.0.0), image Autoload: yes License: GPL version 2 or later Url: http://octave.sf.net Modified: trunk/octaveforge/main/comm/INDEX ===================================================================  trunk/octaveforge/main/comm/INDEX 20110522 12:49:42 UTC (rev 8277) +++ trunk/octaveforge/main/comm/INDEX 20110522 19:32:41 UTC (rev 8278) @@ 114,31 +114,31 @@ all any cosets  gconv  gconvmtx  gdeconv  gdet  gdftmtx  gdiag  gexp + conv + convmtx + deconv + det + dftmtx + diag + exp gf  gfft  gfilter + fft + filter gftable gfweight  gifft  ginv  ginverse  gisequal  glog  glu  gprod  gsqrt  grank  greshape  groots  gsum  gsumsq + ifft + inv + inverse + isequal + log + lu + prod + sqrt + rank + reshape + roots + sum + sumsq isempty isgalois isprimitive Copied: trunk/octaveforge/main/comm/inst/@galois/conv.m (from rev 8276, trunk/octaveforge/main/comm/inst/gconv.m) ===================================================================  trunk/octaveforge/main/comm/inst/@galois/conv.m (rev 0) +++ trunk/octaveforge/main/comm/inst/@galois/conv.m 20110522 19:32:41 UTC (rev 8278) @@ 0,0 +1,81 @@ +## Copyright (C) 2002 David Bateman +## +## This program 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 of the License, or +## (at your option) any later version. +## +## This program 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 this program; If not, see <http://www.gnu.org/licenses/>;. + +## * texinfo * +## @deftypefn {Function File} {} conv (@var{a}, @var{b}) +## Convolve two Galois vectors. +## +## @code{y = conv (a, b)} returns a vector of length equal to +## @code{length (a) + length (b)  1}. +## If @var{a} and @var{b} are polynomial coefficient vectors, @code{conv} +## returns the coefficients of the product polynomial. +## @end deftypefn +## @seealso{deconv} + +function y = conv (a, b) + + if (nargin != 2) + usage ("conv(a, b)"); + endif + + if (!isgalois (a) && !isgalois (b)) + error("conv: at least one argument must be a galois variable"); + elseif (!isgalois (a)) + a = gf(a, b.m, b.prim_poly); + elseif (!isgalois (b)) + b = gf(b, a.m, a.prim_poly); + elseif (a.m != b.m && a.prim_poly != b.prim_poly) + error("conv: both vectors must be in the same galois field"); + endif + + if (min(size(a)) > 1  min(size(b)) > 1) + error("conv: both arguments must be vectors"); + endif + + la = length (a); + lb = length (b); + + ly = la + lb  1; + + ## Ensure that both vectors are row vectors. + if (rows (a) > 1) + a = greshape (a, 1, la); + endif + if (rows (b) > 1) + b = greshape (b, 1, lb); + endif + + ## Use the shortest vector as the coefficent vector to filter. + if (la < lb) + if (ly > lb) + ## Can't concatenate galois variables like this yet + ## x = [b, (zeros (1, ly  lb))]; + x = gf([b, (zeros (1, ly  lb))], b.m, b.prim_poly); + else + x = b; + endif + y = gfilter (a, 1, x); + else + if(ly > la) + ## Can't concatenate galois variables like this yet + ## x = [a, (zeros (1, ly  la))]; + x = gf([a, (zeros (1, ly  la))], a.m, a.prim_poly); + else + x = a; + endif + y = gfilter (b, 1, x); + endif + +endfunction Copied: trunk/octaveforge/main/comm/inst/@galois/convmtx.m (from rev 8276, trunk/octaveforge/main/comm/inst/gconvmtx.m) ===================================================================  trunk/octaveforge/main/comm/inst/@galois/convmtx.m (rev 0) +++ trunk/octaveforge/main/comm/inst/@galois/convmtx.m 20110522 19:32:41 UTC (rev 8278) @@ 0,0 +1,47 @@ +## Copyright (C) 2003 David Bateman +## +## This program 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 of the License, or +## (at your option) any later version. +## +## This program 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 this program; If not, see <http://www.gnu.org/licenses/>;. + +## * texinfo * +## @deftypefn {Function File} {} convmtx (@var{a}, @var{n}) +## +## Create matrix to perform repeated convolutions with the same vector +## in a Galois Field. If @var{a} is a column vector and @var{x} is a +## column vector of length @var{n}, in a Galois Field then +## +## @code{convmtx(@var{a}, @var{n}) * @var{x}} +## +## gives the convolution of of @var{a} and @var{x} and is the +## same as @code{conv(@var{a}, @var{x})}. The difference is if +## many vectors are to be convolved with the same vector, then +## this technique is possibly faster. +## +## Similarly, if @var{a} is a row vector and @var{x} is a row +## vector of length @var{n}, then +## +## @code{@var{x} * convmtx(@var{a}, @var{n})} +## +## is the same as @code{conv(@var{x}, @var{a})}. +## @end deftypefn +## @seealso{conv} + +function b = convmtx (a, n) + + if (!isgalois (a)) + error("convmtx: argument must be a galois variable"); + endif + + b = gf(convmtx(a.x,n), a.m, a.prim_poly); + +endfunction Copied: trunk/octaveforge/main/comm/inst/@galois/deconv.m (from rev 8276, trunk/octaveforge/main/comm/inst/gdeconv.m) ===================================================================  trunk/octaveforge/main/comm/inst/@galois/deconv.m (rev 0) +++ trunk/octaveforge/main/comm/inst/@galois/deconv.m 20110522 19:32:41 UTC (rev 8278) @@ 0,0 +1,80 @@ +## Copyright (C) 2002 David Bateman +## +## This program 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 of the License, or +## (at your option) any later version. +## +## This program 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 this program; If not, see <http://www.gnu.org/licenses/>;. + +## * texinfo * +## @deftypefn {Function File} {} deconv (@var{y}, @var{a}) +## Deconvolve two Galois vectors. +## +## @code{[b, r] = deconv (y, a)} solves for @var{b} and @var{r} such that +## @code{y = gconv (a, b) + r}. +## +## If @var{y} and @var{a} are polynomial coefficient vectors, @var{b} will +## contain the coefficients of the polynomial quotient and @var{r} will be +## a remander polynomial of lowest order. +## @end deftypefn +## @seealso{gconv,deconv,conv} + +function [b, r] = deconv (y, a) + + + if (nargin != 2) + usage ("deconv(a, b)"); + endif + + if (!isgalois (y) && !isgalois (a)) + error("deconv: at least one argument must be a galois variable"); + elseif (!isgalois (y)) + y = gf(y, a.m, a.prim_poly); + elseif (!isgalois (a)) + a = gf(a, y.m, y.prim_poly); + elseif (a.m != y.m && a.prim_poly != y.prim_poly) + error("deconv: both vectors must be in the same galois field"); + endif + + if (min(size(a)) > 1  min(size(y)) > 1) + error("deconv: both arguments must be vectors"); + endif + + la = length (a); + ly = length (y); + + lb = ly  la + 1; + + ## Ensure that both vectors are row vectors. + if (rows (a) > 1) + a = reshape (a, 1, la); + endif + if (rows (y) > 1) + y = reshape (y, 1, ly); + endif + + if (ly > la) + b = filter (y, a, [1, (zeros (1, ly  la))]); + elseif (ly == la) + b = filter (y, a, 1); + else + b = gf(0, y.m, y.prim_poly); + endif + + lc = la + length (b)  1; + if (ly == lc) + r = y  gconv (a, b); + else + ## Can't concatenate galois variables like this yet + ## r = [(zeros (1, lc  ly)), y]  gconv (a, b); + r = gf([(zeros (1, lc  ly)), y], y.m, y.prim_poly)  gconv (a, b); + endif + +endfunction Added: trunk/octaveforge/main/comm/inst/@galois/det.m ===================================================================  trunk/octaveforge/main/comm/inst/@galois/det.m (rev 0) +++ trunk/octaveforge/main/comm/inst/@galois/det.m 20110522 19:32:41 UTC (rev 8278) @@ 0,0 +1,24 @@ +## Copyright (C) 2011 David Bateman +## +## This program 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 of the License, or +## (at your option) any later version. +## +## This program 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 this program; If not, see <http://www.gnu.org/licenses/>;. + +## * texinfo * +## @deftypefn {Loadable Function} {@var{d} = } det (@var{a}) +## Compute the determinant of the Galois array @var{a}. +## @end deftypefn + +function varargout = det (varargin) + varargout = cell (1, nargout); + [varargout{:}] = gdet (varargin{:}); +endfunction Copied: trunk/octaveforge/main/comm/inst/@galois/dftmtx.m (from rev 8276, trunk/octaveforge/main/comm/inst/gdftmtx.m) ===================================================================  trunk/octaveforge/main/comm/inst/@galois/dftmtx.m (rev 0) +++ trunk/octaveforge/main/comm/inst/@galois/dftmtx.m 20110522 19:32:41 UTC (rev 8278) @@ 0,0 +1,67 @@ +## Copyright (C) 2002 David Bateman +## +## This program 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 of the License, or +## (at your option) any later version. +## +## This program 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 this program; If not, see <http://www.gnu.org/licenses/>;. + +## * texinfo * +## @deftypefn {Function File} {@var{d} = } dftmtx (@var{a}) +## +## Form a matrix, that can be used to perform Fourier transforms in +## a Galois Field. +## +## Given that @var{a} is an element of the Galois Field GF(2^m), and +## that the minimum value for @var{k} for which @code{@var{a} ^ @var{k}} +## is equal to one is @code{2^m  1}, then this function produces a +## @var{k}by@...{k} matrix representing the discrete Fourier transform +## over a Galois Field with respect to @var{a}. The Fourier transform of +## a column vector is then given by @code{dftmtx(@var{a}) * @var{x}}. +## +## The inverse Fourier transform is given by @code{dftmtx(1/@var{a})} +## @end deftypefn + +function d = dftmtx(a) + + if (nargin != 1) + error ("usage: d = dftmtx (a)"); + endif + + if (!isgalois(a)) + error("dftmtx: argument must be a galois variable"); + endif + + m = a.m; + prim = a.prim_poly; + n = 2^a.m  1; + if (n > 255) + error ([ "dftmtx: argument must be in Galois Field GF(2^m), where" ... + " m is not greater than 8"]); + endif + + if (length(a) ~= 1) + error ("dftmtx: argument must be a scalar"); + endif + + mp = minpol(a); + if ((mp(1) ~= 1)  !isprimitive(mp)) + error("dftmtx: argument must be a primitive nth root of unity"); + endif + + step = log(a); + step = step.x; + row = exp(gf([0:n1], m, prim)); + d = zeros(n); + for i=1:n; + d(i,:) = row .^ mod(step*(i1),n); + end + +endfunction Added: trunk/octaveforge/main/comm/inst/@galois/diag.m ===================================================================  trunk/octaveforge/main/comm/inst/@galois/diag.m (rev 0) +++ trunk/octaveforge/main/comm/inst/@galois/diag.m 20110522 19:32:41 UTC (rev 8278) @@ 0,0 +1,42 @@ +## Copyright (C) 2011 David Bateman +## +## This program 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 of the License, or +## (at your option) any later version. +## +## This program 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 this program; If not, see <http://www.gnu.org/licenses/>;. + +## * texinfo * +## @deftypefn {Loadable Function} {} diag (@var{v}, @var{k}) +## Return a diagonal matrix with Galois vector @var{v} on diagonal @var{k}. +## The second argument is optional. If it is positive, the vector is placed on +## the @var{k}th superdiagonal. If it is negative, it is placed on the +## @var{k}th subdiagonal. The default value of @var{k} is 0, and the +## vector is placed on the main diagonal. For example, +## +## @example +## diag (gf([1, 2, 3],2), 1) +## ans = +## GF(2^2) array. Primitive Polynomial = D^2+D+1 (decimal 7) +## +## Array elements = +## +## 0 1 0 0 +## 0 0 2 0 +## 0 0 0 3 +## 0 0 0 0 +## @end example +## @end deftypefn + +function varargout = diag (varargin) + varargout = cell (1, nargout); + [varargout{:}] = gdiag (varargin{:}); +endfunction + Added: trunk/octaveforge/main/comm/inst/@galois/exp.m ===================================================================  trunk/octaveforge/main/comm/inst/@galois/exp.m (rev 0) +++ trunk/octaveforge/main/comm/inst/@galois/exp.m 20110522 19:32:41 UTC (rev 8278) @@ 0,0 +1,25 @@ +## Copyright (C) 2011 David Bateman +## +## This program 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 of the License, or +## (at your option) any later version. +## +## This program 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 this program; If not, see <http://www.gnu.org/licenses/>;. + +## * texinfo * +## @deftypefn {Loadable Function} {} exp (@var{x}) +## Compute the antilogarithm for each element of @var{x} for a Galois +## array. +## @end deftypefn + +function varargout = exp (varargin) + varargout = cell (1, nargout); + [varargout{:}] = gexp (varargin{:}); +endfunction Added: trunk/octaveforge/main/comm/inst/@galois/fft.m ===================================================================  trunk/octaveforge/main/comm/inst/@galois/fft.m (rev 0) +++ trunk/octaveforge/main/comm/inst/@galois/fft.m 20110522 19:32:41 UTC (rev 8278) @@ 0,0 +1,50 @@ +## Copyright (C) 2002 David Bateman +## +## This program 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 of the License, or +## (at your option) any later version. +## +## This program 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 this program; If not, see <http://www.gnu.org/licenses/>;. + +## * texinfo * +## @deftypefn {Function File} {} fft (@var{x}) +## +## If @var{x} is a column vector, finds the FFT over the primitive element +## of the Galois Field of @var{x}. If @var{x} is in the Galois Field +## GF(2^@var{m}), then @var{x} must have @code{2^@var{m}  1} elements. +## @end deftypefn + +function y = fft(x) + + if (nargin != 1) + error ("usage: y = fft (x)"); + endif + + if (!isgalois(x)) + error("fft: argument must be a galois variable"); + endif + + n = 2^x.m  1; + if (n > 255) + error ([ "fft: argument must be in Galois Field GF(2^m), where", ... + " m is not greater than 8"]); + endif + + alph = gf(2, x.m, x.prim_poly); + [nr,nc] = size(x); + if ((nc == 1) && (nr == n)) + y = dftmtx(alph) * x; + elseif ((nc == n) && (nr == 1)) + y = (dftmtx(alph) * x')'; + else + error ("fft: argument must be a vector in GF(2^m) of length 2^m1"); + endif + +endfunction Property changes on: trunk/octaveforge/main/comm/inst/@galois/fft.m ___________________________________________________________________ Added: svn:executable + * Added: trunk/octaveforge/main/comm/inst/@galois/filter.m ===================================================================  trunk/octaveforge/main/comm/inst/@galois/filter.m (rev 0) +++ trunk/octaveforge/main/comm/inst/@galois/filter.m 20110522 19:32:41 UTC (rev 8278) @@ 0,0 +1,90 @@ +## Copyright (C) 2011 David Bateman +## +## This program 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 of the License, or +## (at your option) any later version. +## +## This program 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 this program; If not, see <http://www.gnu.org/licenses/>;. + +## * texinfo * +## @deftypefn {Loadable Function} {y =} filter (@var{b}, @var{a}, @var{x}) +## @deftypefnx {Loadable Function} {[@var{y}, @var{sf}] =} filter (@var{b}, @var{a}, @var{x}, @var{si}) +## +## Digital filtering of vectors in a Galois Field. Returns the solution to +## the following linear, timeinvariant difference equation over a Galois +## Field: +## @iftex +## @tex +## $$ +## \\sum_{k=0}^N a_{k+1} y_{nk} = \\sum_{k=0}^M b_{k+1} x_{nk}, \\qquad +## 1 \\le n \\le P +## $$ +## @end tex +## @end iftex +## @ifinfo +## +## @smallexample +## N M +## SUM a(k+1) y(nk) = SUM b(k+1) x(nk) for 1<=n<=length(x) +## k=0 k=0 +## @end smallexample +## @end ifinfo +## +## @noindent +## where +## @ifinfo +## N=length(a)1 and M=length(b)1. +## @end ifinfo +## @iftex +## @tex +## $a \\in \\Re^{N1}$, $b \\in \\Re^{M1}$, and $x \\in \\Re^P$. +## @end tex +## @end iftex +## An equivalent form of this equation is: +## @iftex +## @tex +## $$ +## y_n = \\sum_{k=1}^N c_{k+1} y_{nk} + \\sum_{k=0}^M d_{k+1} x_{nk}, \\qquad +## 1 \\le n \\le P +## $$ +## @end tex +## @end iftex +## @ifinfo +## +## @smallexample +## N M +## y(n) =  SUM c(k+1) y(nk) + SUM d(k+1) x(nk) for 1<=n<=length(x) +## k=1 k=0 +## @end smallexample +## @end ifinfo +## +## @noindent +## where +## @ifinfo +## c = a/a(1) and d = b/a(1). +## @end ifinfo +## @iftex +## @tex +## $c = a/a_1$ and $d = b/a_1$. +## @end tex +## @end iftex +## +## If the fourth argument @var{si} is provided, it is taken as the +## initial state of the system and the final state is returned as +## @var{sf}. The state vector is a column vector whose length is +## equal to the length of the longest coefficient vector minus one. +## If @var{si} is not supplied, the initial state vector is set to all +## zeros. +## @end deftypefn + +function varargout = filter (varargin) + varargout = cell (1, nargout); + [varargout{:}] = gfilter (varargin{:}); +endfunction Copied: trunk/octaveforge/main/comm/inst/@galois/ifft.m (from rev 8276, trunk/octaveforge/main/comm/inst/gifft.m) ===================================================================  trunk/octaveforge/main/comm/inst/@galois/ifft.m (rev 0) +++ trunk/octaveforge/main/comm/inst/@galois/ifft.m 20110522 19:32:41 UTC (rev 8278) @@ 0,0 +1,51 @@ +## Copyright (C) 2002 David Bateman +## +## This program 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 of the License, or +## (at your option) any later version. +## +## This program 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 this program; If not, see <http://www.gnu.org/licenses/>;. + +## * texinfo * +## @deftypefn {Function File} {} ifft (@var{x}) +## +## If @var{x} is a column vector, finds the IFFT over the primitive element +## of the Galois Field of @var{x}. If @var{x} is in the Galois Field +## GF(2^@var{m}), then @var{x} must have @code{2^@var{m}  1} elements. +## @end deftypefn +## @seealso{ifft} + +function y = ifft(x) + + if (nargin != 1) + error ("usage: y = ifft (x)"); + endif + + if (!isgalois(x)) + error("ifft: argument must be a galois variable"); + endif + + n = 2^x.m  1; + if (n > 255) + error ([ "ifft: argument must be in Galois Field GF(2^m), where", ... + " m is not greater than 8"]); + endif + + alph = gf(2, x.m, x.prim_poly); + [nr,nc] = size(x); + if ((nc == 1) && (nr == n)) + y = dftmtx(1/alph) * x; + elseif ((nc == n) && (nr == 1)) + y = (dftmtx(1/alph) * x')'; + else + error ("ifft: argument must be a vector in GF(2^m) of length 2^m1"); + endif + +endfunction Added: trunk/octaveforge/main/comm/inst/@galois/inv.m ===================================================================  trunk/octaveforge/main/comm/inst/@galois/inv.m (rev 0) +++ trunk/octaveforge/main/comm/inst/@galois/inv.m 20110522 19:32:41 UTC (rev 8278) @@ 0,0 +1,26 @@ +## Copyright (C) 2011 David Bateman +## +## This program 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 of the License, or +## (at your option) any later version. +## +## This program 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 this program; If not, see <http://www.gnu.org/licenses/>;. + +## * texinfo * +## @deftypefn {Loadable Function} {[@var{x}, @var{rcond}] = } inv (@var{a}) +## Compute the inverse of the square matrix @var{a}. Return an estimate +## of the reciprocal condition number if requested, otherwise warn of an +## illconditioned matrix if the reciprocal condition number is small. +## @end deftypefn + +function varargout = inv (varargin) + varargout = cell (1, nargout); + [varargout{:}] = ginv (varargin{:}); +endfunction Added: trunk/octaveforge/main/comm/inst/@galois/inverse.m ===================================================================  trunk/octaveforge/main/comm/inst/@galois/inverse.m (rev 0) +++ trunk/octaveforge/main/comm/inst/@galois/inverse.m 20110522 19:32:41 UTC (rev 8278) @@ 0,0 +1,24 @@ +## Copyright (C) 2011 David Bateman +## +## This program 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 of the License, or +## (at your option) any later version. +## +## This program 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 this program; If not, see <http://www.gnu.org/licenses/>;. + +## * texinfo * +## @deftypefn {Loadable Function} {[@var{x}, @var{rcond}] = } inverse (@var{a}) +## See inv. +## @end deftypefn +g +function varargout = inverse (varargin) + varargout = cell (1, nargout); + [varargout{:}] = ginverse (varargin{:}); +endfunction Copied: trunk/octaveforge/main/comm/inst/@galois/isequal.m (from rev 8276, trunk/octaveforge/main/comm/inst/gisequal.m) ===================================================================  trunk/octaveforge/main/comm/inst/@galois/isequal.m (rev 0) +++ trunk/octaveforge/main/comm/inst/@galois/isequal.m 20110522 19:32:41 UTC (rev 8278) @@ 0,0 +1,32 @@ +## Copyright (C) 2000 Paul Kienzle +## +## This program 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 of the License, or +## (at your option) any later version. +## +## This program 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 this program; If not, see <http://www.gnu.org/licenses/>;. + +## * texinfo * +## @deftypefn {Function File} {} isequal (@var{x1}, @var{x2}, @dots{}) +## Return true if all of @var{x1}, @var{x2}, @dots{} are equal. +## @seealso{isequalwithequalnans} +## @end deftypefn + +function t = isequal(x,varargin) + if nargin < 2 + usage("isequal(x,y,...)"); + endif + + for arg = 1:length(varargin) + y = varargin{arg}; + t = all (x (:) == y (:)); + if !t, return; endif + endfor +endfunction Added: trunk/octaveforge/main/comm/inst/@galois/log.m ===================================================================  trunk/octaveforge/main/comm/inst/@galois/log.m (rev 0) +++ trunk/octaveforge/main/comm/inst/@galois/log.m 20110522 19:32:41 UTC (rev 8278) @@ 0,0 +1,25 @@ +## Copyright (C) 2011 David Bateman +## +## This program 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 of the License, or +## (at your option) any later version. +## +## This program 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 this program; If not, see <http://www.gnu.org/licenses/>;. + +## * texinfo * +## @deftypefn {Loadable Function} {} log (@var{x}) +## Compute the natural logarithm for each element of @var{x} for a Galois +## array. +## @end deftypefn + +function varargout = log (varargin) + varargout = cell (1, nargout); + [varargout{:}] = glog (varargin{:}); +endfunction Added: trunk/octaveforge/main/comm/inst/@galois/lu.m ===================================================================  trunk/octaveforge/main/comm/inst/@galois/lu.m (rev 0) +++ trunk/octaveforge/main/comm/inst/@galois/lu.m 20110522 19:32:41 UTC (rev 8278) @@ 0,0 +1,63 @@ +## Copyright (C) 2011 David Bateman +## +## This program 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 of the License, or +## (at your option) any later version. +## +## This program 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 this program; If not, see <http://www.gnu.org/licenses/>;. + +## * texinfo * +## @deftypefn {Loadable Function} {[@var{l}, @var{u}, @var{p}] =} lu (@var{a}) +## @cindex LU decomposition of Galois matrix +## Compute the LU decomposition of @var{a} in a Galois Field. The result is +## returned in a permuted form, according to the optional return value +## @var{p}. For example, given the matrix +## @code{a = gf([1, 2; 3, 4],3)}, +## +## @example +## [l, u, p] = lu (a) +## @end example +## +## @noindent +## returns +## +## @example +## l = +## GF(2^3) array. Primitive Polynomial = D^3+D+1 (decimal 11) +## +## Array elements = +## +## 1 0 +## 6 1 +## +## u = +## GF(2^3) array. Primitive Polynomial = D^3+D+1 (decimal 11) +## +## Array elements = +## +## 3 4 +## 0 7 +## +## p = +## +## 0 1 +## 1 0 +## @end example +## +## Such that @code{@var{p} * @var{a} = @var{l} * @var{u}}. If the argument +## @var{p} is not included then the permutations are applied to @var{l} +## so that @code{@var{a} = @var{l} * @var{u}}. @var{l} is then a pseudo +## lower triangular matrix. The matrix @var{a} can be rectangular. +## @end deftypefn + +function varargout = lu (varargin) + varargout = cell (1, nargout); + [varargout{:}] = glu (varargin{:}); +endfunction Added: trunk/octaveforge/main/comm/inst/@galois/prod.m ===================================================================  trunk/octaveforge/main/comm/inst/@galois/prod.m (rev 0) +++ trunk/octaveforge/main/comm/inst/@galois/prod.m 20110522 19:32:41 UTC (rev 8278) @@ 0,0 +1,26 @@ +## Copyright (C) 2011 David Bateman +## +## This program 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 of the License, or +## (at your option) any later version. +## +## This program 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 this program; If not, see <http://www.gnu.org/licenses/>;. + +## * texinfo * +## @deftypefn {Loadable Function} {} prod (@var{x}, @var{dim}) +## Product of elements along dimension @var{dim} of Galois array. If +## @var{dim} is omitted, it defaults to 1 (columnwise products). +## @end deftypefn + +function varargout = prod (varargin) + varargout = cell (1, nargout); + [varargout{:}] = gprod (varargin{:}); +endfunction + Added: trunk/octaveforge/main/comm/inst/@galois/rank.m ===================================================================  trunk/octaveforge/main/comm/inst/@galois/rank.m (rev 0) +++ trunk/octaveforge/main/comm/inst/@galois/rank.m 20110522 19:32:41 UTC (rev 8278) @@ 0,0 +1,25 @@ +## Copyright (C) 2011 David Bateman +## +## This program 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 of the License, or +## (at your option) any later version. +## +## This program 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 this program; If not, see <http://www.gnu.org/licenses/>;. + +## * texinfo * +## @deftypefn {Loadable Function} {@var{d} = } rank (@var{a}) +## Compute the rank of the Galois array @var{a} by counting the independent +## rows and columns. +## @end deftypefn + +function varargout = rank (varargin) + varargout = cell (1, nargout); + [varargout{:}] = grank (varargin{:}); +endfunction Added: trunk/octaveforge/main/comm/inst/@galois/reshape.m ===================================================================  trunk/octaveforge/main/comm/inst/@galois/reshape.m (rev 0) +++ trunk/octaveforge/main/comm/inst/@galois/reshape.m 20110522 19:32:41 UTC (rev 8278) @@ 0,0 +1,56 @@ +## Copyright (C) 2011 David Bateman +## +## This program 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 of the License, or +## (at your option) any later version. +## +## This program 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 this program; If not, see <http://www.gnu.org/licenses/>;. + +## * texinfo * +## @deftypefn {Loadable Function} {} reshape (@var{a}, @var{m}, @var{n}) +## Return a matrix with @var{m} rows and @var{n} columns whose elements are +## taken from the Galois array @var{a}. To decide how to order the elements, +## Octave pretends that the elements of a matrix are stored in columnmajor +## order (like Fortran arrays are stored). +## +## For example, +## +## @example +## reshape (gf([1, 2, 3, 4],3), 2, 2) +## ans = +## GF(2^3) array. Primitive Polynomial = D^3+D+1 (decimal 11) +## +## Array elements = +## +## 1 3 +## 2 4 +## @end example +## +## The @code{reshape} function is equivalent to +## +## @example +## @group +## retval = gf(zeros (m, n), a.m, a.prim_poly); +## retval (:) = a; +## @end group +## @end example +## +## @noindent +## but it is somewhat less cryptic to use @code{reshape} instead of the +## colon operator. Note that the total number of elements in the original +## matrix must match the total number of elements in the new matrix. +## @end deftypefn +## @seealso{`:'} + +function varargout = reshape (varargin) + varargout = cell (1, nargout); + [varargout{:}] = greshape (varargin{:}); +endfunction + Copied: trunk/octaveforge/main/comm/inst/@galois/roots.m (from rev 8276, trunk/octaveforge/main/comm/inst/groots.m) ===================================================================  trunk/octaveforge/main/comm/inst/@galois/roots.m (rev 0) +++ trunk/octaveforge/main/comm/inst/@galois/roots.m 20110522 19:32:41 UTC (rev 8278) @@ 0,0 +1,75 @@ +## Copyright (C) 2002 David Bateman +## +## This program 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 of the License, or +## (at your option) any later version. +## +## This program 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 this program; If not, see <http://www.gnu.org/licenses/>;. + +## * texinfo * +## @deftypefn {Function File} {} roots (@var{v}) +## +## For a vector @var{v} with @math{N} components, return +## the roots of the polynomial over a Galois Field +## @iftex +## @tex +## $$ +## v_1 z^{N1} + \cdots + v_{N1} z + v_N. +## $$ +## @end tex +## @end iftex +## @ifinfo +## +## @example +## v(1) * z^(N1) + ... + v(N1) * z + v(N). +## @end example +## @end ifinfo +## +## The number of roots returned and their value will be determined +## by the order and primitive polynomial of the Galios Field +## @end deftypefn + +function r = roots (v) + + if (nargin != 1) + error("usage: r = roots(v)"); + endif + + if (!isgalois(v)) + error("roots: argument must be a galois variable"); + endif + + if (min (size (v)) > 1  nargin != 1) + usage ("roots (v), where v is a galois vector"); + endif + + v = reshape (v, 1, length(v)); + m = v.m; + prim_poly = v.prim_poly; + n = 2^m  1; + poly = v; + nr = 0; + t = 0; + r = []; + + while ((t <= n) && (length(poly) > 1)) + [npoly, nrem] = deconv(poly,gf([1,t],m,prim_poly)); + if (any(nrem)) + t = t + 1; + else + nr = nr + 1; + r(nr) = t; + poly = npoly; + endif + end + + r = gf(r,m,prim_poly); + +endfunction Added: trunk/octaveforge/main/comm/inst/@galois/sqrt.m ===================================================================  trunk/octaveforge/main/comm/inst/@galois/sqrt.m (rev 0) +++ trunk/octaveforge/main/comm/inst/@galois/sqrt.m 20110522 19:32:41 UTC (rev 8278) @@ 0,0 +1,25 @@ +## Copyright (C) 2011 David Bateman +## +## This program 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 of the License, or +## (at your option) any later version. +## +## This program 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 this program; If not, see <http://www.gnu.org/licenses/>;. + +## * texinfo * +## @deftypefn {Loadable Function} {} sqrt (@var{x}) +## Compute the square root of @var{x}, element by element, in a Galois Field. +## @end deftypefn +## @seealso{exp} + +function varargout = sqrt (varargin) + varargout = cell (1, nargout); + [varargout{:}] = gsqrt (varargin{:}); +endfunction Added: trunk/octaveforge/main/comm/inst/@galois/sum.m ===================================================================  trunk/octaveforge/main/comm/inst/@galois/sum.m (rev 0) +++ trunk/octaveforge/main/comm/inst/@galois/sum.m 20110522 19:32:41 UTC (rev 8278) @@ 0,0 +1,25 @@ +## Copyright (C) 2011 David Bateman +## +## This program 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 of the License, or +## (at your option) any later version. +## +## This program 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 this program; If not, see <http://www.gnu.org/licenses/>;. + +## * texinfo * +## @deftypefn {Loadable Function} {} sum (@var{x}, @var{dim}) +## Sum of elements along dimension @var{dim} of Galois array. If @var{dim} +## is omitted, it defaults to 1 (columnwise sum). +## @end deftypefn + +function varargout = sum (varargin) + varargout = cell (1, nargout); + [varargout{:}] = gsum (varargin{:}); +endfunction Added: trunk/octaveforge/main/comm/inst/@galois/sumsq.m ===================================================================  trunk/octaveforge/main/comm/inst/@galois/sumsq.m (rev 0) +++ trunk/octaveforge/main/comm/inst/@galois/sumsq.m 20110522 19:32:41 UTC (rev 8278) @@ 0,0 +1,31 @@ +## Copyright (C) 2011 David Bateman +## +## This program 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 of the License, or +## (at your option) any later version. +## +## This program 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 this program; If not, see <http://www.gnu.org/licenses/>;. + +## * texinfo * +## @deftypefn {Loadable Function} {} sumsq (@var{x}, @var{dim}) +## Sum of squares of elements along dimension @var{dim} of Galois array. +## If @var{dim} is omitted, it defaults to 1 (columnwise sum of squares). +## +## This function is equivalent to computing +## @example +## gsum (x .* conj (x), dim) +## @end example +## but it uses less memory. +## @end deftypefn + +function varargout = sumsq (varargin) + varargout = cell (1, nargout); + [varargout{:}] = gsumsq (varargin{:}); +endfunction Modified: trunk/octaveforge/main/comm/inst/comms.m ===================================================================  trunk/octaveforge/main/comm/inst/comms.m 20110522 12:49:42 UTC (rev 8277) +++ trunk/octaveforge/main/comm/inst/comms.m 20110522 19:32:41 UTC (rev 8278) @@ 459,7 +459,7 @@ if (isempty(gone)  !isempty(gempty)) error("FAILED"); endif  tmp = gdiag(grow); + tmp = diag(grow); if (size(tmp,1) != 2^m  size(tmp,2) != 2^m) error("FAILED"); endif @@ 472,7 +472,7 @@ endif end end  tmp = gdiag(gmat); + tmp = diag(gmat); if (length(tmp) != matlen) error("FAILED"); endif @@ 481,14 +481,14 @@ error("FAILED"); endif end  tmp = greshape(gmat,prod(size(gmat)),1); + tmp = reshape(gmat,prod(size(gmat)),1); if (length(tmp) != prod(size(gmat))) error("FAILED"); endif  if (gexp(glog(gf([1:n],m))) != [1:n]) + if (exp(log(gf([1:n],m))) != [1:n]) error("FAILED"); endif  tmp = gsqrt(gmat); + tmp = sqrt(gmat); if (tmp .* tmp != gmat) error("FAILED"); endif @@ 586,7 +586,7 @@ fprintf("PASSED\n"); fprintf(" Linear Algebra: ");  [l,u,p] = glu(gmat); + [l,u,p] = lu(gmat); if (any(l*up*gmat)) error("FAILED"); endif @@ 601,9 +601,9 @@ matdet = 0; while (!matdet) granmat = gf(floor(2^m*rand(matlen)),m);  matdet = gdet(granmat); + matdet = det(granmat); endwhile  matrank = grank(granmat); + matrank = rank(granmat); smallcol = gf([0:matlen1],m)'; sol1 = granmat \ smallcol; sol2 = smallcol' / granmat; @@ 619,12 +619,12 @@ a = gf([1,0,1,1],m); x = gf([1,zeros(1,99)],m); y0 = filter(b, a, x);  y1 = gconv(grow+1, grow);  y2 = grow * gconvmtx(grow+1, length(grow)); + y1 = conv(grow+1, grow); + y2 = grow * convmtx(grow+1, length(grow)); if (any(y1 != y2)) error("FAILED"); endif  [y3,remd] = gdeconv(y2, grow+1); + [y3,remd] = deconv(y2, grow+1); if (any(y3 != grow)) error("FAILED"); endif @@ 633,14 +633,14 @@ endif alph = gf(2,m); x = gf(floor(2^m*rand(n,1)),m);  fm = gdftmtx(alph);  ifm = gdftmtx(1/alph);  y0 = gfft(x); + fm = dftmtx(alph); + ifm = dftmtx(1/alph); + y0 = fft(x); y1 = fm * x; if (any(y0 != y1)) error("FAILED"); endif  z0 = gifft(y0); + z0 = ifft(y0); z1 = ifm * y1; if (any(z0 != x)) error("FAILED"); Modified: trunk/octaveforge/main/comm/inst/deintrlv.m ===================================================================  trunk/octaveforge/main/comm/inst/deintrlv.m 20110522 12:49:42 UTC (rev 8277) +++ trunk/octaveforge/main/comm/inst/deintrlv.m 20110522 19:32:41 UTC (rev 8278) @@ 37,7 +37,7 @@ end deintrlvd = data(invperm); else  if(length(elements) ~= size(data,1)  any(sort(elements) ~= 1:size(data,1))) + if(length(elements) ~= size(data,1)  any(sort(elements) ~= 1:size(data,1))) error("elements must be a permutation of data indices"); end deintrlvd = data(invperm,:); Deleted: trunk/octaveforge/main/comm/inst/gconv.m ===================================================================  trunk/octaveforge/main/comm/inst/gconv.m 20110522 12:49:42 UTC (rev 8277) +++ trunk/octaveforge/main/comm/inst/gconv.m 20110522 19:32:41 UTC (rev 8278) @@ 1,82 +0,0 @@ ## Copyright (C) 2002 David Bateman ## ## This program 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 of the License, or ## (at your option) any later version. ## ## This program 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 this program; If not, see <http://www.gnu.org/licenses/>;.  ## * texinfo * ## @deftypefn {Function File} {} gconv (@var{a}, @var{b}) ## Convolve two Galois vectors. ## ## @code{y = gconv (a, b)} returns a vector of length equal to ## @code{length (a) + length (b)  1}. ## If @var{a} and @var{b} are polynomial coefficient vectors, @code{gconv} ## returns the coefficients of the product polynomial. ## @end deftypefn ## @seealso{gdeconv,conv,deconv}  ## PKG_ADD: dispatch ("conv", "gconv", "galois"); function y = gconv (a, b)   if (nargin != 2)  usage ("gconv(a, b)");  endif   if (!isgalois (a) && !isgalois (b))  error("gconv: at least one argument must be a galois variable");  elseif (!isgalois (a))  a = gf(a, b.m, b.prim_poly);  elseif (!isgalois (b))  b = gf(b, a.m, a.prim_poly);  elseif (a.m != b.m && a.prim_poly != b.prim_poly)  error("gconv: both vectors must be in the same galois field");  endif   if (min(size(a)) > 1  min(size(b)) > 1)  error("gconv: both arguments must be vectors");  endif   la = length (a);  lb = length (b);   ly = la + lb  1;   ## Ensure that both vectors are row vectors.  if (rows (a) > 1)  a = greshape (a, 1, la);  endif  if (rows (b) > 1)  b = greshape (b, 1, lb);  endif   ## Use the shortest vector as the coefficent vector to filter.  if (la < lb)  if (ly > lb)  ## Can't concatenate galois variables like this yet  ## x = [b, (zeros (1, ly  lb))];  x = gf([b, (zeros (1, ly  lb))], b.m, b.prim_poly);  else  x = b;  endif  y = gfilter (a, 1, x);  else  if(ly > la)  ## Can't concatenate galois variables like this yet  ## x = [a, (zeros (1, ly  la))];  x = gf([a, (zeros (1, ly  la))], a.m, a.prim_poly);  else  x = a;  endif  y = gfilter (b, 1, x);  endif  endfunction Deleted: trunk/octaveforge/main/comm/inst/gconvmtx.m ===================================================================  trunk/octaveforge/main/comm/inst/gconvmtx.m 20110522 12:49:42 UTC (rev 8277) +++ trunk/octaveforge/main/comm/inst/gconvmtx.m 20110522 19:32:41 UTC (rev 8278) @@ 1,48 +0,0 @@ ## Copyright (C) 2003 David Bateman ## ## This program 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 of the License, or ## (at your option) any later version. ## ## This program 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 this program; If not, see <http://www.gnu.org/licenses/>;.  ## * texinfo * ## @deftypefn {Function File} {} gconvmtx (@var{a}, @var{n}) ## ## Create matrix to perform repeated convolutions with the same vector ## in a Galois Field. If @var{a} is a column vector and @var{x} is a ## column vector of length @var{n}, in a Galois Field then ## ## @code{gconvmtx(@var{a}, @var{n}) * @var{x}} ## ## gives the convolution of of @var{a} and @var{x} and is the ## same as @code{gconv(@var{a}, @var{x})}. The difference is if ## many vectors are to be convolved with the same vector, then ## this technique is possibly faster. ## ## Similarly, if @var{a} is a row vector and @var{x} is a row ## vector of length @var{n}, then ## ## @code{@var{x} * gconvmtx(@var{a}, @var{n})} ## ## is the same as @code{gconv(@var{x}, @var{a})}. ## @end deftypefn ## @seealso{gconv,convmtx,conv}  ## PKG_ADD: dispatch ("convmtx", "gconvmtx", "galois"); function b = gconvmtx (a, n)   if (!isgalois (a))  error("gconvmtx: argument must be a galois variable");  endif   b = gf(convmtx(a.x,n), a.m, a.prim_poly);  endfunction Deleted: trunk/octaveforge/main/comm/inst/gdeconv.m ===================================================================  trunk/octaveforge/main/comm/inst/gdeconv.m 20110522 12:49:42 UTC (rev 8277) +++ trunk/octaveforge/main/comm/inst/gdeconv.m 20110522 19:32:41 UTC (rev 8278) @@ 1,81 +0,0 @@ ## Copyright (C) 2002 David Bateman ## ## This program 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 of the License, or ## (at your option) any later version. ## ## This program 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 this program; If not, see <http://www.gnu.org/licenses/>;.  ## * texinfo * ## @deftypefn {Function File} {} gdeconv (@var{y}, @var{a}) ## Deconvolve two Galois vectors. ## ## @code{[b, r] = gdeconv (y, a)} solves for @var{b} and @var{r} such that ## @code{y = gconv (a, b) + r}. ## ## If @var{y} and @var{a} are polynomial coefficient vectors, @var{b} will ## contain the coefficients of the polynomial quotient and @var{r} will be ## a remander polynomial of lowest order. ## @end deftypefn ## @seealso{gconv,deconv,conv}  ## PKG_ADD: dispatch ("deconv", "gdeconv", "galois"); function [b, r] = gdeconv (y, a)    if (nargin != 2)  usage ("gdeconv(a, b)");  endif   if (!isgalois (y) && !isgalois (a))  error("gdeconv: at least one argument must be a galois variable");  elseif (!isgalois (y))  y = gf(y, a.m, a.prim_poly);  elseif (!isgalois (a))  a = gf(a, y.m, y.prim_poly);  elseif (a.m != y.m && a.prim_poly != y.prim_poly)  error("gdeconv: both vectors must be in the same galois field");  endif   if (min(size(a)) > 1  min(size(y)) > 1)  error("gdeconv: both arguments must be vectors");  endif   la = length (a);  ly = length (y);   lb = ly  la + 1;   ## Ensure that both vectors are row vectors.  if (rows (a) > 1)  a = greshape (a, 1, la);  endif  if (rows (y) > 1)  y = greshape (y, 1, ly);  endif   if (ly > la)  b = gfilter (y, a, [1, (zeros (1, ly  la))]);  elseif (ly == la)  b = gfilter (y, a, 1);  else  b = gf(0, y.m, y.prim_poly);  endif   lc = la + length (b)  1;  if (ly == lc)  r = y  gconv (a, b);  else  ## Can't concatenate galois variables like this yet  ## r = [(zeros (1, lc  ly)), y]  gconv (a, b);  r = gf([(zeros (1, lc  ly)), y], y.m, y.prim_poly)  gconv (a, b);  endif  endfunction Deleted: trunk/octaveforge/main/comm/inst/gdftmtx.m ===================================================================  trunk/octaveforge/main/comm/inst/gdftmtx.m 20110522 12:49:42 UTC (rev 8277) +++ trunk/octaveforge/main/comm/inst/gdftmtx.m 20110522 19:32:41 UTC (rev 8278) @@ 1,69 +0,0 @@ ## Copyright (C) 2002 David Bateman ## ## This program 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 of the License, or ## (at your option) any later version. ## ## This program 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 this program; If not, see <http://www.gnu.org/licenses/>;.  ## * texinfo * ## @deftypefn {Function File} {@var{d} = } gdftmtx (@var{a}) ## ## Form a matrix, that can be used to perform Fourier transforms in ## a Galois Field. ## ## Given that @var{a} is an element of the Galois Field GF(2^m), and ## that the minimum value for @var{k} for which @code{@var{a} ^ @var{k}} ## is equal to one is @code{2^m  1}, then this function produces a ## @var{k}by@...{k} matrix representing the discrete Fourier transform ## over a Galois Field with respect to @var{a}. The Fourier transform of ## a column vector is then given by @code{gdftmtx(@var{a}) * @var{x}}. ## ## The inverse Fourier transform is given by @code{gdftmtx(1/@var{a})} ## @end deftypefn ## @seealso{dftmtx}  ## PKG_ADD: dispatch ("dftmtx", "gdftmtx", "galois"); function d = gdftmtx(a)   if (nargin != 1)  error ("usage: d = gdftmtx (a)");  endif   if (!isgalois(a))  error("gdftmtx: argument must be a galois variable");  endif   m = a.m;  prim = a.prim_poly;  n = 2^a.m  1;  if (n > 255)  error ([ "gdftmtx: argument must be in Galois Field GF(2^m), where" ...  " m is not greater than 8"]);  endif   if (length(a) ~= 1)  error ("gdftmtx: argument must be a scalar");  endif   mp = minpol(a);  if ((mp(1) ~= 1)  !isprimitive(mp))  error("gdftmtx: argument must be a primitive nth root of unity");  endif   step = glog(a);  step = step.x;  row = gexp(gf([0:n1], m, prim));  d = zeros(n);  for i=1:n;  d(i,:) = row .^ mod(step*(i1),n);  end  endfunction Deleted: trunk/octaveforge/main/comm/inst/gifft.m ===================================================================  trunk/octaveforge/main/comm/inst/gifft.m 20110522 12:49:42 UTC (rev 8277) +++ trunk/octaveforge/main/comm/inst/gifft.m 20110522 19:32:41 UTC (rev 8278) @@ 1,52 +0,0 @@ ## Copyright (C) 2002 David Bateman ## ## This program 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 of the License, or ## (at your option) any later version. ## ## This program 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 this program; If not, see <http://www.gnu.org/licenses/>;.  ## * texinfo * ## @deftypefn {Function File} {} gifft (@var{x}) ## ## If @var{x} is a column vector, finds the IFFT over the primitive element ## of the Galois Field of @var{x}. If @var{x} is in the Galois Field ## GF(2^@var{m}), then @var{x} must have @code{2^@var{m}  1} elements. ## @end deftypefn ## @seealso{ifft}  ## PKG_ADD: dispatch ("ifft", "gifft", "galois"); function y = gifft(x)   if (nargin != 1)  error ("usage: y = gifft (x)");  endif   if (!isgalois(x))  error("gifft: argument must be a galois variable");  endif   n = 2^x.m  1;  if (n > 255)  error ([ "gifft: argument must be in Galois Field GF(2^m), where", ...  " m is not greater than 8"]);  endif   alph = gf(2, x.m, x.prim_poly);  [nr,nc] = size(x);  if ((nc == 1) && (nr == n))  y = gdftmtx(1/alph) * x;  elseif ((nc == n) && (nr == 1))  y = (gdftmtx(1/alph) * x')';  else  error ("gifft: argument must be a vector in GF(2^m) of length 2^m1");  endif  endfunction Deleted: trunk/octaveforge/main/comm/inst/gisequal.m ===================================================================  trunk/octaveforge/main/comm/inst/gisequal.m 20110522 12:49:42 UTC (rev 8277) +++ trunk/octaveforge/main/comm/inst/gisequal.m 20110522 19:32:41 UTC (rev 8278) @@ 1,33 +0,0 @@ ## Copyright (C) 2000 Paul Kienzle ## ## This program 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 of the License, or ## (at your option) any later version. ## ## This program 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 this program; If not, see <http://www.gnu.org/licenses/>;.  ## * texinfo * ## @deftypefn {Function File} {} gisequal (@var{x1}, @var{x2}, @dots{}) ## Return true if all of @var{x1}, @var{x2}, @dots{} are equal. ## @seealso{isequalwithequalnans} ## @end deftypefn  ## PKG_ADD: dispatch ("isequal", "gisequal", "galois"); function t = gisequal(x,varargin)  if nargin < 2  usage("isequal(x,y,...)");  endif   for arg = 1:length(varargin)  y = varargin{arg};  t = all (x (:) == y (:));  if !t, return; endif  endfor endfunction Deleted: trunk/octaveforge/main/comm/inst/groots.m ===================================================================  trunk/octaveforge/main/comm/inst/groots.m 20110522 12:49:42 UTC (rev 8277) +++ trunk/octaveforge/main/comm/inst/groots.m 20110522 19:32:41 UTC (rev 8278) @@ 1,77 +0,0 @@ ## Copyright (C) 2002 David Bateman ## ## This program 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 of the License, or ## (at your option) any later version. ## ## This program 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 this program; If not, see <http://www.gnu.org/licenses/>;.  ## * texinfo * ## @deftypefn {Function File} {} groots (@var{v}) ## ## For a vector @var{v} with @math{N} components, return ## the roots of the polynomial over a Galois Field ## @iftex ## @tex ## $$ ## v_1 z^{N1} + \cdots + v_{N1} z + v_N. ## $$ ## @end tex ## @end iftex ## @ifinfo ## ## @example ## v(1) * z^(N1) + ... + v(N1) * z + v(N). ## @end example ## @end ifinfo ## ## The number of roots returned and their value will be determined ## by the order and primitive polynomial of the Galios Field ## @end deftypefn ## @seealso{roots}  ## PKG_ADD: dispatch ("roots", "groots", "galois"); function r = groots (v)   if (nargin != 1)  error("usage: r = groots(v)");  endif   if (!isgalois(v))  error("groots: argument must be a galois variable");  endif   if (min (size (v)) > 1  nargin != 1)  usage ("groots (v), where v is a galois vector");  endif   v = greshape (v, 1, length(v));  m = v.m;  prim_poly = v.prim_poly;  n = 2^m  1;  poly = v;  nr = 0;  t = 0;  r = [];   while ((t <= n) && (length(poly) > 1))  [npoly, nrem] = gdeconv(poly,gf([1,t],m,prim_poly));  if (any(nrem))  t = t + 1;  else  nr = nr + 1;  r(nr) = t;  poly = npoly;  endif  end   r = gf(r,m,prim_poly);  endfunction Modified: trunk/octaveforge/main/comm/inst/lz77deco.m ===================================================================  trunk/octaveforge/main/comm/inst/lz77deco.m 20110522 12:49:42 UTC (rev 8277) +++ trunk/octaveforge/main/comm/inst/lz77deco.m 20110522 19:32:41 UTC (rev 8278) @@ 33,7 +33,7 @@ ## @end deftypefn function m = lz77deco(c, alph, la, n)  if la <= 0  n <= 0 + if (la <= 0  n <= 0) error("lz77deco: Lookahead buffer size and window size must be higher than 0."); endif if n  la < la Modified: trunk/octaveforge/main/comm/inst/lz77enco.m ===================================================================  trunk/octaveforge/main/comm/inst/lz77enco.m 20110522 12:49:42 UTC (rev 8277) +++ trunk/octaveforge/main/comm/inst/lz77enco.m 20110522 19:32:41 UTC (rev 8278) @@ 32,7 +32,7 @@ function c = lz77enco(m, alph, la, n)  if la <= 0  n <= 0 + if (la <= 0  n <= 0) error("lz77enco: Lookahead buffer size and window size must be higher than 0.2"); endif if n  la < la @@ 67,7 +67,7 @@ enco = [0 0 0]; for y=(nla):1:1 z = 0;  while(z ~= la & (window(y+z) == window(nla+z+1))) + while(z ~= la && (window(y+z) == window(nla+z+1))) z += 1; endwhile Modified: trunk/octaveforge/main/comm/inst/marcumq.m ===================================================================  trunk/octaveforge/main/comm/inst/marcumq.m 20110522 12:49:42 UTC (rev 8277) +++ trunk/octaveforge/main/comm/inst/marcumq.m 20110522 19:32:41 UTC (rev 8278) @@ 34,7 +34,7 @@ b = padarray(b,[lsize(b,1) csize(b,2)],'replicate','post'); m = padarray(m,[lsize(m,1) csize(m,2)],'replicate','post');  if min(a(:)) <0  min(b(:)) <0 + if (min(a(:)) < 0  min(b(:)) < 0) error("a and b must be positive"); end Modified: trunk/octaveforge/main/comm/src/gf.cc ===================================================================  trunk/octaveforge/main/comm/src/gf.cc 20110522 12:49:42 UTC (rev 8277) +++ trunk/octaveforge/main/comm/src/gf.cc 20110522 19:32:41 UTC (rev 8278) @@ 192,7 +192,6 @@ } // PKG_ADD: autoload ("gdiag", "gf.oct"); // PKG_ADD: dispatch ("diag", "gdiag", "galois"); DEFUN_DLD (gdiag, args, , "* texinfo *\n" "@deftypefn {Loadable Function} {} gdiag (@var{v}, @var{k})\n" @@ 232,7 +231,6 @@ } // PKG_ADD: autoload ("greshape", "gf.oct"); // PKG_ADD: dispatch ("reshape", "greshape", "galois"); DEFUN_DLD (greshape, args, , "* texinfo *\n" "@deftypefn {Loadable Function} {} greshape (@var{a}, @var{m}, @var{n})\n" @@ 354,7 +352,6 @@ return retval // PKG_ADD: autoload ("gprod", "gf.oct"); // PKG_ADD: dispatch ("prod", "gprod", "galois"); DEFUN_DLD (gprod, args, , "* texinfo *\n" "@deftypefn {Loadable Function} {} gprod (@var{x}, @var{dim})\n" @@ 367,7 +364,6 @@ } // PKG_ADD: autoload ("gsum", "gf.oct"); // PKG_ADD: dispatch ("sum", "gsum", "galois"); DEFUN_DLD (gsum, args, , "* texinfo *\n" "@deftypefn {Loadable Function} {} gsum (@var{x}, @var{dim})\n" @@ 380,7 +376,6 @@ } // PKG_ADD: autoload ("gsumsq", "gf.oct"); // PKG_ADD: dispatch ("sumsq", "gsumsq", "galois"); DEFUN_DLD (gsumsq, args, , "* texinfo *\n" "@deftypefn {Loadable Function} {} gsumsq (@var{x}, @var{dim})\n" @@ 399,7 +394,6 @@ } // PKG_ADD: autoload ("gsqrt", "gf.oct"); // PKG_ADD: dispatch ("sqrt", "gsqrt", "galois"); DEFUN_DLD (gsqrt, args, , "* texinfo *\n" "@deftypefn {Loadable Function} {} gsqrt (@var{x})\n" @@ 429,7 +423,6 @@ } // PKG_ADD: autoload ("glog", "gf.oct"); // PKG_ADD: dispatch ("log", "glog", "galois"); DEFUN_DLD (glog, args, , "* texinfo *\n" "@deftypefn {Loadable Function} {} glog (@var{x})\n" @@ 461,7 +454,6 @@ // PKG_ADD: autoload ("gexp", "gf.oct"); // PKG_ADD: dispatch ("exp", "gexp", "galois"); DEFUN_DLD (gexp, args, , "* texinfo *\n" "@deftypefn {Loadable Function} {} gexp (@var{x})\n" @@ 602,7 +594,6 @@ // PKG_ADD: autoload ("gfilter", "gf.oct"); // PKG_ADD: dispatch ("filter", "gfilter", "galois"); DEFUN_DLD (gfilter, args, nargout, "* texinfo *\n" "@deftypefn {Loadable Function} {y =} gfilter (@var{b}, @var{a}, @var{x})\n" @@ 782,7 +773,6 @@ } // PKG_ADD: autoload ("glu", "gf.oct"); // PKG_ADD: dispatch ("lu", "glu", "galois"); DEFUN_DLD (glu, args, nargout, "* texinfo *\n" "@deftypefn {Loadable Function} {[@var{l}, @var{u}, @var{p}] =} glu (@var{a})\n" @@ 894,7 +884,6 @@ } // PKG_ADD: autoload ("ginv", "gf.oct"); // PKG_ADD: dispatch ("inv", "ginv", "galois"); DEFUN_DLD (ginv, args, nargout, "* texinfo *\n" "@deftypefn {Loadable Function} {[@var{x}, @var{rcond}] = } ginv (@var{a})\n" @@ 965,7 +954,6 @@ // dynamic linking. // PKG_ADD: autoload ("ginverse", "gf.oct"); // PKG_ADD: dispatch ("inverse", "ginverse", "galois"); DEFUN_DLD (ginverse, args, nargout, "* texinfo *\n" "@deftypefn {Loadable Function} {} ginverse (@var{a})\n" @@ 976,7 +964,6 @@ } // PKG_ADD: autoload ("gdet", "gf.oct"); // PKG_ADD: dispatch ("det", "gdet", "galois"); DEFUN_DLD (gdet, args, nargout, "* texinfo *\n" "@deftypefn {Loadable Function} {@var{d} = } gdet (@var{a})\n" @@ 1025,7 +1012,6 @@ } // PKG_ADD: autoload ("grank", "gf.oct"); // PKG_ADD: dispatch ("rank", "grank", "galois"); DEFUN_DLD (grank, args, nargout, "* texinfo *\n" "@deftypefn {Loadable Function} {@var{d} = } grank (@var{a})\n" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. 
From: <carandraug@us...>  20120313 03:53:47

Revision: 9850 http://octave.svn.sourceforge.net/octave/?rev=9850&view=rev Author: carandraug Date: 20120313 03:53:41 +0000 (Tue, 13 Mar 2012) Log Message:  comm: package no longer automatically loads Modified Paths:  trunk/octaveforge/main/comm/DESCRIPTION trunk/octaveforge/main/comm/NEWS Modified: trunk/octaveforge/main/comm/DESCRIPTION ===================================================================  trunk/octaveforge/main/comm/DESCRIPTION 20120313 03:51:05 UTC (rev 9849) +++ trunk/octaveforge/main/comm/DESCRIPTION 20120313 03:53:41 UTC (rev 9850) @@ 6,6 +6,6 @@ Title: Communications. Description: Digital Communications, Error Correcting Codes (Channel Code), Source Code functions, Modulation and Galois Fields Depends: octave (>= 3.4), signal (>= 1.0.0), image Autoload: yes +Autoload: no License: GPL version 2 or later Url: http://octave.sf.net Modified: trunk/octaveforge/main/comm/NEWS ===================================================================  trunk/octaveforge/main/comm/NEWS 20120313 03:51:05 UTC (rev 9849) +++ trunk/octaveforge/main/comm/NEWS 20120313 03:53:41 UTC (rev 9850) @@ 8,3 +8,6 @@ efficient and should perform faster ** Use of deprecated functions has been removed + + ** Package is no longer automatically loaded. + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. 
From: <carandraug@us...>  20120313 04:31:31

Revision: 9852 http://octave.svn.sourceforge.net/octave/?rev=9852&view=rev Author: carandraug Date: 20120313 04:31:21 +0000 (Tue, 13 Mar 2012) Log Message:  comm: update license to GPLv3+ Modified Paths:  trunk/octaveforge/main/comm/COPYING trunk/octaveforge/main/comm/DESCRIPTION trunk/octaveforge/main/comm/inst/@galois/conv.m trunk/octaveforge/main/comm/inst/@galois/convmtx.m trunk/octaveforge/main/comm/inst/@galois/deconv.m trunk/octaveforge/main/comm/inst/@galois/det.m trunk/octaveforge/main/comm/inst/@galois/dftmtx.m trunk/octaveforge/main/comm/inst/@galois/diag.m trunk/octaveforge/main/comm/inst/@galois/exp.m trunk/octaveforge/main/comm/inst/@galois/fft.m trunk/octaveforge/main/comm/inst/@galois/filter.m trunk/octaveforge/main/comm/inst/@galois/ifft.m trunk/octaveforge/main/comm/inst/@galois/inv.m trunk/octaveforge/main/comm/inst/@galois/inverse.m trunk/octaveforge/main/comm/inst/@galois/isequal.m trunk/octaveforge/main/comm/inst/@galois/log.m trunk/octaveforge/main/comm/inst/@galois/lu.m trunk/octaveforge/main/comm/inst/@galois/prod.m trunk/octaveforge/main/comm/inst/@galois/rank.m trunk/octaveforge/main/comm/inst/@galois/reshape.m trunk/octaveforge/main/comm/inst/@galois/roots.m trunk/octaveforge/main/comm/inst/@galois/sqrt.m trunk/octaveforge/main/comm/inst/@galois/sum.m trunk/octaveforge/main/comm/inst/@galois/sumsq.m trunk/octaveforge/main/comm/inst/ademodce.m trunk/octaveforge/main/comm/inst/amdemod.m trunk/octaveforge/main/comm/inst/ammod.m trunk/octaveforge/main/comm/inst/amodce.m trunk/octaveforge/main/comm/inst/apkconst.m trunk/octaveforge/main/comm/inst/awgn.m trunk/octaveforge/main/comm/inst/bchpoly.m trunk/octaveforge/main/comm/inst/bi2de.m trunk/octaveforge/main/comm/inst/biterr.m trunk/octaveforge/main/comm/inst/bsc.m trunk/octaveforge/main/comm/inst/comms.m trunk/octaveforge/main/comm/inst/compand.m trunk/octaveforge/main/comm/inst/cosets.m trunk/octaveforge/main/comm/inst/de2bi.m trunk/octaveforge/main/comm/inst/decode.m trunk/octaveforge/main/comm/inst/deintrlv.m trunk/octaveforge/main/comm/inst/demodmap.m trunk/octaveforge/main/comm/inst/egolaydec.m trunk/octaveforge/main/comm/inst/egolayenc.m trunk/octaveforge/main/comm/inst/egolaygen.m trunk/octaveforge/main/comm/inst/encode.m trunk/octaveforge/main/comm/inst/eyediagram.m trunk/octaveforge/main/comm/inst/fibodeco.m trunk/octaveforge/main/comm/inst/fiboenco.m trunk/octaveforge/main/comm/inst/fibosplitstream.m trunk/octaveforge/main/comm/inst/fmdemod.m trunk/octaveforge/main/comm/inst/fmmod.m trunk/octaveforge/main/comm/inst/gen2par.m trunk/octaveforge/main/comm/inst/genqamdemod.m trunk/octaveforge/main/comm/inst/genqammod.m trunk/octaveforge/main/comm/inst/gftable.m trunk/octaveforge/main/comm/inst/gfweight.m trunk/octaveforge/main/comm/inst/golombdeco.m trunk/octaveforge/main/comm/inst/golombenco.m trunk/octaveforge/main/comm/inst/hammgen.m trunk/octaveforge/main/comm/inst/helintrlv.m trunk/octaveforge/main/comm/inst/helscandeintrlv.m trunk/octaveforge/main/comm/inst/helscanintrlv.m trunk/octaveforge/main/comm/inst/huffmandeco.m trunk/octaveforge/main/comm/inst/huffmandict.m trunk/octaveforge/main/comm/inst/huffmanenco.m trunk/octaveforge/main/comm/inst/intrlv.m trunk/octaveforge/main/comm/inst/lloyds.m trunk/octaveforge/main/comm/inst/lz77deco.m trunk/octaveforge/main/comm/inst/lz77enco.m trunk/octaveforge/main/comm/inst/marcumq.m trunk/octaveforge/main/comm/inst/matdeintrlv.m trunk/octaveforge/main/comm/inst/matintrlv.m trunk/octaveforge/main/comm/inst/minpol.m trunk/octaveforge/main/comm/inst/modmap.m trunk/octaveforge/main/comm/inst/oct2dec.m trunk/octaveforge/main/comm/inst/pamdemod.m trunk/octaveforge/main/comm/inst/pammod.m trunk/octaveforge/main/comm/inst/pskdemod.m trunk/octaveforge/main/comm/inst/pskmod.m trunk/octaveforge/main/comm/inst/qamdemod.m trunk/octaveforge/main/comm/inst/qammod.m trunk/octaveforge/main/comm/inst/qaskdeco.m trunk/octaveforge/main/comm/inst/qaskenco.m trunk/octaveforge/main/comm/inst/qfunc.m trunk/octaveforge/main/comm/inst/qfuncinv.m trunk/octaveforge/main/comm/inst/quantiz.m trunk/octaveforge/main/comm/inst/randdeintrlv.m trunk/octaveforge/main/comm/inst/randerr.m trunk/octaveforge/main/comm/inst/randint.m trunk/octaveforge/main/comm/inst/randintrlv.m trunk/octaveforge/main/comm/inst/randsrc.m trunk/octaveforge/main/comm/inst/reedmullerdec.m trunk/octaveforge/main/comm/inst/reedmullerenc.m trunk/octaveforge/main/comm/inst/reedmullergen.m trunk/octaveforge/main/comm/inst/ricedeco.m trunk/octaveforge/main/comm/inst/riceenco.m trunk/octaveforge/main/comm/inst/rledeco.m trunk/octaveforge/main/comm/inst/rleenco.m trunk/octaveforge/main/comm/inst/rsdecof.m trunk/octaveforge/main/comm/inst/rsencof.m trunk/octaveforge/main/comm/inst/rsgenpoly.m trunk/octaveforge/main/comm/inst/scatterplot.m trunk/octaveforge/main/comm/inst/shannonfanodeco.m trunk/octaveforge/main/comm/inst/shannonfanodict.m trunk/octaveforge/main/comm/inst/shannonfanoenco.m trunk/octaveforge/main/comm/inst/symerr.m trunk/octaveforge/main/comm/inst/systematize.m trunk/octaveforge/main/comm/inst/vec2mat.m trunk/octaveforge/main/comm/inst/wgn.m trunk/octaveforge/main/comm/src/__errcore__.cc trunk/octaveforge/main/comm/src/__gfweight__.cc trunk/octaveforge/main/comm/src/cyclgen.cc trunk/octaveforge/main/comm/src/cyclpoly.cc trunk/octaveforge/main/comm/src/galoisdef.cc trunk/octaveforge/main/comm/src/galoisdef.h trunk/octaveforge/main/comm/src/galoisops.h trunk/octaveforge/main/comm/src/galois.cc trunk/octaveforge/main/comm/src/galois.h trunk/octaveforge/main/comm/src/galoisfield.cc trunk/octaveforge/main/comm/src/galoisfield.h trunk/octaveforge/main/comm/src/genqamdemod.cc trunk/octaveforge/main/comm/src/gf.cc trunk/octaveforge/main/comm/src/isprimitive.cc trunk/octaveforge/main/comm/src/opgmgm.cc trunk/octaveforge/main/comm/src/opgmm.cc trunk/octaveforge/main/comm/src/opgms.cc trunk/octaveforge/main/comm/src/opmgm.cc trunk/octaveforge/main/comm/src/opsgm.cc trunk/octaveforge/main/comm/src/ovgalois.cc trunk/octaveforge/main/comm/src/ovgalois.h trunk/octaveforge/main/comm/src/primpoly.cc trunk/octaveforge/main/comm/src/syndtable.cc Modified: trunk/octaveforge/main/comm/COPYING ===================================================================  trunk/octaveforge/main/comm/COPYING 20120313 03:54:56 UTC (rev 9851) +++ trunk/octaveforge/main/comm/COPYING 20120313 04:31:21 UTC (rev 9852) @@ 1,283 +1,625 @@ GNU GENERAL PUBLIC LICENSE  Version 2, June 1991 + Version 3, 29 June 2007  Copyright (C) 1989, 1991 Free Software Foundation, Inc. <http://fsf.org/>; + Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>; Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. Preamble  The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change free softwareto make sure the software is free for all its users. This General Public License applies to most of the Free Software Foundation's software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by the GNU Library General Public License instead.) You can apply it to + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a programto make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to your programs, too. When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs; and that you know you can do these things. +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things.  To protect your rights, we need to make restrictions that forbid anyone to deny you these rights or to ask you to surrender the rights. These restrictions translate to certain responsibilities for you if you distribute copies of the software, or if you modify it. + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. For example, if you distribute copies of such a program, whether gratis or for a fee, you must give the recipients all the rights that you have. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights. +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights.  We protect your rights with two steps: (1) copyright the software, and (2) offer you this license which gives you legal permission to copy, distribute and/or modify the software. + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it.  Also, for each author's protection and ours, we want to make certain that everyone understands that there is no warranty for this free software. If the software is modified by someone else and passed on, we want its recipients to know that what they have is not the original, so that any problems introduced by others will not reflect on the original authors' reputations. + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions.  Finally, any free program is threatened constantly by software patents. We wish to avoid the danger that redistributors of a free program will individually obtain patent licenses, in effect making the program proprietary. To prevent this, we have made it clear that any patent must be licensed for everyone's free use or not licensed at all. + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on generalpurpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program nonfree. + The precise terms and conditions for copying, distribution and modification follow.   GNU GENERAL PUBLIC LICENSE  TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION  0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another language. (Hereinafter, translation is included without limitation in the term "modification".) Each licensee is addressed as "you". + TERMS AND CONDITIONS Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running the Program is not restricted, and the output from the Program is covered only if its contents constitute a work based on the Program (independent of having been made by running the Program). Whether that is true depends on what the Program does. + 0. Definitions.  1. You may copy and distribute verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and give any other recipients of the Program a copy of this License along with the Program. + "This License" refers to version 3 of the GNU General Public License. You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee. + "Copyright" also means copyrightlike laws that apply to other kinds of +works, such as semiconductor masks.  2. You may modify your copy or copies of the Program or any portion of it, thus forming a work based on the Program, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions: + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations.  a) You must cause the modified files to carry prominent notices  stating that you changed the files and the date of any change. + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work.  b) You must cause any work that you distribute or publish, that in  whole or in part contains or is derived from the Program or any  part thereof, to be licensed as a whole at no charge to all third  parties under the terms of this License. + A "covered work" means either the unmodified Program or a work based +on the Program.  c) If the modified program normally reads commands interactively  when run, you must cause it, when started running for such  interactive use in the most ordinary way, to print or display an  announcement including an appropriate copyright notice and a  notice that there is no warranty (or else, saying that you provide  a warranty) and that users may redistribute the program under  these conditions, and telling the user how to view a copy of this  License. (Exception: if the Program itself is interactive but  does not normally print such an announcement, your work based on  the Program is not required to print an announcement.)  These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Program, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it. + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Program. + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. In addition, mere aggregation of another work not based on the Program with the Program (or with a work based on the Program) on a volume of a storage or distribution medium does not bring the other work under the scope of this License. + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion.  3. You may copy and distribute the Program (or a work based on it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you also do one of the following: + 1. Source Code.  a) Accompany it with the complete corresponding machinereadable  source code, which must be distributed under the terms of Sections  1 and 2 above on a medium customarily used for software interchange; or, + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any nonsource +form of a work.  b) Accompany it with a written offer, valid for at least three  years, to give any third party, for a charge no more than your  cost of physically performing source distribution, a complete  machinereadable copy of the corresponding source code, to be  distributed under the terms of Sections 1 and 2 above on a medium  customarily used for software interchange; or, + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language.  c) Accompany it with the information you received as to the offer  to distribute corresponding source code. (This alternative is  allowed only for noncommercial distribution and only if you  received the program in object code or executable form with such  an offer, in accord with Subsection b above.) + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable. + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or generalpurpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. If distribution of executable or object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code.   4. You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance. + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source.  5. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Program or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Program (or any work based on the Program), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Program or works based on it. + The Corresponding Source for a work in source code form is that +same work.  6. Each time you redistribute the Program (or any work based on the Program), the recipient automatically receives a license from the original licensor to copy, distribute or modify the Program subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties to + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From AntiCircumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +nonpermissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying NonSource Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machinereadable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peertopeer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or nonconsumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other nonpermissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or nonpermissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peertopeer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a crossclaim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of this License.  7. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or + Each contributor grants you a nonexclusive, worldwide, royaltyfree +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the nonexercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Program at all. For example, if a patent license would not permit royaltyfree redistribution of the Program by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Program. +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply and the section as a whole is intended to apply in other circumstances. + 13. Use with the GNU Affero General Public License. It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system, which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice. + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License.   8. If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License. + 14. Revised Versions of this License.  9. The Free Software Foundation may publish revised and/or new versions of the General Public License from time to time. Such new versions will + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. Each version is given a distinguishing version number. If the Program specifies a version number of this License which applies to it and "any later version", you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of this License, you may choose any version ever published by the Free Software Foundation. + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation.  10. If you wish to incorporate parts of the Program into other free programs whose distribution conditions are different, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally. + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program.  NO WARRANTY + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version.  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + 15. Disclaimer of Warranty.  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + END OF TERMS AND CONDITIONS  + How to Apply These Terms to Your New Programs If you develop a new program, and you want it to be of the greatest @@ 286,15 +628,15 @@ To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively convey the exclusion of warranty; and each file should have at least +state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. <one line to give the program's name and a brief idea of what it does.> Copyright (C) <year> <name of author>  This program is free software; you can redistribute it and/or modify + This program 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 of the License, or + the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ 303,35 +645,30 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License  along with this program; if not, see <http://www.gnu.org/licenses/>;. + along with this program. If not, see <http://www.gnu.org/licenses/>;. Also add information on how to contact you by electronic and paper mail. If the program is interactive, make it output a short notice like this when it starts in an interactive mode: + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode:  Gnomovision version 69, Copyright (C) year name of author  Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + <program> Copyright (C) <year> <name of author> + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. The hypothetical commands `show w' and `show c' should show the appropriate parts of the General Public License. Of course, the commands you use may be called something other than `show w' and `show c'; they could even be mouseclicks or menu itemswhatever suits your program. +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". You should also get your employer (if you work as a programmer) or your school, if any, to sign a "copyright disclaimer" for the program, if necessary. Here is a sample; alter the names: + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +<http://www.gnu.org/licenses/>;.  Yoyodyne, Inc., hereby disclaims all copyright interest in the program  `Gnomovision' (which makes passes at compilers) written by James Hacker.   <signature of Ty Coon>, 1 April 1989  Ty Coon, President of Vice  This General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Library General Public License instead of this License. + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +<http://www.gnu.org/philosophy/whynotlgpl.html>;. Modified: trunk/octaveforge/main/comm/DESCRIPTION ===================================================================  trunk/octaveforge/main/comm/DESCRIPTION 20120313 03:54:56 UTC (rev 9851) +++ trunk/octaveforge/main/comm/DESCRIPTION 20120313 04:31:21 UTC (rev 9852) @@ 7,5 +7,5 @@ Description: Digital Communications, Error Correcting Codes (Channel Code), Source Code functions, Modulation and Galois Fields Depends: octave (>= 3.4), signal (>= 1.0.0), image Autoload: no License: GPL version 2 or later +License: GPL version 3 or later Url: http://octave.sf.net Modified: trunk/octaveforge/main/comm/inst/@galois/conv.m ===================================================================  trunk/octaveforge/main/comm/inst/@galois/conv.m 20120313 03:54:56 UTC (rev 9851) +++ trunk/octaveforge/main/comm/inst/@galois/conv.m 20120313 04:31:21 UTC (rev 9852) @@ 1,17 +1,17 @@ ## Copyright (C) 2002 David Bateman ## ## This program 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 of the License, or ## (at your option) any later version. +## This program 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 3 of the License, or (at your option) any later +## version. ## ## This program 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. +## This program 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 this program; If not, see <http://www.gnu.org/licenses/>;. +## You should have received a copy of the GNU General Public License along with +## this program; if not, see <http://www.gnu.org/licenses/>;. ## * texinfo * ## @deftypefn {Function File} {} conv (@var{a}, @var{b}) Modified: trunk/octaveforge/main/comm/inst/@galois/convmtx.m ===================================================================  trunk/octaveforge/main/comm/inst/@galois/convmtx.m 20120313 03:54:56 UTC (rev 9851) +++ trunk/octaveforge/main/comm/inst/@galois/convmtx.m 20120313 04:31:21 UTC (rev 9852) @@ 1,17 +1,17 @@ ## Copyright (C) 2003 David Bateman ## ## This program 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 of the License, or ## (at your option) any later version. +## This program 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 3 of the License, or (at your option) any later +## version. ## ## This program 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. +## This program 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 this program; If not, see <http://www.gnu.org/licenses/>;. +## You should have received a copy of the GNU General Public License along with +## this program; if not, see <http://www.gnu.org/licenses/>;. ## * texinfo * ## @deftypefn {Function File} {} convmtx (@var{a}, @var{n}) Modified: trunk/octaveforge/main/comm/inst/@galois/deconv.m ===================================================================  trunk/octaveforge/main/comm/inst/@galois/deconv.m 20120313 03:54:56 UTC (rev 9851) +++ trunk/octaveforge/main/comm/inst/@galois/deconv.m 20120313 04:31:21 UTC (rev 9852) @@ 1,17 +1,17 @@ ## Copyright (C) 2002 David Bateman ## ## This program 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 of the License, or ## (at your option) any later version. +## This program 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 3 of the License, or (at your option) any later +## version. ## ## This program 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. +## This program 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 this program; If not, see <http://www.gnu.org/licenses/>;. +## You should have received a copy of the GNU General Public License along with +## this program; if not, see <http://www.gnu.org/licenses/>;. ## * texinfo * ## @deftypefn {Function File} {} deconv (@var{y}, @var{a}) Modified: trunk/octaveforge/main/comm/inst/@galois/det.m ===================================================================  trunk/octaveforge/main/comm/inst/@galois/det.m 20120313 03:54:56 UTC (rev 9851) +++ trunk/octaveforge/main/comm/inst/@galois/det.m 20120313 04:31:21 UTC (rev 9852) @@ 1,17 +1,17 @@ ## Copyright (C) 2011 David Bateman ## ## This program 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 of the License, or ## (at your option) any later version. +## This program 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 3 of the License, or (at your option) any later +## version. ## ## This program 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. +## This program 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 this program; If not, see <http://www.gnu.org/licenses/>;. +## You should have received a copy of the GNU General Public License along with +## this program; if not, see <http://www.gnu.org/licenses/>;. ## * texinfo * ## @deftypefn {Loadable Function} {@var{d} = } det (@var{a}) Modified: trunk/octaveforge/main/comm/inst/@galois/dftmtx.m ===================================================================  trunk/octaveforge/main/comm/inst/@galois/dftmtx.m 20120313 03:54:56 UTC (rev 9851) +++ trunk/octaveforge/main/comm/inst/@galois/dftmtx.m 20120313 04:31:21 UTC (rev 9852) @@ 1,17 +1,17 @@ ## Copyright (C) 2002 David Bateman ## ## This program 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 of the License, or ## (at your option) any later version. +## This program 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 3 of the License, or (at your option) any later +## version. ## ## This program 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. +## This program 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 this program; If not, see <http://www.gnu.org/licenses/>;. +## You should have received a copy of the GNU General Public License along with +## this program; if not, see <http://www.gnu.org/licenses/>;. ## * texinfo * ## @deftypefn {Function File} {@var{d} = } dftmtx (@var{a}) Modified: trunk/octaveforge/main/comm/inst/@galois/diag.m ===================================================================  trunk/octaveforge/main/comm/inst/@galois/diag.m 20120313 03:54:56 UTC (rev 9851) +++ trunk/octaveforge/main/comm/inst/@galois/diag.m 20120313 04:31:21 UTC (rev 9852) @@ 1,17 +1,17 @@ ## Copyright (C) 2011 David Bateman ## ## This program 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 of the License, or ## (at your option) any later version. +## This program 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 3 of the License, or (at your option) any later +## version. ## ## This program 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. +## This program 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 this program; If not, see <http://www.gnu.org/licenses/>;. +## You should have received a copy of the GNU General Public License along with +## this program; if not, see <http://www.gnu.org/licenses/>;. ## * texinfo * ## @deftypefn {Loadable Function} {} diag (@var{v}, @var{k}) Modified: trunk/octaveforge/main/comm/inst/@galois/exp.m ===================================================================  trunk/octaveforge/main/comm/inst/@galois/exp.m 20120313 03:54:56 UTC (rev 9851) +++ trunk/octaveforge/main/comm/inst/@galois/exp.m 20120313 04:31:21 UTC (rev 9852) @@ 1,17 +1,17 @@ ## Copyright (C) 2011 David Bateman ## ## This program 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 of the License, or ## (at your option) any later version. +## This program 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 3 of the License, or (at your option) any later +## version. ## ## This program 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. +## This program 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 this program; If not, see <http://www.gnu.org/licenses/>;. +## You should have received a copy of the GNU General Public License along with +## this program; if not, see <http://www.gnu.org/licenses/>;. ## * texinfo * ## @deftypefn {Loadable Function} {} exp (@var{x}) Modified: trunk/octaveforge/main/comm/inst/@galois/fft.m ===================================================================  trunk/octaveforge/main/comm/inst/@galois/fft.m 20120313 03:54:56 UTC (rev 9851) +++ trunk/octaveforge/main/comm/inst/@galois/fft.m 20120313 04:31:21 UTC (rev 9852) @@ 1,17 +1,17 @@ ## Copyright (C) 2002 David Bateman ## ## This program 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 of the License, or ## (at your option) any later version. +## This program 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 3 of the License, or (at your option) any later +## version. ## ## This program 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. +## This program 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 this program; If not, see <http://www.gnu.org/licenses/>;. +## You should have received a copy of the GNU General Public License along with +## this program; if not, see <http://www.gnu.org/licenses/>;. ## * texinfo * ## @deftypefn {Function File} {} fft (@var{x}) Modified: trunk/octaveforge/main/comm/inst/@galois/filter.m ===================================================================  trunk/octaveforge/main/comm/inst/@galois/filter.m 20120313 03:54:56 UTC (rev 9851) +++ trunk/octaveforge/main/comm/inst/@galois/filter.m 20120313 04:31:21 UTC (rev 9852) @@ 1,17 +1,17 @@ ## Copyright (C) 2011 David Bateman ## ## This program 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 of the License, or ## (at your option) any later version. +## This program 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 3 of the License, or (at your option) any later +## version. ## ## This program 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. +## This program 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 this program; If not, see <http://www.gnu.org/licenses/>;. +## You should have received a copy of the GNU General Public License along with +## this program; if not, see <http://www.gnu.org/licenses/>;. ## * texinfo * ## @deftypefn {Loadable Function} {y =} filter (@var{b}, @var{a}, @var{x}) Modified: trunk/octaveforge/main/comm/inst/@galois/ifft.m ===================================================================  trunk/octaveforge/main/comm/inst/@galois/ifft.m 20120313 03:54:56 UTC (rev 9851) +++ trunk/octaveforge/main/comm/inst/@galois/ifft.m 20120313 04:31:21 UTC (rev 9852) @@ 1,17 +1,17 @@ ## Copyright (C) 2002 David Bateman ## ## This program 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 of the License, or ## (at your option) any later version. +## This program 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 3 of the License, or (at your option) any later +## version. ## ## This program 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. +## This program 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 this program; If not, see <http://www.gnu.org/licenses/>;. +## You should have received a copy of the GNU General Public License along with +## this program; if not, see <http://www.gnu.org/licenses/>;. ## * texinfo * ## @deftypefn {Function File} {} ifft (@var{x}) Modified: trunk/octaveforge/main/comm/inst/@galois/inv.m ===================================================================  trunk/octaveforge/main/comm/inst/@galois/inv.m 20120313 03:54:56 UTC (rev 9851) +++ trunk/octaveforge/main/comm/inst/@galois/inv.m 20120313 04:31:21 UTC (rev 9852) @@ 1,17 +1,17 @@ ## Copyright (C) 2011 David Bateman ## ## This program 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 of the License, or ## (at your option) any later version. +## This program 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 3 of the License, or (at your option) any later +## version. ## ## This program 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. +## This program 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 this program; If not, see <http://www.gnu.org/licenses/>;. +## You should have received a copy of the GNU General Public License along with +## this program; if not, see <http://www.gnu.org/licenses/>;. ## * texinfo * ## @deftypefn {Loadable Function} {[@var{x}, @var{rcond}] = } inv (@var{a}) Modified: trunk/octaveforge/main/comm/inst/@galois/inverse.m ===================================================================  trunk/octaveforge/main/comm/inst/@galois/inverse.m 20120313 03:54:56 UTC (rev 9851) +++ trunk/octaveforge/main/comm/inst/@galois/inverse.m 20120313 04:31:21 UTC (rev 9852) @@ 1,17 +1,17 @@ ## Copyright (C) 2011 David Bateman ## ## This program 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 of the License, or ## (at your option) any later version. +## This program 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 3 of the License, or (at your option) any later +## version. ## ## This program 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. +## This program 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 this program; If not, see <http://www.gnu.org/licenses/>;. +## You should have received a copy of the GNU General Public License along with +## this program; if not, see <http://www.gnu.org/licenses/>;. ## * texinfo * ## @deftypefn {Loadable Function} {[@var{x}, @var{rcond}] = } inverse (@var{a}) Modified: trunk/octaveforge/main/comm/inst/@galois/isequal.m ===================================================================  trunk/octaveforge/main/comm/inst/@galois/isequal.m 20120313 03:54:56 UTC (rev 9851) +++ trunk/octaveforge/main/comm/inst/@galois/isequal.m 20120313 04:31:21 UTC (rev 9852) @@ 1,17 +1,17 @@ ## Copyright (C) 2000 Paul Kienzle ## ## This program 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 of the License, or ## (at your option) any later version. +## This program 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 3 of the License, or (at your option) any later +## version. ## ## This program 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. +## This program 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 this program; If not, see <http://www.gnu.org/licenses/>;. +## You should have received a copy of the GNU General Public License along with +## this program; if not, see <http://www.gnu.org/licenses/>;. ## * texinfo * ## @deftypefn {Function File} {} isequal (@var{x1}, @var{x2}, @dots{}) Modified: trunk/octaveforge/main/comm/inst/@galois/log.m ===================================================================  trunk/octaveforge/main/comm/inst/@galois/log.m 20120313 03:54:56 UTC (rev 9851) +++ trunk/octaveforge/main/comm/inst/@galois/log.m 20120313 04:31:21 UTC (rev 9852) @@ 1,17 +1,17 @@ ## Copyright (C) 2011 David Bateman ## ## This program 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 of the License, or ## (at your option) any later version. +## This program 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 3 of the License, or (at your option) any later +## version. ## ## This program 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. +## This program 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 this program; If not, see <http://www.gnu.org/licenses/>;. +## You should have received a copy of the GNU General Public License along with +## this program; if not, see <http://www.gnu.org/licenses/>;. ## * texinfo * ## @deftypefn {Loadable Function} {} log (@var{x}) Modified: trunk/octaveforge/main/comm/inst/@galois/lu.m ===================================================================  trunk/octaveforge/main/comm/inst/@galois/lu.m 20120313 03:54:56 UTC (rev 9851) +++ trunk/octaveforge/main/comm/inst/@galois/lu.m 20120313 04:31:21 UTC (rev 9852) @@ 1,17 +1,17 @@ ## Copyright (C) 2011 David Bateman ## ## This program 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 of the License, or ## (at your option) any later version. +## This program 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 3 of the License, or (at your option) any later +## version. ## ## This program 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. +## This program 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 this program; If not, see <http://www.gnu.org/licenses/>;. +## You should have received a copy of the GNU General Public License along with +## this program; if not, see <http://www.gnu.org/licenses/>;. ## * texinfo * ## @deftypefn {Loadable Function} {[@var{l}, @var{u}, @var{p}] =} lu (@var{a}) Modified: trunk/octaveforge/main/comm/inst/@galois/prod.m ===================================================================  trunk/octaveforge/main/comm/inst/@galois/prod.m 20120313 03:54:56 UTC (rev 9851) +++ trunk/octaveforge/main/comm/inst/@galois/prod.m 20120313 04:31:21 UTC (rev 9852) @@ 1,17 +1,17 @@ ## Copyright (C) 2011 David Bateman ## ## This program 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 of the License, or ## (at your option) any later version. +## This program 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 3 of the License, or (at your option) any later +## version. ## ## This program 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. +## This program 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 this program; If not, see <http://www.gnu.org/licenses/>;. +## You should have received a copy of the GNU General Public License along with +## this program; if not, see <http://www.gnu.org/licenses/>;. ## * texinfo * ## @deftypefn {Loadable Function} {} prod (@var{x}, @var{dim}) Modified: trunk/octaveforge/main/comm/inst/@galois/rank.m ===================================================================  trunk/octaveforge/main/comm/inst/@galois/rank.m 20120313 03:54:56 UTC (rev 9851) +++ trunk/octaveforge/main/comm/inst/@galois/rank.m 20120313 04:31:21 UTC (rev 9852) @@ 1,17 +1,17 @@ ## Copyright (C) 2011 David Bateman ## ## This program 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 of the License, or ## (at your option) any later version. +## This program 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 3 of the License, or (at your option) any later +## version. ## ## This program 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. +## This program 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 this program; If not, see <http://www.gnu.org/licenses/>;. +## You should have received a copy of the GNU General Public License along with +## this program; if not, see <http://www.gnu.org/licenses/>;. ## * texinfo * ## @deftypefn {Loadable Function} {@var{d} = } rank (@var{a}) Modified: trunk/octaveforge/main/comm/inst/@galois/reshape.m ===================================================================  trunk/octaveforge/main/comm/inst/@galois/reshape.m 20120313 03:54:56 UTC (rev 9851) +++ trunk/octaveforge/main/comm/inst/@galois/reshape.m 20120313 04:31:21 UTC (rev 9852) @@ 1,17 +1,17 @@ ## Copyright (C) 2011 David Bateman ## ## This program 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 of the License, or ## (at your option) any later version. +## This program 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 3 of the License, or (at your option) any later +## version. ## ## This program 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. +## This program 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 this program; If not, see <http://www.gnu.org/licenses/>;. +## You should have received a copy of the GNU General Public License along with +## this program; if not, see <http://www.gnu.org/licenses/>;. ## * texinfo * ## @deftypefn {Loadable Function} {} reshape (@var{a}, @var{m}, @var{n}) Modified: trunk/octaveforge/main/comm/inst/@galois/roots.m ===================================================================  trunk/octaveforge/main/comm/inst/@galois/roots.m 20120313 03:54:56 UTC (rev 9851) +++ trunk/octaveforge/main/comm/inst/@galois/roots.m 20120313 04:31:21 UTC (rev 9852) @@ 1,17 +1,17 @@ ## Copyright (C) 2002 David Bateman ## ## This program 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 of the License, or ## (at your option) any later version. +## This program 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 3 of the License, or (at your option) any later +## version. ## ## This program 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. +## This program 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 this program; If not, see <http://www.gnu.org/licenses/>;. +## You should have received a copy of the GNU General Public License along with +## this program; if not, see <http://www.gnu.org/licenses/>;. ## * texinfo * ## @deftypefn {Function File} {} roots (@var{v}) Modified: trunk/octaveforge/main/comm/inst/@galois/sqrt.m ===================================================================  trunk/octaveforge/main/comm/inst/@galois/sqrt.m 20120313 03:54:56 UTC (rev 9851) +++ trunk/octaveforge/main/comm/inst/@galois/sqrt.m 20120313 04:31:21 UTC (rev 9852) @@ 1,17 +1,17 @@ ## Copyright (C) 2011 David Bateman ## ## This program 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 of the License, or ## (at your option) any later version. +## This program 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 3 of the License, or (at your option) any later +## version. ## ## This program 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. +## This program 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 this program; If not, see <http://www.gnu.org/licenses/>;. +## You should have received a copy of the GNU General Public License along with +## this program; if not, see <http://www.gnu.org/licenses/>;. ## * texinfo * ## @deftypefn {Loadable Function} {} sqrt (@var{x}) Modified: trunk/octaveforge/main/comm/inst/@galois/sum.m ===================================================================  trunk/octaveforge/main/comm/inst/@galois/sum.m 20120313 03:54:56 UTC (rev 9851) +++ trunk/octaveforge/main/comm/inst/@galois/sum.m 20120313 04:31:21 UTC (rev 9852) @@ 1,17 +1,17 @@ ## Copyright (C) 2011 David Bateman ## ## This program 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 of the License, or ## (at your option) any later version. +## This program 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 3 of the License, or (at your option) any later +## version. ## ## This program 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. +## This program 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 this program; If not, see <http://www.gnu.org/licenses/>;. +## You should have received a copy of the GNU General Public License along with +## this program; if not, see <http://www.gnu.org/licenses/>;. ## * texinfo * ## @deftypefn {Loadable Function} {} sum (@var{x}, @var{dim}) Modified: trunk/octaveforge/main/comm/inst/@galois/sumsq.m ===================================================================  trunk/octaveforge/main/comm/inst/@galois/sumsq.m 20120313 03:54:56 UTC (rev 9851) +++ trunk/octaveforge/main/comm/inst/@galois/sumsq.m 20120313 04:31:21 UTC (rev 9852) @@ 1,17 +1,17 @@ ## Copyright (C) 2011 David Bateman ## ## This program 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 of the License, or ## (at your option) any later version. +## This program 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 3 of the License, or (at your option) any later +## version. ## ## This program 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. +## This program 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 this program; If not, see <http://www.gnu.org/licenses/>;. +## You should have received a copy of the GNU General Public License along with +## this program; if not, see <http://www.gnu.org/licenses/>;. ## * texinfo * ## @deftypefn {Loadable Function} {} sumsq (@var{x}, @var{dim}) Modified: trunk/octaveforge/main/comm/inst/ademodce.m ===================================================================  trunk/octaveforge/main/comm/inst/ademodce.m 20120313 03:54:56 UTC (rev 9851) +++ trunk/octaveforge/main/comm/inst/ademodce.m 20120313 04:31:21 UTC (rev 9852) @@ 1,17 +1,17 @@ ## Copyright (C) 2003 David Bateman ## ## This program 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 of the License, or ## (at your option) any later version. +## This program 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 3 of the License, or (at your option) any later +## version. ## ## This program 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. +## This program 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 this program; If not, see <http://www.gnu.org/licenses/>;. +## You should have received a copy of the GNU General Public License along with +## this program; if not, see <http://www.gnu.org/licenses/>;. ## * texinfo * ## @deftypefn {Function File} {@var{y} =} ademodce (@var{x},@var{Fs},'amdsbtc',offset) Modified: trunk/octaveforge/main/comm/inst/amdemod.m ===================================================================  trunk/octaveforge/main/comm/inst/amdemod.m 20120313 03:54:56 UTC (rev 9851) +++ trunk/octaveforge/main/comm/inst/amdemod.m 20120313 04:31:21 UTC (rev 9852) @@ 1,17 +1,17 @@ # Copyright (C) 2007 Sylvain Pelissier <sylvain.pelissier@...> +# Copyright (C) 2007 Sylvain Pelissier <sylvain.pelissier@...> ## ## This program 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 of the License, or ## (at your option) any later version. +## This program 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 3 of the License, or (at your option) any later +## version. ## ## This program 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. +## This program 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 this program; If not, see <http://www.gnu.org/licenses/>;. +## You should have received a copy of the GNU General Public License along with +## this program; if not, see <http://www.gnu.org/licenses/>;. ## * texinfo * ## @deftypefn {Function File} {[@var{m}] =} amdemod (@var{s}, @var{fc}, @var{fs}) Modified: trunk/octaveforge/main/comm/inst/ammod.m ===================================================================  trunk/octaveforge/main/comm/inst/ammod.m 20120313 03:54:56 UTC (rev 9851) +++ trunk/octaveforge/main/comm/inst/ammod.m 20120313 04:31:21 UTC (rev 9852) @@ 1,17 +1,17 @@ ## Copyright (C) 2007 Sylvain Pelissier <sylvain.pelissier@...> +## Copyright (C) 2007 Sylvain Pelissier <sylvain.pelissier@...> ## ## This program 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 of the License, or ## (at your option) any later version. +## This program 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 3 of the License, or (at your option) any later +## version. ## ## This program 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. +## This program 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 this program; If not, see <http://www.gnu.org/licenses/>;. +## You should have received a copy of the GNU General Public License along with +## this program; if not, see <http://www.gnu.org/licenses/>;. ## * texinfo * ## @deftypefn {Function File} ammod (@var{x},@var{fc},@var{fs}) @@ 27,4 +27,4 @@ l = length(x); t=0:1./fs:(l1)./fs;  y = x.*cos(2.*pi.*fc.*t); \ No newline at end of file + y = x.*cos(2.*pi.*fc.*t); Modified: trunk/octaveforge/main/comm/inst/amodce.m ===================================================================  trunk/octaveforge/main/comm/inst/amodce.m 20120313 03:54:56 UTC (rev 9851) +++ trunk/octaveforge/main/comm/inst/amodce.m 20120313 04:31:21 UTC (rev 9852) @@ 1,17 +1,17 @@ ## Copyright (C) 2003 David Bateman ## ## This program 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 of the License, or ## (at your option) any later version. +## This program 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 3 of the License, or (at your option) any later +## version. ## ## This program 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. +## This program 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 this program; If not, see <http://www.gnu.org/licenses/>;. +## You should have received a copy of the GNU General Public License along with +## this program; if not, see <http://www.gnu.org/licenses/>;. ## * texinfo * ## @deftypefn {Function File} {@var{y} =} amodce (@var{x},@var{Fs},'amdsbtc',offset) Modified: trunk/octaveforge/main/comm/inst/apkconst.m ===================================================================  trunk/octaveforge/main/comm/inst/apkconst.m 20120313 03:54:56 UTC (rev 9851) +++ trunk/octaveforge/main/comm/inst/apkconst.m 20120313 04:31:21 UTC (rev 9852) @@ 1,17 +1,17 @@ ## Copyright (C) 2003 David Bateman ## ## This program 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 of the License, or ## (at your option) any later version. +## This program 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 3 of the License, or (at your option) any later +## version. ## ## This program 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. +## This program 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 this program; If not, see <http://www.gnu.org/licenses/>;. +## You should have received a copy of the GNU General Public License along with +## this program; if not, see <http://www.gnu.org/licenses/>;. ## * texinfo * ## @deftypefn {Function File} {} apkconst (@var{nsig}) Modified: trunk/octaveforge/main/comm/inst/awgn.m ===================================================================  trunk/octaveforge/main/comm/inst/awgn.m 20120313 03:54:56 UTC (rev 9851) +++ trunk/octaveforge/main/comm/inst/awgn.m 20120313 04:31:21 UTC (rev 9852) @@ 1,17 +1,17 @@ ## Copyright (C) 2002 David Bateman ## ## This program 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 of the License, or ## (at your option) any later version. +## This program 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 3 of the License, or (at your option) any later +## version. ## ## This program 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. +## This program 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 this program; If not, see <http://www.gnu.org/licenses/>;. +## You should have received a copy of the GNU General Public License along with +## this program; if not, see <http://www.gnu.org/licenses/>;. @@ Diff output truncated at 100000 characters. @@ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. 
From: <mtmiller@us...>  20120429 03:57:09

Revision: 10334 http://octave.svn.sourceforge.net/octave/?rev=10334&view=rev Author: mtmiller Date: 20120429 03:57:02 +0000 (Sun, 29 Apr 2012) Log Message:  comm: fix and clean up bi2de, de2bi, and oct2dec * fix de2bi matlab compatibility * fix oct2dec to fail with an error on invalid input instead of returning NaN * improve argument error checking and reporting * add test suites * clean up indenting and style Modified Paths:  trunk/octaveforge/main/comm/doc/comms.txi trunk/octaveforge/main/comm/inst/bi2de.m trunk/octaveforge/main/comm/inst/de2bi.m trunk/octaveforge/main/comm/inst/oct2dec.m Modified: trunk/octaveforge/main/comm/doc/comms.txi ===================================================================  trunk/octaveforge/main/comm/doc/comms.txi 20120428 08:56:56 UTC (rev 10333) +++ trunk/octaveforge/main/comm/doc/comms.txi 20120429 03:57:02 UTC (rev 10334) @@ 1497,7 +1497,7 @@ @example octave:1> a = minpol(gf(14,5)); octave:2> b = de2bi(a.x,"leftmsb"); +octave:2> b = de2bi(a.x,[],"leftmsb"); @end example converts the polynomial form of the minimum polynomial of 14 in GF(2^5) into Modified: trunk/octaveforge/main/comm/inst/bi2de.m ===================================================================  trunk/octaveforge/main/comm/inst/bi2de.m 20120428 08:56:56 UTC (rev 10333) +++ trunk/octaveforge/main/comm/inst/bi2de.m 20120429 03:57:02 UTC (rev 10334) @@ 15,6 +15,7 @@ ## * texinfo * ## @deftypefn {Function File} {@var{d} = } bi2de (@var{b}) +## @deftypefnx {Function File} {@var{d} = } bi2de (@var{b},@var{f}) ## @deftypefnx {Function File} {@var{d} = } bi2de (@var{b},@var{p}) ## @deftypefnx {Function File} {@var{d} = } bi2de (@var{b},@var{p},@var{f}) ## @@ 29,45 +30,41 @@ ## The variable @var{f} defines whether the first or last element of @var{b} ## is considered to be the mostsignificant. Valid values of @var{f} are ## 'rightmsb' or 'leftmsb'. By default @var{f} is 'rightmsb'. +## +## @seealso{de2bi} ## @end deftypefn ## @seealso{de2bi} ## 20010202 ## initial release ## 20030202 ## add orientation of b and help in texinfo  function d = bi2de (b, p, f) switch (nargin) case 1, p = 2; f = 'rightmsb';  case 2,  if (ischar(p)) + case 2, + if (ischar (p)) f = p; p = 2; else f = 'rightmsb'; endif  case 3,  if (ischar(p)) + case 3, + if (ischar (p)) tmp = f; f = p; p = tmp; endif  otherwise  error ("usage: d = bi2de (b, [p])"); + otherwise + print_usage (); endswitch  if ( any (b (:) < 0)  any (b (:) > p  1) )  error ("bi2de: d must only contain value in [0, p1]"); + if ( any (b(:) < 0)  any (b(:) != floor (b(:)))  any (b(:) > p  1) ) + error ("bi2de: d must only contain integers in the range [0, p1]"); endif  if (strcmp(f,'leftmsb')) + if (strcmp (f, 'leftmsb')) b = b(:,size(b,2):1:1);  elseif (!strcmp(f,'rightmsb'))  error("bi2de: unrecognized flag"); + elseif (!strcmp (f, 'rightmsb')) + error ("bi2de: unrecognized flag"); endif if (length (b) == 0) @@ 76,4 +73,24 @@ d = b * ( p .^ [ 0 : (columns(b)1) ]' ); endif endfunction; +endfunction + +%!shared x +%! x = randi ([0 1], 100, 16); +%!assert (bi2de (0), 0) +%!assert (bi2de (1), 1) +%!assert (bi2de (ones (1, 8)), 255) +%!assert (bi2de ([7 7 7 7], 8), 4095) +%!assert (size (bi2de (x)), [100 1]) +%!assert (bi2de (x, "rightmsb"), bi2de (x)) +%!assert (bi2de (x, "leftmsb"), bi2de (fliplr (x))) + +%% Test input validation +%!error bi2de () +%!error bi2de (1, 2, 3, 4) +%!error bi2de (1, 2, 3) +%!error bi2de (1, 2, "invalid") +%!error bi2de (0.1) +%!error bi2de (1) +%!error bi2de (2) +%!error bi2de (7, 6) Modified: trunk/octaveforge/main/comm/inst/de2bi.m ===================================================================  trunk/octaveforge/main/comm/inst/de2bi.m 20120428 08:56:56 UTC (rev 10333) +++ trunk/octaveforge/main/comm/inst/de2bi.m 20120429 03:57:02 UTC (rev 10334) @@ 26,7 +26,7 @@ ## of elements of @var{d}. If @var{n} is defined then the returned matrix ## will have @var{n} columns. This number of columns can be either larger ## than the minimum needed and zeros will be added to the msb of the ## binary representation or smaller than the minimum in which case the +## binary representation or smaller than the minimum in which case the ## leastsignificant part of the element is returned. ## ## If @var{p} is defined then it is used as the base for the decomposition @@ 36,67 +36,72 @@ ## The variable @var{f} defines whether the first or last element of @var{b} ## is considered to be the mostsignificant. Valid values of @var{f} are ## 'rightmsb' or 'leftmsb'. By default @var{f} is 'rightmsb'. +## +## @seealso{bi2de} ## @end deftypefn ## @seealso{bi2de} ## 20010202 ## initial release ## 20030202 ## add orientation of b and help in texinfo +function b = de2bi (d, n, p, f) function b = de2bi(d, n, p, f)  if (nargin == 1) p = 2; n = floor ( log (max (max (d), 1)) ./ log (p) ) + 1; f = 'rightmsb'; elseif (nargin == 2) p = 2;  if (ischar(n))  f = n;  n = floor ( log (max (max (d), 1)) ./ log (p) ) + 1;  else  f = 'rightmsb';  endif + f = 'rightmsb'; elseif (nargin == 3)  if (ischar(n))  f = n;  n = p  p = 2;  elseif (ischar(p)) + if (ischar (p)) f = p; p = 2; else f = 'rightmsb';  endif  elseif (nargin == 3)  if (ischar(n))  tmp = f  f = n;  n = p  p = tmp;  elseif (ischar(p)) + endif + elseif (nargin == 4) + if (ischar (p)) tmp = f; f = p; p = tmp;  endif + endif else  error ("usage: b = de2bi (d [, n [, p]])"); + print_usage (); endif d = d(:); if ( any (d < 0)  any (d != floor (d)) )  error ("de2bi: only handles nonnegative integers"); + error ("de2bi: d must only contain nonnegative integers"); endif + if (isempty (n)) + n = floor ( log (max (max (d), 1)) ./ log (p) ) + 1; + endif + power = ones (length (d), 1) * (p .^ [0 : n1] ); d = d * ones (1, n); b = floor (rem (d, p*power) ./ power);  if (strcmp(f,'leftmsb')) + if (strcmp (f, 'leftmsb')) b = b(:,columns(b):1:1);  elseif (!strcmp(f,'rightmsb'))  error("de2bi: unrecognized flag"); + elseif (!strcmp (f, 'rightmsb')) + error ("de2bi: unrecognized flag"); endif  + endfunction + +%!shared x +%! x = randi ([0 2^161], 100, 1); +%!assert (de2bi (0), 0) +%!assert (de2bi (1), 1) +%!assert (de2bi (255), ones (1, 8)) +%!assert (de2bi (255, [], 256), 255) +%!assert (de2bi (1023, 8, 8), [7 7 7 1 0 0 0 0]) +%!assert (size (de2bi (x, 16)), [100 16]) +%!assert (de2bi (x, 16, "rightmsb"), de2bi (x, 16)) +%!assert (de2bi (x, 16, "leftmsb"), fliplr (de2bi (x, 16))) + +%% Test input validation +%!error de2bi () +%!error de2bi (1, 2, 3, 4, 5) +%!error de2bi (1, 2, 3, 4) +%!error de2bi (1, 2, 3, "invalid") +%!error de2bi (0.1) +%!error de2bi (1) Modified: trunk/octaveforge/main/comm/inst/oct2dec.m ===================================================================  trunk/octaveforge/main/comm/inst/oct2dec.m 20120428 08:56:56 UTC (rev 10333) +++ trunk/octaveforge/main/comm/inst/oct2dec.m 20120429 03:57:02 UTC (rev 10334) @@ 14,21 +14,48 @@ ## this program; if not, see <http://www.gnu.org/licenses/>;. ## * texinfo * ## @deftypefn {Function File} @var{d} = oct2dec(@var{c}) +## @deftypefn {Function File} @var{d} = oct2dec (@var{c}) +## ## Convert octal to decimal values. ## @seealso{base2dec,bin2dec,dec2bi} +## +## Each element of the octal matrix @var{c} is converted to a decimal value. +## +## @seealso{base2dec,bin2dec,dec2bin} ## @end deftypefn function d = oct2dec(c)  if (nargin != 1)  usage ("d = oct2dec(c)");  endif  if(any(c(:) < 0)  any(c(:) ~= floor(c(:))))  error('c must be an octal matrix');  exit  end  l = size(c,2);  for k = 1:l  str = num2str(c(:,k));  d(:,k) = base2dec(str,8);  end +function d = oct2dec (c) + + if (nargin != 1) + print_usage (); + endif + + # Check for negative or noninteger values + if (any (c(:) < 0)  any (c(:) != floor (c(:)))) + error ("oct2dec: c must be an octal matrix"); + endif + + d = zeros (size (c)); + l = size (c, 2); + for k = 1:l + str = num2str (c(:,k)); + d(:,k) = base2dec (str, 8); + if (any (isnan (d(:,k)))) + error ("oct2dec: c must be an octal matrix"); + endif + endfor + +endfunction + +%!shared x,y +%! x = reshape ([0:79], 10, 8)(1:8,:); +%! y = reshape ([0:63], 8, 8); +%!assert (oct2dec (0), 0) +%!assert (oct2dec (77777777), 2^24  1) +%!assert (oct2dec (x), y) + +%% Test input validation +%!error oct2dec () +%!error oct2dec (0, 0) +%!error <octal matrix> oct2dec (0.1) +%!error <octal matrix> oct2dec (1) +%!error <octal matrix> oct2dec (8) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. 
From: <carandraug@us...>  20120512 14:55:42

Revision: 10425 http://octave.svn.sourceforge.net/octave/?rev=10425&view=rev Author: carandraug Date: 20120512 14:55:36 +0000 (Sat, 12 May 2012) Log Message:  communications: remove dependency on image since it was only because marcumq which now belongs to signal Modified Paths:  trunk/octaveforge/main/comm/DESCRIPTION trunk/octaveforge/main/comm/NEWS Modified: trunk/octaveforge/main/comm/DESCRIPTION ===================================================================  trunk/octaveforge/main/comm/DESCRIPTION 20120512 14:42:27 UTC (rev 10424) +++ trunk/octaveforge/main/comm/DESCRIPTION 20120512 14:55:36 UTC (rev 10425) @@ 5,7 +5,7 @@ Maintainer: OctaveForge community <octavedev@...> Title: Communications. Description: Digital Communications, Error Correcting Codes (Channel Code), Source Code functions, Modulation and Galois Fields Depends: octave (>= 3.4), signal (>= 1.1.3), image +Depends: octave (>= 3.4), signal (>= 1.1.3) Autoload: no License: GPLv3+ Url: http://octave.sf.net Modified: trunk/octaveforge/main/comm/NEWS ===================================================================  trunk/octaveforge/main/comm/NEWS 20120512 14:42:27 UTC (rev 10424) +++ trunk/octaveforge/main/comm/NEWS 20120512 14:55:36 UTC (rev 10425) @@ 3,6 +3,8 @@ ** The function `marcumq' has been moved to the signal package + ** communications is no longer dependent on the signal package + ** The following functions are new: convenc This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. 
From: <mtmiller@us...>  20120520 16:04:19

Revision: 10470 http://octave.svn.sourceforge.net/octave/?rev=10470&view=rev Author: mtmiller Date: 20120520 16:04:12 +0000 (Sun, 20 May 2012) Log Message:  istrellis, poly2trellis: new functions for comm package Modified Paths:  trunk/octaveforge/main/comm/NEWS Added Paths:  trunk/octaveforge/main/comm/inst/istrellis.m trunk/octaveforge/main/comm/inst/poly2trellis.m Modified: trunk/octaveforge/main/comm/NEWS ===================================================================  trunk/octaveforge/main/comm/NEWS 20120520 15:13:10 UTC (rev 10469) +++ trunk/octaveforge/main/comm/NEWS 20120520 16:04:12 UTC (rev 10470) @@ 1,3 +1,10 @@ +Summary of important uservisible changes for communications 1.1.2: + + + ** The following functions are new: + istrellis + poly2trellis + Summary of important uservisible changes for communications 1.1.1:  Added: trunk/octaveforge/main/comm/inst/istrellis.m ===================================================================  trunk/octaveforge/main/comm/inst/istrellis.m (rev 0) +++ trunk/octaveforge/main/comm/inst/istrellis.m 20120520 16:04:12 UTC (rev 10470) @@ 0,0 +1,110 @@ +## Copyright (C) 2012 Mike Miller <mtmiller@...> +## +## This program 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 3 of the License, or (at your option) any later +## version. +## +## This program 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 +## this program; if not, see <http://www.gnu.org/licenses/>;. + +## * texinfo * +## @deftypefn {Function File} {} istrellis (@var{t}) +## @deftypefnx {Function File} {[@var{status}, @var{text}] =} istrellis (@var{t}) +## +## Return true if @var{t} is a valid trellis structure. +## +## If called with two output arguments, @var{text} contains a string indicating +## a reason if @var{status} is false or an empty string if @var{status} is true. +## +## @seealso{poly2trellis, struct} +## @end deftypefn + +function [status, text] = istrellis (t) + + if (nargin != 1) + print_usage (); + endif + + status = false; + text = ""; + + if !( isstruct (t) && + isfield (t, "numInputSymbols") && + isfield (t, "numOutputSymbols") && + isfield (t, "numStates") && + isfield (t, "nextStates") && + isfield (t, "outputs") ) + text = "t is not a valid trellis structure"; + else + try + outputs = oct2dec(t.outputs); + outputs_is_octal = true; + catch + outputs_is_octal = false; + end_try_catch + k = log2 (t.numInputSymbols); + n = log2 (t.numOutputSymbols); + nu = log2 (t.numStates); + if ( !isscalar(k)  (k < 0)  (k != fix (k))) + text = "numInputSymbols is not a power of 2"; + elseif ( !isscalar(n)  (n < 0)  (n != fix (n))) + text = "numOutputSymbols is not a power of 2"; + elseif ( !isscalar(nu)  (nu < 0)  (nu != fix (nu))) + text = "numStates is not a power of 2"; + elseif (any (size (t.nextStates) != [t.numStates t.numInputSymbols])) + text = "nextStates is not a numStatesbynumInputSymbols matrix"; + elseif (any (size (t.outputs) != [t.numStates t.numInputSymbols])) + text = "outputs is not a numStatesbynumInputSymbols matrix"; + elseif ( any (t.nextStates(:) != fix (t.nextStates(:)))  + any (t.nextStates(:) < 0)  + any (t.nextStates(:) > t.numStates  1) ) + text = "nextStates must contain integers from 0 to numStates1"; + elseif ( !outputs_is_octal  + any (t.outputs(:) != fix (t.outputs(:)))  + any (t.outputs(:) < 0)  + any (outputs(:) > t.numOutputSymbols  1) ) + text = "outputs must contain octal integers from 0 to numOutputSymbols1"; + else + status = true; + endif + endif + +endfunction + +%% Test the simple (2,1,3) encoder from Lin & Costello example 11.1 +%!test +%! T = struct ("numInputSymbols", 2, +%! "numOutputSymbols", 4, +%! "numStates", 8, +%! "nextStates", [0 4; 0 4; 1 5; 1 5; 2 6; 2 6; 3 7; 3 7], +%! "outputs", [0 3; 3 0; 3 0; 0 3; 1 2; 2 1; 2 1; 1 2]); +%! assert (istrellis (T), true) + +%% Tests of invalid arguments or invalid structures +%!test +%! [status, text] = istrellis ([]); +%! assert (status, false); +%! assert (isempty (strfind (text, "not a valid trellis")), false) +%!test +%! [status, text] = istrellis (struct ()); +%! assert (status, false); +%! assert (isempty (strfind (text, "not a valid trellis")), false) +%!test +%! T = struct ("numInputSymbols", 3, +%! "numOutputSymbols", 4, +%! "numStates", 0, +%! "nextStates", zeros(0,4), +%! "outputs", zeros(0,4)); +%! [status, text] = istrellis (T); +%! assert (status, false); +%! assert (isempty (strfind (text, "numInputSymbols")), false) + +%% Test input validation +%!error istrellis () +%!error istrellis (1,2) Added: trunk/octaveforge/main/comm/inst/poly2trellis.m ===================================================================  trunk/octaveforge/main/comm/inst/poly2trellis.m (rev 0) +++ trunk/octaveforge/main/comm/inst/poly2trellis.m 20120520 16:04:12 UTC (rev 10470) @@ 0,0 +1,201 @@ +## Copyright (C) 2012 Mike Miller <mtmiller@...> +## +## This program 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 3 of the License, or (at your option) any later +## version. +## +## This program 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 +## this program; if not, see <http://www.gnu.org/licenses/>;. + +## * texinfo * +## @deftypefn {Function File} {@var{t} =} poly2trellis (@var{m}, @var{g}) +## +## Convert convolutional code generator polynomials into trellis form. +## +## The arguments @var{m} and @var{g} together describe a rate k/n feedforward +## convolutional encoder. The output @var{t} is a trellis structure describing +## the same encoder with the fields listed below. +## +## The vector @var{m} is a kby1 array containing the lengths of each of the +## shift registers for the k input bits to the encoder. +## +## The matrix @var{g} is a kbyn octalvalue matrix describing the generation +## of each of the n outputs from each of the k inputs. For a particular entry +## of @var{g}, the leastsignificant bit corresponds to the mostdelayed input +## bit in the kth shiftregister. +## +## The returned trellis structure contains the following fields: +## +## @table @samp +## @item numInputSymbols +## The number of kbit input symbols possible, i.e. 2^k. +## +## @item numOutputSymbols +## The number of nbit output symbols possible, i.e. 2^n. +## +## @item numStates +## The number of states in the trellis. +## +## @item nextStates +## The state transition table for the trellis. The ith row contains the indices +## of the states reachable from the (i1)th state for each possible input +## symbol. +## +## @item outputs +## A table of octalencoded output values for the trellis. The ith row contains +## values representing the output symbols produced in the (i1)th state for each +## possible input symbol. +## @end table +## +## Input symbols, output symbols, and encoder states are all interpreted with +## the lowest indices being the most significant bits. +## +## References: +## +## [1] S. Lin and D. J. Costello, "Convolutional codes," in @cite{Error +## Control Coding}, 2nd ed. Upper Saddle River, NJ: Pearson, 2004, +## ch. 11, pp. 453513. +## +## @seealso{istrellis} +## @end deftypefn + +function t = poly2trellis (m, g) + + if (nargin != 2) + print_usage (); + endif + + ## Notation agrees with Lin & Costello for the most part: + ## m = length of each modulo2 adder + ## = 1 + nu(:) = one more than length of each shift register + ## g = generator sequences, kbyn + ## k = bits per input symbol = number of shift registers + ## n = bits per output symbol = number of modulo2 adders + [nr, k] = size(m); + if (nr != 1) + error ("poly2trellis: m must be a 1byk positive integer row vector"); + endif + if (any (m < 1)  any (m != fix (m))) + error ("poly2trellis: m must be a 1byk positive integer row vector"); + endif + + [nr, n] = size(g); + if (nr != k) + error ("poly2trellis: g must be a kbyn octal matrix"); + endif + + ## Convert g to decimal, let oct2dec validate the octal values + g = oct2dec (g); + + ## Check the ranges of the generators + ## nu = total number of linear shift registers for all k + nu = sum (m)  k; + + ## Number of states and input symbols needed to capture the state machine + nstates = 2^nu; + ninputs = 2^k; + noutputs = 2^n; + + t = struct ("numInputSymbols", ninputs, + "numOutputSymbols", noutputs, + "numStates", nstates, + "nextStates", zeros (nstates, ninputs), + "outputs", zeros (nstates, ninputs)); + + ## Split state indices into values for each distinct shift register. + ## Also precalculate new bit position for each shift register and the left + ## shifts required to reassemble the states into one state value. + ## + ## Conventions: + ##  Each shift register shifts to the right, MSBtoLSB + ##  The MSB of each shift register is the newest input + ##  The MSBs of the state represent the k=1 shift register + statebits = de2bi (0:nstates  1); + states = zeros (nstates, k); + newbit = zeros (1, k); + shifts = zeros (1, k); + offset = 1; + for i = 1:k + nu_i = m(i)  1; + if (nu_i > 0) + states(:,i) = bi2de (statebits(:, offset:offset + nu_i  1)); + endif + newbit(i) = bitshift (1, nu_i); + shifts(i) = offset  1; + offset += nu_i; + + if (any (g(i,:) >= 2^m(i))) + error ("poly2trellis: code size is greater than constraint length"); + endif + if (all (g(i,:) < 2^nu_i)  !any (mod (g(i,:), 2))) + error ("poly2trellis: code size is less than constraint length"); + endif + endfor + + ## Generate conversion list of all possible output octal values + outputs = str2num (dec2base (0:noutputs  1, 8)); + + ## Walk the trellis, each row index is state, each column index is input + for s = 1:nstates + + for i = 1:k + ## For each next input bit [0,1] calculate inputs to modulo2 adder + ## and the next state for the ith linear shift register, leftshifted + ## to be combined into the total state. + state = states(s,i) + [0; newbit(i)]; + next = bitshift (bitshift (state, 1), shifts(i)); + + ## Calculate the modulo2 sum of the state plus input for each n for + ## this particular shift register. + ## The MSB of the output represents the n=1 generator(s) + out = [0; 0]; + for adder = 1:n + val = mod (sum (de2bi (bitand (g(i, adder), state)), 2), 2); + out += bitshift(val, n  adder); + endfor + + ## Accumulate contributions to the trellis for this shift register. + ## The contribution to each input symbol depends on whether the + ## (ki)th bit is 0 or 1. + bitpos = k  i; + for symbol = 1:ninputs + idx = bitget (symbol  1, bitpos + 1) + 1; + t.nextStates(s, symbol) += next(idx); + t.outputs(s, symbol) = bitxor (t.outputs(s, symbol), out(idx)); + endfor + + endfor + + ## Convert output values to octal representation + t.outputs(s,:) = outputs(t.outputs(s,:) + 1); + + endfor + +endfunction + +%% Test the simple (2,1,3) encoder from Lin & Costello example 11.1 +%!test +%! T = struct ("numInputSymbols", 2, +%! "numOutputSymbols", 4, +%! "numStates", 8, +%! "nextStates", [0 4; 0 4; 1 5; 1 5; 2 6; 2 6; 3 7; 3 7], +%! "outputs", [0 3; 3 0; 3 0; 0 3; 1 2; 2 1; 2 1; 1 2]); +%! t = poly2trellis (4, [13 17]); +%! assert (t, T) +%! assert (istrellis (t), true) + +%% Test input validation +%!error poly2trellis () +%!error poly2trellis (1,2,3) +%!error poly2trellis (1) +%!error poly2trellis (2,8) +%!error poly2trellis (0,0) +%!error poly2trellis (2,0) +%!error poly2trellis (2,2) +%!error poly2trellis (2,7) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. 
From: <carandraug@us...>  20120413 09:08:08

Revision: 10205 http://octave.svn.sourceforge.net/octave/?rev=10205&view=rev Author: carandraug Date: 20120413 09:08:01 +0000 (Fri, 13 Apr 2012) Log Message:  convenc: new function for comm package by Anthony Richardson <ar63@...> on octaveforge mailing list Modified Paths:  trunk/octaveforge/main/comm/NEWS Added Paths:  trunk/octaveforge/main/comm/inst/convenc.m Modified: trunk/octaveforge/main/comm/NEWS ===================================================================  trunk/octaveforge/main/comm/NEWS 20120412 21:22:47 UTC (rev 10204) +++ trunk/octaveforge/main/comm/NEWS 20120413 09:08:01 UTC (rev 10205) @@ 1,6 +1,10 @@ Summary of important uservisible changes for communications 1.1.1:  + ** The following functions are new: + + convenc + ** The function `reedmullerdec' had a bug fix introduced on the previous release @@ 10,4 +14,3 @@ ** Use of deprecated functions has been removed ** Package is no longer automatically loaded.  Added: trunk/octaveforge/main/comm/inst/convenc.m ===================================================================  trunk/octaveforge/main/comm/inst/convenc.m (rev 0) +++ trunk/octaveforge/main/comm/inst/convenc.m 20120413 09:08:01 UTC (rev 10205) @@ 0,0 +1,50 @@ +## Copyright (C) 2012 Tony Richardson <richardson.tony@...> +## +## This program 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 3 of the License, or (at your option) any later +## version. +## +## This program 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 +## this program; if not, see <http://www.gnu.org/licenses/>;. + +%  Function File: convenv(m, G, k) +% Compute the output of an (n, k, L) convolutional encoder with vector input +% m and matrix of generator polynomials G. +% +% The input vector m can be of arbitrary length. G is a matrix with n rows +% and k*(L+1) columns. The rows of G are the generator polynomials for each +% of the n output bits (per k input bits). +% +% The output is a vector whose length is n*floor([length(m)+k*(L+1)1]/k). +% With two inputs, k is assumed to be equal to 1. +% +% Example 1: Compute the output from a (2, 1, 2) convolutional encoder +% with generator polynomials g1 = [ 1 1 1 ] and g2 = [ 1 0 1 ] +% when the input message is m = [ 1 1 0 1 1 1 0 0 1 0 0 0 ] +% +% x = convenc(m, [g1; g2]) +% x = 1101010001100111111011000000 +% +% Example 2: Compute the output from a (3, 2, 1) conv encoder with +% generator polynomials g1 = [ 1 0 1 1 ], g2 = [ 1 1 0 1 ] and +% g3 = [ 1 0 1 0 ] when the input is m = [ 0 1 1 0 0 0 1 1 ] +% +% x = convenc(m, [g1; g2; g3], 2) +% x = 111 111 110 101 +% +% Note: This function is not compatible with Matlab's convenc() + +function x = convenc(m, G, k=1) + % Use conv2 to do repeated 1d convolutions of m with each row of G. + % rem is used to transform the standard convolution result to one + % which uses modulo2 addition. Only cols with index a mult. of k + % are in the actual enc. output + + x = rem(conv2(1, m(:)', G),2)(:,!rem(1:numel(m),k))(:)'; +end This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. 
From: <mtmiller@us...>  20120505 00:05:15

Revision: 10363 http://octave.svn.sourceforge.net/octave/?rev=10363&view=rev Author: mtmiller Date: 20120505 00:05:09 +0000 (Sat, 05 May 2012) Log Message:  comm: marcumq function has been moved to the signal package Modified Paths:  trunk/octaveforge/main/comm/INDEX trunk/octaveforge/main/comm/NEWS Removed Paths:  trunk/octaveforge/main/comm/inst/marcumq.m Modified: trunk/octaveforge/main/comm/INDEX ===================================================================  trunk/octaveforge/main/comm/INDEX 20120505 00:04:13 UTC (rev 10362) +++ trunk/octaveforge/main/comm/INDEX 20120505 00:05:09 UTC (rev 10363) @@ 177,4 +177,3 @@ vec2mat qfunc qfuncinv  marcumq Modified: trunk/octaveforge/main/comm/NEWS ===================================================================  trunk/octaveforge/main/comm/NEWS 20120505 00:04:13 UTC (rev 10362) +++ trunk/octaveforge/main/comm/NEWS 20120505 00:05:09 UTC (rev 10363) @@ 1,6 +1,8 @@ Summary of important uservisible changes for communications 1.1.1:  + ** The function `marcumq' has been moved to the signal package + ** The following functions are new: convenc Deleted: trunk/octaveforge/main/comm/inst/marcumq.m ===================================================================  trunk/octaveforge/main/comm/inst/marcumq.m 20120505 00:04:13 UTC (rev 10362) +++ trunk/octaveforge/main/comm/inst/marcumq.m 20120505 00:05:09 UTC (rev 10363) @@ 1,49 +0,0 @@ ## Copyright (C) 2007 Sylvain Pelissier <sylvain.pelissier@...> ## ## This program 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 3 of the License, or (at your option) any later ## version. ## ## This program 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 ## this program; if not, see <http://www.gnu.org/licenses/>;.  ## * texinfo * ## @deftypefn {Function File} {[@var{Q}] =} marcumq (@var{a}, @var{b}, @var{m}) ## Compute the Marcum Q function. ## @end deftypefn  function Q = marcumq(a,b,m)   if nargin < 2  usage(" marcumq(a,b)\n\tmarcumq(a,b,m)");  end   if nargin < 3  m = 1;  end   l = max([size(a,1) size(b,1) size(m,1)]);  c = max([size(a,2) size(b,2) size(m,2)]);  a = padarray(a,[lsize(a,1) csize(a,2)],'replicate','post')  b = padarray(b,[lsize(b,1) csize(b,2)],'replicate','post');  m = padarray(m,[lsize(m,1) csize(m,2)],'replicate','post');   if (min(a(:)) < 0  min(b(:)) < 0)  error("a and b must be positive");  end   for n = 1:l  for o = 1:c  k = 1m(n,o):100;  v = (a(n,o)./b(n,o)).^k.*besseli(k,a(n,o).*b(n,o));  v = sum(v);  Q(n,o) = v.*exp((a(n,o).^2+b(n,o).^2)/2);  end  end endfunction This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. 
From: <jordigh@us...>  20120511 18:15:19

Revision: 10414 http://octave.svn.sourceforge.net/octave/?rev=10414&view=rev Author: jordigh Date: 20120511 18:15:13 +0000 (Fri, 11 May 2012) Log Message:  Version bump Modified Paths:  trunk/octaveforge/main/comm/DESCRIPTION trunk/octaveforge/main/comm/NEWS Modified: trunk/octaveforge/main/comm/DESCRIPTION ===================================================================  trunk/octaveforge/main/comm/DESCRIPTION 20120511 18:10:27 UTC (rev 10413) +++ trunk/octaveforge/main/comm/DESCRIPTION 20120511 18:15:13 UTC (rev 10414) @@ 1,5 +1,5 @@ Name: Communications Version: 1.1.0 +Version: 1.1.1 Date: 20111009 Author: Various Authors Maintainer: The Octave Community Modified: trunk/octaveforge/main/comm/NEWS ===================================================================  trunk/octaveforge/main/comm/NEWS 20120511 18:10:27 UTC (rev 10413) +++ trunk/octaveforge/main/comm/NEWS 20120511 18:15:13 UTC (rev 10414) @@ 13,6 +13,8 @@ ** The function `huffmandeco' has been rewritten and made more efficient and should perform faster + ** Fixed bug in `glu' which made it unusable + ** Use of deprecated functions has been removed ** Package is no longer automatically loaded. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. 
From: <carandraug@us...>  20120821 00:32:42

Revision: 10891 http://octave.svn.sourceforge.net/octave/?rev=10891&view=rev Author: carandraug Date: 20120821 00:32:36 +0000 (Tue, 21 Aug 2012) Log Message:  egolaydec: bug fix where the error flag was not given for more than 3 erroneous bits Modified Paths:  trunk/octaveforge/main/comm/NEWS trunk/octaveforge/main/comm/inst/egolaydec.m Modified: trunk/octaveforge/main/comm/NEWS ===================================================================  trunk/octaveforge/main/comm/NEWS 20120820 17:15:30 UTC (rev 10890) +++ trunk/octaveforge/main/comm/NEWS 20120821 00:32:36 UTC (rev 10891) @@ 5,6 +5,10 @@ istrellis poly2trellis + ** Fixed bug in `egolaydec' which gave an error when there were more + than the three allowed erroneous bits, rather than setting the + error flag. + Summary of important uservisible changes for communications 1.1.1:  Modified: trunk/octaveforge/main/comm/inst/egolaydec.m ===================================================================  trunk/octaveforge/main/comm/inst/egolaydec.m 20120820 17:15:30 UTC (rev 10890) +++ trunk/octaveforge/main/comm/inst/egolaydec.m 20120821 00:32:36 UTC (rev 10891) @@ 14,7 +14,7 @@ ## this program; if not, see <http://www.gnu.org/licenses/>;. ## * texinfo * ## @deftypefn {Function File} {} egolaydec (@var{R}) +## @deftypefn {Function File} {} egolaydec (@var{R}) ## ## Given @var{R}, the received Extended Golay code, this function tries to ## decode @var{R} using the Extended Golay code parity check matrix. @@ 37,7 +37,7 @@ ## ## @example ## @group ## M=[rand(10,12)>0.5]; +## M=[rand(10,12)>0.5]; ## C1=egolayenc(M); ## C1(:,1)=mod(C1(:,1)+1,2) ## C2=egolaydec(C1) @@ 80,12 +80,13 @@ S=mod(RR*H,2); wt=sum(S); done=0; + E=[S, zeros(1,12)]; if (wt <= 3) E=[S, zeros(1,12)]; done=1; else SP = mod(repmat(S,[12, 1])+P,2);  idx = find( sum(SP,2) <= 2 ); + idx = find( sum(SP,2) <= 2 ); if ( idx ) idx=idx(1); %pick first of matches. Ui=zeros(1,12); Ui(idx)=1; @@ 118,9 +119,5 @@ return; end %! %!assert(egolaydec([1 1 1 zeros(1,21)]),zeros(1,24)) %!assert(egolaydec([1 0 1 zeros(1,20) 1]),zeros(1,24)) %!   This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. 