[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.6 and 1.17

version 1.6, 2000/04/20 02:30:35 version 1.17, 2016/02/04 04:17:21
Line 1 
Line 1 
 /* $OpenXM$ */  /*
    * Copyright (c) 1994-2000 FUJITSU LABORATORIES LIMITED
    * All rights reserved.
    *
    * FUJITSU LABORATORIES LIMITED ("FLL") hereby grants you a limited,
    * non-exclusive and royalty-free license to use, copy, modify and
    * redistribute, solely for non-commercial and non-profit purposes, the
    * computer program, "Risa/Asir" ("SOFTWARE"), subject to the terms and
    * conditions of this Agreement. For the avoidance of doubt, you acquire
    * only a limited right to use the SOFTWARE hereunder, and FLL or any
    * third party developer retains all rights, including but not limited to
    * copyrights, in and to the SOFTWARE.
    *
    * (1) FLL does not grant you a license in any way for commercial
    * purposes. You may use the SOFTWARE only for non-commercial and
    * non-profit purposes only, such as academic, research and internal
    * business use.
    * (2) The SOFTWARE is protected by the Copyright Law of Japan and
    * international copyright treaties. If you make copies of the SOFTWARE,
    * with or without modification, as permitted hereunder, you shall affix
    * to all such copies of the SOFTWARE the above copyright notice.
    * (3) An explicit reference to this SOFTWARE and its copyright owner
    * shall be made on your publication or presentation in any form of the
    * results obtained by use of the SOFTWARE.
    * (4) In the event that you modify the SOFTWARE, you shall notify FLL by
    * 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
    * SOFTWARE.
    *
    * THE SOFTWARE IS PROVIDED AS IS WITHOUT ANY WARRANTY OF ANY KIND. FLL
    * MAKES ABSOLUTELY NO WARRANTIES, EXPRESSED, IMPLIED OR STATUTORY, AND
    * EXPRESSLY DISCLAIMS ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS
    * FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT OF THIRD PARTIES'
    * RIGHTS. NO FLL DEALER, AGENT, EMPLOYEES IS AUTHORIZED TO MAKE ANY
    * MODIFICATIONS, EXTENSIONS, OR ADDITIONS TO THIS WARRANTY.
    * UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, TORT, CONTRACT,
    * OR OTHERWISE, SHALL FLL BE LIABLE TO YOU OR ANY OTHER PERSON FOR ANY
    * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
    * DAMAGES OF ANY CHARACTER, INCLUDING, WITHOUT LIMITATION, DAMAGES
    * ARISING OUT OF OR RELATING TO THE SOFTWARE OR THIS AGREEMENT, DAMAGES
    * FOR LOSS OF GOODWILL, WORK STOPPAGE, OR LOSS OF DATA, OR FOR ANY
    * DAMAGES, EVEN IF FLL SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF
    * SUCH DAMAGES, OR FOR ANY CLAIM BY ANY OTHER PARTY. EVEN IF A PART
    * OF THE SOFTWARE HAS BEEN DEVELOPED BY A THIRD PARTY, THE THIRD PARTY
    * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE,
    * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE.
    *
    * $OpenXM: OpenXM_contrib2/asir2000/lib/sp,v 1.16 2010/07/14 04:48:14 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 11 
Line 60 
 #include "defs.h"  #include "defs.h"
   
 extern ASCENT,GCDTIME,UFTIME,RESTIME,SQTIME,PRINT$  extern ASCENT,GCDTIME,UFTIME,RESTIME,SQTIME,PRINT$
 extern Ord$  extern SpOrd$
   extern USE_PARI_FACTOR$
   
   /* gen_sp can handle non-monic poly */
   
   def gen_sp(P)
   {
           P = ptozp(P);
           V = var(P);
           D = deg(P,V);
           LC = coef(P,D,V);
           F = LC^(D-1)*subst(P,V,V/LC);
           /* F must be monic */
           L = sp(F);
           return cons(map(subst,car(L),V,LC*V),cdr(L));
   }
   
 def sp(P)  def sp(P)
 {  {
         RESTIME=UFTIME=GCDTIME=SQTIME=0;          RESTIME=UFTIME=GCDTIME=SQTIME=0;
Line 147  def flatmf(L) {
Line 211  def flatmf(L) {
 def af(P,AL)  def af(P,AL)
 {  {
         RESTIME=UFTIME=GCDTIME=SQTIME=0;          RESTIME=UFTIME=GCDTIME=SQTIME=0;
       V = var(P);
       LC = coef(P,deg(P,V),V);
       if ( ntype(LC) != 1 )
         P = simpalg(1/LC*P);
         S = reverse(asq(P));          S = reverse(asq(P));
         for ( L = []; S != []; S = cdr(S) ) {          for ( L = []; S != []; S = cdr(S) ) {
                 FM = car(S); F = FM[0]; M = FM[1];                  FM = car(S); F = FM[0]; M = FM[1];
Line 163  def af_sp(P,AL,HINT)
Line 231  def af_sp(P,AL,HINT)
 {  {
         if ( !P || type(P) == NUM )          if ( !P || type(P) == NUM )
                 return [P];                  return [P];
       V = var(P);
       LC = coef(P,deg(P,V),V);
       if ( ntype(LC) != 1 )
         P = simpalg(1/LC*P);
         P1 = simpcoef(simpalg(P));          P1 = simpcoef(simpalg(P));
         return af_spmain(P1,AL,1,HINT,P1,[]);          return af_spmain(P1,AL,1,HINT,P1,[]);
 }  }
Line 544  def simpcoef(P) {
Line 616  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 580  def ufctrhint2(P,HINT,PP,AL)
Line 667  def ufctrhint2(P,HINT,PP,AL)
                 return [[P,1]];                  return [[P,1]];
         if ( AL == [] )          if ( AL == [] )
                 return ufctrhint(P,HINT);                  return ufctrhint(P,HINT);
   
           /* if P != norm(PP) then call the generic ufctrhint() */
           for ( T = AL, E = 1; T != []; T = cdr(T) ) {
                   D = defpoly(car(T)); E *= deg(D,var(D));
           }
           if ( E*deg(PP,var(PP)) != deg(P,var(P)) )
                   return ufctrhint(P,HINT);
   
           /* P = norm(PP) */
         L = resfctr(algptorat(PP),map(defpoly,AL),map(algtorat,AL),P);          L = resfctr(algptorat(PP),map(defpoly,AL),map(algtorat,AL),P);
         for ( T = reverse(L[1]), DL = []; T != []; T = cdr(T) )          for ( T = reverse(L[1]), DL = []; T != []; T = cdr(T) )
                 DL = cons(deg(car(car(T)),a_),DL);                  DL = cons(deg(car(car(T)),a_),DL);
Line 724  def norm_ch_lag(V,VM,P,P0) {
Line 820  def norm_ch_lag(V,VM,P,P0) {
   
 def cr_gcda(P1,P2)  def cr_gcda(P1,P2)
 {  {
         if ( !(V = var(P1)) || !var(P2) )          if ( !P1 )
                   return P2;
           if ( !P2 )
                   return P1;
           if ( !var(P1) || !var(P2) )
                 return 1;                  return 1;
           V = var(P1);
         EXT = union_sort(getalgtreep(P1),getalgtreep(P2));          EXT = union_sort(getalgtreep(P1),getalgtreep(P2));
         if ( EXT == [] )          if ( EXT == [] )
                 return gcd(P1,P2);                  return gcd(P1,P2);
Line 753  def cr_gcda(P1,P2)
Line 854  def cr_gcda(P1,P2)
                                 break;                                  break;
                 if ( J != length(DL) )                  if ( J != length(DL) )
                         continue;                          continue;
                 Ord = 2; NOSUGAR = 1;                  SpOrd = 2; NOSUGAR = 1;
                 T = ag_mod(G1 % MOD,G2 % MOD,ML,VL,MOD);                  T = ag_mod(G1 % MOD,G2 % MOD,ML,VL,MOD);
                 if ( dp_gr_print() )                  if ( dp_gr_print() )
                         print(".");                          print(".");
Line 967  def ag_mod(F1,F2,D,VL,MOD)
Line 1068  def ag_mod(F1,F2,D,VL,MOD)
         VL = cons(V,VL); B = append([F1,F2],D); N = length(VL);          VL = cons(V,VL); B = append([F1,F2],D); N = length(VL);
     while ( 1 ) {      while ( 1 ) {
                 FLAGS = dp_gr_flags(); dp_gr_flags(["Reverse",1,"NoSugar",1]);                  FLAGS = dp_gr_flags(); dp_gr_flags(["Reverse",1,"NoSugar",1]);
                 G = dp_gr_mod_main(B,VL,0,MOD,Ord);                  G = dp_gr_mod_main(B,VL,0,MOD,SpOrd);
                 dp_gr_flags(FLAGS);                  dp_gr_flags(FLAGS);
                 if ( length(G) == 1 )                  if ( length(G) == 1 )
                         return 1;                          return 1;
Line 1201  def ag_mod_single6(F1,F2,D,MOD)
Line 1302  def ag_mod_single6(F1,F2,D,MOD)
   
 def inverse_by_gr_mod(C,D,MOD)  def inverse_by_gr_mod(C,D,MOD)
 {  {
         Ord = 2;          SpOrd = 2;
         dp_gr_flags(["NoSugar",1]);          dp_gr_flags(["NoSugar",1]);
         G = dp_gr_mod_main(cons(x*C-1,D),cons(x,vars(D)),0,MOD,Ord);          G = dp_gr_mod_main(cons(x*C-1,D),cons(x,vars(D)),0,MOD,SpOrd);
         dp_gr_flags(["NoSugar",0]);          dp_gr_flags(["NoSugar",0]);
         if ( length(G) == 1 )          if ( length(G) == 1 )
                 return 1;                  return 1;
Line 1262  def resfctr(F,L,V,N)
Line 1363  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++;
Line 1287  def resfctr_mod(F,L,M)
Line 1392  def resfctr_mod(F,L,M)
                 C = res(var(MP),B,MP) % M;                  C = res(var(MP),B,MP) % M;
                 R = cons(flatten(cdr(modfctr(C,M))),R);                  R = cons(flatten(cdr(modfctr(C,M))),R);
         }          }
         return R;          return reverse(R);
 }  }
   
 def flatten(L)  def flatten(L)
Legend:
Removed from v.1.6  
changed lines
  Added in v.1.17
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>