Changeset d351d8 in git for kernel/kutil.cc

Timestamp:

Jul 7, 2008, 2:21:43 PM (16 years ago)

Author:

Oliver Wienand <wienand@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

5213495c7848b41c2054e3b3f459b68bb4b7de04

Parents:

d81b79a04dd97fbb40df1b3a823019d92d8987a7

Message:

* nComp --> nDivComp
* ring definition like decided during meeting
* initstrattailring for gcd poly adapted


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

File:

• kernel/kutil.cc (modified) (4 diffs)

kernel/kutil.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kutil.cc,v 1.95 2008-07-04 16:17:15 motsak Exp $ */
+/* $Id: kutil.cc,v 1.96 2008-07-07 12:21:42 wienand Exp $ */
 /*
 * ABSTRACT: kernel: utils for kStd
@@ -1106 +1106 @@
   {
     compare=pDivCompRing(strat->B[j].lcm,Lp.lcm);
-    compareCoeff = nComp(pGetCoeff(strat->B[j].lcm), pGetCoeff(Lp.lcm));
+    compareCoeff = nDivComp(pGetCoeff(strat->B[j].lcm), pGetCoeff(Lp.lcm));
     if (compareCoeff == 0 || compare == compareCoeff)
     {
@@ -2235 +2235 @@
   {
     compare=pDivCompRing(strat->B[j].lcm,Lp.lcm);
-    compareCoeff = nComp(pGetCoeff(strat->B[j].lcm), pGetCoeff(Lp.lcm));
+    compareCoeff = nDivComp(pGetCoeff(strat->B[j].lcm), pGetCoeff(Lp.lcm));
     if (compareCoeff == 0 || compare == compareCoeff)
     {
@@ -5889 +5889 @@
     l = p_GetMaxExpL(strat->T[i].p, currRing, l);
   }
+  if (rField_is_Ring(currRing))
+  {
+    l += 20; // TEMP, TODO OLI
+    l *= 2;
+  }
   e = p_GetMaxExp(l, currRing);
   if (e <= 1) e = 2;