Changeset 1e6734 in git

Timestamp:

Nov 6, 2009, 3:53:53 PM (14 years ago)

Author:

Frank Seelisch <seelisch@…>

Branches:

(u'spielwiese', '5d369c3cbad1a1bf2d5c856a48fb8a30b51cec3b')

Children:

822e655d18d08e0974d10c5f667eba284bff1e0a

Parents:

83f349c17bc61f05628b00a81b245ebb3b00eac6

Message:

pCopy bug removed

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

Location:

Singular

Files:

• TestMinors.cc (modified) (4 diffs)
• extra.cc (modified) (1 diff)

Singular/TestMinors.cc

@@ -361 +361 @@
   // containers for all upcoming results
   PolyMinorValue theMinor;
-  poly po;
+  poly po = NULL;
   ideal iii = idInit(1, 0);
 
@@ -376 +376 @@
       totalAdditionsAccumulated += theMinor.getAccumulatedAdditions();
       totalAdditions += theMinor.getAdditions();
-      idInsertPoly(iii, po); // will include po only if it is not the zero polynomial
+      idInsertPoly(iii, pCopy(po)); // will include po only if it is not the zero polynomial
     }
   }
@@ -394 +394 @@
       totalAdditionsAccumulated += theMinor.getAccumulatedAdditions();
       totalAdditions += theMinor.getAdditions();
-      idInsertPoly(iii, po); // will include po only if it is not the zero polynomial
+      idInsertPoly(iii, pCopy(po)); // will include po only if it is not the zero polynomial
     }
   }
   idSkipZeroes(iii);  // remove zero generators (resulting from block-wise allocation of memory)
-
   PrintLn(); PrintS("numbers of performed operations");
   PrintLn(); PrintS("   polynomial-to-polynomial multiplications: ");
@@ -409 +408 @@
   sprintf(h, "%d", totalAdditionsAccumulated); PrintS(h); PrintS(")");
   PrintLn(); PrintLn();
-
   return iii;
 }

Singular/extra.cc

@@ -2197 +2197 @@
                  (h->next->next->next->next->next->next->Typ() == INT_CMD) &&
                  (h->next->next->next->next->next->next->next->Typ() == INT_CMD) &&
-                 (h->next->next->next->next->next->next->next->next == NULL))
+                 (h->next->next->next->next->next->next->next->next->Typ() == INT_CMD) &&
+                 (h->next->next->next->next->next->next->next->next->next == NULL))
         {
           const matrix m           = (const matrix)h->Data();