===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2018/engine/dist.c,v
retrieving revision 1.19
retrieving revision 1.26
diff -u -p -r1.19 -r1.26
--- OpenXM_contrib2/asir2018/engine/dist.c	2019/12/27 08:13:59	1.19
+++ OpenXM_contrib2/asir2018/engine/dist.c	2021/12/23 08:55:33	1.26
@@ -45,7 +45,7 @@
  * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE,
  * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE.
  *
- * $OpenXM: OpenXM_contrib2/asir2018/engine/dist.c,v 1.18 2019/12/12 04:44:59 noro Exp $
+ * $OpenXM: OpenXM_contrib2/asir2018/engine/dist.c,v 1.25 2021/01/11 08:37:44 noro Exp $
 */
 #include "ca.h"
 
@@ -210,6 +210,7 @@ void initd(struct order_spec *spec)
 
 int dpm_ordtype;
 
+#if 0
 void ptod(VL vl,VL dvl,P p,DP *pr)
 {
   int n,i,j,k;
@@ -267,7 +268,61 @@ void ptod(VL vl,VL dvl,P p,DP *pr)
     dp_fcoeffs = N_GFS;
 #endif
 }
+#else
+void ptod(VL vl,VL dvl,P p,DP *pr)
+{
+  int n,i,j,k;
+  VL tvl;
+  V v;
+  DL d;
+  MP m;
+  DCP dc;
+  DP *y;
+  DP r,s,t,u;
+  P x,c;
 
+  if ( !p )
+    *pr = 0;
+  else if ( OID(p) > O_P )
+    error("ptod : only polynomials can be converted.");
+  else {
+    for ( n = 0, tvl = dvl; tvl; tvl = NEXT(tvl), n++ );
+    if ( NUM(p) ) {
+      NEWDL(d,n);
+      NEWMP(m); m->dl = d; C(m) = (Obj)p; NEXT(m) = 0; MKDP(n,m,*pr); (*pr)->sugar = 0;
+    } else {
+      for ( i = 0, tvl = dvl, v = VR(p); tvl && tvl->v != v; tvl = NEXT(tvl), i++ );
+      for ( dc = DC(p), k = 0; dc; dc = NEXT(dc), k++ );
+      y = (DP *)ALLOCA(k*sizeof(DP));
+      if ( !tvl ) {
+        MKV(v,x);
+        for ( dc = DC(p), j = 0; dc; dc = NEXT(dc), j++ ) {
+          ptod(vl,dvl,COEF(dc),&t); pwrp(vl,x,DEG(dc),&c);
+          muldc(vl,t,(Obj)c,&y[j]);
+        }
+      } else {
+        for ( dc = DC(p), j = 0; dc; dc = NEXT(dc), j++ ) {
+          ptod(vl,dvl,COEF(dc),&t);
+          NEWDL(d,n); 
+          d->d[i] = ZTOS(DEG(dc));
+          d->td = MUL_WEIGHT(d->d[i],i);
+          NEWMP(m); m->dl = d; C(m) = (Obj)ONE; NEXT(m) = 0; MKDP(n,m,u); u->sugar = d->td;
+          comm_muld(vl,t,u,&y[j]); 
+        }
+      }
+      for ( j = k-1, s = 0; j >= 0; j-- ) {
+        addd(vl,y[j],s,&t); s = t;
+      }
+      *pr = s;
+    }
+  }
+#if 0
+  if ( !dp_fcoeffs && has_sfcoef(*pr) )
+    dp_fcoeffs = N_GFS;
+#endif
+}
+#endif
+
 void dtop(VL vl,VL dvl,DP p,Obj *pr)
 {
   int n,i,j,k;
@@ -582,6 +637,16 @@ void _adddl(int n,DL d1,DL d2,DL d3)
     d3->d[i] = d1->d[i]+d2->d[i];
 }
 
+void _subdl(int n,DL d1,DL d2,DL d3)
+{
+  int i;
+
+  d3->td = d1->td-d2->td;
+  for ( i = 0; i < n; i++ )
+    d3->d[i] = d1->d[i]-d2->d[i];
+}
+
+
 void _addtodl(int n,DL d1,DL d2)
 {
   int i;
@@ -591,6 +656,15 @@ void _addtodl(int n,DL d1,DL d2)
     d2->d[i] += d1->d[i];
 }
 
+void _subfromdl(int n,DL d1,DL d2)
+{
+  int i;
+
+  d2->td -= d1->td;
+  for ( i = 0; i < n; i++ )
+    d2->d[i] -= d1->d[i];
+}
+
 void _copydl(int n,DL d1,DL d2)
 {
   int i;
@@ -2755,6 +2829,7 @@ DPM dpm_sp_nf_asir(VECT psv,int i,int j,DPM *nf);
 void dpm_sort(DPM p,DPM *r);
 
 extern int DP_Multiple;
+extern int DP_Print;
 
 void dpm_nf_z(NODE b,DPM g,VECT psv,int full,int multiple,DPM *rp);
 NODE dpm_sort_list(NODE l);
@@ -3039,7 +3114,7 @@ int compdp_lex(DP *a,DP *b)
   return -cmpdl_lex(compdp_nv,BDY(*a)->dl,BDY(*b)->dl);
 }
 
-DMMstack_array dpm_schreyer_frame(NODE g)
+DMMstack_array dpm_schreyer_frame(NODE g,int lex)
 {
   LIST l;
   NODE nd,in,b0,b,n1,n2,n3,t;
@@ -3087,8 +3162,8 @@ DMMstack_array dpm_schreyer_frame(NODE g)
     }
     s = s1;
     level++;
+    if ( DP_Print ) printf("level=%d,len=%d\n",level,n);
 
-
     /* create new list */
     MKVECT(psv,n+1);
     ps = (DPM *)BDY(psv);
@@ -3122,28 +3197,28 @@ DMMstack_array dpm_schreyer_frame(NODE g)
           }
           if ( h ) m[p2] = h;
         }
-#if 0
-        // compress m to m2
-        for ( j = 0, n2 = NEXT(n1); n2; n2 = NEXT(n2) ) {
-          p2 = (long)BDY(n2);
-          if ( m[p2] ) m2[j++] = m[p2];
-        }
-        qsort(m2,j,sizeof(DP),(int (*)(const void *,const void *))compdp_lex);
-        for ( k = 0; k < j; k++ ) {
-          NEWDMM(dmm); dmm->dl = BDY(m2[k])->dl; dmm->pos = p1; dmm->c = (Obj)ONE;
-          MKDPM(nv,dmm,dpm);
-          NEXTNODE(b0,b); BDY(b) = (pointer)dpm;
-        }
-#else
-        for ( n2 = NEXT(n1); n2; n2 = NEXT(n2) ) {
-          p2 = (long)BDY(n2);
-          if ( m[p2] ) {
-            NEWDMM(dmm); dmm->dl = BDY(m[p2])->dl; dmm->pos = p1; dmm->c = (Obj)ONE;
+        if ( lex ) {
+          // compress m to m2
+          for ( j = 0, n2 = NEXT(n1); n2; n2 = NEXT(n2) ) {
+            p2 = (long)BDY(n2);
+            if ( m[p2] ) m2[j++] = m[p2];
+          }
+          qsort(m2,j,sizeof(DP),(int (*)(const void *,const void *))compdp_lex);
+          for ( k = 0; k < j; k++ ) {
+            NEWDMM(dmm); dmm->dl = BDY(m2[k])->dl; dmm->pos = p1; dmm->c = (Obj)ONE;
             MKDPM(nv,dmm,dpm);
             NEXTNODE(b0,b); BDY(b) = (pointer)dpm;
           }
+        } else {
+          for ( n2 = NEXT(n1); n2; n2 = NEXT(n2) ) {
+            p2 = (long)BDY(n2);
+            if ( m[p2] ) {
+              NEWDMM(dmm); dmm->dl = BDY(m[p2])->dl; dmm->pos = p1; dmm->c = (Obj)ONE;
+              MKDPM(nv,dmm,dpm);
+              NEXTNODE(b0,b); BDY(b) = (pointer)dpm;
+            }
+          }
         }
-#endif
       }
     }
     if ( !b0 ) {
@@ -3210,11 +3285,58 @@ int compdmm_schreyer(int n,DMM m1,DMM m2)
       else return 0;
     }
   }
+  /* XXX */
+  return 0;
 }
 
+int compdmm_schreyer_old(int n,DMM m1,DMM m2)
+{
+  int pos1,pos2,t,npos1,npos2;
+  DMM *in,*sum;
+  DMMstack s;
+  static DL d1=0,d2=0;
+  static int dlen=0;
+
+  sch_count++;
+  pos1 = m1->pos; pos2 = m2->pos;
+  if ( pos1 == pos2 ) return (*cmpdl)(n,m1->dl,m2->dl);
+  if ( n > dlen ) {
+    NEWDL(d1,n); NEWDL(d2,n); dlen = n;
+  }
+  sum = dmm_stack->sum;
+  _copydl(n,m1->dl,d1);
+  _copydl(n,m2->dl,d2);
+  for ( s = dmm_stack; s; s = NEXT(s) ) {
+    in = s->in;
+    _addtodl(n,in[pos1]->dl,d1);
+    _addtodl(n,in[pos2]->dl,d2);
+    if ( in[pos1]->pos == in[pos2]->pos && _eqdl(n,d1,d2)) {
+      if ( pos1 < pos2 ) return 1;
+      else if ( pos1 > pos2 ) return -1;
+      else return 0;
+    }
+    pos1 = in[pos1]->pos;
+    pos2 = in[pos2]->pos;
+    if ( pos1 == pos2 ) return (*cmpdl)(n,d1,d2);
+  }
+  if ( dpm_base_ordtype == 1 ) {
+    if ( pos1 < pos2 ) return 1;
+    else if ( pos1 > pos2 ) return -1;
+    else return (*cmpdl)(n,d1,d2);
+  } else {
+    t = (*cmpdl)(n,d1,d2);
+    if ( t ) return t;
+    else if ( pos1 < pos2 ) return 1;
+    else if ( pos1 > pos2 ) return -1;
+    else return 0;
+  }
+}
+
+extern int NaiveSchreyer;
+
 int compdmm(int n,DMM m1,DMM m2)
 {
-  int t;
+  int t,t1;
   int *base_ord;
 
   switch ( dpm_ordtype ) {
@@ -3235,7 +3357,11 @@ int compdmm(int n,DMM m1,DMM m2)
     else if ( m1->pos > m2->pos ) return -1;
     else return (*cmpdl)(n,m1->dl,m2->dl);
   case 3: /* Schreyer */
-    return compdmm_schreyer(n,m1,m2);
+    if ( NaiveSchreyer )
+      t = compdmm_schreyer_old(n,m1,m2);
+    else
+      t = compdmm_schreyer(n,m1,m2);
+    return t;
   case 4:  /* POT with base_ord */
     base_ord = dp_current_spec->module_base_ord;
     if ( base_ord[m1->pos] < base_ord[m2->pos] ) return 1;
@@ -3243,6 +3369,7 @@ int compdmm(int n,DMM m1,DMM m2)
     else return (*cmpdl)(n,m1->dl,m2->dl);
   default:
     error("compdmm : invalid dpm_ordtype");
+    return 0;
   }
 }
 
@@ -3557,6 +3684,7 @@ DPM dpm_compress(DPM p,int *tab)
 }
 
 // input : s, s = syz(m) output simplified s, m
+// assuming the term order is POT
 void dpm_simplify_syz(LIST s,LIST m,LIST *s1,LIST *m1,LIST *w1)
 {
   int lm,ls,i,j,k,pos,nv;
@@ -3579,10 +3707,12 @@ void dpm_simplify_syz(LIST s,LIST m,LIST *s1,LIST *m1,
     p = as[i];
     if ( p == 0 ) continue;
     nv = NV(p);
-    for ( d = BDY(p); d; d = NEXT(d) ) {
+    for ( d = BDY(p); d; ) {
       dd = d->dl->d;
       for ( k = 0; k < nv; k++ ) if ( dd[k] ) break;
       if ( k == nv ) break;
+      pos = d->pos;
+      while ( d && d->pos == pos ) d = NEXT(d);
     }
     if ( d ) {
       c = d->c; pos = d->pos;