Changeset 94312b5 in git

Timestamp:

Mar 17, 2011, 4:03:04 PM (13 years ago)

Author:

Frank Seelisch <seelisch@…>

Branches:

(u'spielwiese', '4a9821a93ffdc22a6696668bd4f6b8c9de3e6c5f')

Children:

2ab4af50ab6c7100bb04b9bf33d43dc7ea86a33d

Parents:

2815e8ac192a591e3d2618c320e12f21d3e7a2cd

Message:

bug fix trac ticket #314

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

File:

• Singular/Minor.cc (modified) (7 diffs)

Singular/Minor.cc

@@ -601 +601 @@
       /* allocate memory for new entries in _rowKey; */
       _rowKey = new unsigned int[_numberOfRowBlocks];
+      /* initializing entries to zero */
+        for (int r = 0; r < _numberOfRowBlocks; r++) _rowKey[r] = 0;
     }
     else
@@ -667 +669 @@
               return true). */
 
-  /* The next two variables will finally name a columns which is
+  /* The next two variables will finally name a column which is
      (1) currently not yet among the columns in this MinorKey, but
      (2) among the columns in mk, and
-     (3) which is "higher" than the lowest columns in this MinorKey, and
+     (3) which is "higher" than the lowest column in this MinorKey, and
      (4) which is the lowest possible choice such that (1) - (3) hold.
-     If we should not be able to find such a columns, then there is no next
+     If we should not be able to find such a column, then there is no next
      subset of columns. In this case, the method will return false; otherwise
      always true. */
@@ -714 +716 @@
   {
     /* Note that the following must hold when reaching this line of code:
-       (1) The columns with bit newBitToBeSet in
+       (1) The column with bit newBitToBeSet in
            this->getColumnKey(newBitBlockIndex) is currently not among the
            columns in this MinorKey, but
@@ -731 +733 @@
         /* allocate memory for new entries in _columnKey; */
         _columnKey = new unsigned int[_numberOfColumnBlocks];
+        /* initializing entries to zero */
+        for (int c = 0; c < _numberOfColumnBlocks; c++) _columnKey[c] = 0;
     }
     else
@@ -749 +753 @@
         _columnKey[i] = 0;
     }
-
     /* We have now deleted all bits from _columnKey[...] below the bit
        2^newBitToBeSet. In the example we shall have at this point:
@@ -788 +791 @@
 string MinorKey::toString() const
 {
-  char h[32];
-  string t = "";
+  string t;
   string s = "(";
   unsigned int z = 0;
   for (int r = this->getNumberOfRowBlocks() - 1; r >= 0; r--)
   {
+    t = "";
     z = this->getRowKey(r);
     while (z != 0)
@@ -805 +808 @@
   }
   s += ", ";
-  t = "";
   for (int c = this->getNumberOfColumnBlocks() - 1; c >= 0; c--)
   {
+    t = "";
     z = this->getColumnKey(c);
     while (z != 0)