Changeset 3ecd5f in git for kernel/tgb.cc

Timestamp:

Feb 20, 2006, 1:28:25 PM (18 years ago)

Author:

Michael Brickenstein <bricken@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

839ec19c4ad0dc6a59849ee222f43327491e54d6

Parents:

6b4fbf721b6d9185133f9a11fa31512c69502bf6

Message:

*bricken: further improved pair handling


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

File:

• kernel/tgb.cc (modified) (5 diffs)

kernel/tgb.cc

@@ -5 +5 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: tgb.cc,v 1.58 2006-02-20 11:57:03 bricken Exp $ */
+/* $Id: tgb.cc,v 1.59 2006-02-20 12:28:25 bricken Exp $ */
 /*
 * ABSTRACT: slimgb and F4 implementation
@@ -994 +994 @@
             slim_nsize(p_GetCoeff(c->S->m[j],c->r),c->r);
         return (c->lengths[i]+c->lengths[j]-2)*cs;
+    }
+    if (pLexOrder) {
+
+        return (c->weighted_lengths[i]+c->weighted_lengths[j]-2);
     }
     return c->lengths[i]+c->lengths[j]-2;
@@ -1997 +2001 @@
       si->i=-1;
       si->j=-2;
-      si->expected_length=pLength(I->m[i]);
+      si->expected_length=pQuality(I->m[i],this,pLength(I->m[i]));
       si->deg=pTotaldegree(I->m[i]);
       if (!rField_is_Zp(r)){ 
@@ -2060 +2064 @@
   omfree(c->states);
   omfree(c->lengths);
+  omfree(c->weighted_lengths);
   for(int z=0;z<c->n;z++)
   {
@@ -3068 +3073 @@
         pContent(p);
       }
-      si->expected_length=pLength(p);
+      si->expected_length=pQuality(p,c,pLength(p));
       si->deg=pTotaldegree(p);