Changeset 7e6bfe in git

Timestamp:

Sep 8, 2011, 9:06:08 PM (12 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

38fc1817a82ba6eed7f9f6355cfa06e1e00e1872

Parents:

1a20e55502c0dfa3a9f2bef770f1555129241ab4

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2011-09-08 21:06:08+02:00

git-committer:

Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 16:12:36+01:00

Message:

CHG: cleanup for id_GCD

Files:

• kernel/ideals.cc (modified) (2 diffs)
• libpolys/polys/simpleideals.cc (modified) (1 diff)

kernel/ideals.cc

@@ -2462 +2462 @@
 
 #ifdef HAVE_FACTORY
+#if 0
 poly id_GCD(poly f, poly g, const ring r)
 {
@@ -2477 +2478 @@
   return gcd_p;
 }
+#else
+poly id_GCD(poly f, poly g, const ring r)
+{
+  ideal I=idInit(2,1); I->m[0]=f; I->m[1]=g;
+  intvec *w = NULL;
+
+  ring save_r = currRing; rChangeCurrRing(r); ideal S=idSyzygies(I,testHomog,&w); rChangeCurrRing(save_r);   
+   
+  if (w!=NULL) delete w;
+  poly gg=p_TakeOutComp(&(S->m[0]), 2, r);
+  id_Delete(&S, r);
+  poly gcd_p=singclap_pdivide(f,gg, r);
+  p_Delete(&gg, r);
+   
+  return gcd_p;
+}
+#endif
 #endif
 

libpolys/polys/simpleideals.cc

@@ -1695 +1695 @@
 // #include <kernel/clapsing.h>
 
-#ifdef HAVE_FACTORY
-#if 0
-poly id_GCD(poly f, poly g, const ring r)
-{
-  ring save_r=r;
-  rChangeCurrRing(r);
-  ideal I=idInit(2,1); I->m[0]=f; I->m[1]=g;
-  intvec *w = NULL;
-
-  ideal S=idSyzygies(I,testHomog,&w);
-
-  if (w!=NULL) delete w;
-  poly gg=pTakeOutComp(&(S->m[0]),2);
-  id_Delete(&S, r);
-  poly gcd_p=singclap_pdivide(f,gg);
-  pDelete(&gg);
-  rChangeCurrRing(save_r);
-  return gcd_p;
-}
-#endif
-#endif
-
-
 /*2
 * transpose a module