Happy New Year!

[ginac.git] / ginac / inifcns.cpp

diff --git a/ginac/inifcns.cpp b/ginac/inifcns.cpp
index 6141b8652d0d7faa9230b6476f8ac91d32703df3..e2a09b161ccf95ad01e3f95f07b823b79d2b2e54 100644 (file)
--- a/ginac/inifcns.cpp
+++ b/ginac/inifcns.cpp
@@ -3,7 +3,7 @@
  *  Implementation of GiNaC's initially known functions. */
 
 /*
- *  GiNaC Copyright (C) 1999-2016 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2019 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
@@ -1038,6 +1038,24 @@ REGISTER_FUNCTION(Order, eval_func(Order_eval).
 // Solve linear system
 //////////
 
+static void insert_symbols(exset &es, const ex &e)
+{
+       if (is_a<symbol>(e)) {
+               es.insert(e);
+       } else {
+               for (const ex &sube : e) {
+                       insert_symbols(es, sube);
+               }
+       }
+}
+
+static exset symbolset(const ex &e)
+{
+       exset s;
+       insert_symbols(s, e);
+       return s;
+}
+
 ex lsolve(const ex &eqns, const ex &symbols, unsigned options)
 {
        // solve a system of linear equations
@@ -1053,20 +1071,20 @@ ex lsolve(const ex &eqns, const ex &symbols, unsigned options)
        }
        
        // syntax checks
-       if (!eqns.info(info_flags::list)) {
-               throw(std::invalid_argument("lsolve(): 1st argument must be a list or an equation"));
+       if (!(eqns.info(info_flags::list) || eqns.info(info_flags::exprseq))) {
+               throw(std::invalid_argument("lsolve(): 1st argument must be a list, a sequence, or an equation"));
        }
        for (size_t i=0; i<eqns.nops(); i++) {
                if (!eqns.op(i).info(info_flags::relation_equal)) {
                        throw(std::invalid_argument("lsolve(): 1st argument must be a list of equations"));
                }
        }
-       if (!symbols.info(info_flags::list)) {
-               throw(std::invalid_argument("lsolve(): 2nd argument must be a list or a symbol"));
+       if (!(symbols.info(info_flags::list) || symbols.info(info_flags::exprseq))) {
+               throw(std::invalid_argument("lsolve(): 2nd argument must be a list, a sequence, or a symbol"));
        }
        for (size_t i=0; i<symbols.nops(); i++) {
                if (!symbols.op(i).info(info_flags::symbol)) {
-                       throw(std::invalid_argument("lsolve(): 2nd argument must be a list of symbols"));
+                       throw(std::invalid_argument("lsolve(): 2nd argument must be a list or a sequence of symbols"));
                }
        }
        
@@ -1077,8 +1095,10 @@ ex lsolve(const ex &eqns, const ex &symbols, unsigned options)
        
        for (size_t r=0; r<eqns.nops(); r++) {
                const ex eq = eqns.op(r).op(0)-eqns.op(r).op(1); // lhs-rhs==0
+               const exset syms = symbolset(eq);
                ex linpart = eq;
                for (size_t c=0; c<symbols.nops(); c++) {
+                       if (syms.count(symbols.op(c)) == 0) continue;
                        const ex co = eq.coeff(ex_to<symbol>(symbols.op(c)),1);
                        linpart -= co*symbols.op(c);
                        sys(r,c) = co;
@@ -1088,11 +1108,13 @@ ex lsolve(const ex &eqns, const ex &symbols, unsigned options)
        }
        
        // test if system is linear and fill vars matrix
+       const exset sys_syms = symbolset(sys);
+       const exset rhs_syms = symbolset(rhs);
        for (size_t i=0; i<symbols.nops(); i++) {
                vars(i,0) = symbols.op(i);
-               if (sys.has(symbols.op(i)))
+               if (sys_syms.count(symbols.op(i)) != 0)
                        throw(std::logic_error("lsolve: system is not linear"));
-               if (rhs.has(symbols.op(i)))
+               if (rhs_syms.count(symbols.op(i)) != 0)
                        throw(std::logic_error("lsolve: system is not linear"));
        }