Changeset d20633 in git for kernel/ideals.cc

Timestamp:

Jan 13, 2010, 4:47:04 PM (13 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'f875bbaccd0831e36aaed09ff6adeb3eb45aeb94')

Children:

03993beb87e3cc442e9ff88e2b2f8dcdd584ec58

Parents:

af3d2ab658fbcc713db4e2f31354b07220c9c07a

Message:

quotient by poly (again)

git-svn-id: file:///usr/local/Singular/svn/trunk@12432 2c84dea3-7e68-4137-9b89-c4e89433aadc

File:

• kernel/ideals.cc (modified) (6 diffs)

kernel/ideals.cc

@@ -2147 +2147 @@
     for (i=1; i<k; i++)
     {
-      p = pCopy_noCheck(h4->m[i-1]);
-      pShift(&p,1);
-      h4->m[i] = p;
-    }
-  }
-
+      if (h4->m[i-1]!=NULL)
+      {
+        p = pCopy_noCheck(h4->m[i-1]);
+        pShift(&p,1);
+        h4->m[i] = p;
+      }
+    }
+  }
+  idSkipZeroes(h4);
   kkk = IDELEMS(h4);
   i = IDELEMS(temph1);
-  while ((i>0) && (temph1->m[i-1]==NULL)) i--;
   for (l=0; l<i; l++)
   {
@@ -2180 +2182 @@
   if (*addOnlyOne)
   {
+    idSkipZeroes(h4);
     p = h4->m[0];
     for (i=0;i<IDELEMS(h4)-1;i++)
@@ -2186 +2189 @@
     }
     h4->m[IDELEMS(h4)-1] = p;
-    idSkipZeroes(h4);
-    // test |= Sy_bit(OPT_SB_1);
+    test |= Sy_bit(OPT_SB_1);
   }
   idDelete(&temph1);
@@ -2227 +2229 @@
     s_h4 = idrMoveR(s_h4,orig_ring);
   idTest(s_h4);
+  #if 0
+  void ipPrint_MA0(matrix m, const char *name);
+  matrix m=idModule2Matrix(idCopy(s_h4));
+  PrintS("start:\n");
+  ipPrint_MA0(m,"Q");
+  idDelete((ideal *)&m);
+  PrintS("last elem:");wrp(s_h4->m[IDELEMS(s_h4)-1]);PrintLn();
+  #endif
   ideal s_h3;
   if (addOnlyOne)
   {
-    s_h3 = kStd(s_h4,currQuotient,hom,&weights1,NULL,kmax-1,IDELEMS(s_h4)-1);
+    s_h3 = kStd(s_h4,currQuotient,hom,&weights1,NULL,0/*kmax-1*/,IDELEMS(s_h4)-1);
   }
   else
@@ -2236 +2246 @@
     s_h3 = kStd(s_h4,currQuotient,hom,&weights1,NULL,kmax-1);
   }
+  test = old_test;
+  #if 0
+  // only together with the above debug stuff
+  idSkipZeroes(s_h3);
+  m=idModule2Matrix(idCopy(s_h3));
+  Print("result, kmax=%d:\n",kmax);
+  ipPrint_MA0(m,"S");
+  idDelete((ideal *)&m);
+  #endif
   idTest(s_h3);
   if (weights1!=NULL) delete weights1;
@@ -2263 +2282 @@
   }
   idSkipZeroes(s_h3);
-  test = old_test;
   idTest(s_h3);
   return s_h3;