[BACK]Return to sp CVS log [TXT][DIR] Up to [local] / OpenXM_contrib2 / asir2000 / lib

Diff for /OpenXM_contrib2/asir2000/lib/sp between version 1.7 and 1.10

version 1.7, 2000/08/21 08:31:43 version 1.10, 2002/06/21 00:34:21
Line 23 
Line 23 
  * shall be made on your publication or presentation in any form of the   * shall be made on your publication or presentation in any form of the
  * results obtained by use of the SOFTWARE.   * results obtained by use of the SOFTWARE.
  * (4) In the event that you modify the SOFTWARE, you shall notify FLL by   * (4) In the event that you modify the SOFTWARE, you shall notify FLL by
  * e-mail at risa-admin@flab.fujitsu.co.jp of the detailed specification   * e-mail at risa-admin@sec.flab.fujitsu.co.jp of the detailed specification
  * for such modification or the source code of the modified part of the   * for such modification or the source code of the modified part of the
  * SOFTWARE.   * SOFTWARE.
  *   *
Line 45 
Line 45 
  * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE,   * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE,
  * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE.   * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE.
  *   *
  * $OpenXM: OpenXM_contrib2/asir2000/lib/sp,v 1.6 2000/04/20 02:30:35 noro Exp $   * $OpenXM: OpenXM_contrib2/asir2000/lib/sp,v 1.9 2001/10/12 06:07:05 noro Exp $
 */  */
 /*  /*
         sp : functions related to algebraic number fields          sp : functions related to algebraic number fields
   
         Revision History:          Revision History:
   
           2001/10/12    noro    if USE_PARI_FACTOR is nonzero, pari factor is called
         2000/03/10    noro    fixed several bugs around gathering algebraic numbers          2000/03/10    noro    fixed several bugs around gathering algebraic numbers
         1999/08/24    noro    modified for 1999 release version          1999/08/24    noro    modified for 1999 release version
 */  */
Line 60 
Line 61 
   
 extern ASCENT,GCDTIME,UFTIME,RESTIME,SQTIME,PRINT$  extern ASCENT,GCDTIME,UFTIME,RESTIME,SQTIME,PRINT$
 extern Ord$  extern Ord$
   extern USE_PARI_FACTOR$
   
 def sp(P)  def sp(P)
 {  {
Line 592  def simpcoef(P) {
Line 594  def simpcoef(P) {
 }  }
   
 def ufctrhint_heuristic(P,HINT,PP,SHIFT) {  def ufctrhint_heuristic(P,HINT,PP,SHIFT) {
           if ( USE_PARI_FACTOR )
                   return pari_ufctr(P);
           else
                   return asir_ufctrhint_heuristic(P,HINT,PP,SHIFT);
   }
   
   def pari_ufctr(P) {
           F = pari(factor,P);
           S = size(F);
           for ( I = S[0]-1, R = []; I >= 0; I-- )
                   R = cons(vtol(F[I]),R);
           return cons([1,1],R);
   }
   
   def asir_ufctrhint_heuristic(P,HINT,PP,SHIFT) {
         V = var(P); D = deg(P,V);          V = var(P); D = deg(P,V);
         if ( D == HINT )          if ( D == HINT )
                 return [[P,1]];                  return [[P,1]];
Line 1310  def resfctr(F,L,V,N)
Line 1327  def resfctr(F,L,V,N)
         N = ptozp(N);          N = ptozp(N);
         V0 = var(N);          V0 = var(N);
         DN = diff(N,V0);          DN = diff(N,V0);
           LC = coef(N,deg(N,V0),V0);
           LCD = coef(DN,deg(DN,V0),V0);
         for ( I = 0, J = 2, Len = deg(N,V0)+1; I < 5; J++ ) {          for ( I = 0, J = 2, Len = deg(N,V0)+1; I < 5; J++ ) {
                 M = prime(J);                  M = prime(J);
                   if ( !(LC%M) || !(LCD%M))
                           continue;
                 G = gcd(N,DN,M);                  G = gcd(N,DN,M);
                 if ( !deg(G,V0) ) {                  if ( !deg(G,V0) ) {
                         I++;                          I++;
Legend:
Removed from v.1.7  
changed lines
  Added in v.1.10
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>