X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Fncmul.h;h=7476e290392762e46c57ccc7567de56b281a87d1;hp=03b47ca7ae119c9337a31045f0c509469265ba7b;hb=bd2d7351b89743eb68ce7d3bfa7ab62c331f9522;hpb=9eab44408b9213d8909b7a9e525f404ad06064dd

diff --git a/ginac/ncmul.h b/ginac/ncmul.h
index 03b47ca7..7476e290 100644
--- a/ginac/ncmul.h
+++ b/ginac/ncmul.h
@@ -3,7 +3,7 @@
  *  Interface to GiNaC's non-commutative products of expressions. */
 
 /*
- *  GiNaC Copyright (C) 1999 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2000 Johannes Gutenberg University Mainz, Germany
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -23,16 +23,20 @@
 #ifndef __GINAC_NCMUL_H__
 #define __GINAC_NCMUL_H__
 
-#include <ginac/exprseq.h>
+#include "exprseq.h"
 
+#ifndef NO_NAMESPACE_GINAC
 namespace GiNaC {
+#endif // ndef NO_NAMESPACE_GINAC
 
 /** Non-commutative product of expressions. */
 class ncmul : public exprseq
 {
+    GINAC_DECLARE_REGISTERED_CLASS(ncmul, exprseq)
+
     friend class power;
-    friend ex nonsimplified_ncmul(exvector const & v);
-    friend ex simplified_ncmul(exvector const & v);
+    friend ex nonsimplified_ncmul(const exvector & v);
+    friend ex simplified_ncmul(const exvector & v);
 
 // member functions
 
@@ -40,44 +44,44 @@ class ncmul : public exprseq
 public:
     ncmul();
     ~ncmul();
-    ncmul(ncmul const & other);
-    ncmul const & operator=(ncmul const & other);
+    ncmul(const ncmul & other);
+    const ncmul & operator=(const ncmul & other);
 protected:
-    void copy(ncmul const & other);
+    void copy(const ncmul & other);
     void destroy(bool call_parent);
 
     // other constructors
 public:
-    ncmul(ex const & lh, ex const & rh);
-    ncmul(ex const & f1, ex const & f2, ex const & f3);
-    ncmul(ex const & f1, ex const & f2, ex const & f3,
-          ex const & f4);
-    ncmul(ex const & f1, ex const & f2, ex const & f3,
-          ex const & f4, ex const & f5);
-    ncmul(ex const & f1, ex const & f2, ex const & f3,
-          ex const & f4, ex const & f5, ex const & f6);
-    ncmul(exvector const & v, bool discardable=false);
+    ncmul(const ex & lh, const ex & rh);
+    ncmul(const ex & f1, const ex & f2, const ex & f3);
+    ncmul(const ex & f1, const ex & f2, const ex & f3,
+          const ex & f4);
+    ncmul(const ex & f1, const ex & f2, const ex & f3,
+          const ex & f4, const ex & f5);
+    ncmul(const ex & f1, const ex & f2, const ex & f3,
+          const ex & f4, const ex & f5, const ex & f6);
+    ncmul(const exvector & v, bool discardable=false);
     ncmul(exvector * vp); // vp will be deleted
 
     // functions overriding virtual functions from bases classes
 public:
     basic * duplicate() const;
-    void printraw(ostream & os) const;
-    void print(ostream & os, unsigned upper_precedence) const;
-    void printcsrc(ostream & os, unsigned upper_precedence) const;
+    void print(std::ostream & os, unsigned upper_precedence) const;
+    void printraw(std::ostream & os) const;
+    void printcsrc(std::ostream & os, unsigned upper_precedence) const;
     bool info(unsigned inf) const;
-    int degree(symbol const & s) const;
-    int ldegree(symbol const & s) const;
+    int degree(const symbol & s) const;
+    int ldegree(const symbol & s) const;
     ex expand(unsigned options=0) const;
-    ex coeff(symbol const & s, int const n=1) const;
+    ex coeff(const symbol & s, int n=1) const;
     ex eval(int level=0) const;
-    ex diff(symbol const & s) const;
-    ex subs(lst const & ls, lst const & lr) const;
+    ex subs(const lst & ls, const lst & lr) const;
     exvector get_indices(void) const;
-    ex thisexprseq(exvector const & v) const;
+    ex thisexprseq(const exvector & v) const;
     ex thisexprseq(exvector * vp) const;
 protected:
-    int compare_same_type(basic const & other) const;
+    ex derivative(const symbol & s) const;
+    int compare_same_type(const basic & other) const;
     unsigned return_type(void) const;
     unsigned return_type_tinfo(void) const;
     
@@ -86,11 +90,11 @@ protected:
 
     // non-virtual functions in this class
 protected:
-    unsigned count_factors(ex const & e) const;
-    void append_factors(exvector & v, ex const & e) const;
+    unsigned count_factors(const ex & e) const;
+    void append_factors(exvector & v, const ex & e) const;
     exvector expandchildren(unsigned options) const;
 public:
-    exvector const & get_factors(void) const;
+    const exvector & get_factors(void) const;
 
 // member variables
 
@@ -101,12 +105,12 @@ protected:
 // global constants
 
 extern const ncmul some_ncmul;
-extern type_info const & typeid_ncmul;
+extern const type_info & typeid_ncmul;
 
 // friend funtions 
 
-ex nonsimplified_ncmul(exvector const & v);
-ex simplified_ncmul(exvector const & v);
+ex nonsimplified_ncmul(const exvector & v);
+ex simplified_ncmul(const exvector & v);
 
 // utility functions
 inline const ncmul &ex_to_ncmul(const ex &e)
@@ -114,6 +118,8 @@ inline const ncmul &ex_to_ncmul(const ex &e)
 	return static_cast <const ncmul &>(*e.bp);
 }
 
+#ifndef NO_NAMESPACE_GINAC
 } // namespace GiNaC
+#endif // ndef NO_NAMESPACE_GINAC
 
 #endif // ndef __GINAC_NCMUL_H__