===================================================================
RCS file: /home/cvs/OpenXM/doc/compalg/factor.tex,v
retrieving revision 1.3
retrieving revision 1.6
diff -u -p -r1.3 -r1.6
--- OpenXM/doc/compalg/factor.tex	2000/03/28 02:02:29	1.3
+++ OpenXM/doc/compalg/factor.tex	2001/02/27 08:07:24	1.6
@@ -1,4 +1,4 @@
-%$OpenXM$
+%$OpenXM: OpenXM/doc/compalg/factor.tex,v 1.5 2001/02/07 07:17:46 noro Exp $
 \chapter{$BB?9`<0$N0x?tJ,2r(B}
 
 \section{$BM-8BBN(B}
@@ -195,7 +195,7 @@ $$\GCD(\prod_k g_k,\sum_i n_i g'_i \prod_{k\neq i}g_k)
 \begin{al}($BL5J?J}J,2r(B)
 \label{sqfrmod}
 \begin{tabbing}
-Input : $f(x) \in K[x]$ ($K$ $B$OI8?t(B $p>0$ $B$NBN(B)\\
+Input : $f(x) \in K[x]$ ($K$ $B$OI8?t(B $p>0$ $B$NM-8BBN(B)\\
 Output : $f$ $B$NL5J?J}J,2r(B $f= g_1^{n_1}g_2^{n_2}\cdots$\\
 $F \leftarrow 1$\\
 if \= $f'\neq 0$ \{\\
@@ -411,7 +411,7 @@ $\GCD(\Tr(e),f) = 1 \Leftrightarrow$ $B$9$Y$F$N(B $i
 \end{center}
 $s \in GF(q)$ $B$H$9$k;~(B, $\Tr(s) \equiv 0, 1$ $B$J$k85$O$=$l$>$l(B $q/2$ $B8D(B. 
 $B$h$C$F(B, $\GCD(\Tr(e),f) = f$, $\GCD(\Tr(e),f) = 1$ $B$J$k3NN((B
-$B$O$=$l$>$l(B $1/2^k$ $B8D$H$J$k(B. \qed\\
+$B$O$=$l$>$l(B $1/2^k$ $B$H$J$k(B. \qed\\
 $B$3$l$i$r$b$H$K(B, $B<!$N$h$&$J%"%k%4%j%:%`$rF@$k(B. 
 
 \begin{al}(Cantor-Zassenhaus{\rm\cite{CZ}})
@@ -423,16 +423,22 @@ $Q \leftarrow \pi$ $B$N9TNsI=8=(B\\
 $\{e_1 = 1, e_2, \cdots, e_r\} \leftarrow \Ker(Q-I)$ $B$N(B $K$-$B4pDl(B\\
 if ($r = 1$) then return $F$\\
 while\= ($|F| < r$) do \{\\
-\> $g \leftarrow F$ $B$N85(B, \quad $F \leftarrow F \backslash \{g\}$\\
 \> $(c_1,\cdots,c_r) \leftarrow$ $BMp?t%Y%/%H%k(B ($c_i \in GF(q)$)\\
 \> $e \leftarrow \sum c_ie_i$ \\
 \> if \= $p=2$\\
-\>\> $E \leftarrow \Tr(e)$\\
+\>\> $E \leftarrow \Tr(e) \bmod f$\\
 \>else\\
-\>\> $E \leftarrow e^{(q-1)/2}-1$\\
-\> $h \leftarrow \GCD(g,E)$\\
-\> if $h \neq 1,g$\\
-\>\> $F \leftarrow F \cup \{h,g/h\}$\\
+\>\> $E \leftarrow e^{(q-1)/2}-1 \bmod f$\\
+\> $F_1 \leftarrow \emptyset$\\
+\> while \= ($F \neq \emptyset$) do \{\\
+\>        \> $g \leftarrow F$ $B$N85(B, \quad $F \leftarrow F \backslash \{g\}$\\
+\>        \> $h \leftarrow \GCD(g,E)$\\
+\>        \> if \= $h \neq 1,g$\\
+\>        \> \> $F_1 \leftarrow F_1 \cup \{h,g/h\}$\\
+\>        \> else \\
+\>        \> \> $F_1 \leftarrow F_1 \cup \{g\}$\\
+\> \}\\
+\>   $F \leftarrow F_1$ \\
 \}\\
 return F
 \end{tabbing}
@@ -493,7 +499,7 @@ $q=p^n$ $B$G(B $p$ $B$,4qAG?t$H$9$k(B. $f=f_1f_2$ 
 $B$D$N(B $d$ $B<!4{Ls0x;R$H$9$k(B. $GF(q)$ $B>e$N(B $B9b!9(B $2d-1$ $B<!<0(B $g$ $B$r%i%s%@%`$KA*(B
 $B$V$H$-(B, 
 $\GCD(g^{(q^d-1)/2}-1,f)=f_1$ $B$^$?$O(B $f_2$
-$B$H$J$k3NN($O(B $1-1/(2q^d)$.
+$B$H$J$k3NN($O(B $1/2-1/(2q^d)$.
 \end{pr}
 \proof
 $f_1$, $f_2$ $B$,(B $d$ $B<!4{Ls$h$j(B, 
@@ -513,7 +519,7 @@ GF(q^d)\bigoplus GF(q^d)$ $B$N85$KBP$7(B, $BB?9`<0$
 $B$h$C$F(B, $2d-1$ $B0J2<$NB?9`<0(B $q^{2d}$ $B8D$N$&$A(B,
 $\GCD(g^{(q^d-1)/2}-1,f)=f_1$ $B$^$?$O(B $f_2$ $B$H$J$k$N$O(B, 
 $$2(q^d-1)/2\cdot (q^d+1)/2 = (q^{2d}-1)/2$$
-$B8D$G$"$j(B, $B3NN($O(B $1-1/(2q^{2d}).$ \qed
+$B8D$G$"$j(B, $B3NN($O(B $1/2-1/(2q^{2d}).$ \qed
 
 \begin{pr}
 $q=2^n$ $B$H$9$k(B. $f=f_1f_2$ $B$G(B$f_1$, $f_2$ $B$,(B $f$ $B$N(B 2 
@@ -554,15 +560,21 @@ Input : $f(x) \in GF(q)[x]$, $q=p^n$, $f$ $B$OL5J?J}$
 Output : $f(x) = \prod f_i$, $f$ $B$N(B $B4{Ls0x;RJ,2r(B\\
 $r \leftarrow \deg(f)/d,\quad F \leftarrow \{f\}$\\
 while\= ($|F| < r$) do \{\\
-\> $h \leftarrow F$ $B$N(B $\deg(h)>d$ $B$J$k85(B,\quad $F \leftarrow F \backslash \{h\}$\\
 \> $g \leftarrow 2d-1$ $B<!$N%i%s%@%`$JB?9`<0(B\\
 \> if \= $p=2$\\
-\>\>$G \leftarrow \sum_{j=0}^{rd-1}g^{2^i}$\\
+\>\>$G \leftarrow \sum_{j=0}^{rd-1}g^{2^i} \bmod f$\\
 \> else\\
-\>\> $G \leftarrow g^{(q^d-1)/2}-1$\\
-\> $z \leftarrow \GCD(h,G)$\\
-\> if $z \neq 1,h$ \\
-\>\> $F \leftarrow F \cup \{z,h/z\}$\\
+\>\> $G \leftarrow g^{(q^d-1)/2}-1 \bmod f$\\
+\> $F_1 \leftarrow \emptyset$\\
+\> while \= ($F \neq \emptyset$) do \{\\
+\> 	  \> $h \leftarrow F$ $B$N(B $\deg(h)>d$ $B$J$k85(B,\quad $F \leftarrow F \backslash \{h\}$\\
+\>        \> $z \leftarrow \GCD(h,G)$\\
+\>        \> if \= $z \neq 1,h$\\
+\>        \> \> $F_1 \leftarrow F_1 \cup \{z,h/z\}$\\
+\>        \> else \\
+\>        \> \> $F_1 \leftarrow F_1 \cup \{h\}$\\
+\> \}\\
+\>   $F \leftarrow F_1$ \\
 \}\\
 return $F$\\
 \end{tabbing}