Changeset 6f801b in git


Ignore:
Timestamp:
Feb 22, 2008, 1:16:03 PM (16 years ago)
Author:
Hans Schönemann <hannes@…>
Branches:
(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')
Children:
9667879f6c3f848cdfbb5c6c0e9a14ea6e130e81
Parents:
8078c8a05a777673a09af83fb19f5f3e9c1f24ff
Message:
hannes: genZero ->isZero


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

Legend:

Unmodified
Added
Removed

  • libfac/charset/alg_factor.cc

    r8078c8 r6f801b  
    33// emacs edit mode for this file is -*- C++ -*-
    44////////////////////////////////////////////////////////////
    5 static char * rcsid = "$Id: alg_factor.cc,v 1.19 2008-01-25 14:19:39 Singular Exp $";
     5static char * rcsid = "$Id: alg_factor.cc,v 1.20 2008-02-22 12:16:02 Singular Exp $";
    66////////////////////////////////////////////////////////////
    77// FACTORY - Includes
    … …  
    9494  else { l = 1; }
    9595  d= dr-dv+1;
    96   while ( ( dv <= dr  ) && ( r != r.genZero()) ){
     96  while ( ( dv <= dr  ) && ( !r.isZero()) )
     97  {
    9798    test = power(x,dr-dv)*v*LC(r,x);
    9899    if ( dr == 0 ) { r= CanonicalForm(0); }
    … …  
    141142
    142143  h = CanonicalForm(1);
    143   while ( G != G.genZero() ) {
     144  while ( !G.isZero() )
     145  {
    144146     delta= degree(F,v) -degree(G,v);
    145147     beta = power(CanonicalForm(-1), delta+1) * LC(F,v)* power(h, delta);
    … …  
    194196      temp= gcd(R, R.deriv(vf));
    195197      DEBOUTLN(CERR, "sqrf_norm_sub: temp= ", temp);
    196       if (degree(temp,vf) != 0 || temp == temp.genZero() ){ sqfreetest= 0; }
     198      if (degree(temp,vf) != 0 || temp.isZero() ){ sqfreetest= 0; }
    197199      else { sqfreetest= 1; }
    198200      DEBOUTLN(CERR, "sqrf_norm_sub: sqfreetest= ", sqfreetest);
    … …  
    259261      temp= gcd(R, R.deriv(vf));
    260262      DEBOUTLN(CERR, "sqrf_norm_sub: temp= ", temp);
    261       if (degree(temp,vf) != 0 || temp == temp.genZero() ){ sqfreetest= 0; }
     263      if (degree(temp,vf) != 0 || temp.isZero() ){ sqfreetest= 0; }
    262264      else { sqfreetest= 1; }
    263265      DEBOUTLN(CERR, "sqrf_norm_sub: sqfreetest= ", sqfreetest);
    … …  
    355357
    356358  if ( Astar.length() == 0 ) return 0;
    357   for ( CFListIterator i=Astar; i.hasItem(); i++){
     359  for ( CFListIterator i=Astar; i.hasItem(); i++)
     360  {
    358361    elem= i.getItem();
    359     if ( elem.deriv() == elem.genZero() ) return Counter;
     362    if ( elem.deriv().isZero() ) return Counter;
    360363    else Counter += 1;
    361364  }
    … …  
    830833/*
    831834$Log: not supported by cvs2svn $
     835Revision 1.19  2008/01/25 14:19:39  Singular
     836*hannes: SqrFreeTest -> isSqrFree
     837
    832838Revision 1.18  2008/01/22 09:51:36  Singular
    833839*hannes: sqrFree/InternalSqrFree -> factory

  • libfac/charset/csutil.cc

    r8078c8 r6f801b  
    22////////////////////////////////////////////////////////////
    33// emacs edit mode for this file is -*- C++ -*-
    4 static char * rcsid = "$Id: csutil.cc,v 1.15 2007-10-16 15:49:49 Singular Exp $";
     4static char * rcsid = "$Id: csutil.cc,v 1.16 2008-02-22 12:16:02 Singular Exp $";
    55/////////////////////////////////////////////////////////////
    66// FACTORY - Includes
    … …  
    138138    if (dg <= df) {l=LC(gg); gg = gg -LC(gg)*power(v,dg);}
    139139    else { l = 1; }
    140     while ( ( dg <= df  ) && ( ff != ff.genZero()) )
     140    while ( ( dg <= df  ) && ( !ff.isZero()) )
    141141    {
    142142      // CERR << "Start gcd..." << "\n";
    … …  
    195195    else { l = 1; }
    196196    n= 0;
    197     while ( ( dg <= df  ) && ( ff != ff.genZero()) )
     197    while ( ( dg <= df  ) && ( !ff.isZero()) )
    198198    {
    199199      test= power(v,df-dg) * gg * LC(ff);
    … …  
    372372  {
    373373    elem= premasb(i.getItem(),as);
    374     if ( elem != elem.genZero() ) output.append(elem);
     374    if ( !elem.isZero() ) output.append(elem);
    375375  }
    376376  return output;
    … …  
    457457    {
    458458      test = mydivremt(r,testelem,a,b);
    459       if ( test && b == r.genZero() ) r = a;
     459      if ( test && b.isZero() ) r = a;
    460460      else break;
    461461    }
    … …  
    472472      {
    473473        test = divremt(r,testelem,a,b);
    474         if ( test && b == r.genZero() )
     474        if ( test && b.isZero() )
    475475        {
    476476          Remembern.FS2= Union(Remembern.FS2, CFList(testelem));
    … …  
    988988/*
    989989$Log: not supported by cvs2svn $
     990Revision 1.15  2007/10/16 15:49:49  Singular
     991SAGE: remove alg content in myfitting
     992
    990993Revision 1.14  2007/05/15 14:46:48  Singular
    991994*hannes: factorize in Zp(a)[x...]

  • libfac/factor/Factor.cc

    r8078c8 r6f801b  
    11/* Copyright 1996 Michael Messollen. All rights reserved. */
    22///////////////////////////////////////////////////////////////////////////////
    3 static char * rcsid = "$Id: Factor.cc,v 1.40 2008-01-25 14:19:40 Singular Exp $ ";
     3static char * rcsid = "$Id: Factor.cc,v 1.41 2008-02-22 12:16:03 Singular Exp $ ";
    44static char * errmsg = "\nYou found a bug!\nPlease inform (Michael Messollen) michael@math.uni-sb.de \nPlease include above information and your input (the ideal/polynomial and characteristic) in your bug-report.\nThank you.";
    55///////////////////////////////////////////////////////////////////////////////
    … …  
    190190
    191191  retvalue= mydivremt(num,denum,a,b);
    192   if ( retvalue && b == num.genZero() ) // num/denum from FFdomain
     192  if ( retvalue && b.isZero() ) // num/denum from FFdomain
    193193    return a;
    194194  else // num/denum is rational
    … …  
    257257          numerator= numerator(x*lt,levelF); // x <- x*lt
    258258          denumerator= power(lt,degree(F,levelF)-1); // == lt^(1-degree(F,x)
    259           while (numerator.genZero() == is_rational(numerator, denumerator))
     259          while (is_rational(numerator, denumerator).isZero())
    260260            numerator*= lt;
    261261          intermediate= is_rational(numerator,denumerator);
    … …  
    270270          intermediate*= j.getItem().factor();
    271271        test1= mydivremt( intermediate,F,a,b);
    272         if ( test1 && b == intermediate.genZero() ) // Yupp!
     272        if ( test1 && b.isZero() ) // Yupp!
    273273        {
    274274          IntermediateList.append(CFFactor(1/a,1));
    … …  
    288288          test= content(numerator,x);
    289289          test1= mydivremt(denumerator,test,a,b);
    290           if ( test1 && b == numerator.genZero() ) // Yupp!
     290          if ( test1 && b.isZero() ) // Yupp!
    291291          {
    292292            save_denumerator*= a;
    … …  
    308308        // save_denumerator should be a multiple of the leading coeff
    309309        test1= mydivremt(save_denumerator,lt,a,b);
    310         if ( test1 && b == save_denumerator.genZero() ) // Yupp!
     310        if ( test1 && b.isZero() ) // Yupp!
    311311          // We have to multiply one of the factors with
    312312          // the multiplicity of the save_denumerator <-> lc
    … …  
    440440  return find_irreducible( degree_of_Extension, gen, Variable(1) );
    441441}
     442
    442443
    443444///////////////////////////////////////////////////////////////
    … …  
    13291330/*
    13301331$Log: not supported by cvs2svn $
     1332Revision 1.40  2008/01/25 14:19:40  Singular
     1333*hannes: SqrFreeTest -> isSqrFree
     1334
    13311335Revision 1.39  2008/01/22 09:51:37  Singular
    13321336*hannes: sqrFree/InternalSqrFree -> factory

  • libfac/factor/MVMultiHensel.cc

    r8078c8 r6f801b  
    22///////////////////////////////////////////////////////////////////////////////
    33// emacs edit mode for this file is -*- C++ -*-
    4 // static char * rcsid = "$Id: MVMultiHensel.cc,v 1.15 2008-01-22 09:51:37 Singular Exp $";
     4// static char * rcsid = "$Id: MVMultiHensel.cc,v 1.16 2008-02-22 12:16:03 Singular Exp $";
    55///////////////////////////////////////////////////////////////////////////////
    66// FACTORY - Includes
    … …  
    502502      CanonicalForm a,b;
    503503      // we add a division test now for intermediat.One and intermediat.Two
    504       if ( mydivremt (mF,intermediat.One,a,b) && b == mF.genZero() )
     504      if ( mydivremt (mF,intermediat.One,a,b) && b.isZero() )
    505505        Retlistinter.append(CFFactor(intermediat.One,1) );
    506       if ( mydivremt (mF,intermediat.Two,a,b) && b == mF.genZero() )
     506      if ( mydivremt (mF,intermediat.Two,a,b) && b.isZero() )
    507507        Retlistinter.append(CFFactor(intermediat.Two,1)  );
    508508
    … …  
    520520/*
    521521$Log: not supported by cvs2svn $
     522Revision 1.15  2008/01/22 09:51:37  Singular
     523*hannes: sqrFree/InternalSqrFree -> factory
     524
    522525Revision 1.14  2007/06/14 14:16:35  Singular
    523526*hannes: Factorize2 etc.

  • libfac/factor/Truefactor.cc

    r8078c8 r6f801b  
    22///////////////////////////////////////////////////////////////////////////////
    33// emacs edit mode for this file is -*- C++ -*-
    4 //static char * rcsid = "@(#) $Id: Truefactor.cc,v 1.12 2008-01-22 09:51:37 Singular Exp $";
     4//static char * rcsid = "@(#) $Id: Truefactor.cc,v 1.13 2008-02-22 12:16:03 Singular Exp $";
    55///////////////////////////////////////////////////////////////////////////////
    66// Factory - Includes
    … …  
    241241    //CERR << "           1:" << change_poly(factor.factor(),SubstitutionList,1) <<"\n";
    242242    c= mydivremt(U,test_f,a,b);
    243     if (  c  && b == U.genZero() && !hasAlgVar(test_f))
     243    if (  c  && b.isZero() && !hasAlgVar(test_f))
    244244    // factor.getFactor() divides U
    245245    {
    … …  
    450450/*
    451451$Log: not supported by cvs2svn $
     452Revision 1.12  2008/01/22 09:51:37  Singular
     453*hannes: sqrFree/InternalSqrFree -> factory
     454
    452455Revision 1.11  2008/01/07 13:34:56  Singular
    453456*hannes: omse optiomzations(isOne)
Note: See TracChangeset for help on using the changeset viewer.