Changeset 91d0e6 in git

Timestamp:

Aug 5, 2009, 7:29:12 PM (14 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '828514cf6e480e4bafc26df99217bf2a1ed1ef45')

Children:

3d6c38c30089200c989a79851a19bf43b565678e

Parents:

dc560f747a6867005b5ce262a19ac0d38e7137f9

Message:

*hannes: singclap_gcd_r


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

Location:

kernel

Files:

• clapsing.cc (modified) (3 diffs)
• clapsing.h (modified) (2 diffs)

kernel/clapsing.cc

@@ -3 +3 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-// $Id: clapsing.cc,v 1.37 2009-07-28 14:15:05 Singular Exp $
+// $Id: clapsing.cc,v 1.38 2009-08-05 17:29:12 Singular Exp $
 /*
 * ABSTRACT: interface between Singular and factory
@@ -196 +196 @@
 
 
-poly singclap_gcd ( poly f, poly g )
+poly singclap_gcd ( poly f, poly g, const ring r )
 {
   poly res=NULL;
@@ -288 +288 @@
   pDelete(&f);
   pDelete(&g);
+  pTest(res);
+  return res;
+}
+
+poly singclap_gcd_r ( poly f, poly g, const ring r )
+{
+  // assume pCleardenom is done
+  // assume f!=0, g!=0
+  poly res=NULL;
+
+  if (p_IsConstantPoly(f,r) || p_IsConstantPoly(g,r))
+  {
+    return pOne();
+  }
+
+  // for now there is only the possibility to handle polynomials over
+  // Q and Fp ...
+  Off(SW_RATIONAL);
+  if (rField_is_Q(r) || (rField_is_Zp(r)))
+  {
+    CanonicalForm newGCD(const CanonicalForm & A, const CanonicalForm & B);
+    setCharacteristic( n_GetChar(r) );
+    CanonicalForm F( conv_SingPFactoryP( f,r ) ), G( conv_SingPFactoryP( g, r ) );
+    //if (nGetChar() > 1 )
+    //{
+    //  res=convFactoryPSingP( newGCD( F,G ));
+    //  if (!nGreaterZero(pGetCoeff(res))) res=pNeg(res);
+    //}
+    //else
+      res=conv_FactoryPSingP( gcd( F, G ) , r);
+  }
+  else
+    WerrorS( feNotImplemented );
+
+  Off(SW_RATIONAL);
   pTest(res);
   return res;

kernel/clapsing.h

@@ -3 +3 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-// $Id: clapsing.h,v 1.2 2008-01-23 15:42:10 Singular Exp $
+// $Id: clapsing.h,v 1.3 2009-08-05 17:29:12 Singular Exp $
 /*
 * ABSTRACT: interface between Singular and factory
@@ -19 +19 @@
 
 poly singclap_gcd ( poly f, poly g );
+poly singclap_gcd_r ( poly f, poly g, const ring r );
 napoly singclap_alglcm ( napoly f, napoly g );
 void singclap_algdividecontent ( napoly f, napoly g, napoly &ff, napoly &gg );