Changeset 69618d in git

Timestamp:

Feb 7, 2000, 6:22:07 PM (24 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '2a584933abf2a2d3082034c7586d38bb6de1a30a')

Children:

c01d03a2d29234c0b04fec15e4de017e64e9d6b5

Parents:

68cf0679b21833f59029fca1df0a0e16b01f5ff1

Message:

*hannes: SHIFTED_EXP


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

Location:

Singular

Files:

• polys-impl.cc (modified) (3 diffs)
• ring.cc (modified) (2 diffs)

Singular/polys-impl.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: polys-impl.cc,v 1.34 1999-11-24 14:07:23 obachman Exp $ */
+/* $Id: polys-impl.cc,v 1.35 2000-02-07 17:21:48 Singular Exp $ */
 
 /***************************************************************
@@ -817 +817 @@
     }
     int i=pVariables;
+#ifndef HAVE_SHIFTED_EXPONENTS
+    // can not hapen for SHIFTED_EXPONENTS
     for(;i;i--)
     {
@@ -825 +827 @@
       }
     }
+#endif
     if (pGetComp(p)<0)
     {

Singular/ring.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ring.cc,v 1.96 2000-01-26 18:10:53 Singular Exp $ */
+/* $Id: ring.cc,v 1.97 2000-02-07 17:22:07 Singular Exp $ */
 
 /*
@@ -2039 +2039 @@
         }
         else
-        if ((r->typ[j].ord_typ!=ro_syzcomp)
-         && (r->VarOffset[i]/(sizeof(long)/sizeof(Exponent_t)))
-           == (size_t)r->typ[j].data.dp.place)
-          Warn("ordrec %d conflicts with var %d\n",j,i);
+        #ifdef HAVE_SHIFTED_EXPONENTS
+          if ((r->typ[j].ord_typ!=ro_syzcomp)
+          && (r->VarOffset[i] == r->typ[j].data.dp.place))
+            Warn("ordrec %d conflicts with var %d\n",j,i);
+        #else
+          if ((r->typ[j].ord_typ!=ro_syzcomp)
+           && (r->VarOffset[i]/(sizeof(long)/sizeof(Exponent_t)))
+             == (size_t)r->typ[j].data.dp.place)
+            Warn("ordrec %d conflicts with var %d\n",j,i);
+        #endif
       }
     }