Changeset 954622 in git for Singular/polys.cc

Timestamp:

Jan 5, 1998, 5:39:30 PM (26 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

c3f65f904023367359e5ea645233a032bc19ec97

Parents:

9804bd89225c20a26731f3612ccb6b9060765066

Message:

* hannes: fixes for "TEST_MAC_ORDER" and some optimizations for binomials
   (binom.cc binom.h claptmpl.cc ipid.h kstd1.cc kstd2.cc kutil.cc
   polys-impl.h polys.cc polys.h polys0.cc polys1.cc ring.h spolys.cc spolys0.h)


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

File:

• Singular/polys.cc (modified) (5 diffs)

Singular/polys.cc

@@ -3 +3 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: polys.cc,v 1.11 1997-12-16 18:24:00 obachman Exp $ */
+/* $Id: polys.cc,v 1.12 1998-01-05 16:39:26 Singular Exp $ */
 
 /*
@@ -1926 +1926 @@
          short ** wv)
 {
+#ifdef TEST_MAC_ORDER
+  bNoAdd=FALSE;
+#endif
   int i;
   pComponentOrder=1;
@@ -1999 +2002 @@
 #ifdef TEST_MAC_ORDER
     if (orders[0]==ringorder_dp)
-       bBinomSet();
+       bBinomSet(orders);
 #endif
   }
@@ -2016 +2019 @@
 #endif    
     SetpSetm(orders[1],1);
+#ifdef TEST_MAC_ORDER
+    if (orders[1]==ringorder_dp)
+       bBinomSet(orders);
+#endif
   }
   /*------- more than one block ----------------------*/
@@ -2147 +2154 @@
            pAddExp(a,i, pGetExp(exp,i));
         }
-        #ifndef TEST_MAC_ORDER
-        a->Order += exp->Order;
-        #else
-        pSetm(a);
+        #ifdef TEST_MAC_ORDER
+        if (bNoAdd)
+          pSetm(a);
+        else
         #endif
+          a->Order += exp->Order;
         if (pMultT_nok)
         {