Changeset 32c11f in git


Ignore:
Timestamp:
Dec 10, 2009, 12:17:01 PM (13 years ago)
Author:
Hans Schönemann <hannes@…>
Branches:
(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')
Children:
268ecefb97aabec39527c04a7cf70a9a701b5673
Parents:
49322598c9584a3eeea285d54df58555dad65365
Message:
removed debug stuff

git-svn-id: file:///usr/local/Singular/svn/trunk@12379 2c84dea3-7e68-4137-9b89-c4e89433aadc
Location:
factory
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • factory/cf_factor.cc

    r493225 r32c11f  
    8484}
    8585
    86 #if 1
     86#if 0
    8787//#ifndef NOSTREAMIO
    8888void out_cf(const char *s1,const CanonicalForm &f,const char *s2)
  • factory/fac_multivar.cc

    r493225 r32c11f  
    270270          //printf("found:p=%d (%d)\n",p,i);
    271271          if (p==0)
    272           {
    273             printf("out of primes - switch ot non-NTL\n");
    274             // non-NTL stuff
    275              b = coeffBound( U, getZFacModulus().getp() );
    276              if ( getZFacModulus().getpk() > b.getpk() )
    277                 b = getZFacModulus();
     272          {
     273            return conv_to_factor_array(CFFactor(arg,1));
     274            //printf("out of primes - switch ot non-NTL\n");
    278275          }
    279           else if (((i==0)||(i!=prime_number)))
     276          else if (((i==0)||(i!=prime_number)))
    280277          {
    281278            b = coeffBound( U, p );
    282279            prime_number=i;
    283280          }
    284           if (p!=0)
    285           {
    286             modpk bb=coeffBound(U0,p);
    287             if (bb.getk() > b.getk() ) b=bb;
    288             bb=coeffBound(arg,p);
    289             if (bb.getk() > b.getk() ) b=bb;
    290           }
     281          // p!=0:
     282          modpk bb=coeffBound(U0,p);
     283          if (bb.getk() > b.getk() ) b=bb;
     284          bb=coeffBound(arg,p);
     285          if (bb.getk() > b.getk() ) b=bb;
    291286        }
    292287        #else
     
    409404static CFArray FpFactorizeMulti ( const CanonicalForm & arg )
    410405{
    411     out_cf("FpFactorizeMulti:",arg,"\n");
    412406    DEBINCLEVEL( cerr, "FpFactorizeMulti" );
    413407    CFMap M;
     
    433427
    434428    maxdeg = 0;
    435     out_cf("try:",U,"\n");
    436429    for ( i = 2; i <= t; i++ )
    437430    {
     
    464457        TIMING_START(fac_findeval);
    465458        findEvaluation( U, V, omega, F, A, U0, delta, D, r );
    466         out_cf("univ.U0:",U0,"\n");
    467459        TIMING_END(fac_findeval);
    468460        DEBOUTLN( cerr, "the evaluation point to reduce to an univariate problem is " << A );
     
    513505        F = sqrFree( f );
    514506
    515     printf("nach sqrFree:\n");
    516     out_cff(F);
    517507    for ( i = F; i.hasItem(); i++ )
    518508    {
    519         out_cf("consider:",i.getItem().factor(),"\n");
    520509        if ( i.getItem().factor().inCoeffDomain() )
    521510        {
     
    551540                        R.append( CFFactor( M( GG[k] ), n ) );
    552541            }
    553             out_cf("try cont:",cont,"\n");
    554542            G = factorize( cont, true );
    555             out_cff(G);
    556543            for ( j = G; j.hasItem(); j++ )
    557544                if ( ! j.getItem().factor().isOne() )
Note: See TracChangeset for help on using the changeset viewer.