Changeset ab33f6e in git

Timestamp:

Aug 13, 2009, 2:48:39 PM (14 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

6620d757775d0859e2fea065552c5016ad0a0089

Parents:

47b2b2d4786e5e56325d65b21c6f1f85c064cf69

Message:

*hannes: indep. of currRing


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

Location:

kernel

Files:

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

kernel/clapconv.cc

@@ -3 +3 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-// $Id: clapconv.cc,v 1.13 2009-08-05 17:28:16 Singular Exp $
+// $Id: clapconv.cc,v 1.14 2009-08-13 12:48:39 Singular Exp $
 /*
 * ABSTRACT: convert data between Singular and factory
@@ -97 +97 @@
 }
 
-CanonicalForm conv_SingPFactoryP( poly p, ring r )
+CanonicalForm convSingPFactoryP( poly p, const ring r )
 {
   CanonicalForm result = 0;
@@ -157 +157 @@
 }
 
-poly conv_FactoryPSingP ( const CanonicalForm & f, ring r )
+poly convFactoryPSingP ( const CanonicalForm & f, const ring r )
 {
 //    cerr << " f = " << f << endl;

kernel/clapconv.h

@@ -3 +3 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-// $Id: clapconv.h,v 1.3 2008-01-07 13:36:16 Singular Exp $
+// $Id: clapconv.h,v 1.4 2009-08-13 12:48:39 Singular Exp $
 /*
 * ABSTRACT: convert data between Singular and factory
@@ -19 +19 @@
 CanonicalForm convSingTrFactoryP( napoly p );
 
-#define  convSingPFactoryP(p) conv_SingPFactoryP(p,currRing)
-
-poly conv_FactoryPSingP ( const CanonicalForm & f, ring r );
-CanonicalForm conv_SingPFactoryP( poly p, ring r );
-
-#define  convFactoryPSingP(p) conv_FactoryPSingP(p,currRing)
+poly convFactoryPSingP ( const CanonicalForm & f, const ring r=currRing );
+CanonicalForm convSingPFactoryP( poly p, const ring r=currRing );
 
 CanonicalForm convSingAPFactoryAP ( poly p , const Variable & a );

kernel/clapsing.cc

@@ -3 +3 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-// $Id: clapsing.cc,v 1.40 2009-08-06 10:18:24 Singular Exp $
+// $Id: clapsing.cc,v 1.41 2009-08-13 12:48:39 Singular Exp $
 /*
 * ABSTRACT: interface between Singular and factory
@@ -131 +131 @@
   if (p_IsConstantPoly(f,r) || p_IsConstantPoly(g,r))
   {
-    return pOne();
+    return p_One(r);
   }
 
@@ -141 +141 @@
     CanonicalForm newGCD(const CanonicalForm & A, const CanonicalForm & B);
     setCharacteristic( n_GetChar(r) );
-    CanonicalForm F( conv_SingPFactoryP( f,r ) ), G( conv_SingPFactoryP( g, r ) );
+    CanonicalForm F( convSingPFactoryP( f,r ) ), G( convSingPFactoryP( g, r ) );
     //if (nGetChar() > 1 )
     //{
@@ -148 +148 @@
     //}
     //else
-      res=conv_FactoryPSingP( gcd( F, G ) , r);
+      res=convFactoryPSingP( gcd( F, G ) , r);
   }
   else
@@ -154 +154 @@
 
   Off(SW_RATIONAL);
-  pTest(res);
   return res;
 }