Changeset 9bdba5 in git for factory

Timestamp:

Oct 27, 2020, 2:08:01 PM (3 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

6c0138c673567884c6a0476d4496df51b0d7c049

Parents:

ba9e24e67185c12eb7966da1c68fcef2d90666d0

Message:

more FLINT conversions: fmpz_mpoly

Location:

factory

Files:

• FLINTconvert.cc (modified) (3 diffs)
• FLINTconvert.h (modified) (1 diff)

factory/FLINTconvert.cc

@@ -711 +711 @@
 }
 
+static void convFlint_RecPP ( const CanonicalForm & f, ulong * exp, fmpz_mpoly_t result, fmpz_mpoly_ctx_t ctx, int N )
+{
+  // assume f!=0
+  if ( ! f.inBaseDomain() )
+  {
+    int l = f.level();
+    for ( CFIterator i = f; i.hasTerms(); i++ )
+    {
+      exp[N-l] = i.exp();
+      convFlint_RecPP( i.coeff(), exp, result, ctx, N );
+    }
+    exp[N-l] = 0;
+  }
+  else
+  {
+    fmpz_t c;
+    fmpz_init(c);
+    convertCF2Fmpz(c,f);
+    fmpz_mpoly_push_term_fmpz_ui(result,c,exp,ctx);
+    fmpz_clear(c);
+  }
+}
+
 void convFactoryPFlintMP ( const CanonicalForm & f, nmod_mpoly_t res, nmod_mpoly_ctx_t ctx, int N )
 {
@@ -733 +756 @@
 }
 
+void convFactoryPFlintMP ( const CanonicalForm & f, fmpz_mpoly_t res, fmpz_mpoly_ctx_t ctx, int N )
+{
+  if (f.isZero()) return;
+  ulong * exp = (ulong*)Alloc(N*sizeof(ulong));
+  memset(exp,0,N*sizeof(ulong));
+  convFlint_RecPP( f, exp, res, ctx, N );
+  //fmpz_mpoly_reduce(res,ctx);
+  Free(exp,N*sizeof(ulong));
+}
+
 CanonicalForm convFlintMPFactoryP(nmod_mpoly_t f, nmod_mpoly_ctx_t ctx, int N)
 {
@@ -772 +805 @@
   }
   fmpq_clear(c);
+  Free(exp,N*sizeof(ulong));
+  return result;
+}
+
+CanonicalForm convFlintMPFactoryP(fmpz_mpoly_t f, fmpz_mpoly_ctx_t ctx, int N)
+{
+  CanonicalForm result;
+  int d=fmpz_mpoly_length(f,ctx)-1;
+  ulong* exp=(ulong*)Alloc(N*sizeof(ulong));
+  fmpz_t c;
+  fmpz_init(c);
+  for(int i=d; i>=0; i--)
+  {
+    fmpz_mpoly_get_term_coeff_fmpz(c,f,i,ctx);
+    fmpz_mpoly_get_term_exp_ui(exp,f,i,ctx);
+    CanonicalForm term=convertFmpz2CF(c);
+    for ( int i = 0; i <N; i++ )
+    {
+      if (exp[i]!=0) term*=CanonicalForm( Variable( N-i ), exp[i] );
+    }
+    result+=term;
+  }
+  fmpz_clear(c);
   Free(exp,N*sizeof(ulong));
   return result;

factory/FLINTconvert.h

@@ -275 +275 @@
 void convFactoryPFlintMP ( const CanonicalForm & f, nmod_mpoly_t res, nmod_mpoly_ctx_t ctx, int N );
 void convFactoryPFlintMP ( const CanonicalForm & f, fmpq_mpoly_t res, fmpq_mpoly_ctx_t ctx, int N );
+void convFactoryPFlintMP ( const CanonicalForm & f, fmpz_mpoly_t res, fmpz_mpoly_ctx_t ctx, int N );
 CanonicalForm convFlintMPFactoryP(nmod_mpoly_t f, nmod_mpoly_ctx_t ctx, int N);
 CanonicalForm convFlintMPFactoryP(fmpq_mpoly_t f, fmpq_mpoly_ctx_t ctx, int N);
-#endif
-#endif
-#endif
+CanonicalForm convFlintMPFactoryP(fmpz_mpoly_t f, fmpz_mpoly_ctx_t ctx, int N);
+#endif
+#endif
+#endif