Changeset ca058c in git

Timestamp:

Mar 9, 2012, 12:43:54 PM (11 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'spielwiese', '828514cf6e480e4bafc26df99217bf2a1ed1ef45')

Children:

41fea7e7855abb0fa24d84704ca2690c219670fb

Parents:

1ddcde904c894e6fac1afc8cced863fa937c072d

git-author:

Martin Lee <martinlee84@web.de>2012-03-09 12:43:54+01:00

git-committer:

Martin Lee <martinlee84@web.de>2012-04-04 14:42:27+02:00

Message:

fix: some minor bugs
chg: reverseSubstQa now takes an additional argument a polynomial variable

File:

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

factory/facMul.cc

@@ -51 +51 @@
 
 CanonicalForm
-reverseSubstQa (const fmpz_poly_t F, int d, const Variable& alpha,
-                const CanonicalForm& den)
-{
-  Variable x= Variable (1);
+reverseSubstQa (const fmpz_poly_t F, int d, const Variable& x,
+                const Variable& alpha, const CanonicalForm& den)
+{
 
   CanonicalForm result= 0;
@@ -115 +114 @@
 
   denA *= denB;
-  A= reverseSubstQa (FLINTA, d, alpha, denA);
+  A= reverseSubstQa (FLINTA, d, F.mvar(), alpha, denA);
 
   fmpz_poly_clear (FLINTA);
@@ -226 +225 @@
 
   denA *= denB;
-  A= reverseSubstQa (FLINTA, d, alpha, denA);
+  A= reverseSubstQa (FLINTA, d, F.mvar(), alpha, denA);
   fmpz_poly_clear (FLINTA);
   fmpz_poly_clear (FLINTB);
@@ -519 +518 @@
   if (CFFactory::gettype() == GaloisFieldDomain)
     return mod (F, G);
-  if (F.inCoeffDomain() && G.isUnivariate())
+  if (F.inCoeffDomain() && G.isUnivariate() && !G.inCoeffDomain())
   {
     if (b.getp() != 0)
@@ -632 +631 @@
   if (CFFactory::gettype() == GaloisFieldDomain)
     return div (F, G);
-  if (F.inCoeffDomain() && G.isUnivariate())
-  {
-    if (b.getp() != 0)
-      return b(F);
-    return F;
+  if (F.inCoeffDomain() && G.isUnivariate() && !G.inCoeffDomain())
+  {
+    return 0;
   }
   else if (F.inCoeffDomain() && G.inCoeffDomain())
@@ -653 +650 @@
         ZZ_pX NTLf= convertFacCF2NTLZZpX (F);
         ZZ_pE result;
-        div (result, to_ZZ_pE (NTLg), to_ZZ_pE (NTLf));
+        div (result, to_ZZ_pE (NTLf), to_ZZ_pE (NTLg));
         return b (convertNTLZZpX2CF (rep (result), alpha));
       }
@@ -2842 +2839 @@
 #ifdef HAVE_FLINT
   Variable alpha;
+  bool isRat= isOn (SW_RATIONAL);
+  if (!isRat)
+    On (SW_RATIONAL);
   if (!hasFirstAlgVar (A, alpha) && !hasFirstAlgVar (B, alpha))
   {
@@ -2851 +2851 @@
     fmpq_poly_clear (FLINTA);
     fmpq_poly_clear (FLINTB);
+    if (!isRat)
+      Off (SW_RATIONAL);
     return result;
   }
-  bool isRat= isOn (SW_RATIONAL);
-  if (!isRat)
-    On (SW_RATIONAL);
   CanonicalForm Q, R;
   Variable x= Variable (1);