Changeset 1f6c7a in git

Timestamp:

Oct 8, 2009, 5:12:37 PM (14 years ago)

Author:

Frank Seelisch <seelisch@…>

Branches:

(u'spielwiese', '828514cf6e480e4bafc26df99217bf2a1ed1ef45')

Children:

9193d93b4d40ee988851d32b6b7d64e21ec55ab1

Parents:

23ab77a71f89616ef0697fae07d84e3a8b621e1b

Message:

bug fixes, replace srand by siRand


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

Location:

Singular

Files:

• Minor.cc (modified) (3 diffs)
• TestMinors.cc (modified) (2 diffs)

Singular/Minor.cc

@@ -584 +584 @@
             }
             shiftedBit = shiftedBit >> 1;
-        }                                           
+        }
     }
 
@@ -658 +658 @@
     string s = "(";
     for (int r = this->getNumberOfRowBlocks() - 1; r >= 0; r--) {
-        sprintf(h, "%du", this->getRowKey(r)); t += h;
+        sprintf(h, "%u", this->getRowKey(r)); t += h;
         if (r < this->getNumberOfRowBlocks() - 1)
             t = string(32 - t.length(), '0') + t;
@@ -665 +665 @@
     s += ", ";
     for (int c = this->getNumberOfColumnBlocks() - 1; c >= 0; c--) {
-        sprintf(h, "%du", this->getColumnKey(c)); t += h;
+        sprintf(h, "%u", this->getColumnKey(c)); t += h;
         if (c < this->getNumberOfColumnBlocks() - 1)
             t = string(32 - t.length(), '0') + t;

Singular/TestMinors.cc

@@ -80 +80 @@
                       const int zeroPercentage, const int entryBound, int* theMatrix) {
     int theSize = rowCount * columnCount;
-    srand(randomSeed); // random seed for ensuring reproducability of experiments
+    siSeed = randomSeed; // random seed for ensuring reproducability of experiments
     for (int i = 0; i < theSize; i++) {
-        if ((rand() % 100) < zeroPercentage)
+        if ((siRand() % 100) < zeroPercentage)
             theMatrix[i] = 0;
         else
-            theMatrix[i] = 1 + (rand() % entryBound); // ranges from 1 to entryBound, including both
+            theMatrix[i] = 1 + (siRand() % entryBound); // ranges from 1 to entryBound, including both
     }
 }
@@ -117 +117 @@
   +prpr; +prpr;
 
-  // looks for minor == 3000; to this end, it needs to compute 1001 minors:
-  testAllMinorsUntil(prpr, "Test III", 100, 60, 10, 10, 6, 471, 300, 10000, 3000, true, 10000);
+  // looks for minor == 92868; to this end, it needs to compute 1632 minors:
+  testAllMinorsUntil(prpr, "Test III", 100, 60, 10, 10, 6, 471, 300, 10000, 92868, true, 10000);
   +prpr; +prpr;
 
-  // looks for the first non-zero minor (6x6); to this end, it needs to compute 476 minors:
+  // looks for the first non-zero minor (6x6); to this end, it needs to compute 229 minors:
   testAllMinorsUntil(prpr, "Test IV", 100, 60, 10, 75, 6, 4712, 300, 10000, 0, false, 10000);
   +prpr; +prpr;
 
-  // looks for minor == 265986; to this end, it needs to compute 16 minors:
-  testAllMinorsUntil(prpr, "Test V", 100, 60, 10, 10, 6, 471, 300, 10000, 265986, true, 10000);
+  // looks for minor == -43065; to this end, it needs to compute 23 minors:
+  testAllMinorsUntil(prpr, "Test V", 100, 60, 10, 10, 6, 471, 300, 10000, -43065, true, 10000);
 
   return 0;