Changeset 1f5db38 in git for kernel/ideals.cc

Timestamp:

May 18, 2009, 2:03:28 PM (14 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '8d54773d6c9e2f1d2593a28bc68b7eeab54ed529')

Children:

8660795525dd05cd4a19c0ba04f85758df5542fa

Parents:

0dc61ffc743dea40243ea5543d8c57f268e2f381

Message:

*hannes: proc var


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

File:

• kernel/ideals.cc (modified) (3 diffs)

kernel/ideals.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ideals.cc,v 1.71 2009-02-25 18:15:03 Singular Exp $ */
+/* $Id: ideals.cc,v 1.72 2009-05-18 12:03:28 Singular Exp $ */
 /*
 * ABSTRACT - all basic methods to manipulate ideals
@@ -3037 +3037 @@
   int i,j,cmax=2,order=0,ord,* diff,* iscom,diffmin=32000;
   poly p=NULL;
+  pFDegProc d;
+  if (pLexOrder && (currRing->order[0]==ringorder_lp))
+     d=pTotaldegree;
+  else 
+     d=pFDeg;
   int length=IDELEMS(m);
   polyset P=m->m;
@@ -3069 +3074 @@
         p = F[i];
       }
-      if (pLexOrder && (currRing->order[0]==ringorder_lp))
-        order=pTotaldegree(p);
-      else
+      //if (pLexOrder && (currRing->order[0]==ringorder_lp))
+      //  order=pTotaldegree(p);
+      //else
       //  order = p->order;
-        order = pFDeg(p,currRing);
-      order += diff[pGetComp(p)];
+      //  order = pFDeg(p,currRing);
+      order = d(p,currRing) +diff[pGetComp(p)];
+      //order += diff[pGetComp(p)];
       p = F[i];
 //Print("Actual p=F[%d]: ",i);pWrite(p);