Changeset 616d685 in git

Timestamp:

Jan 23, 2014, 1:53:48 PM (10 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'c5facdfddea2addfd91babd8b9019161dea4b695')

Children:

5c8e18ff3dc32f83461ed21cad1151a77366ed56

Parents:

e79e263afc119eeedd5b0ae93a7554cd2ca25396

Message:

add: farey for alg./trans. extensions

Location:

libpolys/polys/ext_fields

Files:

• algext.cc (modified) (2 diffs)
• transext.cc (modified) (2 diffs)

libpolys/polys/ext_fields/algext.cc

@@ -1391 +1391 @@
 }
 
+number  naFarey(number p, number n, const coeffs cf)
+{
+  // n is really a bigint
+  poly result=p_Farey(p_Copy((poly)p,cf->extRing),n,cf->extRing);
+  return ((number)result);
+}
+
 
 BOOLEAN naInitChar(coeffs cf, void * infoStruct)
@@ -1432 +1439 @@
   cf->cfInit         = naInit;
   cf->cfInit_bigint  = naInit_bigint;
-  // cf->cfFarey
+  cf->cfFarey        = naFarey;
   cf->cfChineseRemainder= naChineseRemainder;
   cf->cfInt          = naInt;

libpolys/polys/ext_fields/transext.cc

@@ -2386 +2386 @@
 }
 
+number  ntFarey(number p, number n, const coeffs cf)
+{
+  // n is really a bigint
+  fraction result = (fraction)omAlloc0Bin(fractionObjectBin);
+  NUM(result)=p_Farey(p_Copy(NUM((fraction)p),cf->extRing),n,cf->extRing);
+  DEN(result)=p_Farey(p_Copy(DEN((fraction)p),cf->extRing),n,cf->extRing);
+  return ((number)result);
+}
+
 BOOLEAN ntInitChar(coeffs cf, void * infoStruct)
 {
@@ -2421 +2430 @@
   cf->cfInit         = ntInit;
   cf->cfInit_bigint  = ntInit_bigint;
-  //cf->cfFarey
+  cf->cfFarey        = ntFarey;
   cf->cfChineseRemainder = ntChineseRemainder;
   cf->cfInt          = ntInt;