Changeset 18255d in git for Singular/ring.cc

Timestamp:

Mar 19, 1998, 5:05:53 PM (26 years ago)

Author:

Olaf Bachmann <obachman@…>

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

Children:

737b2b4e3dd7efb3603cab701c4146ea17e9805e

Parents:

7f1b912b1613387b9ef8e0f2a053a2c335b9b5da

Message:

1998-03-18  Olaf Bachmann  <obachman@mathematik.uni-kl.de>

	* Cleaned up COMP_FAST and related #defines almost everywhere


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

File:

• Singular/ring.cc (modified) (2 diffs)

Singular/ring.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ring.cc,v 1.17 1998-03-18 14:28:52 obachman Exp $ */
+/* $Id: ring.cc,v 1.18 1998-03-19 16:05:51 obachman Exp $ */
 
 /*
@@ -1672 +1672 @@
         r->order[0] != ringorder_M)))
   {
-    if ((r->order[1]==ringorder_c)||(r->order[1]==ringorder_C))
-    {
-      return rOrderType_ExpComp;
+    if ((r->order[1] == ringorder_c) || (r->order[1] == ringorder_C))
+    {
+      switch(r->order[0])
+      {
+          case ringorder_dp:
+          case ringorder_wp:
+          case ringorder_ds:
+          case ringorder_ws:
+          case ringorder_ls:
+          case ringorder_unspec:
+            if (r->order[1] == ringorder_C ||  r->order[0] == ringorder_unspec)
+              return rOrderType_ExpComp;
+            return rOrderType_Exp;
+       
+          default:
+            assume(r->order[1] == ringorder_lp ||
+                   r->order[1] == ringorder_Dp ||
+                   r->order[1] == ringorder_Wp ||
+                   r->order[1] == ringorder_Ds ||
+                   r->order[1] == ringorder_Ws);
+            
+            if (r->order[1] == ringorder_c) return rOrderType_ExpComp;
+            return rOrderType_Exp;
+      }
     }
     else