Changeset 80ba530 in git

Timestamp:

Feb 1, 2010, 11:29:06 AM (14 years ago)

Author:

Frank Seelisch <seelisch@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

835604146a3a1dabecdf5653b203f926bfc98aa1

Parents:

fc323e3421a512eb4770e20b1957b2e139709eb9

Message:

removed development stuff

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

File:

• kernel/matpol.cc (modified) (6 diffs)

kernel/matpol.cc

@@ -50 +50 @@
 static void mpSwapCol(matrix, int, int, int);
 static void mpElimBar(matrix, matrix, poly, int, int);
-
-#ifdef HAVE_MINOR
-unsigned long SM_MULT_Counter = 0;
-unsigned long SM_DIV_Counter = 0;
-int recursionLevel = 0;
-#endif // HAVE_MINOR
 
 /*2
@@ -458 +452 @@
   matrix nextLevel=mpNew(kr,kc);
 
-#ifdef HAVE_MINOR
-  if (recursionLevel == 0)
-  {
-    SM_MULT_Counter = 0;  // for counting basic operations
-    SM_DIV_Counter = 0;   // for counting basic operations
-  }
-#endif // HAVE_MINOR
-
   loop
   {
@@ -479 +465 @@
       if (ar>1)
       {
-#ifdef HAVE_MINOR
-        recursionLevel++;
-#endif // HAVE_MINOR
         mpRecMin(ar-1,result,elems,nextLevel,kr,k,a->m[kr*a->ncols+k],R);
-#ifdef HAVE_MINOR
-        recursionLevel--;
-#endif // HAVE_MINOR
         mpPartClean(nextLevel,kr,k);
       }
@@ -496 +476 @@
     kr--;
   }
-#ifdef HAVE_MINOR
-  if (recursionLevel == 0)
-  {
-    char h[100];
-    sprintf(h, "%s%lu", "total number of calls to 'SM_MULT': ", SM_MULT_Counter);
-    PrintLn(); PrintS(h);
-    sprintf(h, "%s%lu", "total number of calls to 'SM_DIV': ", SM_DIV_Counter);
-    PrintLn(); PrintS(h); PrintLn();
-  }
-#endif // HAVE_MINOR
   mpFinalClean(nextLevel);
 }
@@ -1857 +1827 @@
         {
           q1 = SM_MULT(a[j], piv, div);
-#ifdef HAVE_MINOR
-          SM_MULT_Counter++;
-#endif // HAVE_MINOR
           if (ap[j] != NULL)
           {
-            q2 = SM_MULT(ap[j], elim, div);                 
-#ifdef HAVE_MINOR
-          SM_MULT_Counter++;
-#endif // HAVE_MINOR
+            q2 = SM_MULT(ap[j], elim, div);
             q1 = pAdd(q1,q2);
           }
         }
         else if (ap[j] != NULL)
-          q1 = SM_MULT(ap[j], elim, div);                   
-#ifdef HAVE_MINOR
-          SM_MULT_Counter++;
-#endif // HAVE_MINOR
+          q1 = SM_MULT(ap[j], elim, div);
         if (q1 != NULL)
         {
           if (div)
             SM_DIV(q1, div);                                
-#ifdef HAVE_MINOR
-          SM_DIV_Counter++;
-#endif // HAVE_MINOR
           q[j] = q1;
         }
@@ -1891 +1849 @@
         if (a[j] != NULL)
         {
-          q1 = SM_MULT(a[j], piv, div);                    
-#ifdef HAVE_MINOR
-          SM_MULT_Counter++;
-#endif // HAVE_MINOR
+          q1 = SM_MULT(a[j], piv, div);
           if (div)
             SM_DIV(q1, div);                                
-#ifdef HAVE_MINOR
-          SM_DIV_Counter++;
-#endif // HAVE_MINOR
           q[j] = q1;
         }