Changeset e82417 in git

Timestamp:

Aug 12, 2011, 5:29:12 PM (12 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')

Children:

45c9bd3cc75a93224a2ce248f62c450b05c2ec61

Parents:

94a065cc1eef470efefb950abf185f50c06ba20d

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2011-08-12 17:29:12+02:00

git-committer:

Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 13:22:44+01:00

Message:

ADD: new function "int n_IsParam(number m, const ring r)" a-la onld p_Var

Location:

libpolys/polys

Files:

• ext_fields/algext.cc (modified) (3 diffs)
• ext_fields/algext.h (modified) (1 diff)
• ext_fields/transext.cc (modified) (4 diffs)
• ext_fields/transext.h (modified) (1 diff)
• monomials/ring.cc (modified) (3 diffs)
• monomials/ring.h (modified) (1 diff)

libpolys/polys/ext_fields/algext.cc

@@ -679 +679 @@
 
 
-number naParam(short iParameter, const coeffs cf)
+number naParam(const short iParameter, const coeffs cf)
 {
   assume(getCoeffType(cf) == ID);
@@ -685 +685 @@
   const ring R = cf->extRing;
   assume( R != NULL );  
-  assume( 0 <= iParameter && iParameter < rVar(R) );
+  assume( 0 < iParameter && iParameter <= rVar(R) );
   
   poly p = p_One(R); p_SetExp(p, iParameter, 1, R); p_Setm(p, R);
@@ -691 +691 @@
   return (number) p; 
 }
+
+
+/// if m == var(i)/1 => return i, 
+int naIsParam(number m, const coeffs cf)
+{
+  assume(getCoeffType(cf) == ID);
+
+  const ring R = cf->extRing;
+  assume( R != NULL );  
+
+  return p_Var( (poly)m, R ); 
+}

libpolys/polys/ext_fields/algext.h

@@ -82 +82 @@
 number naParam(short iParameter, const coeffs cf);
 
+
+/// if m == var(i)/1 => return i, 
+int naIsParam(number, const coeffs);
+
 #endif
 /* ALGEXT_H */

libpolys/polys/ext_fields/transext.cc

@@ -54 +54 @@
 
 #include "ext_fields/transext.h"
-
-
-
-
 
 
@@ -1132 +1128 @@
 
 
-number ntParam(short iParameter, const coeffs cf)
+number ntParam(const short iParameter, const coeffs cf)
 {
   assume(getCoeffType(cf) == ID);
@@ -1138 +1134 @@
   const ring R = cf->extRing;
   assume( R != NULL );  
-  assume( 0 <= iParameter && iParameter < rVar(R) );
+  assume( 0 < iParameter && iParameter <= rVar(R) );
 
   poly p = p_One(R); p_SetExp(p, iParameter, 1, R); p_Setm(p, R);
@@ -1151 +1147 @@
   return (number)f;
 }
+
+
+/// if m == var(i)/1 => return i, 
+int ntIsParam(number m, const coeffs cf)
+{
+  assume(getCoeffType(cf) == ID);
+
+  const ring R = cf->extRing;
+  assume( R != NULL );
+
+  fraction f = (fraction)m;
+
+  if( DEN(f) != NULL )
+    return 0;
+
+  return p_Var( NUM(f), R ); 
+}

libpolys/polys/ext_fields/transext.h

@@ -124 +124 @@
 number ntParam(short iParameter, const coeffs cf);
 
+/// if m == var(i)/1 => return i, 
+int ntIsParam(number, const coeffs);
+
 #endif
 /* TRANSEXT_H */

libpolys/polys/monomials/ring.cc

@@ -22 +22 @@
 // #include <???/febase.h>
 // #include <???/intvec.h>
-//#include <polys/ext_fields/longalg.h>
-//#include <polys/ext_fields/longtrans.h>
 // #include <coeffs/ffields.h>
 #include <polys/monomials/ring.h>
@@ -41 +39 @@
 // #include <???/maps.h>
 // #include <???/matpol.h>
+
+
+#include "ext_fields/algext.h"
+#include "ext_fields/transext.h"
+
 
 #define BITS_PER_LONG 8*SIZEOF_LONG
@@ -5568 +5571 @@
   const n_coeffType _filed_type = getCoeffType(C);
 
-  if ( iParameter < 0 || iParameter >= rPar(r) )
+  if ( iParameter <= 0 || iParameter > rPar(r) )
     // Wrong parameter
     return NULL;
 
   if( _filed_type == n_algExt )
-  {
-    extern number naParam(short iParameter, const coeffs cf);
     return naParam(iParameter, C);
-  }
   
   if( _filed_type == n_transExt )
-  {
-    extern number ntParam(short iParameter, const coeffs cf);
     return ntParam(iParameter, C);
-  }
     
   return NULL;
 }
 
+
+
+int n_IsParam(number m, const ring r)
+{
+  assume(r != NULL);
+  const coeffs C = r->cf;
+  assume(C != NULL);
+
+  const n_coeffType _filed_type = getCoeffType(C);
+
+  if( _filed_type == n_algExt )
+    return naIsParam(m, C);
+
+  if( _filed_type == n_transExt )
+    return ntIsParam(m, C);
+
+  return 0;
+}
+

libpolys/polys/monomials/ring.h

@@ -562 +562 @@
 
 /// return the specified parameter as a (new!) number in the given
-/// polynomial ring, or NULL if invalid 
+/// polynomial ring, or NULL if invalid
+/// parameters (as variables) begin with 1!
 number n_Param(const short iParameter, const ring r);
 
+/// if m == var(i)/1 => return i, 
+int n_IsParam(number m, const ring r);
    
 /* R, Q, Fp: FALSE */