Changeset b3f6d8 in git

Timestamp:

Feb 9, 2000, 9:15:10 AM (24 years ago)

Author:

Wilfred Pohl <pohl@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

23e9613b6e2954737f783056c61ad070065c84c6

Parents:

dcef92bb720f83006de727ceb364633b0a2cba28

Message:

OLD_DIV for arithmetic


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

Location:

Singular

Files:

• matpol.cc (modified) (6 diffs)
• sparsmat.cc (modified) (2 diffs)
• sparsmat.h (modified) (2 diffs)

Singular/matpol.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: matpol.cc,v 1.31 1999-12-20 12:50:21 Singular Exp $ */
+/* $Id: matpol.cc,v 1.32 2000-02-09 08:15:02 pohl Exp $ */
 
 /*
@@ -1105 +1105 @@
         if (ap[jj] != NULL)
         {
-          q2 = smMultDiv(ap[jj], elim, div);
+          q2 = SM_MULT(ap[jj], elim, div);
           if (a[jj] != NULL)
           {
-            q1 = smMultDiv(a[jj], piv, div);
+            q1 = SM_MULT(a[jj], piv, div);
             pDelete(&a[jj]);
             q2 = pAdd(q2, q1);
@@ -1115 +1115 @@
         else if (a[jj] != NULL)
         {
-          q2 = smMultDiv(a[jj], piv, div);
+          q2 = SM_MULT(a[jj], piv, div);
         }
         if ((q2!=NULL) && div)
-          smSpecialPolyDiv(q2, div);
+          SM_DIV(q2, div);
         a[jj] = q2;
       }
@@ -1130 +1130 @@
         if (a[jj] != NULL)
         {
-          q2 = smMultDiv(a[jj], piv, div);
+          q2 = SM_MULT(a[jj], piv, div);
           pDelete(&a[jj]);
           if (div)
-            smSpecialPolyDiv(q2, div);
+            SM_DIV(q2, div);
           a[jj] = q2;
         }
@@ -1850 +1850 @@
         if (a[j] != NULL)
         {
-          q1 = smMultDiv(a[j], piv, div);
+          q1 = SM_MULT(a[j], piv, div);
           if (ap[j] != NULL)
           {
-            q2 = smMultDiv(ap[j], elim, div);
+            q2 = SM_MULT(ap[j], elim, div);
             q1 = pAdd(q1,q2);
           }
         }
         else if (ap[j] != NULL)
-          q1 = smMultDiv(ap[j], elim, div);
+          q1 = SM_MULT(ap[j], elim, div);
         if (q1 != NULL)
         {
           if (div)
-            smSpecialPolyDiv(q1, div);
+            SM_DIV(q1, div);
           q[j] = q1;
         }
@@ -1873 +1873 @@
         if (a[j] != NULL)
         {
-          q1 = smMultDiv(a[j], piv, div);
+          q1 = SM_MULT(a[j], piv, div);
           if (div)
-            smSpecialPolyDiv(q1, div);
+            SM_DIV(q1, div);
           q[j] = q1;
         }

Singular/sparsmat.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: sparsmat.cc,v 1.24 2000-02-07 17:23:16 Singular Exp $ */
+/* $Id: sparsmat.cc,v 1.25 2000-02-09 08:15:09 pohl Exp $ */
 
 /*
@@ -24 +24 @@
 #include "prCopy.h"
 
-/* ----------------- macros ------------------ */
-#ifdef HAVE_SHIFTED_EXPONENTS
-#define OLD_DIV 1
-#endif
-
-#ifdef OLD_DIV
-#define SM_MULT(A,B,C) smMult(A,B)
-#define SM_DIV smPolyDiv
-#else
-#define SM_MULT smMultDiv
-#define SM_DIV smSpecialPolyDiv
-#endif
 /* ----------------- general definitions ------------------ */
 /* in structs.h

Singular/sparsmat.h

@@ -8 +8 @@
  *
  *******************************************************************/
-/* $Id: sparsmat.h,v 1.3 1999-11-15 17:20:50 obachman Exp $ */
+/* $Id: sparsmat.h,v 1.4 2000-02-09 08:15:10 pohl Exp $ */
 
 
@@ -15 +15 @@
 poly smMultDiv(poly, poly, const poly);
 void smSpecialPolyDiv(poly, poly);
+/* ----------------- macros ------------------ */
+#ifdef HAVE_SHIFTED_EXPONENTS
+#define OLD_DIV 1
+#endif
+
+#ifdef OLD_DIV
+#define SM_MULT(A,B,C) smMult(A,B)
+#define SM_DIV smPolyDiv
+#else
+#define SM_MULT smMultDiv
+#define SM_DIV smSpecialPolyDiv
+#endif
 
 poly smCallDet(ideal I);