Changeset c5323e in git for factory


Ignore:
Timestamp:
Mar 26, 1997, 5:32:24 PM (27 years ago)
Author:
Jens Schmidt <schmidt@…>
Branches:
(u'spielwiese', '82fc009ea2b0098c1a4896c841bb70860976bdfc')
Children:
f5f16d0c85133c4858c7e8a709212263f1f5870b
Parents:
c78b18b1fa50e52018c1f01004e35a9cda192bd7
Message:
stream-io wrapped by NOSTREAMIO


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

Legend:

Unmodified
Added
Removed
  • factory/canonicalform.cc

    rc78b18b rc5323e  
    11// emacs editmode for this file is -*- C++ -*-
    2 // $Id: canonicalform.cc,v 1.2 1996-07-02 11:18:32 stobbe Exp $
     2// $Id: canonicalform.cc,v 1.3 1997-03-26 16:27:09 schmidt Exp $
    33
    44/*
    55$Log: not supported by cvs2svn $
     6Revision 1.2  1996/07/02 11:18:32  stobbe
     7"initCanonicalForm: now initializes the switch system.
     8"
     9
    610Revision 1.1  1996/06/13 07:15:50  stobbe
    711"CanonicalForm::deriv(x): bug fix, result is now swapped back if x is not
     
    1519
    1620#include "assert.h"
     21
    1722#include "cf_defs.h"
     23
    1824#include "cf_globals.h"
    1925#include "canonicalform.h"
     
    2430#include "gfops.h"
    2531#include "cf_binom.h"
    26 #if defined USE_MEMUTIL && ! defined USE_OLD_MEMMAN
     32#if defined (USE_MEMUTIL) && ! defined (USE_OLD_MEMMAN)
    2733#include "memman.h"
    2834#endif
    2935
     36#ifndef NOSTREAMIO
    3037CanonicalForm readCF( istream& );
    31 
     38#endif /* NOSTREAMIO */
    3239
    3340CanonicalForm::CanonicalForm() : value( CFFactory::basic( (int)0 ) )
     
    413420}
    414421
     422#ifndef NOSTREAMIO
    415423void
    416424CanonicalForm::print( ostream & os, char * str ) const
     
    421429        value->print( os, str );
    422430}
     431#endif /* NOSTREAMIO */
    423432
    424433bool
     
    9991008}
    10001009
     1010#ifndef NOSTREAMIO
    10011011ostream&
    10021012operator << ( ostream & os, const CanonicalForm & cf )
     
    10051015    return os;
    10061016}
    1007 
     1017#endif /* NOSTREAMIO */
     1018
     1019#ifndef NOSTREAMIO
    10081020istream&
    10091021operator >> ( istream & is, CanonicalForm & cf )
    10101022{
    1011 #ifdef SINGULAR
    1012     cf = 0;
    1013 #else
    10141023    cf = readCF( is );
    1015 #endif
    10161024    return is;
    10171025}
     1026#endif /* NOSTREAMIO */
    10181027
    10191028CanonicalForm
     
    11251134    static bool initialized = false;
    11261135    if ( ! initialized ) {
    1127 #if defined USE_MEMUTIL && ! defined USE_OLD_MEMMAN
     1136#if defined (USE_MEMUTIL) && ! defined (USE_OLD_MEMMAN)
    11281137        (void)mmInit();
    11291138#endif
     
    12001209    }
    12011210}
    1202        
     1211
    12031212void
    12041213On( int sw )
     
    12611270        return CanonicalForm( value->sqrt() );
    12621271}
    1263        
     1272
    12641273
    12651274int
     
    13241333    }
    13251334}
    1326 
  • factory/canonicalform.h

    rc78b18b rc5323e  
    11// emacs edit mode for this file is -*- C++ -*-
    2 // $Id: canonicalform.h,v 1.2 1996-07-15 08:32:46 stobbe Exp $
     2// $Id: canonicalform.h,v 1.3 1997-03-26 16:28:31 schmidt Exp $
    33
    44#ifndef INCL_CANONICALFORM_H
     
    77/*
    88$Log: not supported by cvs2svn $
     9Revision 1.2  1996/07/15 08:32:46  stobbe
     10"new function linearSystemSolve
     11"
     12
    913Revision 1.1  1996/06/24 11:26:36  stobbe
    1014"new function determinant.
     
    1721*/
    1822
     23#ifndef NOSTREAMIO
    1924#include <iostream.h>
     25#endif /* NOSTREAMIO */
    2026
    2127#include "cf_defs.h"
     28
    2229#include "variable.h"
    2330#include "templates/list.h"
     
    116123    CanonicalForm& mod ( const CanonicalForm& );
    117124
    118     friend CanonicalForm operator - ( const CanonicalForm& ); 
     125    friend CanonicalForm operator - ( const CanonicalForm& );
    119126
    120127    friend CanonicalForm operator + ( const CanonicalForm&, const CanonicalForm& );
     
    130137    friend bool divremt ( const CanonicalForm&, const CanonicalForm&, CanonicalForm&, CanonicalForm& );
    131138
     139#ifndef NOSTREAMIO
    132140    void print( ostream&, char * ) const;
    133141    friend ostream& operator << ( ostream&, const CanonicalForm& );
    134142    friend istream& operator >> ( istream&, CanonicalForm& );
     143#endif /* NOSTREAMIO */
    135144
    136145    friend bool operator == ( const CanonicalForm&, const CanonicalForm& );
  • factory/cf_eval.cc

    rc78b18b rc5323e  
    11// emacs edit mode for this file is -*- C++ -*-
    2 // $Id: cf_eval.cc,v 1.1 1996-05-24 09:21:54 stobbe Exp $
     2// $Id: cf_eval.cc,v 1.2 1997-03-26 16:29:50 schmidt Exp $
    33
    44/*
    55$Log: not supported by cvs2svn $
     6Revision 1.1  1996/05/24 09:21:54  stobbe
     7"operator(): Bug fix, operator( const CanonicalForm & ) now uses
     8            values.min() as lower index instead of 2 and produces the
     9            right result.
     10"
     11
    612// Revision 1.0  1996/05/17  10:59:43  stobbe
    713// Initial revision
     
    1016
    1117#include "assert.h"
     18
    1219#include "cf_defs.h"
     20
    1321#include "cf_eval.h"
    1422
     
    5159}
    5260
     61#ifndef NOSTREAMIO
    5362ostream&
    5463operator<< ( ostream& s, const Evaluation &e )
     
    5766    return s;
    5867}
     68#endif /* NOSTREAMIO */
    5969
    6070CanonicalForm
  • factory/cf_eval.h

    rc78b18b rc5323e  
    11// emacs edit mode for this file is -*- C++ -*-
    2 // $Id: cf_eval.h,v 1.0 1996-05-17 10:59:38 stobbe Exp $
     2// $Id: cf_eval.h,v 1.1 1997-03-26 16:32:24 schmidt Exp $
    33
    44#ifndef INCL_EVALUATION_H
     
    77/*
    88$Log: not supported by cvs2svn $
     9Revision 1.0  1996/05/17 10:59:38  stobbe
     10Initial revision
     11
    912*/
    1013
     14#ifndef NOSTREAMIO
    1115#include <iostream.h>
     16#endif /* NOSTREAMIO */
     17
    1218#include "canonicalform.h"
    1319
     
    3137    CanonicalForm operator() ( const CanonicalForm & f, int i, int j ) const;
    3238    virtual void nextpoint();
     39#ifndef NOSTREAMIO
    3340    friend ostream& operator<< ( ostream& s, const Evaluation &e );
     41#endif /* NOSTREAMIO */
    3442};
    3543
Note: See TracChangeset for help on using the changeset viewer.