Changeset 67c922 in git for libpolys/polys/clapsing.cc

Timestamp:

Dec 6, 2019, 2:11:20 PM (4 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

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

Children:

d2a9865cca207801d3b0c05a50dfc5a02724120e

Parents:

47504331597a2f8c775772cb002241dcf904a680

Message:

opt: singclap_factorize

File:

• libpolys/polys/clapsing.cc (modified) (2 diffs)

libpolys/polys/clapsing.cc

@@ -994 +994 @@
 
   Variable a;
-  if ((rField_is_Q(r) || rField_is_Q_a(r)
-  && (r->cf->convSingNFactoryN!=ndConvSingNFactoryN))) /* Q, Q(a) */
-  {
-    //if (f!=NULL) // already tested at start of routine
-    {
-      number n0=n_Copy(pGetCoeff(f),r->cf);
-      if (with_exps==0)
-        N=n_Copy(n0,r->cf);
-      p_Cleardenom(f, r);
-      //after here f should not have a denominator!!
-      //PrintS("S:");p_Write(f,r);PrintLn();
-      NN=n_Div(n0,pGetCoeff(f),r->cf);
-      n_Delete(&n0,r->cf);
-      if (with_exps==0)
-      {
-        n_Delete(&N,r->cf);
-        N=n_Copy(NN,r->cf);
-      }
-    }
-  }
-  else if (rField_is_Zp_a(r))
-  {
-    //if (f!=NULL) // already tested at start of routine
-    if (singclap_factorize_retry==0)
-    {
-      number n0=n_Copy(pGetCoeff(f),r->cf);
-      if (with_exps==0)
-        N=n_Copy(n0,r->cf);
-      p_Norm(f,r);
-      p_Cleardenom(f, r);
-      NN=n_Div(n0,pGetCoeff(f),r->cf);
-      n_Delete(&n0,r->cf);
-      if (with_exps==0)
-      {
-        n_Delete(&N,r->cf);
-        N=n_Copy(NN,r->cf);
-      }
-    }
-  }
-  if ((rField_is_Q(r) || rField_is_Zp(r) || (rField_is_Z(r)))
-  || (rField_is_Zn(r)&&(r->cf->convSingNFactoryN!=ndConvSingNFactoryN)))
-  {
-    setCharacteristic( rChar(r) );
-    CanonicalForm F( convSingPFactoryP( f,r ) );
-    L = factorize( F );
-  }
-  // and over Q(a) / Fp(a)
-  else if ((r->cf->extRing!=NULL)
-  &&(r->cf->extRing->cf->convSingNFactoryN!=ndConvSingNFactoryN))
-  {
-    if (rField_is_Q_a (r)) setCharacteristic (0);
-    else                   setCharacteristic( rChar(r) );
-    if (r->cf->extRing->qideal!=NULL) /*algebraic extension */
-    {
-      CanonicalForm mipo=convSingPFactoryP(r->cf->extRing->qideal->m[0],
-                                           r->cf->extRing);
-      a=rootOf(mipo);
-      CanonicalForm F( convSingAPFactoryAP( f, a, r ) );
-      L = factorize( F, a );
-      prune(a);
-    }
-    else /* rational functions */
-    {
-      CanonicalForm F( convSingTrPFactoryP( f,r ) );
+  if (r->cf->convSingNFactoryN!=ndConvSingNFactoryN)
+  {
+    if (rField_is_Q(r) || rField_is_Q_a(r)) /* Q, Q(a) */
+    {
+      //if (f!=NULL) // already tested at start of routine
+      {
+        number n0=n_Copy(pGetCoeff(f),r->cf);
+        if (with_exps==0)
+          N=n_Copy(n0,r->cf);
+        p_Cleardenom(f, r);
+        //after here f should not have a denominator!!
+        //PrintS("S:");p_Write(f,r);PrintLn();
+        NN=n_Div(n0,pGetCoeff(f),r->cf);
+        n_Delete(&n0,r->cf);
+        if (with_exps==0)
+        {
+          n_Delete(&N,r->cf);
+          N=n_Copy(NN,r->cf);
+        }
+      }
+    }
+    else if (rField_is_Zp_a(r))
+    {
+      //if (f!=NULL) // already tested at start of routine
+      if (singclap_factorize_retry==0)
+      {
+        number n0=n_Copy(pGetCoeff(f),r->cf);
+        if (with_exps==0)
+          N=n_Copy(n0,r->cf);
+        p_Norm(f,r);
+        p_Cleardenom(f, r);
+        NN=n_Div(n0,pGetCoeff(f),r->cf);
+        n_Delete(&n0,r->cf);
+        if (with_exps==0)
+        {
+          n_Delete(&N,r->cf);
+          N=n_Copy(NN,r->cf);
+        }
+      }
+    }
+    if (rField_is_Q(r) || rField_is_Zp(r) || rField_is_Z(r) || rField_is_Zn(r))
+    {
+      setCharacteristic( rChar(r) );
+      CanonicalForm F( convSingPFactoryP( f,r ) );
       L = factorize( F );
+    }
+    // and over Q(a) / Fp(a)
+    else if (r->cf->extRing!=NULL)
+    {
+      if (rField_is_Q_a (r)) setCharacteristic (0);
+      else                   setCharacteristic( rChar(r) );
+      if (r->cf->extRing->qideal!=NULL) /*algebraic extension */
+      {
+        CanonicalForm mipo=convSingPFactoryP(r->cf->extRing->qideal->m[0],
+                                             r->cf->extRing);
+        a=rootOf(mipo);
+        CanonicalForm F( convSingAPFactoryAP( f, a, r ) );
+        L = factorize( F, a );
+        prune(a);
+      }
+      else /* rational functions */
+      {
+        CanonicalForm F( convSingTrPFactoryP( f,r ) );
+        L = factorize( F );
+      }
+    }
+    else
+    {
+      goto notImpl;
     }
   }
@@ -1089 +1093 @@
       if (with_exps!=1) (**v)[j] = J.getItem().exp();
       if (rField_is_Zp(r) || rField_is_Q(r)||  rField_is_Z(r)
-      || (rField_is_Zn(r) && r->cf->convSingNFactoryN!=ndConvSingNFactoryN))           /* Q, Fp, Z */
+      || rField_is_Zn(r))           /* Q, Fp, Z */
       {
         //count_Factors(res,*v,f, j, convFactoryPSingP( J.getItem().factor() );