- moved polynomial interpolation in heur_gcd() to its own function

[ginac.git] / ginac / symbol.h

diff --git a/ginac/symbol.h b/ginac/symbol.h
index 13515c4730d4fe299548de03fad4ead42855df28..55f204499958984aa636c013d6548a74612d3f75 100644 (file)
--- a/ginac/symbol.h
+++ b/ginac/symbol.h
@@ -65,7 +65,7 @@ protected:
 
     // other constructors
 public:
-    explicit symbol(const string & initname);
+    explicit symbol(const std::string & initname);
 
     // functions overriding virtual functions from base classes
 public:
@@ -81,11 +81,12 @@ public:
     int ldegree(const symbol & s) const;
     ex coeff(const symbol & s, int n = 1) const;
     ex eval(int level = 0) const;
-    ex diff(const symbol & s) const;
-    ex series(const symbol & s, const ex & point, int order) const;
+    ex series(const relational & s, int order) const;
     ex normal(lst &sym_lst, lst &repl_lst, int level=0) const;
+    ex to_rational(lst &repl_lst) const;
     ex subs(const lst & ls, const lst & lr) const;
 protected:
+    ex derivative(const symbol & s) const;
     int compare_same_type(const basic & other) const;
     bool is_equal_same_type(const basic & other) const;
     unsigned return_type(void) const;
@@ -96,18 +97,17 @@ protected:
 public:
     void assign(const ex & value);
     void unassign(void);
-    ex diff(const symbol & s, unsigned nth) const;
-    void setname(const string & n) {name=n;}
-    string getname(void) const {return name;}
+    void setname(const std::string & n) {name=n;}
+    std::string getname(void) const {return name;}
 private:
-    string & autoname_prefix(void);
+    std::string & autoname_prefix(void);
 
 // member variables
 
 protected:
     assigned_ex_info * asexinfop;
     unsigned serial;  //!< unique serial number for comparision
-    string name;
+    std::string name;
 private:
     static unsigned next_serial;
 };