Changeset 3086df in git

Timestamp:

Oct 2, 2009, 4:16:57 PM (15 years ago)

Author:

Frank Seelisch <seelisch@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

414d035b432a95898b803d8803f4ebc5eee0166e

Parents:

f2dcd1b022b58cf3a4a8c2c40138fcd7a41c8fe7

Message:

*** empty log message ***


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

File:

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

kernel/matpol.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: matpol.cc,v 1.17 2009-10-02 13:48:13 seelisch Exp $ */
+/* $Id: matpol.cc,v 1.18 2009-10-02 14:16:57 seelisch Exp $ */
 
 /*
@@ -655 +655 @@
   l = 1; /* k,l:the index in result*/
   idInitChoise(ar,1,a->nrows,&rowch,rowchoise);
+  totalNumOfMult = 0; totalNumOfAdd = 0; // for counting basic arithmetic operations
   while (!rowch)
   {
@@ -677 +678 @@
     l++;
   }
-
+<<<<<<< matpol.cc
+  PrintS("==========================================================================");
+  printf("total number of calls to pAdd = %d", totalNumOfAdd);
+  printf("total number of calls to smMultDiv = %d", totalNumOfMult);
+  PrintS("(smMultDiv(a,b,c) returns the portion of (a*b)/LM(c) with nonegative");
+  PrintS(" exponents; for more than five monomials this method makes use of buckets)");
+  PrintS("==========================================================================");
+=======
+
+>>>>>>> 1.17
   /*delete the matrix tmp*/
   for (i=1; i<=ar; i++)
@@ -1111 +1121 @@
         if (ap[jj] != NULL)
         {
+          totalNumOfMult++;
           q2 = SM_MULT(ap[jj], elim, div);
           if (a[jj] != NULL)
           {
+            totalNumOfMult++;
             q1 = SM_MULT(a[jj], piv, div);
             pDelete(&a[jj]);
+            totalNumOfAdd++;
             q2 = pAdd(q2, q1);
           }
@@ -1121 +1134 @@
         else if (a[jj] != NULL)
         {
+          totalNumOfMult++;
           q2 = SM_MULT(a[jj], piv, div);
         }
@@ -1136 +1150 @@
         if (a[jj] != NULL)
         {
+          totalNumOfMult++;
           q2 = SM_MULT(a[jj], piv, div);
           pDelete(&a[jj]);