[BACK]Return to dist.c CVS log [TXT][DIR] Up to [local] / OpenXM_contrib2 / asir2018 / engine

Diff for /OpenXM_contrib2/asir2018/engine/dist.c between version 1.7 and 1.8

version 1.7, 2019/09/06 00:11:59 version 1.8, 2019/09/13 02:04:42
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/asir2018/engine/dist.c,v 1.6 2019/09/05 08:49:43 noro Exp $   * $OpenXM: OpenXM_contrib2/asir2018/engine/dist.c,v 1.7 2019/09/06 00:11:59 noro Exp $
 */  */
 #include "ca.h"  #include "ca.h"
   
Line 2716  NODE dpm_reduceall(NODE in)
Line 2716  NODE dpm_reduceall(NODE in)
   for ( i = 0, t = in; i < n; i++, t = NEXT(t) ) ps[i] = BDY(t);    for ( i = 0, t = in; i < n; i++, t = NEXT(t) ) ps[i] = BDY(t);
   for ( i = 0; i < n; i++ ) {    for ( i = 0; i < n; i++ ) {
     g = ps[i]; ps[i] = 0;      g = ps[i]; ps[i] = 0;
     dpm_nf_z(0,g,psv,1,DP_Multiple,&r);  //    dpm_nf_z(0,g,psv,1,DP_Multiple,&ps[i]);
     ps[i] = r;      dpm_nf_z(0,g,psv,1,0,&ps[i]);
   }    }
   t = 0;    t = 0;
   for ( i = n-1; i >= 0; i-- ) {    for ( i = n-1; i >= 0; i-- ) {
Line 2727  NODE dpm_reduceall(NODE in)
Line 2727  NODE dpm_reduceall(NODE in)
   return t;    return t;
 }  }
   
   struct oEGT egra;
   
 void dpm_schreyer_base(LIST g,LIST *s)  void dpm_schreyer_base(LIST g,LIST *s)
 {  {
   NODE nd,t,b0,b;    NODE nd,t,b0,b;
Line 2740  void dpm_schreyer_base(LIST g,LIST *s)
Line 2742  void dpm_schreyer_base(LIST g,LIST *s)
   DPM *ps;    DPM *ps;
   VECT psv;    VECT psv;
   DP **m,*quo;    DP **m,*quo;
   struct oEGT eg_nf,eg0,eg1;    struct oEGT eg0,eg1;
   extern struct oEGT egc,egcomp;    extern struct oEGT egred;
   
 //  init_eg(&eg_nf);    init_eg(&egra);
 //  init_eg(&egcomp);  
   nd = BDY(g);    nd = BDY(g);
   n = length(nd);    n = length(nd);
   MKVECT(psv,n);    MKVECT(psv,n);
Line 2753  void dpm_schreyer_base(LIST g,LIST *s)
Line 2754  void dpm_schreyer_base(LIST g,LIST *s)
   nv = ps[0]->nv;    nv = ps[0]->nv;
   m = (DP **)almat_pointer(n,n);    m = (DP **)almat_pointer(n,n);
   b0 = 0;    b0 = 0;
 //  init_eg(&egc);  
   for ( i = 0; i < n; i++ ) {    for ( i = 0; i < n; i++ ) {
     // sp(ps[i],ps[j]) = ti*ps[i]-tj*ps[j] => m[i][j] = ti      // sp(ps[i],ps[j]) = ti*ps[i]-tj*ps[j] => m[i][j] = ti
     for ( j = i+1; j < n; j++ ) m[i][j] = dpm_sp_hm(ps[i],ps[j]);      for ( j = i+1; j < n; j++ ) m[i][j] = dpm_sp_hm(ps[i],ps[j]);
     for ( j = i+1; j < n; j++ ) {      for ( j = i+1; j < n; j++ ) {
 //    for ( j = n-1; j > i; j-- ) {  
       if ( !m[i][j] ) continue;        if ( !m[i][j] ) continue;
       for ( h = m[i][j], k = i+1; k < n; k++ )        for ( h = m[i][j], k = i+1; k < n; k++ )
         if ( k != j && m[i][k] && dp_redble(m[i][k],h) ) m[i][k] = 0;          if ( k != j && m[i][k] && dp_redble(m[i][k],h) ) m[i][k] = 0;
Line 2766  void dpm_schreyer_base(LIST g,LIST *s)
Line 2765  void dpm_schreyer_base(LIST g,LIST *s)
     for ( j = i+1; j < n; j++ ) {      for ( j = i+1; j < n; j++ ) {
       if ( m[i][j] ) {        if ( m[i][j] ) {
         dpm_sp(ps[i],ps[j],&sp,&t1,&t2);          dpm_sp(ps[i],ps[j],&sp,&t1,&t2);
 //        get_eg(&eg0);  
         quo = dpm_nf_and_quotient(0,sp,psv,&nf,&dn);          quo = dpm_nf_and_quotient(0,sp,psv,&nf,&dn);
 //        get_eg(&eg1); add_eg(&eg_nf,&eg0,&eg1);  
         if ( nf )          if ( nf )
           error("dpm_schreyer_base : cannot happen");            error("dpm_schreyer_base : cannot happen");
         NEWDMM(r0); r = r0;          NEWDMM(r0); r = r0;
Line 2797  void dpm_schreyer_base(LIST g,LIST *s)
Line 2794  void dpm_schreyer_base(LIST g,LIST *s)
     BDY(t) = (pointer)dpm;      BDY(t) = (pointer)dpm;
   }    }
   b0 = dpm_sort_list(b0);    b0 = dpm_sort_list(b0);
 //  b0 = dpm_reduceall(b0);  // get_eg(&eg0);
     b0 = dpm_reduceall(b0);
   // get_eg(&eg1); add_eg(&egra,&eg0,&eg1); print_eg("RA",&egra);
   MKLIST(*s,b0);    MKLIST(*s,b0);
 //  print_eg("nf",&eg_nf); printf("\n");  //  print_eg("red",&egred); printf("\n");
 //  print_eg("coef",&egc); printf("\n");  
 }  }
   
 int compdmm_schreyer(int n,DMM m1,DMM m2)  int compdmm_schreyer(int n,DMM m1,DMM m2)
Line 2964  void chsgndpm(DPM p,DPM *pr)
Line 2962  void chsgndpm(DPM p,DPM *pr)
     NEXT(mr) = 0; MKDPM(NV(p),mr0,*pr);      NEXT(mr) = 0; MKDPM(NV(p),mr0,*pr);
     if ( *pr )      if ( *pr )
       (*pr)->sugar = p->sugar;        (*pr)->sugar = p->sugar;
     }
   }
   
   void mulcmp(Obj c,MP m)
   {
     MP t;
     Obj c1;
   
     for ( t = m; t; t = NEXT(t) ) {
       arf_mul(CO,c,C(t),&c1); C(t) = c1;
     }
   }
   
   void mulcdmm(Obj c,DMM m)
   {
     DMM t;
     Obj c1;
   
     for ( t = m; t; t = NEXT(t) ) {
       arf_mul(CO,c,C(t),&c1); C(t) = c1;
   }    }
 }  }
   
Legend:
Removed from v.1.7  
changed lines
  Added in v.1.8
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>