[SCM] an open source computer algebra system branch, cleanedupstream, updated. 6125e540ca6d66c307958938a9d53b245507c323

[Bernhard R. Link]

The following commit has been merged in the cleanedupstream branch:
commit 2c3137814851fe3673ffcc0e34c40ec667a565c2
Author: Martin Lee <martinlee84 at web.de>
Date:   Tue Feb 28 14:28:47 2012 +0100

    chg: count factors only in debug version

diff --git a/kernel/clapsing.cc b/kernel/clapsing.cc
index 7c49e2f..105d907 100644
--- a/kernel/clapsing.cc
+++ b/kernel/clapsing.cc
@@ -909,28 +909,39 @@ ideal singclap_factorize ( poly f, intvec ** v , int with_exps)
       #endif
       else if (rField_is_Extension())     /* Q(a), Fp(a) */
       {
+#ifndef NDEBUG
         intvec *w=NULL;
         if (v!=NULL) w=*v;
+#endif
         if (currRing->minpoly==NULL)
         {
+#ifdef NDEBUG
+          res->m[j]= convFactoryPSingTrP( J.getItem().factor() );
+#else
           if(!count_Factors(res,w,j,ff,convFactoryPSingTrP( J.getItem().factor() )))
           {
             if (w!=NULL)
               (*w)[j]=1;
             res->m[j]=pOne();
           }
+#endif
         }
         else
         {
+#ifdef NDEBUG
+          res->m[j]= convFactoryAPSingAP( J.getItem().factor(),currRing );
+#else
           if (!count_Factors(res,w,j,ff,convFactoryAPSingAP( J.getItem().factor(),currRing )))
           {
             if (w!=NULL)
               (*w)[j]=1;
             res->m[j]=pOne();
           }
+#endif
         }
       }
     }
+#ifndef NDEBUG
     if (rField_is_Extension() && (!pIsConstantPoly(ff)))
     {
       singclap_factorize_retry++;
@@ -979,6 +990,7 @@ ideal singclap_factorize ( poly f, intvec ** v , int with_exps)
         res->m[1]=ff; ff=NULL;
       }
     }
+#endif
     pDelete(&ff);
     if (N!=NULL)
     {

-- 
an open source computer algebra system