[bugfix] normalize_in_ring: don't set the leading coefficient to 1.

[ginac.git] / ginac / basic.h

diff --git a/ginac/basic.h b/ginac/basic.h
index 6b117cc9dc1b289b1cdc9cef023f696c449f2fcd..ffc508dbee0dd48ae4b4d6e18b18b96a4f68b1da 100644 (file)
--- a/ginac/basic.h
+++ b/ginac/basic.h
@@ -3,7 +3,7 @@
  *  Interface to GiNaC's ABC. */
 
 /*
- *  GiNaC Copyright (C) 1999-2006 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2008 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
@@ -25,6 +25,7 @@
 
 #include <cstddef> // for size_t
 #include <vector>
+#include <set>
 #include <map>
 // CINT needs <algorithm> to work properly with <vector>
 #include <algorithm>
@@ -45,6 +46,7 @@ class archive_node;
 class print_context;
 
 typedef std::vector<ex> exvector;
+typedef std::set<ex, ex_is_less> exset;
 typedef std::map<ex, ex, ex_is_less> exmap;
 
 // Define this to enable some statistical output for comparisons and hashing
@@ -161,7 +163,7 @@ public:
 
        // pattern matching
        virtual bool has(const ex & other, unsigned options = 0) const;
-       virtual bool match(const ex & pattern, lst & repl_lst) const;
+       virtual bool match(const ex & pattern, exmap & repls) const;
 protected:
        virtual bool match_same_type(const basic & other) const;
 public:
@@ -215,8 +217,10 @@ public:
        virtual unsigned return_type() const;
        virtual tinfo_t return_type_tinfo() const;
 
-       // complex conjugation
+       // functions for complex expressions
        virtual ex conjugate() const;
+       virtual ex real_part() const;
+       virtual ex imag_part() const;
 
        // functions that should be called from class ex only
 protected: