Changeset ea1d44c in git

Timestamp:

Feb 28, 2012, 2:28:47 PM (12 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

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

Children:

42af50525c9435e916c3d1356060b7605d90a28e

Parents:

67ed7453c29d77d1c838dfcc5a2cc5ad7b629695

git-author:

Martin Lee <martinlee84@web.de>2012-02-28 14:28:47+01:00

git-committer:

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

Message:

chg: count factors only in debug version

File:

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

libpolys/polys/clapsing.cc

@@ -793 +793 @@
       else if (rField_is_Extension(r))     /* Q(a), Fp(a) */
       {
+#ifndef NDEBUG
         intvec *w=NULL;
         if (v!=NULL) w=*v;
+#endif
         if (r->cf->extRing->qideal==NULL)
         {
+#ifdef NDEBUG
+          res->m[j]= convFactoryPSingTrP( J.getItem().factor(),r );
+#else
           if(!count_Factors(res,w,j,ff,convFactoryPSingTrP( J.getItem().factor(),r ),r))
           {
@@ -803 +808 @@
             res->m[j]=p_One(r);
           }
+#endif
         }
         else
         {
+#ifdef NDEBUG
+          res->m[j]= convFactoryAPSingAP( J.getItem().factor(),r );
+#else
           if (!count_Factors(res,w,j,ff,convFactoryAPSingAP( J.getItem().factor(),r ),r))
           {
@@ -812 +821 @@
             res->m[j]=p_One(r);
           }
+#endif
         }
       }
     }
+#ifndef NDEBUG
     if (rField_is_Extension(r) && (!p_IsConstantPoly(ff,r)))
     {
@@ -863 +874 @@
       }
     }
+#endif
     p_Delete(&ff,r);
     if (N!=NULL)