Changeset 53568d in git for factory/FLINTconvert.cc

Timestamp:

Dec 18, 2012, 11:10:15 AM (11 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

91a015cb615aa2ad8c3f32d3c78527d934cb8d1d

Parents:

7964f9c956558e8b0001c238e40b87ea1f0d9757

git-author:

Martin Lee <martinlee84@web.de>2012-12-18 11:10:15+01:00

git-committer:

Martin Lee <martinlee84@web.de>2013-02-22 18:10:31+01:00

Message:

chg: clean up of FLINT interface

File:

• factory/FLINTconvert.cc (modified) (8 diffs)

factory/FLINTconvert.cc

@@ -73 +73 @@
 CanonicalForm convertFmpz2CF (fmpz_t coefficient)
 {
-  if (fmpz_cmp_si (coefficient, MINIMMEDIATE) >= 0 && fmpz_cmp_si (coefficient, MAXIMMEDIATE) <= 0) //this should work with flint 2.3 now
+  if (fmpz_cmp_si (coefficient, MINIMMEDIATE) >= 0 &&
+      fmpz_cmp_si (coefficient, MAXIMMEDIATE) <= 0)
   {
     long coeff= fmpz_get_si (coefficient);
@@ -86 +87 @@
     return result;
   }
-
-  /*mpz_t gmp_val;
-  mpz_init (gmp_val);
-  fmpz_get_mpz (gmp_val, coefficient); //TODO fmpz_fits_si
-  if (mpz_is_imm (gmp_val)) //TODO for long
-  {
-    long coeff= mpz_get_si (gmp_val);
-    mpz_clear (gmp_val);
-    return CanonicalForm (coeff);
-  }
-
-  CanonicalForm result= CanonicalForm (CFFactory::basic (gmp_val));
-  return result;*/
 }
 
@@ -147 +135 @@
 }
 
-void convertCF2Fmpq (fmpq_t result, const CanonicalForm& f) //TODO wie oben bei CF2Fmpz
+void convertCF2Fmpq (fmpq_t result, const CanonicalForm& f)
 {
   ASSERT (isOn (SW_RATIONAL), "expected rational");
@@ -178 +166 @@
 {
   ASSERT (isOn (SW_RATIONAL), "expected rational");
-  //TODO as for Fmpz check first if num and den are immediate
 
   CanonicalForm num, den;
@@ -201 +188 @@
 CanonicalForm convertFmpq_poly_t2FacCF (fmpq_poly_t p, const Variable& x)
 {
-#if 0
-  ASSERT (isOn (SW_RATIONAL), "expected poly over Q");
-  CanonicalForm den= convertFmpz2CF (fmpq_poly_denref (p));
-  fmpz_poly_t FLINTnum;
-  long n= fmpq_poly_length (p);
-  fmpz_poly_init2 (FLINTnum, fmpq_poly_length (p));
-
-  for (long i= 0; i < n; i++)
-    fmpz_set (FLINTnum->coeffs + i,fmpq_poly_numref (p) + i);
-  _fmpz_poly_set_length (FLINTnum, n);
-  CanonicalForm result= convertFmpz_poly_t2FacCF (FLINTnum, x);
-  fmpz_poly_clear (FLINTnum);
-  return result/den;
-#else
   CanonicalForm result= 0;
   fmpq_t coeff;
@@ -231 +204 @@
   }
   return result;
-#endif
 }
 
@@ -240 +212 @@
 }
 
-//TODO multiply by bCommonDen and convertFacCF2Fmpz_poly_t
 void convertFacCF2Fmpq_poly_t (fmpq_poly_t result, const CanonicalForm& f)
 {
@@ -250 +221 @@
   convertFacCF2Fmpz_array (fmpq_poly_numref (result), f*den);
   convertCF2Fmpz (fmpq_poly_denref (result), den);
-  /*fmpq_t coeff;
-  for (CFIterator i= f; i.hasTerms(); i++)
-  {
-    fmpq_init (coeff);
-    convertCF2Fmpq (coeff, i.coeff());
-    fmpq_poly_set_coeff_fmpq (result, i.exp(), coeff);
-    fmpq_clear (coeff);
-  }*/
 }