X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Fflags.h;h=8f8f25dff572a45bdc4a0b75df2755d11f8e4ba5;hp=8ef1c0ac07e03a72f8482a431b886543b3bbfc1a;hb=77c2acd59e345fe7697304a865a8f41d43494129;hpb=7e68cf1c0515b0397a49a13f2f08decae7509af1

diff --git a/ginac/flags.h b/ginac/flags.h
index 8ef1c0ac..8f8f25df 100644
--- a/ginac/flags.h
+++ b/ginac/flags.h
@@ -3,7 +3,7 @@
  *  Collection of all flags used through the GiNaC framework. */
 
 /*
- *  GiNaC Copyright (C) 1999-2005 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2011 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
@@ -20,8 +20,8 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef __GINAC_FLAGS_H__
-#define __GINAC_FLAGS_H__
+#ifndef GINAC_FLAGS_H
+#define GINAC_FLAGS_H
 
 namespace GiNaC {
 
@@ -30,7 +30,8 @@ class expand_options {
 public:
 	enum {
 		expand_indexed = 0x0001,      ///< expands (a+b).i to a.i+b.i
-		expand_function_args = 0x0002 ///< expands the arguments of functions
+		expand_function_args = 0x0002, ///< expands the arguments of functions
+		expand_rename_idx = 0x0004 ///< used internally by mul::expand()
 	};
 };
 
@@ -38,7 +39,7 @@ public:
 class has_options {
 public:
 	enum {
-		algebraic = 0x0001,              ///< enable algebraic matching
+		algebraic = 0x0001              ///< enable algebraic matching
 	};
 };
 
@@ -193,7 +194,9 @@ public:
 		evaluated       = 0x0002, ///< .eval() has already done its job
 		expanded        = 0x0004, ///< .expand(0) has already done its job (other expand() options ignore this flag)
 		hash_calculated = 0x0008, ///< .calchash() has already done its job
-		not_shareable   = 0x0010  ///< don't share instances of this object between different expressions unless explicitly asked to (used by ex::compare())
+		not_shareable   = 0x0010, ///< don't share instances of this object between different expressions unless explicitly asked to (used by ex::compare())
+		has_indices	= 0x0020,
+		has_no_indices	= 0x0040  // ! (has_indices || has_no_indices) means "don't know"
 	};
 };
 
@@ -201,7 +204,7 @@ public:
 class info_flags {
 public:
 	enum {
-		// answered by class numeric and symbols/constants in particular domains
+		// answered by class numeric, add, mul and symbols/constants in particular domains
 		numeric,
 		real,
 		rational,
@@ -250,7 +253,10 @@ public:
 		has_indices,  // object has at least one index
 
 		// answered by class idx
-		idx
+		idx,
+
+		// answered by classes numeric, symbol, add, mul, power
+		expanded
 	};
 };
 
@@ -275,6 +281,15 @@ public:
 	};
 };
 
+/** Flags to control the polynomial factorization. */
+class factor_options {
+public:
+	enum {
+		polynomial = 0x0000, ///< factor only expressions that are polynomials
+		all        = 0x0001  ///< factor all polynomial subexpressions
+	};
+};
+
 } // namespace GiNaC
 
-#endif // ndef __GINAC_FLAGS_H__
+#endif // ndef GINAC_FLAGS_H