Changeset 456842 in git


Ignore:
Timestamp:
Aug 8, 2001, 4:26:56 PM (23 years ago)
Author:
Hans Schönemann <hannes@…>
Branches:
(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')
Children:
8444b045c3217f44893e92cc7acc9a1bc7595178
Parents:
14b1e65b4290df7e1f7dc6b926269dc204ea38a3
Message:
*hannes: Dan's HAVE_SINGULAR_ERROR


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

Legend:

Unmodified
Added
Removed

  • libfac/charset/charset.cc

    r14b1e65 r456842  
    22////////////////////////////////////////////////////////////
    33// emacs edit mode for this file is -*- C++ -*-
    4 static char * rcsid = "$Id: charset.cc,v 1.8 2001-08-06 08:32:53 Singular Exp $";
     4static char * rcsid = "$Id: charset.cc,v 1.9 2001-08-08 14:26:54 Singular Exp $";
    55/////////////////////////////////////////////////////////////
    66// FACTORY - Includes
    … …  
    3939
    4040#ifdef SINGULAR
    41        extern void WarnS(const char *);
    42        #include "../../Singular/mod2.h"
    43        #include "../../Singular/febase.h"
     41#define HAVE_SINGULAR_ERROR
     42#endif
     43
     44#ifdef HAVE_SINGULAR_ERROR
     45   extern "C" { void WerrorS(char *); }
     46   extern "C" { void WarnS(const char *); }
    4447#endif
    4548
    … …  
    580583          else
    581584          {
    582 #ifdef SINGULAR
    583             //WarnS("libfac: Factoring over algebraic function field required!");
     585#ifdef HAVE_SINGULAR_ERROR
     586            WarnS("libfac: Factoring over algebraic function field required!");
    584587#else
    585588#ifndef NOSTREAMIO
    … …  
    599602/*
    600603$Log: not supported by cvs2svn $
     604Revision 1.8  2001/08/06 08:32:53  Singular
     605* hannes: code cleanup
     606
    601607Revision 1.7  2001/06/27 13:58:06  Singular
    602608*hannes/GP: debug newfactoras, char_series, ...

  • libfac/factor/Factor.cc

    r14b1e65 r456842  
    11/* Copyright 1996 Michael Messollen. All rights reserved. */
    22///////////////////////////////////////////////////////////////////////////////
    3 static char * rcsid = "$Id: Factor.cc,v 1.9 2001-08-08 11:59:12 Singular Exp $ ";
     3static char * rcsid = "$Id: Factor.cc,v 1.10 2001-08-08 14:26:55 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///////////////////////////////////////////////////////////////////////////////
    … …  
    2323
    2424#ifdef SINGULAR
    25 #  define HAVE_SINGULAR
     25#define HAVE_SINGULAR_ERROR
     26#endif
     27
     28#ifdef HAVE_SINGULAR_ERROR
    2629   extern "C" { void WerrorS(char *); }
    27    extern  void WarnS(const char *);
     30   extern "C" { void WarnS(const char *); }
    2831#endif
    2932
    … …  
    218221          }
    219222          else {
    220 #ifdef HAVE_SINGULAR
     223#ifdef HAVE_SINGULAR_ERROR
    221224            WerrorS("libfac: ERROR: not_monic1: case lt is a sum.");
    222225#else
     226#ifndef NOSTREAMIO
    223227            cerr << "libfac: ERROR: not_monic1: case lt is a sum.\n"
    224228                 << rcsid << errmsg << endl;
     229#endif
    225230#endif
    226231          }
    … …  
    235240          Returnlist= myUnion( CFFList(CFFactor(1/a,1)),Returnlist) ;
    236241        else {
    237 #ifdef HAVE_SINGULAR
     242#ifdef HAVE_SINGULAR_ERROR
    238243          WerrorS("libfac: ERROR: not_monic2: case lt is a sum.");
    239244#else
     245#ifndef NOSTREAMIO
    240246          cerr << "libfac: ERROR: not_monic2: case lt is a sum.\n"
    241247               << rcsid << errmsg << endl;
     248#endif
    242249#endif
    243250        }
    … …  
    324331    if ( degree(Extension) == 0 ) FFRandom gen;
    325332    else {
    326 #ifdef HAVE_SINGULAR
     333#ifdef HAVE_SINGULAR_ERROR
    327334    WerrorS("libfac: evaluate: Extension not inFF() or inGF() !");
    328335#else
    … …  
    397404    }
    398405    else {
    399 #ifdef HAVE_SINGULAR
     406#ifdef HAVE_SINGULAR_ERROR
    400407      WerrorS("libfac: spezializePoly ERROR: Working over given extension-field not yet implemented!");
    401408#else
     409#ifndef NOSTREAMIO
    402410      cerr << "libfac: spezializePoly ERROR: Working over given extension-field not yet implemented!\n"
    403411           << rcsid << errmsg << endl;
     412#endif
    404413#endif
    405414      return 0;
    … …  
    431440  else { if ( degree(Extension) == 0 ) FFRandom gen;
    432441  else {
    433 #ifdef HAVE_SINGULAR
     442#ifdef HAVE_SINGULAR_ERROR
    434443    WerrorS("libfac: evaluate: Extension not inFF() or inGF() !");
    435444#else
     445#ifndef NOSTREAMIO
    436446    cerr << "libfac: evaluate: " << Extension << " not inFF() or inGF() !"
    437447         << endl;
     448#endif
    438449#endif
    439450    FFRandom gen; }}
    … …  
    619630    DEBOUTLN(cout,  "Returned from specializePoly: success: ", success);
    620631    if (success == 0 ){ // No spezialisation could be found
    621 #ifdef SINGULAR
     632#ifdef HAVE_SINGULAR_ERROR
    622633      WarnS("libfac: Factorize: ERROR: Not able to find a valid specialization!");
    623634#else
     635#ifndef NOSTREAMIO
    624636      cerr << "libfac: Factorize: ERROR: Not able to find a valid specialization!\n"
    625637           << rcsid << errmsg << endl;
     638#else
     639       ;
     640#endif
    626641#endif
    627642      Outputlist.append(CFFactor(F,1));
    … …  
    828843/*
    829844$Log: not supported by cvs2svn $
     845Revision 1.9  2001/08/08 11:59:12  Singular
     846*hannes: Dan's NOSTREAMIO changes
     847
    830848Revision 1.8  2001/08/06 08:32:54  Singular
    831849* hannes: code cleanup

  • libfac/factor/MVMultiHensel.cc

    r14b1e65 r456842  
    22///////////////////////////////////////////////////////////////////////////////
    33// emacs edit mode for this file is -*- C++ -*-
    4 // static char * rcsid = "$Id: MVMultiHensel.cc,v 1.5 2001-08-08 11:59:12 Singular Exp $";
     4// static char * rcsid = "$Id: MVMultiHensel.cc,v 1.6 2001-08-08 14:26:55 Singular Exp $";
    55///////////////////////////////////////////////////////////////////////////////
    66// FACTORY - Includes
    … …  
    1616
    1717#ifdef SINGULAR
    18 #  define HAVE_SINGULAR
     18#define HAVE_SINGULAR_ERROR
     19#endif
     20
     21#ifdef HAVE_SINGULAR_ERROR
    1922   extern "C" { void WerrorS(char *); }
    2023#endif
    … …  
    109112  // Degrees ok? degree(F1,mainvar) + degree(F2,mainvar) <= i ?
    110113  if ( (degree(F1,levelU) + degree(F2,levelU) ) <= i ) {
    111 #ifdef HAVE_SINGULAR
     114#ifdef factor/MVMultiHensel.cc
    112115    WerrorS("libfac: diophant ERROR: degree too large!  ");
    113116#else
     117#ifndef NOSTREAMIO
    114118    cerr << "libfac: diophant ERROR: degree too large!  "
    115119         << (degree(F1,levelU) + degree(F2,levelU) ) <<endl;
     120#else
     121    ;
     122#endif
    116123#endif
    117124    Retvalue.One=F1;Retvalue.Two=F2;
    … …  
    123130    // check if gcd(F1,F2) <> 1 , i.e. F1 and F2 are not relatively prime
    124131    if ( ! r.isOne() ){
    125 #ifdef HAVE_SINGULAR
     132#ifdef HAVE_SINGULAR_ERROR
    126133      WerrorS("libfac: diophant ERROR: F1 and F2 are not relatively prime! ");
    127134#else
    … …  
    130137           << "  are not relatively prime!" << endl;
    131138#else
    132      cerr << "libfac: diophant ERROR: F1 and F2 are not relatively prime!"
    133           << endl;
     139     ;
    134140#endif
    135141#endif
    … …  
    405411/*
    406412$Log: not supported by cvs2svn $
     413Revision 1.5  2001/08/08 11:59:12  Singular
     414*hannes: Dan's NOSTREAMIO changes
     415
    407416Revision 1.4  1997/11/18 16:39:05  Singular
    408417* hannes: moved WerrorS from C++ to C

  • libfac/factor/SqrFree.cc

    r14b1e65 r456842  
    22///////////////////////////////////////////////////////////////////////////////
    33// emacs edit mode for this file is -*- C++ -*-
    4 static char * rcsid = "$Id: SqrFree.cc,v 1.5 2001-08-08 11:59:13 Singular Exp $";
     4static char * rcsid = "$Id: SqrFree.cc,v 1.6 2001-08-08 14:26:56 Singular Exp $";
    55static char * errmsg = "\nYou found a bug!\nPlease inform (Michael Messollen) michael@math.uni-sb.de .\n Please include above information and your input (the ideal/polynomial and characteristic) in your bug-report.\nThank you.";
    66///////////////////////////////////////////////////////////////////////////////
    … …  
    1717
    1818#ifdef SINGULAR
    19 #  define HAVE_SINGULAR
     19#define HAVE_SINGULAR_ERROR
     20#endif
     21
     22#ifdef HAVE_SINGULAR_ERROR
    2023   extern "C" { void WerrorS(char *); }
    2124#endif
    … …  
    128131    else return 0 ;
    129132  }
    130 #ifdef HAVE_SINGULAR
     133#ifdef HAVE_SINGULAR_ERROR
    131134  WerrorS("libfac: ERROR: SqrFreeTest: we should never fall trough here!");
    132135#else
     136#ifndef NOSTREAMIO
    133137  cerr << "\nlibfac: ERROR: SqrFreeTest: we should never fall trough here!\n"
    134138       << rcsid << errmsg << endl;
     139#endif
    135140#endif
    136141  return 0;
    … …  
    254259    return Outputlist ;
    255260  }
    256 #ifdef HAVE_SINGULAR
     261#ifdef HAVE_SINGULAR_ERROR
    257262  WerrorS("libfac: ERROR: SqrFreed: we should never fall trough here!");
    258263#else
     264#infdef NOSTREAMIO
    259265  cerr << "\nlibfac: ERROR: SqrFreed: we should never fall trough here!\n"
    260266       << rcsid << errmsg << endl;
     267#endif
    261268#endif
    262269  DEBDECLEVEL(cout, "SqrFreed");
    … …  
    334341/*
    335342$Log: not supported by cvs2svn $
     343Revision 1.5  2001/08/08 11:59:13  Singular
     344*hannes: Dan's NOSTREAMIO changes
     345
    336346Revision 1.4  1997/11/18 16:39:06  Singular
    337347* hannes: moved WerrorS from C++ to C
Note: See TracChangeset for help on using the changeset viewer.