Changeset ad82f6 in git

Timestamp:

Sep 22, 2008, 6:27:17 PM (15 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', 'f6c3dc58b0df4bd712574325fe76d0626174ad97')

Children:

d97aa56019829e7ee4d56c080928c7930fabeca9

Parents:

8492bd5dbfc42db0b4dbc2cf846ce087318ce006

Message:

*hannes: psr


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

File:

• factory/cf_algorithm.cc (modified) (4 diffs)

factory/cf_algorithm.cc

@@ -1 +1 @@
 /* emacs edit mode for this file is -*- C++ -*- */
-/* $Id: cf_algorithm.cc,v 1.13 2008-06-19 15:58:18 Singular Exp $ */
+/* $Id: cf_algorithm.cc,v 1.14 2008-09-22 16:27:17 Singular Exp $ */
 
 //{{{ docu
@@ -30 +30 @@
 #include "cf_iter.h"
 #include "ftmpl_functions.h"
+
+void out_cf(char *s1,const CanonicalForm &f,char *s2);
 
 //{{{ CanonicalForm psr ( const CanonicalForm & f, const CanonicalForm & g, const Variable & x )
@@ -109 +111 @@
 }
 #else
-psr ( const CanonicalForm &rr, const CanonicalForm &vv, const Variable & x ){
+psr ( const CanonicalForm &rr, const CanonicalForm &vv, const Variable & x )
+{
   CanonicalForm r=rr, v=vv, l, test, lu, lv, t, retvalue;
   int dr, dv, d,n=0;
@@ -115 +118 @@
 
   dr = degree( r, x );
-  dv = degree( v, x );
-  if (dv <= dr) {l=LC(v,x); v = v -l*power(x,dv);}
-  else { l = 1; }
-  d= dr-dv+1;
-  while ( ( dv <= dr  ) && ( r != r.genZero()) )
+  if (dr>0)
   {
-    test = power(x,dr-dv)*v*LC(r,x);
-    if ( dr == 0 ) { r= CanonicalForm(0); }
-    else { r= r - LC(r,x)*power(x,dr); }
-    r= l*r -test;
-    dr= degree(r,x);
-    n+=1;
+    dv = degree( v, x );
+    if (dv <= dr) {l=LC(v,x); v = v -l*power(x,dv);}
+    else { l = 1; }
+    d= dr-dv+1;
+    //out_cf("psr(",rr," ");
+    //out_cf("",vv," ");
+    //printf(" var=%d\n",x.level());
+    while ( ( dv <= dr  ) && ( !r.isZero()) )
+    {
+      test = power(x,dr-dv)*v*LC(r,x);
+      if ( dr == 0 ) { r= CanonicalForm(0); }
+      else { r= r - LC(r,x)*power(x,dr); }
+      r= l*r -test;
+      dr= degree(r,x);
+      n+=1;
+    }
+    r= power(l, d-n)*r;
   }
-  r= power(l, d-n)*r;
   return r;
 }