Changeset fc4977 in git

Timestamp:

Nov 8, 2011, 1:46:01 PM (12 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

146c6031e29bacb7405aa0a52f67591c3cfd1d1f

Parents:

c3238c9cf73749e83476377e7c488cf63eca07fd

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2011-11-08 13:46:01+01:00

git-committer:

Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 16:14:11+01:00

Message:

fix: conversion of transext to/from factory

Location:

libpolys

Files:

• coeffs/coeffs.h (modified) (1 diff)
• polys/clapconv.cc (modified) (2 diffs)
• polys/ext_fields/transext.cc (modified) (6 diffs)

libpolys/coeffs/coeffs.h

@@ -203 +203 @@
    int     char_flag;
    int     ref;
+   /// how many variables of factort are already used by this coeff
+   int     factoryVarOffset;
    n_coeffType type;
 //-------------------------------------------

libpolys/polys/clapconv.cc

@@ -64 +64 @@
     poly term = p_Init(r);
     pNext( term ) = NULL;
+    int varoffset=r->cf->factoryVarOffset;
     for ( int i = 1; i <= r->N; i++ )
-      p_SetExp( term, i, exp[i], r);
+      p_SetExp( term, i-varoffset, exp[i], r);
     pGetCoeff( term )=r->cf->convFactoryNSingN(f, r->cf);
     p_Setm( term, r );
@@ -92 +93 @@
     if (errorreported) break;
     setChar=FALSE;
+    int varoffset=r->cf->factoryVarOffset;
     for ( int i = n; i >0; i-- )
     {
       if ( (e = p_GetExp( p, i, r)) != 0 )
-        term *= power( Variable( i ), e );
+        term *= power( Variable( i+varoffset ), e );
     }
     result += term;

libpolys/polys/ext_fields/transext.cc

@@ -51 +51 @@
 #ifdef HAVE_FACTORY
 #include <polys/clapsing.h>
+#include <polys/clapconv.h>
+#include <factory/factory.h>
 #endif
 
@@ -90 +92 @@
 
 
-extern omBin fractionObjectBin = omGetSpecBin(sizeof(fractionObject));
+omBin fractionObjectBin = omGetSpecBin(sizeof(fractionObject));
 
 /// forward declarations
@@ -305 +307 @@
     fraction result = (fraction)omAlloc0Bin(fractionObjectBin);
     NUM(result) = p_ISet(i, ntRing);
-    DEN(result) = NULL;
-    COM(result) = 0;
+    //DEN(result) = NULL; // done by omAlloc0Bin
+    //COM(result) = 0; // done by omAlloc0Bin
     return (number)result;
   }
@@ -1199 +1201 @@
     rDelete(cf->extRing);
 }
+#ifdef HAVE_FACTORY
+number ntConvFactoryNSingN( const CanonicalForm n, const coeffs cf)
+{
+  if (n.isZero()) return NULL;
+  poly p=convFactoryPSingP(n,ntRing);
+  fraction result = (fraction)omAlloc0Bin(fractionObjectBin);
+  NUM(result) = p;
+  //DEN(result) = NULL; // done by omAlloc0Bin
+  //COM(result) = 0; // done by omAlloc0Bin
+  return (number)result;
+}
+CanonicalForm ntConvSingNFactoryN( number n, BOOLEAN setChar, const coeffs cf )
+{
+  ntTest(n);
+  if (IS0(n)) return CanonicalForm(0);
+
+  fraction f = (fraction)n;
+  return convSingPFactoryP(NUM(f),ntRing);
+}
+#endif
 
 BOOLEAN ntInitChar(coeffs cf, void * infoStruct)
@@ -1216 +1238 @@
   cf->extRing           = e->r;
   cf->extRing->ref ++; // increase the ref.counter for the ground poly. ring!
+  cf->factoryVarOffset = cf->extRing->cf->factoryVarOffset+rVar(cf->extRing);
 
   /* propagate characteristic up so that it becomes
@@ -1261 +1284 @@
   PrintS("//          Hence gcd's cannot be cancelled in any\n");
   PrintS("//          computed fraction!\n");
+#else
+  cf->convFactoryNSingN =ntConvFactoryNSingN;
+  cf->convSingNFactoryN =ntConvSingNFactoryN;
 #endif