Changeset a29c12 in git for Singular/polys.cc

Timestamp:

Jan 27, 1998, 5:20:42 PM (26 years ago)

Author:

Wilfred Pohl <pohl@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

69bba6723e83f4422080c051395b3190dea2224e

Parents:

4f2d37e6d452cc3714ecb45890c403707cc9aba0

Message:

or -> o_r (mac)


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

File:

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

Singular/polys.cc

@@ -1 @@
-
 /****************************************
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: polys.cc,v 1.14 1998-01-16 08:24:04 Singular Exp $ */
+/* $Id: polys.cc,v 1.15 1998-01-27 16:20:42 pohl Exp $ */
 
 /*
@@ -1287 +1286 @@
 /*2
 * sets the comparision routine for monomials: for the first block
-* of variables (or is the number of the ordering)
+* of variables (o_r is the number of the ordering)
 */
 #ifdef COMP_FAST
-static void SimpleChoose(int or, int comp_order, pCompProc *p)
+static void SimpleChoose(int o_r, int comp_order, pCompProc *p)
 #else  
-static void SimpleChoose(int or, pCompProc *p)
+static void SimpleChoose(int o_r, pCompProc *p)
 #endif  
 {
@@ -1302 +1301 @@
   else
   {
-    switch(or)
+    switch(o_r)
     {
         case ringorder_lp:
@@ -1328 +1327 @@
 #ifdef PDEBUG
         default:
-          Werror("wrong internal ordering:%d at %s, l:%d\n",or,__FILE__,__LINE__);
-#endif
-    }
-  }
-  if (or == ringorder_lp || or == ringorder_ls)
+          Werror("wrong internal ordering:%d at %s, l:%d\n",o_r,__FILE__,__LINE__);
+#endif
+    }
+  }
+  if (o_r == ringorder_lp || o_r == ringorder_ls)
   {
       pLexOrder=TRUE;
       pFDeg = pTotaldegree;
       pLDeg = ldeg1c;
-      if (or == ringorder_ls) pLexSgn = -1;
+      if (o_r == ringorder_ls) pLexSgn = -1;
   }
   
@@ -1343 +1342 @@
 #endif
 #ifdef COMP_FAST
-  switch(or)
+  switch(o_r)
   {
       case ringorder_dp:
@@ -1353 +1352 @@
         pSetVarIndicies_RevLex(pVariables);
         pLexSgn = -1;
-        if (comp_order == ringorder_C || or == ringorder_unspec)
+        if (comp_order == ringorder_C || o_r == ringorder_unspec)
         {
           if (pVariables1W == 1)
@@ -1413 +1412 @@
         break;
       default:
-        Werror("wrong internal ordering:%d at %s, l:%d\n",or,__FILE__,__LINE__);
+        Werror("wrong internal ordering:%d at %s, l:%d\n",o_r,__FILE__,__LINE__);
 #endif
   }
   
-  if (or == ringorder_lp || or == ringorder_ls)
+  if (o_r == ringorder_lp || o_r == ringorder_ls)
   {
     pLexOrder=TRUE;
     pFDeg = pTotaldegree;
     pLDeg = ldeg1c;
-    if (or == ringorder_ls)
+    if (o_r == ringorder_ls)
       pSetVarIndicies_Lex(pVariables);
   }
@@ -1435 +1434 @@
 /*2
 * sets pSetm
-* (according or = order of first block)
-*/
-static void SetpSetm(int or, int ip)
-{
-  switch(or)
+* (according o_r = order of first block)
+*/
+static void SetpSetm(int o_r, int ip)
+{
+  switch(o_r)
   {
     case ringorder_lp:
@@ -1470 +1469 @@
 #ifdef TEST
     default:
-      Werror("wrong internal ordering:%d at %s, l:%d\n",or,__FILE__,__LINE__);
+      Werror("wrong internal ordering:%d at %s, l:%d\n",o_r,__FILE__,__LINE__);
 #endif
   }
@@ -1478 +1477 @@
 /*2
 * sets the comparision routine for monomials: for the first block
-* of variables (or is the number of the ordering)
+* of variables (o_r is the number of the ordering)
 */
 #ifdef COMP_FAST
-static void SimpleChooseC(int or, int comp_order, pCompProc *p)
+static void SimpleChooseC(int o_r, int comp_order, pCompProc *p)
 #else  
-static void SimpleChooseC(int or, pCompProc *p)
+static void SimpleChooseC(int o_r, pCompProc *p)
 #endif  
 {
@@ -1493 +1492 @@
   else
   {
-    switch(or)
+    switch(o_r)
     {
         case ringorder_lp:
@@ -1519 +1518 @@
 #ifdef PDEBUG
         default:
-          Werror("wrong internal ordering:%d at %s, l:%d\n",or,__FILE__,__LINE__);
-#endif
-    }
-  }
-  if (or == ringorder_lp || or == ringorder_ls)
+          Werror("wrong internal ordering:%d at %s, l:%d\n",o_r,__FILE__,__LINE__);
+#endif
+    }
+  }
+  if (o_r == ringorder_lp || o_r == ringorder_ls)
   {
       pLexOrder=TRUE;
       pFDeg = pTotaldegree;
       pLDeg = ldeg1c;
-      if (or == ringorder_ls) pLexSgn = -1;
+      if (o_r == ringorder_ls) pLexSgn = -1;
   }
   
@@ -1534 +1533 @@
 #endif
 #ifdef COMP_FAST
-  switch(or)
+  switch(o_r)
   {
       case ringorder_dp:
@@ -1575 +1574 @@
         break;
       default:
-        Werror("wrong internal ordering:%d at %s, l:%d\n",or,__FILE__,__LINE__);
-#endif
-  }
-  if (or == ringorder_lp || or == ringorder_ls)
+        Werror("wrong internal ordering:%d at %s, l:%d\n",o_r,__FILE__,__LINE__);
+#endif
+  }
+  if (o_r == ringorder_lp || o_r == ringorder_ls)
   {
     pLexOrder=TRUE;
     pFDeg = pTotaldegree;
     pLDeg = ldeg1c;
-    if (or == ringorder_ls)
+    if (o_r == ringorder_ls)
      pSetVarIndicies_Lex(pVariables);
   }
@@ -1596 +1595 @@
 /*2
 * sets the comparision routine for monomials: for all but the first
-* block of variables (ip is the block number, or the number of the ordering)
-*/
-static void HighSet(int ip, int or)
-{
-  switch(or)
+* block of variables (ip is the block number, o_r the number of the ordering)
+*/
+static void HighSet(int ip, int o_r)
+{
+  switch(o_r)
   {
     case ringorder_lp:
@@ -1658 +1657 @@
 #ifdef TEST
     default:
-      Werror("wrong internal ordering:%d at %s, l:%d\n",or,__FILE__,__LINE__);
+      Werror("wrong internal ordering:%d at %s, l:%d\n",o_r,__FILE__,__LINE__);
 #endif
   }