Changeset f0a8c59 in git

Timestamp:

Jul 19, 2011, 5:55:43 PM (13 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

99cfa5e3566af5edf083913e4d9a15e16196be67

Parents:

f478f5beee78cd910479115b993cc9e7b02b82a8

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2011-07-19 17:55:43+02:00

git-committer:

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

Message:

FIX: pNorm, was a macro => wrong method name... :/
FIX: nGcd may need currRing or another ring: moved to polys/polys.h for now

Files:

• kernel/kInline.h (modified) (3 diffs)
• libpolys/coeffs/numbers.h (modified) (1 diff)
• libpolys/polys/polys.h (modified) (2 diffs)

kernel/kInline.h

@@ -14 +14 @@
 #if !defined(NO_KINLINE) || defined(KUTIL_CC)
 
+#include <omalloc/omalloc.h>
+#include <misc/options.h>
+
 #include <polys/monomials/p_polys.h>
-#include <polys/polys.h>
 #include <polys/templates/p_Procs.h>
 #include <polys/kbuckets.h>
-#include <omalloc/omalloc.h>
-#include <misc/options.h>
+
+#include <polys/polys.h>
+
 
 #define HAVE_TAIL_BIN
@@ -419 +422 @@
 
 //extern void pCleardenom(poly p);
-extern void pNorm(poly p);
+// extern void pNorm(poly p);
+
 // manipulations
 KINLINE void  sTObject::pCleardenom()
@@ -467 +471 @@
 }
 
-KINLINE void  sTObject::pNorm()
+KINLINE void sTObject::pNorm() // pNorm seems to be a _bad_ method name...
 {
   assume(p != NULL);
   if (! is_normalized)
   {
-    ::pNorm(p);
+    p_Norm(p, currRing);
     if (t_p != NULL)
       pSetCoeff0(t_p, pGetCoeff(p));

libpolys/coeffs/numbers.h

@@ -31 +31 @@
 #define nNormalize(n)     n_Normalize(n,currRing->cf)
 
-inline number nGcd(number a, number b, const ring r = currRing) { return n_Gcd(a, b, r->cf); }
 inline number nGcd(number a, number b, const coeffs cf) { return n_Gcd(a, b, cf); }
 

libpolys/polys/polys.h

@@ -13 +13 @@
 extern ring currRing;
 extern void rChangeCurrRing(ring r);
+
+#include <coeffs/numbers.h>
+inline number nGcd(number a, number b, const ring r = currRing) { return n_Gcd(a, b, r->cf); }
 
 /***************************************************************
@@ -319 +322 @@
 void      pSetPolyComp(poly p, int comp);
 #define   pDeleteComp(p,k) p_DeleteComp(p,k,currRing)
-#define   pNorm(p) p_Norm(p,currRing)
+
+inline void pNorm(poly p, const ring R = currRing){ p_Norm(p, R); }
+
+
 #define   pSubst(p,n,e) p_Subst(p,n.e,currRing)
 #define   ppJet(p,m) pp_Jet(p,m,currRing)