[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.12 and 1.15

version 1.12, 2004/01/07 08:23:11 version 1.15, 2006/06/23 08:57:47
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.11 2003/02/07 09:25:58 noro Exp $   * $OpenXM: OpenXM_contrib2/asir2000/lib/sp,v 1.14 2005/08/18 23:35:20 noro Exp $
 */  */
 /*  /*
         sp : functions related to algebraic number fields          sp : functions related to algebraic number fields
Line 659  def ufctrhint2(P,HINT,PP,AL)
Line 659  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 803  def norm_ch_lag(V,VM,P,P0) {
Line 812  def norm_ch_lag(V,VM,P,P0) {
   
 def cr_gcda(P1,P2)  def cr_gcda(P1,P2)
 {  {
         if ( !var(P1) )          if ( !P1 )
                 return P2;                  return P2;
         else if ( !var(P2) )          if ( !P2 )
                 return P1;                  return P1;
           if ( !var(P1) || !var(P2) )
                   return 1;
         V = var(P1);          V = var(P1);
         EXT = union_sort(getalgtreep(P1),getalgtreep(P2));          EXT = union_sort(getalgtreep(P1),getalgtreep(P2));
         if ( EXT == [] )          if ( EXT == [] )
Line 1373  def resfctr_mod(F,L,M)
Line 1384  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.12  
changed lines
  Added in v.1.15
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>