Consider solve_algo::markowitz in automatic elimination algorithm selection.

[ginac.git] / ginac / flags.h

diff --git a/ginac/flags.h b/ginac/flags.h
index 0ea0fd9fd2f5dbd4082dbb93320a6ab1e34a2001..f759dcd411bce1edc740a94cfbf1a2e10bc63ad5 100644 (file)
--- 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-2008 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2018 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 {
 
@@ -31,7 +31,8 @@ public:
        enum {
                expand_indexed = 0x0001,      ///< expands (a+b).i to a.i+b.i
                expand_function_args = 0x0002, ///< expands the arguments of functions
-               expand_rename_idx = 0x0004 ///< used internally by mul::expand()
+               expand_rename_idx = 0x0004, ///< used internally by mul::expand()
+               expand_transcendental = 0x0008 ///< expands transcendental functions like log and exp
        };
 };
 
@@ -54,7 +55,7 @@ public:
                pattern_is_product = 0x0004,     ///< used internally by expairseq::subschildren()
                pattern_is_not_product = 0x0008, ///< used internally by expairseq::subschildren()
                no_index_renaming = 0x0010,
-               // To indicate that we want to substitue an index by something that is
+               // To indicate that we want to substitute an index by something that
                // is not an index. Without this flag the index value would be
                // substituted in that case.
                really_subs_idx = 0x0020
@@ -181,7 +182,15 @@ public:
                 *  linear systems.  In contrast to division-free elimination it only
                 *  has a linear expression swell.  For two-dimensional systems, the
                 *  two algorithms are equivalent, however. */
-               bareiss
+               bareiss,
+               /** Markowitz-ordered Gaussian elimination. Same as the usual
+                *  Gaussian elimination, but with additional effort spent on
+                *  selecting pivots that minimize fill-in. Faster than the
+                *  methods above for large sparse matrices (particularly with
+                *  symbolic coefficients), otherwise slightly slower than
+                *  Gaussian elimination.
+                */
+               markowitz
        };
 };
 
@@ -196,7 +205,10 @@ public:
                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())
                has_indices     = 0x0020,
-               has_no_indices  = 0x0040  // ! (has_indices || has_no_indices) means "don't know"
+               has_no_indices  = 0x0040, // ! (has_indices || has_no_indices) means "don't know"
+               is_positive     = 0x0080,
+               is_negative     = 0x0100,
+               purely_indefinite = 0x0200  // If set in a mul, then it does not contains any terms with determined signs, used in power::expand()
        };
 };
 
@@ -204,7 +216,7 @@ public:
 class info_flags {
 public:
        enum {
-               // answered by class numeric and symbols/constants in particular domains
+               // answered by class numeric, add, mul, function and symbols/constants in particular domains
                numeric,
                real,
                rational,
@@ -246,7 +258,6 @@ public:
                rational_polynomial,
                crational_polynomial,
                rational_function,
-               algebraic,
 
                // answered by class indexed
                indexed,      // class can carry indices
@@ -256,7 +267,10 @@ public:
                idx,
 
                // answered by classes numeric, symbol, add, mul, power
-               expanded
+               expanded,
+
+               // is meaningful for mul only
+               indefinite
        };
 };
 
@@ -285,10 +299,11 @@ public:
 class factor_options {
 public:
        enum {
-               all = 0x0001    ///< factor all polynomial subexpressions
+               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