Changeset 6637ee in git

Timestamp:

Aug 12, 2011, 4:20:38 PM (12 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

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

Children:

e92b071a14e237753ca43c8b8faad5e5199cd077

Parents:

1f414c83d736799f4aa2169403778da7b6403897

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2011-08-12 16:20:38+02:00

git-committer:

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

Message:

ADD: new function: number n_Param(iParameter,ring) - creates a number representing the specified parameter in the given alg./trans. extension

Location:

libpolys/polys

Files:

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

libpolys/polys/ext_fields/algext.cc

@@ -677 +677 @@
   return FALSE;
 }
+
+
+number naParam(short iParameter, const coeffs cf)
+{
+  assume(getCoeffType(cf) == ID);
+  
+  const ring R = cf->extRing;
+  assume( R != NULL );  
+  assume( 0 <= iParameter && iParameter < rVar(R) );
+  
+  poly p = p_One(R); p_SetExp(p, iParameter, 1, R); p_Setm(p, R);
+  
+  return (number) p; 
+}

libpolys/polys/ext_fields/algext.h

@@ -79 +79 @@
 */
 
+/// return the specified parameter as a number in the given alg. field
+number naParam(short iParameter, const coeffs cf);
 
 #endif

libpolys/polys/ext_fields/transext.cc

@@ -1130 +1130 @@
   return FALSE;
 }
+
+
+number ntParam(short iParameter, const coeffs cf)
+{
+  assume(getCoeffType(cf) == ID);
+
+  const ring R = cf->extRing;
+  assume( R != NULL );  
+  assume( 0 <= iParameter && iParameter < rVar(R) );
+
+  poly p = p_One(R); p_SetExp(p, iParameter, 1, R); p_Setm(p, R);
+
+//  return (number) p; 
+
+  fraction f = (fraction)omAlloc0Bin(fractionObjectBin);
+  NUM(f) = p;
+  DEN(f) = NULL;
+  COM(f) = 0;
+
+  return (number)f;
+}

libpolys/polys/ext_fields/transext.h

@@ -121 +121 @@
 */
 
-#ifdef LDEBUG
-#define ntTest(a) ntDBTest(a,__FILE__,__LINE__,cf)
-BOOLEAN  ntDBTest(number a, const char *f, const int l, const coeffs r);
-#else
-#define ntTest(a)
-#endif
-
-/* our own type */
-#define ntID n_transExt
-
-/* polynomial ring in which the numerators and denominators of our
-   numbers live */
-#define ntRing cf->extRing
-
-/* coeffs object in which the coefficients of our numbers live;
- * methods attached to ntCoeffs may be used to compute with the
- * coefficients of our numbers, e.g., use ntCoeffs->nAdd to add
- * coefficients of our numbers */
-#define ntCoeffs cf->extRing->cf
+/// return the specified parameter as a number in the given trans.ext.
+number ntParam(short iParameter, const coeffs cf);
 
 #endif

libpolys/polys/monomials/ring.cc

@@ -5558 +5558 @@
 }
 
+
+
+number n_Param(const short iParameter, const ring r)
+{
+  assume(r != NULL);
+  const coeffs C = r->cf;
+  assume(C != NULL);
+
+  const n_coeffType _filed_type = getCoeffType(C);
+
+  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;
+}
+

libpolys/polys/monomials/ring.h

@@ -560 +560 @@
   return NULL;
 }
+
+/// return the specified parameter as a (new!) number in the given
+/// polynomial ring, or NULL if invalid 
+number n_Param(const short iParameter, const ring r);
+
    
 /* R, Q, Fp: FALSE */