Changeset 5b45a4 in git

Timestamp:

Sep 16, 2014, 4:57:17 PM (9 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', '8d54773d6c9e2f1d2593a28bc68b7eeab54ed529')

Children:

46f37cb57098799d8399fc704c5b3ca2020ca0c1

Parents:

eb55f8a52fe5ee84d19c269132981a40defce0da

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2014-09-16 16:57:17+02:00

git-committer:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2014-09-23 20:15:33+02:00

Message:

Testing the 'wrong ideal rank' issue in kernel/combinatorics + p_Copy_noCheck

add: p_Copy_noCheck to libpolys/polys/monomials/p_polys.h due to its (wrong) useage within idInitializeQuot (kernel/ideals.cc)...

Files:

• kernel/GBEngine/khstd.cc (modified) (1 diff)
• kernel/combinatorics/hdegree.cc (modified) (9 diffs)
• kernel/combinatorics/hilb.cc (modified) (3 diffs)
• kernel/combinatorics/stairc.h (modified) (1 diff)
• kernel/ideals.cc (modified) (4 diffs)
• libpolys/polys/monomials/p_polys.h (modified) (2 diffs)

kernel/GBEngine/khstd.cc

@@ -156 +156 @@
 Lm = id_Head(strat->Shdl,currRing);
 
-newhilb =hHstdSeries(Lm,w,strat->kHomW,Q,currRing);
+newhilb =hHstdSeries(Lm,w,strat->kHomW,Q,currRing); // ,strat->tailRing?
 
 #if ADIDEBUG

kernel/combinatorics/hdegree.cc

@@ -838 +838 @@
 }
 
-static void hDegree0(ideal S, ideal Q, const ring r=currRing)
-{
-  id_Test(S, r);  
-  id_Test(Q, r);
+static void hDegree0(ideal S, ideal Q, const ring tailRing)
+{
+  id_TestTail(S, currRing, tailRing);  
+  id_TestTail(Q, currRing, tailRing);
    
   int  mc;
-  hexist = hInit(S, Q, &hNexist, r);
+  hexist = hInit(S, Q, &hNexist, tailRing);
   if (!hNexist)
   {
@@ -852 +852 @@
   else
     hMu = 0;
+   
+  const ring r = currRing;
+   
   hwork = (scfmon)omAlloc(hNexist * sizeof(scmon));
   hvar = (varset)omAlloc(((r->N) + 1) * sizeof(int));
@@ -909 +912 @@
 }
 
-int  scMult0Int(ideal S, ideal Q, const ring r)
-{
-  id_Test(S, r);  
-  id_Test(Q, r);  
-  hDegree0(S, Q);
+int  scMult0Int(ideal S, ideal Q, const ring tailRing)
+{
+  id_TestTail(S, currRing, tailRing);  
+  id_TestTail(Q, currRing, tailRing);
+  hDegree0(S, Q, tailRing);
   return hMu;
 }
@@ -1016 +1019 @@
 
   hNvar = (currRing->N);
-  hexist = hInit(S, Q, &hNexist, tailRing);
+  hexist = hInit(S, Q, &hNexist, tailRing); // tailRing?
   if (k!=0)
     hComp(hexist, hNexist, k, hexist, &hNstc);
@@ -1309 +1312 @@
 }
 
-static ideal scIdKbase()
-{
-  polyset mm;
-  ideal res;
-  poly p, q = last;
-  int i = pLength(q);
-  res = idInit(i,1);
-  mm = res->m;
-  i = 0;
+static ideal scIdKbase(poly q, const int rank)
+{
+  ideal res = idInit(pLength(q), rank);
+  polyset mm = res->m;
+  int i = 0;
   do
   {
-    mm[i] = q;
-    i++;
-    p = pNext(q);
+    *mm = q; ++mm;
+
+    const poly p = pNext(q);
     pNext(q) = NULL;
     q = p;
+     
   } while (q!=NULL);
    
-  id_Test(res, currRing);   
+  id_Test(res, currRing);   // WRONG RANK!!!???
   return res;
 }
@@ -1391 +1391 @@
   if (p == NULL)
     return idInit(1,s->rank);
-  else
-  {
-    last = p;
-    ideal res=scIdKbase();
-    res->rank=s->rank;
-    id_Test(res, currRing);
-    return res;
-  }
+   
+  last = p;
+  return scIdKbase(p, s->rank);
 }
 
 #if 0 //-- alternative implementation of scComputeHC
+/*
 void scComputeHCw(ideal ss, ideal Q, int ak, poly &hEdge, ring tailRing)
 {
@@ -1422 +1418 @@
   hexist = hInit(s, Q, &hNexist, currRing);
   p = last = pInit();
-  /*pNext(p) = NULL;*/
+  // pNext(p) = NULL;
   act = (scmon)omAlloc(((currRing->N) + 1) * sizeof(int));
   *act = 0;
@@ -1463 +1459 @@
   {
     last = p;
-    ideal res=scIdKbase();
-    res->rank=ss->rank;
+    ideal res=scIdKbase(p, ss->rank);
     poly p_ind=res->m[0]; int ind=0;
     for(i=IDELEMS(res)-1;i>0;i--)
@@ -1484 +1479 @@
   }
 }
+ */ 
 #endif

kernel/combinatorics/hilb.cc

@@ -1138 +1138 @@
                 int /*notstc*/, intvec *wdegree, ideal Q, ring tailRing)
 {
-  id_TestTail(S, currRing, tailRing);
+//  id_TestTail(S, currRing, tailRing);
    
   intvec *work, *hseries1=NULL;
@@ -1293 +1293 @@
 intvec * hHstdSeries(ideal S, intvec *modulweight, intvec *wdegree, ideal Q, ring tailRing)
 {
+  id_TestTail(S, currRing, tailRing);
+  id_TestTail(Q, currRing, tailRing);
   return hSeries(S, modulweight, 0, wdegree, Q, tailRing);
 }
@@ -1298 +1300 @@
 intvec * hFirstSeries(ideal S, intvec *modulweight, ideal Q, intvec *wdegree, ring tailRing)
 {
+  id_TestTail(S, currRing, tailRing);
+  id_TestTail(Q, currRing, tailRing);
   return hSeries(S, modulweight, 1, wdegree, Q, tailRing);
 }

kernel/combinatorics/stairc.h

@@ -27 +27 @@
 int scDimInt(ideal  s,ideal Q=NULL);
 int scMultInt(ideal  s,ideal Q=NULL);
-int scMult0Int(ideal  s,ideal Q=NULL, const ring r=currRing);
+int scMult0Int(ideal  s,ideal Q=NULL, const ring tailRing = currRing);
 void scPrintDegree(int co, int mu);
 void scDegree(ideal  s,intvec *modulweight,ideal Q=NULL);

kernel/ideals.cc

@@ -45 +45 @@
 
 /* #define WITH_OLD_MINOR */
-#define pCopy_noCheck(p) pCopy(p)
 
 /*0 implementation*/
@@ -1209 +1208 @@
 *
 */
-static ideal idInitializeQuot (ideal  h1, ideal h2, BOOLEAN h1IsStb,
-                               BOOLEAN *addOnlyOne, int *kkmax)
-{
+static ideal idInitializeQuot (ideal  h1, ideal h2, BOOLEAN h1IsStb, BOOLEAN *addOnlyOne, int *kkmax)
+{
+  idTest(h1);
+  idTest(h2);
+   
   ideal temph1;
   poly     p,q = NULL;
@@ -1267 +1268 @@
       if (h4->m[i-1]!=NULL)
       {
-        p = pCopy_noCheck(h4->m[i-1]);
-        p_Shift(&p,1,currRing);
+        p = p_Copy_noCheck(h4->m[i-1], currRing); p_Shift(&p,1,currRing); 
+        // pTest(p);
         h4->m[i] = p;
       }
@@ -1313 +1314 @@
   }
   idDelete(&temph1);
+  idTest(h4); 
   return h4;
 }

libpolys/polys/monomials/p_polys.h

@@ -801 +801 @@
  *
  ***************************************************************/
-// returns a copy of p
+/// returns a copy of p (without any additional testing)
+static inline poly p_Copy_noCheck(poly p, const ring r)
+{
+  assume(r != NULL); assume(r->p_Procs != NULL); assume(r->p_Procs->p_Copy != NULL);
+  return r->p_Procs->p_Copy(p, r);
+}
+
+/// returns a copy of p
 static inline poly p_Copy(poly p, const ring r)
 {
-  const poly pp = r->p_Procs->p_Copy(p, r);
+  p_Test(p,r);
+  const poly pp = p_Copy_noCheck(p, r);
   p_Test(pp,r);
   return pp;
@@ -829 +837 @@
 #ifndef PDEBUG
     if (tailRing == lmRing)
-      return tailRing->p_Procs->p_Copy(p, tailRing);
+      return p_Copy_noCheck(p, tailRing);
 #endif
     poly pres = p_Head(p, lmRing);
-    pNext(pres) = tailRing->p_Procs->p_Copy(pNext(p), tailRing);
+    pNext(pres) = p_Copy_noCheck(pNext(p), tailRing);
     return pres;
   }