Changeset b130fb in git for kernel/kstdfac.cc

Timestamp:

Feb 17, 2005, 10:42:23 AM (19 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

08db0a0dca2c73d19b0d83ba8110def246830498

Parents:

ecce503e3c38e63f043db34fbea817c3fc1fdc6c

Message:

*hannes: gcc-3.4


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

File:

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

kernel/kstdfac.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kstdfac.cc,v 1.1.1.1 2003-10-06 12:15:56 Singular Exp $ */
+/* $Id: kstdfac.cc,v 1.2 2005-02-17 09:42:20 Singular Exp $ */
 /*
 *  ABSTRACT -  Kernel: factorizing alg. of Buchberger
@@ -239 +239 @@
 BOOLEAN k_factorize(poly p,ideal &rfac, ideal &fac_copy)
 {
-  int facdeg=pFDeg(p);
+  int facdeg=pFDeg(p,currRing);
   ideal fac=singclap_factorize(p,NULL,1);
   int fac_elems;
@@ -255 +255 @@
   fac_copy=idInit(fac_elems,1);
 
-  if ((fac_elems!=1)||(facdeg!=pFDeg(fac->m[0])))
+  if ((fac_elems!=1)||(facdeg!=pFDeg(fac->m[0],currRing)))
   {
     if (TEST_OPT_DEBUG)
@@ -504 +504 @@
     if (TEST_OPT_DEGBOUND
     && ((strat->honey
-        && (strat->L[strat->Ll].ecart+pFDeg(strat->L[strat->Ll].p)>Kstd1_deg))
-      || ((!strat->honey) && (pFDeg(strat->L[strat->Ll].p)>Kstd1_deg))))
+        && (strat->L[strat->Ll].ecart+pFDeg(strat->L[strat->Ll].p,currRing)>Kstd1_deg))
+      || ((!strat->honey) && (pFDeg(strat->L[strat->Ll].p,currRing)>Kstd1_deg))))
     {
       /*
@@ -530 +530 @@
     {
       if (TEST_OPT_PROT)
-        message(strat->P.ecart+pFDeg(strat->P.p),&olddeg,&reduc,strat, red_result);
+        message(strat->P.ecart+pFDeg(strat->P.p,currRing),&olddeg,&reduc,strat, red_result);
     }
     else
     {
       if (TEST_OPT_PROT)
-        message(pFDeg(strat->P.p),&olddeg,&reduc,strat, red_result);
+        message(pFDeg(strat->P.p,currRing),&olddeg,&reduc,strat, red_result);
     }
     /* reduction of the element choosen from L */