Update of /cvsroot/octave/octave-forge/main/comm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18501
Modified Files:
cyclgen.cc cyclpoly.cc
Log Message:
Yet another attemptted fix for cyclpoly/cyclgen, I think this one is right
Index: cyclgen.cc
===================================================================
RCS file: /cvsroot/octave/octave-forge/main/comm/cyclgen.cc,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- cyclgen.cc 16 Jun 2004 23:41:48 -0000 1.6
+++ cyclgen.cc 21 Jun 2004 09:15:45 -0000 1.7
@@ -223,7 +223,6 @@
mask <<= 1;
if (mask & ((unsigned long long)1<<mm))
mask ^= p;
- mask &= n;
}
Matrix parity(mm,n,0);
Index: cyclpoly.cc
===================================================================
RCS file: /cvsroot/octave/octave-forge/main/comm/cyclpoly.cc,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- cyclpoly.cc 16 Jun 2004 23:29:54 -0000 1.5
+++ cyclpoly.cc 21 Jun 2004 09:15:45 -0000 1.6
@@ -80,7 +80,7 @@
y(0) = 1;
y(n) = 1;
x(0) = 1;
- for (int i=0; i < n+1; i++)
+ for (int i=0; i < m+1; i++)
a(i) = (a1 & (1UL << i) ? 1 : 0);
Array<int> b = filter_gf2 (y, a, x, n);
@@ -188,7 +188,7 @@
switch (type) {
case CYCLIC_POLY_MIN:
cyclic_polys.resize(1);
- for (unsigned long long i = ((unsigned long long)1<<m)+1; i < ((unsigned long long)1<<(1+m)); i+=2)
+ for (unsigned long long i = (1UL<<m)+1; i < (1UL<<(1+m)); i+=2)
if (do_is_cyclic_polynomial(i, n, m)) {
cyclic_polys(0) = (double)i;
break;
@@ -196,14 +196,14 @@
break;
case CYCLIC_POLY_MAX:
cyclic_polys.resize(1);
- for (unsigned long long i = ((unsigned long long)1<<(m+1))-1; i > ((unsigned long long)1<<m); i-=2)
+ for (unsigned long long i = (1UL<<(m+1))-1; i > (1UL<<m); i-=2)
if (do_is_cyclic_polynomial(i, n, m)) {
cyclic_polys(0) = (double)i;
break;
}
break;
case CYCLIC_POLY_ALL:
- for (unsigned long long i = ((unsigned long long)1<<m)+1; i < ((unsigned long long)1<<(1+m)); i+=2)
+ for (unsigned long long i = (1UL<<m)+1; i < (1UL<<(1+m)); i+=2)
if (do_is_cyclic_polynomial(i, n, m)) {
cyclic_polys.resize(cyclic_polys.length()+1);
cyclic_polys(cyclic_polys.length()-1) = (double)i;
|