Changeset c5323e in git

Timestamp:

Mar 26, 1997, 5:32:24 PM (27 years ago)

Author:

Jens Schmidt <schmidt@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

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:

• canonicalform.cc (modified) (11 diffs)
• canonicalform.h (modified) (5 diffs)
• cf_eval.cc (modified) (4 diffs)
• cf_eval.h (modified) (3 diffs)

factory/canonicalform.cc

@@ -1 +1 @@
 // emacs editmode for this file is -*- C++ -*-
-// $Id: canonicalform.cc,v 1.2 1996-07-02 11:18:32 stobbe Exp $
+// $Id: canonicalform.cc,v 1.3 1997-03-26 16:27:09 schmidt Exp $
 
 /*
 $Log: not supported by cvs2svn $
+Revision 1.2  1996/07/02 11:18:32  stobbe
+"initCanonicalForm: now initializes the switch system.
+"
+
 Revision 1.1  1996/06/13 07:15:50  stobbe
 "CanonicalForm::deriv(x): bug fix, result is now swapped back if x is not
@@ -15 +19 @@
 
 #include "assert.h"
+
 #include "cf_defs.h"
+
 #include "cf_globals.h"
 #include "canonicalform.h"
@@ -24 +30 @@
 #include "gfops.h"
 #include "cf_binom.h"
-#if defined USE_MEMUTIL && ! defined USE_OLD_MEMMAN
+#if defined (USE_MEMUTIL) && ! defined (USE_OLD_MEMMAN)
 #include "memman.h"
 #endif
 
+#ifndef NOSTREAMIO
 CanonicalForm readCF( istream& );
-
+#endif /* NOSTREAMIO */
 
 CanonicalForm::CanonicalForm() : value( CFFactory::basic( (int)0 ) )
@@ -413 +420 @@
 }
 
+#ifndef NOSTREAMIO
 void
 CanonicalForm::print( ostream & os, char * str ) const
@@ -421 +429 @@
         value->print( os, str );
 }
+#endif /* NOSTREAMIO */
 
 bool
@@ -999 +1008 @@
 }
 
+#ifndef NOSTREAMIO
 ostream&
 operator << ( ostream & os, const CanonicalForm & cf )
@@ -1005 +1015 @@
     return os;
 }
-
+#endif /* NOSTREAMIO */
+
+#ifndef NOSTREAMIO
 istream&
 operator >> ( istream & is, CanonicalForm & cf )
 {
-#ifdef SINGULAR
-    cf = 0;
-#else
     cf = readCF( is );
-#endif
     return is;
 }
+#endif /* NOSTREAMIO */
 
 CanonicalForm
@@ -1125 +1134 @@
     static bool initialized = false;
     if ( ! initialized ) {
-#if defined USE_MEMUTIL && ! defined USE_OLD_MEMMAN
+#if defined (USE_MEMUTIL) && ! defined (USE_OLD_MEMMAN)
         (void)mmInit();
 #endif
@@ -1200 +1209 @@
     }
 }
-        
+
 void
 On( int sw )
@@ -1261 +1270 @@
         return CanonicalForm( value->sqrt() );
 }
-        
+
 
 int
@@ -1324 +1333 @@
     }
 }
-

factory/canonicalform.h

@@ -1 +1 @@
 // emacs edit mode for this file is -*- C++ -*-
-// $Id: canonicalform.h,v 1.2 1996-07-15 08:32:46 stobbe Exp $
+// $Id: canonicalform.h,v 1.3 1997-03-26 16:28:31 schmidt Exp $
 
 #ifndef INCL_CANONICALFORM_H
@@ -7 +7 @@
 /*
 $Log: not supported by cvs2svn $
+Revision 1.2  1996/07/15 08:32:46  stobbe
+"new function linearSystemSolve
+"
+
 Revision 1.1  1996/06/24 11:26:36  stobbe
 "new function determinant.
@@ -17 +21 @@
 */
 
+#ifndef NOSTREAMIO
 #include <iostream.h>
+#endif /* NOSTREAMIO */
 
 #include "cf_defs.h"
+
 #include "variable.h"
 #include "templates/list.h"
@@ -116 +123 @@
     CanonicalForm& mod ( const CanonicalForm& );
 
-    friend CanonicalForm operator - ( const CanonicalForm& ); 
+    friend CanonicalForm operator - ( const CanonicalForm& );
 
     friend CanonicalForm operator + ( const CanonicalForm&, const CanonicalForm& );
@@ -130 +137 @@
     friend bool divremt ( const CanonicalForm&, const CanonicalForm&, CanonicalForm&, CanonicalForm& );
 
+#ifndef NOSTREAMIO
     void print( ostream&, char * ) const;
     friend ostream& operator << ( ostream&, const CanonicalForm& );
     friend istream& operator >> ( istream&, CanonicalForm& );
+#endif /* NOSTREAMIO */
 
     friend bool operator == ( const CanonicalForm&, const CanonicalForm& );

factory/cf_eval.cc

@@ -1 +1 @@
 // emacs edit mode for this file is -*- C++ -*-
-// $Id: cf_eval.cc,v 1.1 1996-05-24 09:21:54 stobbe Exp $
+// $Id: cf_eval.cc,v 1.2 1997-03-26 16:29:50 schmidt Exp $
 
 /*
 $Log: not supported by cvs2svn $
+Revision 1.1  1996/05/24 09:21:54  stobbe
+"operator(): Bug fix, operator( const CanonicalForm & ) now uses
+            values.min() as lower index instead of 2 and produces the
+            right result.
+"
+
 // Revision 1.0  1996/05/17  10:59:43  stobbe
 // Initial revision
@@ -10 +16 @@
 
 #include "assert.h"
+
 #include "cf_defs.h"
+
 #include "cf_eval.h"
 
@@ -51 +59 @@
 }
 
+#ifndef NOSTREAMIO
 ostream&
 operator<< ( ostream& s, const Evaluation &e )
@@ -57 +66 @@
     return s;
 }
+#endif /* NOSTREAMIO */
 
 CanonicalForm

factory/cf_eval.h

@@ -1 +1 @@
 // emacs edit mode for this file is -*- C++ -*-
-// $Id: cf_eval.h,v 1.0 1996-05-17 10:59:38 stobbe Exp $
+// $Id: cf_eval.h,v 1.1 1997-03-26 16:32:24 schmidt Exp $
 
 #ifndef INCL_EVALUATION_H
@@ -7 +7 @@
 /*
 $Log: not supported by cvs2svn $
+Revision 1.0  1996/05/17 10:59:38  stobbe
+Initial revision
+
 */
 
+#ifndef NOSTREAMIO
 #include <iostream.h>
+#endif /* NOSTREAMIO */
+
 #include "canonicalform.h"
 
@@ -31 +37 @@
     CanonicalForm operator() ( const CanonicalForm & f, int i, int j ) const;
     virtual void nextpoint();
+#ifndef NOSTREAMIO
     friend ostream& operator<< ( ostream& s, const Evaluation &e );
+#endif /* NOSTREAMIO */
 };