Changeset ab33f6e in git
 Timestamp:
 Aug 13, 2009, 2:48:39 PM (14 years ago)
 Branches:
 (u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')
 Children:
 6620d757775d0859e2fea065552c5016ad0a0089
 Parents:
 47b2b2d4786e5e56325d65b21c6f1f85c064cf69
 Location:
 kernel
 Files:

 3 edited
Legend:
 Unmodified
 Added
 Removed

kernel/clapconv.cc
r47b2b2d rab33f6e 3 3 * Computer Algebra System SINGULAR * 4 4 ****************************************/ 5 // $Id: clapconv.cc,v 1.1 3 20090805 17:28:16Singular Exp $5 // $Id: clapconv.cc,v 1.14 20090813 12:48:39 Singular Exp $ 6 6 /* 7 7 * ABSTRACT: convert data between Singular and factory … … 97 97 } 98 98 99 CanonicalForm conv _SingPFactoryP( poly p,ring r )99 CanonicalForm convSingPFactoryP( poly p, const ring r ) 100 100 { 101 101 CanonicalForm result = 0; … … 157 157 } 158 158 159 poly conv _FactoryPSingP ( const CanonicalForm & f,ring r )159 poly convFactoryPSingP ( const CanonicalForm & f, const ring r ) 160 160 { 161 161 // cerr << " f = " << f << endl; 
kernel/clapconv.h
r47b2b2d rab33f6e 3 3 * Computer Algebra System SINGULAR * 4 4 ****************************************/ 5 // $Id: clapconv.h,v 1. 3 20080107 13:36:16Singular Exp $5 // $Id: clapconv.h,v 1.4 20090813 12:48:39 Singular Exp $ 6 6 /* 7 7 * ABSTRACT: convert data between Singular and factory … … 19 19 CanonicalForm convSingTrFactoryP( napoly p ); 20 20 21 #define convSingPFactoryP(p) conv_SingPFactoryP(p,currRing) 22 23 poly conv_FactoryPSingP ( const CanonicalForm & f, ring r ); 24 CanonicalForm conv_SingPFactoryP( poly p, ring r ); 25 26 #define convFactoryPSingP(p) conv_FactoryPSingP(p,currRing) 21 poly convFactoryPSingP ( const CanonicalForm & f, const ring r=currRing ); 22 CanonicalForm convSingPFactoryP( poly p, const ring r=currRing ); 27 23 28 24 CanonicalForm convSingAPFactoryAP ( poly p , const Variable & a ); 
kernel/clapsing.cc
r47b2b2d rab33f6e 3 3 * Computer Algebra System SINGULAR * 4 4 ****************************************/ 5 // $Id: clapsing.cc,v 1.4 0 20090806 10:18:24Singular Exp $5 // $Id: clapsing.cc,v 1.41 20090813 12:48:39 Singular Exp $ 6 6 /* 7 7 * ABSTRACT: interface between Singular and factory … … 131 131 if (p_IsConstantPoly(f,r)  p_IsConstantPoly(g,r)) 132 132 { 133 return p One();133 return p_One(r); 134 134 } 135 135 … … 141 141 CanonicalForm newGCD(const CanonicalForm & A, const CanonicalForm & B); 142 142 setCharacteristic( n_GetChar(r) ); 143 CanonicalForm F( conv _SingPFactoryP( f,r ) ), G( conv_SingPFactoryP( g, r ) );143 CanonicalForm F( convSingPFactoryP( f,r ) ), G( convSingPFactoryP( g, r ) ); 144 144 //if (nGetChar() > 1 ) 145 145 //{ … … 148 148 //} 149 149 //else 150 res=conv _FactoryPSingP( gcd( F, G ) , r);150 res=convFactoryPSingP( gcd( F, G ) , r); 151 151 } 152 152 else … … 154 154 155 155 Off(SW_RATIONAL); 156 pTest(res);157 156 return res; 158 157 }
Note: See TracChangeset
for help on using the changeset viewer.