Changeset a386fb3 in git

Timestamp:

Dec 13, 2016, 3:19:01 PM (7 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'd08f5f0bb3329b8ca19f23b74cb1473686415c3a')

Children:

d38e6a38c2efa915f286e60995a20aebf834207d

Parents:

c032f97cae4f26489effacf66babd5257426a860

Message:

 fix: example tropicalVariety: ring construction in searchForMonomialViaStepwiseSaturation

Files:

• Singular/dyn_modules/gfanlib/containsMonomial.cc (modified) (1 diff)
• Singular/dyn_modules/gfanlib/tropicalStrategy.cc (modified) (1 diff)
• libpolys/polys/monomials/ring.cc (modified) (1 diff)

Singular/dyn_modules/gfanlib/containsMonomial.cc

@@ -143 +143 @@
     w[0] = cache;
 
-    ring rGradedNew = rCopy0(r,TRUE,FALSE);
-    omFree(rGradedNew->order);
+    ring rGradedNew = rCopy0(r,FALSE,FALSE); // cannot copy q-ideal without ordering
     rGradedNew->order = (rRingOrder_t*) omAlloc0(3*sizeof(rRingOrder_t));
-    omFree(rGradedNew->block0);
     rGradedNew->block0 = (int*) omAlloc0(3*sizeof(int));
-    omFree(rGradedNew->block1);
     rGradedNew->block1 = (int*) omAlloc0(3*sizeof(int));
-    omFree(rGradedNew->wvhdl);
     rGradedNew->wvhdl = (int**) omAlloc0(3*sizeof(int**));
     rGradedNew->order[0] = ringorder_wp;

Singular/dyn_modules/gfanlib/tropicalStrategy.cc

@@ -70 +70 @@
   ring rShortcut = rCopy0(r);
 
-  rRingOrder_t* order = r->order;
-  int* block0 = r->block0;
-  int* block1 = r->block1;
-  int** wvhdl = r->wvhdl;
+  rRingOrder_t* order = rShortcut->order;
+  int* block0 = rShortcut->block0;
+  int* block1 = rShortcut->block1;
+  int** wvhdl = rShortcut->wvhdl;
 
   int h = rBlocks(r);

libpolys/polys/monomials/ring.cc

@@ -1973 +1973 @@
   omCheckAddrSize(r->block0,i*sizeof(int));
   omCheckAddrSize(r->block1,i*sizeof(int));
+  for(int j=0;j<=i;j++)
+  {
+    if((r->order[j]<0)||(r->order[j]>ringorder_unspec))
+      dError("wrong order in r->order");
+  }
   if (r->wvhdl!=NULL)
   {