Changeset 9193d9 in git

Timestamp:

Oct 8, 2009, 5:31:58 PM (14 years ago)

Author:

Frank Seelisch <seelisch@…>

Branches:

(u'spielwiese', '828514cf6e480e4bafc26df99217bf2a1ed1ef45')

Children:

b85e375dee0ef1d2f9b2272975f133610b000b0a

Parents:

1f6c7a1cb42b3480fe6e327a47a342174f605a38

Message:

changed time measurements


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

File:

• Singular/TestMinors.cc (modified) (10 diffs)

Singular/TestMinors.cc

@@ -107 +107 @@
 int testIntMinors (const int dummy) {
   // for output of non-zero minors into file
-  PrettyPrinter prpr("minor_output_complete_ints.txt", "minor_output_results_int.txt", false, false, -1, "   ");
+  PrettyPrinter prpr("minor_output_complete_ints.txt", "minor_output_results_ints.txt", false, false, -1, "   ");
 
   // computes just one minor:
@@ -152 +152 @@
   int rowCount = mat->nrows;
   int columnCount = mat->ncols;
-  long totalTimeStart, totalTime, printTimeStart, printTime;
+  clock_t totalTimeStart, totalTime, printTimeStart, printTime;
   string testHeader = "COMPUTE ALL MINORS IN A POLY MATRIX";
 
@@ -244 +244 @@
     prpr << totalAdditions << " additions";
     ++prpr << "number of non-zero minors = " << nonZeroCounter;
-    ++prpr << "(time = " << totalTime << " msec)";
+    ++prpr << "(time = " << ((totalTime * 1000) / CLOCKS_PER_SEC) << " msec)";
   }
 
@@ -318 +318 @@
       prpr << totalAdditionsAccumulated << " additions)";
       ++prpr << "number of non-zero minors = " << nonZeroCounter;
-      ++prpr << "(time = " << totalTime << " msec)";
+      ++prpr << "(time = " << ((totalTime * 1000) / CLOCKS_PER_SEC) << " msec)";
       +prpr < "The cache looks like this:";
       +prpr < cch.toString();
@@ -481 +481 @@
 void testAllMinors(PrettyPrinter& prpr, string testHeader, int rowCount, int columnCount, int entryBound, int zeroPercentage,
                    int minorRows, int minorColumns, int minorSize, int randomSeed, int cacheEntries, int cacheWeight) {
-    long totalTimeStart, totalTime, printTimeStart, printTime;
+    clock_t totalTimeStart, totalTime, printTimeStart, printTime;
 
     prpr < testHeader;
@@ -561 +561 @@
     ++prpr << "performed in total " << totalMultiplications << " multiplications and ";
     prpr << totalAdditions << " additions";
-    ++prpr << "(time = " << totalTime << " msec)";
+    ++prpr << "(time = " << ((totalTime * 1000) / CLOCKS_PER_SEC) << " msec)";
 
     for (int strategy = 1; strategy <= 5; strategy++) {
@@ -624 +624 @@
         ++prpr << "(computation without reuse would need " << totalMultiplicationsAccumulated << " and ";
         prpr << totalAdditionsAccumulated << " additions)";
-        ++prpr << "(time = " << totalTime << " msec)";
+        ++prpr << "(time = " << ((totalTime * 1000) / CLOCKS_PER_SEC) << " msec)";
         +prpr < "The cache looks like this:";
         +prpr < cch.toString();
@@ -643 +643 @@
                         int minorSize, int randomSeed, int cacheEntries, int cacheWeight, int targetMinor,
                         bool checkForEquality, int maxLoops) {
-    long totalTimeStart, totalTime, printTimeStart, printTime;
+    clock_t totalTimeStart, totalTime, printTimeStart, printTime;
 
     prpr < testHeader;
@@ -718 +718 @@
     ++prpr << "performed in total " << totalMultiplications << " multiplications and ";
     prpr << totalAdditions << " additions";
-    ++prpr << "(time = " << totalTime << " msec)";
+    ++prpr << "(time = " << ((totalTime * 1000) / CLOCKS_PER_SEC) << " msec)";
 
     for (int strategy = 1; strategy <= 5; strategy++) {
@@ -771 +771 @@
         ++prpr << "(computation without reuse would need " << totalMultiplicationsAccumulated << " and ";
         prpr << totalAdditionsAccumulated << " additions)";
-        ++prpr << "(time = " << totalTime << " msec)";
+        ++prpr << "(time = " << ((totalTime * 1000) / CLOCKS_PER_SEC) << " msec)";
         +prpr < "The cache has " < cch.getNumberOfEntries() < " (of max. " < cacheEntries < ") entries and a weight of ";
         prpr < cch.getWeight() < " (of max. " < cacheWeight < ").";