Changeset 5a4e17 in git for libpolys/polys/clapsing.cc

Timestamp:

Aug 14, 2013, 5:44:47 PM (11 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

e7af713b2118666efd56a51c8fd09dcc0b99e0ee

Parents:

adae8b2811aa80401958b914b4cfc7d0ad8eb36b

Message:

chg: improve ntNormalize etc.

File:

• libpolys/polys/clapsing.cc (modified) (2 diffs)

libpolys/polys/clapsing.cc

@@ -59 +59 @@
 void out_cf(const char *s1,const CanonicalForm &f,const char *s2);
 
-static poly singclap_gcd_r ( poly f, poly g, const ring r )
+poly singclap_gcd_r ( poly f, poly g, const ring r )
 {
   poly res=NULL;
@@ -66 +66 @@
   assume(g!=NULL);
 
-  if((pNext(f)==NULL) && (pNext(g)==NULL))
+  if(pNext(f)==NULL) 
   {
     poly p=p_One(r);
+    if (pNext(g)==NULL)
+    {
+      for(int i=rVar(r);i>0;i--)
+        p_SetExp(p,i,si_min(p_GetExp(f,i,r),p_GetExp(g,i,r)),r);
+      p_Setm(p,r);
+      return p;
+    }
+#if 0
+    else
+    {
+      poly h=g;
+      for(int i=rVar(r);i>0;i--)
+        p_SetExp(p,i,p_GetExp(f,i,r),r);
+      while(h!=NULL)
+      {
+        for(int i=rVar(r);i>0;i--)
+          p_SetExp(p,i,si_min(p_GetExp(p,i,r),p_GetExp(h,i,r)),r);
+        pIter(h);
+      }
+      p_Setm(p,r);
+      return p;
+    }
+#endif
+  }
+#if 0
+  else if (pNext(g)==NULL)
+  {
+    poly p=p_One(r);
+    poly h=f;
     for(int i=rVar(r);i>0;i--)
-      p_SetExp(p,i,si_min(p_GetExp(f,i,r),p_GetExp(g,i,r)),r);
+      p_SetExp(p,i,p_GetExp(g,i,r),r);
+    while(h!=NULL)
+    {
+      for(int i=rVar(r);i>0;i--)
+        p_SetExp(p,i,si_min(p_GetExp(p,i,r),p_GetExp(h,i,r)),r);
+      pIter(h);
+    }
     p_Setm(p,r);
     return p;
   }
+#endif
 
   Off(SW_RATIONAL);