Changeset 2bcf4b in git

Timestamp:

Mar 24, 2017, 3:39:42 PM (7 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

d12a2904e34710ed91be3102e52a0b02fd919b86

Parents:

232b0953a6412f9a34b3e57519d0c19ff4cfb73c

Message:

fix: handling of s(..) in rCompose, rDecompose, rComplete

Files:

• Singular/ipshell.cc (modified) (3 diffs)
• kernel/ideals.cc (modified) (10 diffs)
• libpolys/polys/monomials/ring.cc (modified) (3 diffs)

Singular/ipshell.cc

@@ -2155 +2155 @@
     LLL->m[0].data=(void *)omStrDup(rSimpleOrdStr(r->order[i]));
 
-    if(r->order[i] == ringorder_IS) //  || r->order[i] == ringorder_s || r->order[i] == ringorder_S)
+    if((r->order[i] == ringorder_IS)
+    || (r->order[i] == ringorder_s)) //|| r->order[i] == ringorder_S)
     {
       assume( r->block0[i] == r->block1[i] );
       const int s = r->block0[i];
-      assume( -2 < s && s < 2);
+      assume( (-2 < s && s < 2)||(r->order[i] != ringorder_IS));
 
       iv=new intvec(1);
@@ -2568 +2569 @@
           iv=ivCopy((intvec*)vv->m[1].Data()); //assume INTVEC
         int iv_len=iv->length();
-        R->block1[j_in_R]=si_max(R->block0[j_in_R],R->block0[j_in_R]+iv_len-1);
-        if (R->block1[j_in_R]>R->N)
+        if (R->order[j_in_R]!=ringorder_s)
         {
-          R->block1[j_in_R]=R->N;
-          iv_len=R->block1[j_in_R]-R->block0[j_in_R]+1;
+          R->block1[j_in_R]=si_max(R->block0[j_in_R],R->block0[j_in_R]+iv_len-1);
+          if (R->block1[j_in_R]>R->N)
+          {
+            R->block1[j_in_R]=R->N;
+            iv_len=R->block1[j_in_R]-R->block0[j_in_R]+1;
+          }
+          //Print("block %d from %d to %d\n",j,R->block0[j], R->block1[j]);
         }
-        //Print("block %d from %d to %d\n",j,R->block0[j], R->block1[j]);
         int i;
         switch (R->order[j_in_R])
@@ -2632 +2636 @@
 
            case ringorder_s:
+             R->block1[j_in_R]=R->block0[j_in_R]=(*iv)[0];
+             rSetSyzComp(R->block0[j_in_R],R);
              break;
 

kernel/ideals.cc

@@ -236 +236 @@
 
   ring orig_ring=currRing;
-  ring syz_ring=rAssure_SyzOrder(orig_ring,TRUE); rChangeCurrRing(syz_ring);
-  rSetSyzComp(length, syz_ring);
+  ring syz_ring=rAssure_SyzOrder(orig_ring,TRUE);
+  rSetSyzComp(length,syz_ring);
+  rChangeCurrRing(syz_ring);
 
   while ((j>0) && (first->m[j-1]==NULL)) j--;
@@ -375 +376 @@
 
   ring orig_ring=currRing;
-  ring syz_ring=rAssure_SyzOrder(orig_ring,TRUE); rChangeCurrRing(syz_ring);
-  rSetSyzComp(syzComp, syz_ring);
+  ring syz_ring=rAssure_SyzOrder(orig_ring,TRUE);
+  rSetSyzComp(syzComp,syz_ring);
+  rChangeCurrRing(syz_ring);
 
   bigmat = idInit(j,(k+1)*maxrk);
@@ -558 +560 @@
   assume(currRing != NULL);
   ring orig_ring=currRing;
-  ring syz_ring=rAssure_SyzComp(orig_ring,TRUE); rChangeCurrRing(syz_ring);
-
-  if (setSyzComp)
-    rSetSyzComp(k,syz_ring);
+  ring syz_ring=rAssure_SyzComp(orig_ring,TRUE);
+  if (setSyzComp) rSetSyzComp(k,syz_ring);
+  rChangeCurrRing(syz_ring);
 
   if (orig_ring != syz_ring)
@@ -683 +684 @@
   assume(currRing != NULL);
   ring orig_ring=currRing;
-  ring syz_ring=rAssure_SyzComp(orig_ring,TRUE); rChangeCurrRing(syz_ring);
-
+  ring syz_ring=rAssure_SyzComp(orig_ring,TRUE);
   rSetSyzComp(k,syz_ring);
+  rChangeCurrRing(syz_ring);
 
   if (orig_ring != syz_ring)
@@ -751 +752 @@
 
   ring orig_ring = currRing;
-  ring syz_ring = rAssure_SyzOrder(orig_ring,TRUE);  rChangeCurrRing(syz_ring);
+  ring syz_ring = rAssure_SyzOrder(orig_ring,TRUE);
   rSetSyzComp(k,syz_ring);
+  rChangeCurrRing(syz_ring);
 
   ideal s_h1=h1;
@@ -947 +949 @@
 
   ring orig_ring=currRing;
-  ring syz_ring=rAssure_SyzOrder(orig_ring,TRUE);  rChangeCurrRing(syz_ring);
+  ring syz_ring=rAssure_SyzOrder(orig_ring,TRUE);
   rSetSyzComp(k,syz_ring);
+  rChangeCurrRing(syz_ring);
 
   ideal s_mod, s_temp;
@@ -1306 +1309 @@
 
   ring orig_ring=currRing;
-  ring syz_ring=rAssure_SyzOrder(orig_ring,TRUE);  rChangeCurrRing(syz_ring);
+  ring syz_ring=rAssure_SyzOrder(orig_ring,TRUE);
   rSetSyzComp(kmax-1,syz_ring);
+  rChangeCurrRing(syz_ring);
   if (orig_ring!=syz_ring)
   //  s_h4 = idrMoveR_NoSort(s_h4,orig_ring, syz_ring);
@@ -2081 +2085 @@
 
   ring orig_ring=currRing;
-  ring syz_ring=rAssure_SyzOrder(orig_ring, TRUE); rChangeCurrRing(syz_ring);
+  ring syz_ring=rAssure_SyzOrder(orig_ring, TRUE);
+  rSetSyzComp(length,syz_ring);
+  rChangeCurrRing(syz_ring);
   // we can use OPT_RETURN_SB only, if syz_ring==orig_ring,
   // therefore we disable OPT_RETURN_SB for modulo:
@@ -2088 +2094 @@
   //  rSetSyzComp(IDELEMS(h2)+length, syz_ring);
   //else
-    rSetSyzComp(length, syz_ring);
+  //  rSetSyzComp(length, syz_ring);
   ideal s_temp;
 
@@ -2620 +2626 @@
 }
 
-GbVariant syGetAlgorithm(char *n, const ring r, const ideal M)
+GbVariant syGetAlgorithm(char *n, const ring r, const ideal /*M*/)
 {
   GbVariant alg=GbDefault;

libpolys/polys/monomials/ring.cc

@@ -2346 +2346 @@
   ord_struct.data.syz.place=place;
   ord_struct.data.syz.limit=syz_comp;
-  ord_struct.data.syz.syz_index = (int*) omAlloc0((syz_comp+1)*sizeof(int));
+  if (syz_comp>0)
+    ord_struct.data.syz.syz_index = (int*) omAlloc0((syz_comp+1)*sizeof(int));
+  else
+    ord_struct.data.syz.syz_index = NULL;
   ord_struct.data.syz.curr_index = 1;
   o[place]= -1;
@@ -4996 +4999 @@
   if ((r->typ!=NULL) && (r->typ[0].ord_typ==ro_syz))
   {
+    r->block0[0]=r->block1[0] = k;
     if( k == r->typ[0].data.syz.limit )
       return; // nothing to do
@@ -5040 +5044 @@
 #endif
   }
-  else
-  if ((r->order[0]!=ringorder_c) && (k!=0)) // ???
+  else if (r->order[0]==ringorder_s)
+  {
+    r->block0[0] = r->block1[0] = k;
+  }
+  else if (r->order[0]!=ringorder_c)
   {
     dReportError("syzcomp in incompatible ring");