===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2018/engine/dist.c,v
retrieving revision 1.15
retrieving revision 1.18
diff -u -p -r1.15 -r1.18
--- OpenXM_contrib2/asir2018/engine/dist.c	2019/11/19 10:50:31	1.15
+++ OpenXM_contrib2/asir2018/engine/dist.c	2019/12/12 04:44:59	1.18
@@ -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.14 2019/11/12 22:27:04 noro Exp $
+ * $OpenXM: OpenXM_contrib2/asir2018/engine/dist.c,v 1.17 2019/11/21 04:03:16 noro Exp $
 */
 #include "ca.h"
 
@@ -2750,6 +2750,7 @@ void dpm_sp(DPM p1,DPM p2,DPM *sp,DP *t1,DP *t2);
 DPM dpm_nf_and_quotient3(DPM sp,VECT psv,DPM *nf,P *dn);
 DPM dpm_nf_and_quotient4(DPM sp,DPM *ps,VECT psiv,DPM head,DPM *nf,P *dn);
 DPM dpm_sp_nf(VECT psv,VECT psiv,int i,int j,DPM *nf);
+DPM dpm_sp_nf_zlist(VECT psv,VECT psiv,int i,int j,DPM *nf);
 DPM dpm_sp_nf_asir(VECT psv,int i,int j,DPM *nf);
 void dpm_sort(DPM p,DPM *r);
 
@@ -2788,6 +2789,7 @@ NODE dpm_reduceall(NODE in)
 struct oEGT egra;
 
 void dpm_ht(DPM d,DPM *r);
+NODE reverse_node(NODE b);
 
 void dpm_schreyer_base(LIST g,LIST *s)
 {
@@ -2801,7 +2803,7 @@ void dpm_schreyer_base(LIST g,LIST *s)
   DPM *ps;
   VECT psv,psiv;
   DPM quo;
-  DP **m;
+  DP *mm;
   NODE *psi;
   NODE n1,n2,n3;
   int p1,p2,p3;
@@ -2827,54 +2829,175 @@ void dpm_schreyer_base(LIST g,LIST *s)
     MKNODE(nd,(long)i,psi[pos]); psi[pos] = nd;
   }
   nv = ps[1]->nv;
-  m = (DP **)almat_pointer(n+1,n+1);
+  mm = (DP *)MALLOC((n+1)*sizeof(DP));
   b0 = 0;
   get_eg(&eg0);
   for ( i = 1; i <= max; i++ ) {
+    memset(mm,0,(n+1)*sizeof(DP));
     for ( n1 = psi[i]; n1; n1 = NEXT(n1) ) {
       p1 = (long)BDY(n1);
       for ( n2 = NEXT(n1); n2; n2 = NEXT(n2) ) {
         p2 = (long)BDY(n2);
-        m[p1][p2] = dpm_sp_hm(ps[p1],ps[p2]);
+        mm[p2] = dpm_sp_hm(ps[p1],ps[p2]);
       }
-    }
-    for ( n1 = psi[i]; n1; n1 = NEXT(n1) ) {
-      p1 = (long)BDY(n1);
       for ( n2 = NEXT(n1); n2; n2 = NEXT(n2) ) {
         p2 = (long)BDY(n2);
-        if ( !m[p1][p2] ) continue;
-        for ( h = m[p1][p2], n3 = NEXT(n1); n3; n3 = NEXT(n3) ) {
+        if ( !mm[p2] ) continue;
+        for ( h = mm[p2], n3 = NEXT(n1); n3; n3 = NEXT(n3) ) {
           p3 = (long)BDY(n3);
-          if ( n3 != n2 && m[p1][p3] && dp_redble(m[p1][p3],h) ) m[p1][p3] = 0;
+          if ( n3 != n2 && mm[p3] && dp_redble(mm[p3],h) ) mm[p3] = 0;
         }
       }
+      for ( j = p1+1; j <= n; j++ ) {
+        if ( mm[j] ) {
+          quo = dpm_sp_nf(psv,psiv,p1,j,&nf);
+          if ( nf ) 
+            error("dpm_schreyer_base : cannot happen");
+          NEXTNODE(b0,b); BDY(b) = (pointer)quo;
+        }
+      }
     }
   }
   get_eg(&eg1); add_eg(&egsp,&eg0,&eg1); print_eg("SP",&egsp);
   get_eg(&eg0);
-  for ( i = 1; i <= n; i++ ) {
-    for ( j = i+1; j <= n; j++ ) {
-      if ( m[i][j] ) {
-        quo = dpm_sp_nf(psv,psiv,i,j,&nf);
-        if ( nf ) 
-          error("dpm_schreyer_base : cannot happen");
-        NEXTNODE(b0,b); BDY(b) = (pointer)quo;
+  get_eg(&eg1); add_eg(&egnf,&eg0,&eg1); print_eg("NF",&egnf); printf("\n");
+  if ( b0 ) NEXT(b) = 0;
+  for ( t0 = 0, nd = BDY(g); nd; nd = NEXT(nd) ) {
+    dpm_ht((DPM)BDY(nd),&dpm); NEXTNODE(t0,t); BDY(t) = (pointer)dpm;
+  }
+  if ( t0 ) NEXT(t) = 0;
+  MKLIST(l,t0);
+  dmm_stack = push_schreyer_order(l,dmm_stack);
+//  b0 = dpm_sort_list(b0);
+//  get_eg(&eg0);
+//  b0 = dpm_reduceall(b0);
+//  get_eg(&eg1); add_eg(&egra,&eg0,&eg1); print_eg("RA",&egra);
+  MKLIST(*s,b0);
+//  print_eg("red",&egred); printf("\n");
+  printf("sch_count=%d, schlast_count=%d\n",sch_count,schlast_count);
+}
+
+void dpm_list_to_array(LIST g,VECT *psvect,VECT *psindvect)
+{
+  NODE nd,t;
+  int n;
+  VECT psv,psiv;
+  DPM *ps;
+  int i,max,pos;
+  LIST *psi;
+  LIST l;
+  Z iz;
+
+  nd = BDY(g);
+  n = length(nd);
+  MKVECT(psv,n+1);
+  ps = (DPM *)BDY(psv);
+  for ( i = 1, t = nd; i <= n; i++, t = NEXT(t) ) ps[i] = (DPM)BDY(t);
+  for ( i = 1, max = 0; i <= n; i++ )
+    if ( (pos=BDY(ps[i])->pos) > max ) max = pos;
+  MKVECT(psiv,max+1);
+  psi = (LIST *)BDY(psiv);
+  for ( i = 0; i <= max; i++ ) {
+    MKLIST(l,0); psi[i] = l;
+  }
+  for ( i = n; i >= 1; i-- ) {
+    pos = BDY(ps[i])->pos;
+    STOZ(i,iz); MKNODE(nd,iz,BDY(psi[pos])); BDY(psi[pos]) = nd;
+  }
+  *psvect = psv; *psindvect = psiv;
+}
+
+void dpm_insert_to_zlist(VECT psiv,int pos,int i)
+{
+  LIST l;
+  NODE prev,cur,nd;
+  int curi;
+  Z iz;
+
+  l = (LIST)BDY(psiv)[pos];
+  for ( prev = 0, cur = BDY(l); cur; cur = NEXT(cur) ) {
+    curi = ZTOS((Q)BDY(cur));
+    if ( curi == i )
+      error("dpm_insert_to_list : invalid index");
+    if ( i < curi ) break;
+    prev = cur;
+  }
+  STOZ(i,iz); MKNODE(nd,iz,cur);
+  if ( prev == 0 ) BDY(l) = nd;
+  else NEXT(prev) = nd;
+}
+
+void dpm_schreyer_base_zlist(LIST g,LIST *s)
+{
+  NODE nd,t0,t,b0,b;
+  int n,i,j,k,nv,max,pos;
+  LIST l;
+  DP h,t1,t2;
+  MP d;
+  DMM r0,r,r1;
+  DPM sp,nf,dpm;
+  DPM *ps;
+  VECT psv,psiv;
+  DPM quo;
+  DP *mm;
+  LIST *psi;
+  NODE n1,n2,n3;
+  int p1,p2,p3;
+  Z iz;
+  struct oEGT eg0,eg1,egsp,egnf;
+  extern struct oEGT egred;
+  extern int sch_count,schrec_count,schlast_count;
+
+  sch_count = schlast_count= 0;
+  init_eg(&egra);
+  init_eg(&egsp);
+  init_eg(&egnf);
+  dpm_list_to_array(g,&psv,&psiv);
+  ps = (DPM *)BDY(psv);
+  psi = (LIST *)BDY(psiv);
+  nv = ps[1]->nv;
+  n = psv->len-1;
+  max = psiv->len-1;
+  mm = (DP *)MALLOC((n+1)*sizeof(DP));
+  b0 = 0;
+  get_eg(&eg0);
+  for ( i = 1; i <= max; i++ ) {
+    memset(mm,0,(n+1)*sizeof(DP));
+    for ( n1 = BDY((LIST)psi[i]); n1; n1 = NEXT(n1) ) {
+      p1 = ZTOS((Q)BDY(n1));
+      for ( n2 = NEXT(n1); n2; n2 = NEXT(n2) ) {
+        p2 = ZTOS((Q)BDY(n2));
+        mm[p2] = dpm_sp_hm(ps[p1],ps[p2]);
       }
+      for ( n2 = NEXT(n1); n2; n2 = NEXT(n2) ) {
+        p2 = ZTOS((Q)BDY(n2));
+        if ( !mm[p2] ) continue;
+        for ( h = mm[p2], n3 = NEXT(n1); n3; n3 = NEXT(n3) ) {
+          p3 = ZTOS((Q)BDY(n3));
+          if ( n3 != n2 && mm[p3] && dp_redble(mm[p3],h) ) mm[p3] = 0;
+        }
+      }
+      for ( j = p1+1; j <= n; j++ ) {
+        if ( mm[j] ) {
+          quo = dpm_sp_nf_zlist(psv,psiv,p1,j,&nf);
+          if ( nf ) 
+            error("dpm_schreyer_base : cannot happen");
+          NEXTNODE(b0,b); BDY(b) = (pointer)quo;
+        }
+      }
     }
   }
+  get_eg(&eg1); add_eg(&egsp,&eg0,&eg1); print_eg("SP",&egsp);
+  get_eg(&eg0);
   get_eg(&eg1); add_eg(&egnf,&eg0,&eg1); print_eg("NF",&egnf); printf("\n");
   if ( b0 ) NEXT(b) = 0;
-  for ( t0 = t, nd = BDY(g); nd; nd = NEXT(nd) ) {
+  for ( t0 = 0, nd = BDY(g); nd; nd = NEXT(nd) ) {
     dpm_ht((DPM)BDY(nd),&dpm); NEXTNODE(t0,t); BDY(t) = (pointer)dpm;
   }
   if ( t0 ) NEXT(t) = 0;
   MKLIST(l,t0);
   dmm_stack = push_schreyer_order(l,dmm_stack);
-//  for ( t = b0; t; t = NEXT(t) ) {
-//    dpm_sort((DPM)BDY(t),&dpm); 
-//    BDY(t) = (pointer)dpm;
-//  }
-//    b0 = dpm_sort_list(b0);
+//  b0 = dpm_sort_list(b0);
 //  get_eg(&eg0);
 //  b0 = dpm_reduceall(b0);
 //  get_eg(&eg1); add_eg(&egra,&eg0,&eg1); print_eg("RA",&egra);
@@ -2883,7 +3006,6 @@ void dpm_schreyer_base(LIST g,LIST *s)
   printf("sch_count=%d, schlast_count=%d\n",sch_count,schlast_count);
 }
 
-
 DMMstack_array dpm_schreyer_frame(NODE g)
 {
   LIST l;
@@ -2924,9 +3046,11 @@ DMMstack_array dpm_schreyer_frame(NODE g)
         s1->sum[i] = BDY(dpm1);
       }
     } else {
-      for ( i = 1, in = nd; i <= n; i++, in = NEXT(in) ) 
-        s1->sum[i] = s1->in[i] = BDY((DPM)BDY(in));
-
+      for ( i = 1, in = nd; i <= n; i++, in = NEXT(in) )  {
+        m0 = BDY((DPM)BDY(in));
+        NEWDMM(m1); *m1 = *m0; m1->c = (Obj)ONE; NEXT(m1) = 0;
+        s1->sum[i] = s1->in[i] = m1;
+      }
     }
     s = s1;
     level++;