Changeset 9b87a3 in git


Ignore:
Timestamp:
Apr 8, 2008, 6:19:10 PM (15 years ago)
Author:
Hans Schönemann <hannes@…>
Branches:
(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')
Children:
f307021ad1ffaabeac4f3f688f2140c724143680
Parents:
6ad5ce630be2eb27e4e1453cd679e97bca10deaa
Message:
*hannes: removed rcsid


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

Legend:

Unmodified
Added
Removed

  • libfac/charset/alg_factor.cc

    r6ad5ce r9b87a3  
    33// emacs edit mode for this file is -*- C++ -*-
    44////////////////////////////////////////////////////////////
    5 /* $Id: alg_factor.cc,v 1.22 2008-03-18 17:46:14 Singular Exp $ */
     5/* $Id: alg_factor.cc,v 1.23 2008-04-08 16:19:09 Singular Exp $ */
    66////////////////////////////////////////////////////////////
    77// FACTORY - Includes
    … …  
    678678  success=1;
    679679  DEBINCLEVEL(CERR, "newfactoras");
    680   DEBOUTMSG(CERR, rcsid);
    681680  DEBOUTLN(CERR, "newfactoras called with f= ", f);
    682681  DEBOUTLN(CERR, "               content(f)= ", content(f));
    … …  
    830829/*
    831830$Log: not supported by cvs2svn $
     831Revision 1.22  2008/03/18 17:46:14  Singular
     832*hannes: gcc 4.2
     833
    832834Revision 1.21  2008/03/17 17:44:15  Singular
    833835*hannes: fact.tst

  • libfac/charset/algfactor.cc

    r6ad5ce r9b87a3  
    33// emacs edit mode for this file is -*- C++ -*-
    44////////////////////////////////////////////////////////////
    5 /* $Id: algfactor.cc,v 1.11 2008-03-18 17:46:14 Singular Exp $ */
     5/* $Id: algfactor.cc,v 1.12 2008-04-08 16:19:09 Singular Exp $ */
    66////////////////////////////////////////////////////////////
    77// FACTORY - Includes
    … …  
    193193
    194194  DEBINCLEVEL(CERR, "factoras");
    195   DEBOUTMSG(CERR, rcsid);
    196195  DEBOUTLN(CERR, "factoras called with f= ", f);
    197196  DEBOUTLN(CERR, "               content(f)= ", content(f));
    … …  
    450449/*
    451450$Log: not supported by cvs2svn $
     451Revision 1.11  2008/03/18 17:46:14  Singular
     452*hannes: gcc 4.2
     453
    452454Revision 1.10  2008/03/17 17:44:16  Singular
    453455*hannes: fact.tst

  • libfac/charset/charset.cc

    r6ad5ce r9b87a3  
    22////////////////////////////////////////////////////////////
    33// emacs edit mode for this file is -*- C++ -*-
    4 /* $Id: charset.cc,v 1.13 2008-03-18 17:46:14 Singular Exp $ */
     4/* $Id: charset.cc,v 1.14 2008-04-08 16:19:09 Singular Exp $ */
    55/////////////////////////////////////////////////////////////
    66// FACTORY - Includes
    … …  
    384384#endif
    385385
    386   DEBOUTMSG(CERR, rcsid);
    387386//  CERR << getCharacteristic() << "\n";
    388387  for ( CFListIterator Ps=PS; Ps.hasItem(); Ps++ )
    … …  
    599598/*
    600599$Log: not supported by cvs2svn $
     600Revision 1.13  2008/03/18 17:46:14  Singular
     601*hannes: gcc 4.2
     602
    601603Revision 1.12  2006/06/14 15:35:08  Singular
    602604*hannes: CS renamed

  • libfac/charset/csutil.cc

    r6ad5ce r9b87a3  
    22////////////////////////////////////////////////////////////
    33// emacs edit mode for this file is -*- C++ -*-
    4 /* $Id: csutil.cc,v 1.17 2008-03-18 17:46:15 Singular Exp $ */
     4/* $Id: csutil.cc,v 1.18 2008-04-08 16:19:10 Singular Exp $ */
    55/////////////////////////////////////////////////////////////
    66// FACTORY - Includes
    … …  
    629629// AS is given by AS = { A1, A2, .. Ar }, d_i = degree(Ai)
    630630
    631   DEBOUTMSG(CERR, rcsid);
    632631// 1) we test: if d_i > 1, d_j =1 for all j<>i, then AS is irreducible.
    633632  bool deg1=true;
    … …  
    988987/*
    989988$Log: not supported by cvs2svn $
     989Revision 1.17  2008/03/18 17:46:15  Singular
     990*hannes: gcc 4.2
     991
    990992Revision 1.16  2008/02/22 12:16:02  Singular
    991993hannes: genZero ->isZero

  • libfac/charset/reorder.cc

    r6ad5ce r9b87a3  
    1212/////////////////////////////////////////////////////////////
    1313// emacs edit mode for this file is -*- C++ -*-
    14 /* $Id: reorder.cc,v 1.5 2008-03-18 17:46:15 Singular Exp $ */
     14/* $Id: reorder.cc,v 1.6 2008-04-08 16:19:10 Singular Exp $ */
    1515////////////////////////////////////////////////////////////
    1616// FACTORY - Includes
    … …  
    274274
    275275  DEBINCLEVEL(CERR, "neworder");
    276   DEBOUTMSG(CERR, rcsid);
    277276  TIMING_START(neworder_time);
    278277
    … …  
    408407/*
    409408$Log: not supported by cvs2svn $
     409Revision 1.5  2008/03/18 17:46:15  Singular
     410*hannes: gcc 4.2
     411
    410412Revision 1.4  2006/05/16 14:46:49  Singular
    411413*hannes: gcc 4.1 fixes

  • libfac/factor/Factor.cc

    r6ad5ce r9b87a3  
    11/* Copyright 1996 Michael Messollen. All rights reserved. */
    22///////////////////////////////////////////////////////////////////////////////
    3 /* $Id: Factor.cc,v 1.44 2008-03-18 17:46:15 Singular Exp $ */
     3/* $Id: Factor.cc,v 1.45 2008-04-08 16:19:10 Singular Exp $ */
    44static const char * errmsg = "\nYou found a bug!\nPlease inform singular@mathematik.uni-kl.de\nPlease include above information and your input (the ideal/polynomial and characteristic) in your bug-report.\nThank you.";
    55///////////////////////////////////////////////////////////////////////////////
    … …  
    300300#ifndef NOSTREAMIO
    301301            CERR << "libfac: ERROR: not_monic1: case lt is a sum.\n"
    302                  << rcsid << errmsg << "\n";
     302                 << errmsg << "\n";
    303303#endif
    304304#endif
    … …  
    320320#ifndef NOSTREAMIO
    321321          CERR << "libfac: ERROR: not_monic2: case lt is a sum.\n"
    322                << rcsid << errmsg << "\n";
     322               << errmsg << "\n";
    323323#endif
    324324#endif
    … …  
    524524#ifndef NOSTREAMIO
    525525      CERR << "libfac: spezializePoly ERROR: Working over given extension-field not yet implemented!\n"
    526            << rcsid << errmsg << "\n";
     526           << errmsg << "\n";
    527527#endif
    528528#endif
    … …  
    774774#ifndef NOSTREAMIO
    775775      CERR << "libfac: Factorize: ERROR: Not able to find a valid specialization!\n"
    776            << rcsid << errmsg << "\n";
     776           << errmsg << "\n";
    777777#else
    778778       ;
    … …  
    892892
    893893  DEBINCLEVEL(CERR, "Factorize");
    894   DEBOUTMSG(CERR, rcsid);
    895894  DEBOUTLN(CERR, "Called with F= ", F);
    896895  if ( getCharacteristic() == 0 )
    … …  
    911910  // search an "optimal" main variavble
    912911  int mv=F.level();
    913   if (mv != LEVELBASE && ! F.isUnivariate() )
     912  if ((mv != LEVELBASE) && (! F.isUnivariate()) )
    914913  {
    915914     mv=find_mvar(F);
    … …  
    11511150
    11521151  DEBINCLEVEL(CERR, "Factorize");
    1153   DEBOUTMSG(CERR, rcsid);
    11541152  DEBOUTLN(CERR, "Called with F= ", F);
    11551153  if ( getCharacteristic() == 0 )
    … …  
    13351333/*
    13361334$Log: not supported by cvs2svn $
     1335Revision 1.44  2008/03/18 17:46:15  Singular
     1336*hannes: gcc 4.2
     1337
    13371338Revision 1.43  2008/03/18 10:12:21  Singular
    13381339*hannes: format

  • libfac/factor/SqrFree.cc

    r6ad5ce r9b87a3  
    22///////////////////////////////////////////////////////////////////////////////
    33// emacs edit mode for this file is -*- C++ -*-
    4 /* $Id: SqrFree.cc,v 1.17 2008-03-18 17:46:15 Singular Exp $ */
     4/* $Id: SqrFree.cc,v 1.18 2008-04-08 16:19:10 Singular Exp $ */
    55static const char * errmsg = "\nYou found a bug!\nPlease inform singular@mathematik.uni-kl.de\n Please include above information and your input (the ideal/polynomial and characteristic) in your bug-report.\nThank you.";
    66///////////////////////////////////////////////////////////////////////////////
    … …  
    200200#ifndef NOSTREAMIO
    201201  CERR << "\nlibfac: ERROR: SqrFreeTest: we should never fall trough here!\n"
    202        << rcsid << errmsg << "\n";
     202       << errmsg << "\n";
    203203#endif
    204204#endif
    … …  
    352352#ifndef NOSTREAMIO
    353353  CERR << "\nlibfac: ERROR: SqrFreed: we should never fall trough here!\n"
    354        << rcsid << errmsg << "\n";
     354       << errmsg << "\n";
    355355#endif
    356356#endif
    … …  
    370370
    371371  DEBINCLEVEL(CERR, "SqrFreeMV");
    372   DEBOUTMSG(CERR, rcsid);
    373372  DEBOUTLN(CERR,"Called with f= ", f);
    374373
    … …  
    440439/*
    441440$Log: not supported by cvs2svn $
     441Revision 1.17  2008/03/18 17:46:15  Singular
     442*hannes: gcc 4.2
     443
    442444Revision 1.16  2008/03/18 10:12:59  Singular
    443445*hannes: typo

  • libfac/factor/homogfactor.cc

    r6ad5ce r9b87a3  
    11/* Copyright 1997 Michael Messollen. All rights reserved. */
    22////////////////////////////////////////////////////////////
    3 // $Id: homogfactor.cc,v 1.9 2008-03-18 17:46:16 Singular Exp $
     3// $Id: homogfactor.cc,v 1.10 2008-04-08 16:19:10 Singular Exp $
    44////////////////////////////////////////////////////////////
    55// FACTORY - Includes
    … …  
    142142  DEBINCLEVEL(CERR, "HomogFactor");
    143143  Variable xn = get_max_degree_Variable(g);
     144  out_cf("HomogFactor:",g,"\n");
    144145  int d_xn = degree(g,xn);
    145146  CanonicalForm F = g(1,xn);
    … …  
    148149  DEBOUTLN(CERR, "d_xn=   ", d_xn);
    149150  DEBOUTLN(CERR, "F= ", F); 
     151  out_cf("HomogFactor:subst ",F,"\n");
    150152
    151153  // should we do this for low degree polys g ? e.g. quadratic?
    … …  
    157159  {
    158160     CFMap n;
    159      Intermediatelist = Factorized(compress(F,n), minpoly, Mainvar);
     161     if (minpoly.isZero())
     162       Intermediatelist = Factorize(compress(F,n), 1);
     163     else
     164       Intermediatelist = Factorized(compress(F,n), minpoly, Mainvar);
    160165     for ( j=Intermediatelist; j.hasItem(); j++ )
    161166       Homoglist.append(CFFactor( n(j.getItem().factor()), j.getItem().exp()) );
    162167  }
    163168  else
    164      Homoglist = Factorize2(F, minpoly);
     169  {
     170     if (minpoly.isZero())
     171       Homoglist = factorize(F);
     172     else
     173       Homoglist = Factorize2(F,minpoly);
     174  }
    165175  // Now we have uncompressed factors in Homoglist
    166176  DEBOUTLN(CERR, "F factors as: ", Homoglist);
    167177  CFFList Unhomoglist;
    168178  CanonicalForm unhomogelem;
    169   if ((!minpoly.isZero()) &&(getCharacteristic() == 0) )
     179  if ((!(minpoly.isZero())) &&(getCharacteristic() == 0) )
    170180  {
    171181    for ( j=Homoglist; j.hasItem(); j++ )
    … …  
    187197      unhomogelem= homogenize(j.getItem().factor(),xn);
    188198      DEBOUTLN(CERR, "      that is ", unhomogelem);
     199      out_cf("unhomogelem:",unhomogelem,"\n");
    189200      Unhomoglist.append(CFFactor(unhomogelem,j.getItem().exp()));
    190201      d_xn -= degree(unhomogelem,xn)*j.getItem().exp();
    … …  
    201212/*
    202213$Log: not supported by cvs2svn $
     214Revision 1.9  2008/03/18 17:46:16  Singular
     215*hannes: gcc 4.2
     216
    203217Revision 1.8  2007/10/25 14:45:41  Singular
    204218*hannes: homgfactor for alg.ext of Q
Note: See TracChangeset for help on using the changeset viewer.