Update copyright statements.

[ginac.git] / ginac / polynomial / collect_vargs.cpp

diff --git a/ginac/polynomial/collect_vargs.cpp b/ginac/polynomial/collect_vargs.cpp
index f014a874e4a76cda43de60f49d1530226efdfb5e..083dfdbb5c374cb39944b49ec1cdf0d8a0ba8867 100644 (file)
--- a/ginac/polynomial/collect_vargs.cpp
+++ b/ginac/polynomial/collect_vargs.cpp
@@ -1,19 +1,41 @@
-#include <iterator>
-#include <map>
-#include <algorithm>
-#include <stdexcept>
-#include <string>
+/** @file collect_vargs.cpp
+ *
+ *  Utility functions. */
+
+/*
+ *  GiNaC Copyright (C) 1999-2014 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
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
 #include "add.h"
 #include "mul.h"
 #include "operators.h"
 #include "power.h"
 #include "collect_vargs.h"
-#include <cln/integer.h>
 #include "smod_helpers.h"
 #include "debug.h"
 
-namespace GiNaC
-{
+#include <algorithm>
+#include <cln/integer.h>
+#include <iterator>
+#include <map>
+#include <stdexcept>
+#include <string>
+
+namespace GiNaC {
 
 typedef std::map<exp_vector_t, ex> ex_collect_priv_t;
 
@@ -47,7 +69,7 @@ struct compare_terms
 };
 
 template<typename T, typename CoeffCMP>
-static struct compare_terms<T, CoeffCMP>
+static compare_terms<T, CoeffCMP>
 make_compare_terms(const T& dummy, const CoeffCMP& coeff_cmp)
 {
        return compare_terms<T, CoeffCMP>(coeff_cmp);
@@ -126,8 +148,14 @@ ex_collect_to_ex(const ex_collect_t& ec, const GiNaC::exvector& vars)
                exvector tv;
                tv.reserve(vars.size() + 1);
                for (std::size_t j = 0; j < vars.size(); ++j) {
-                       if (ec[i].first[j] != 0)
-                               tv.push_back(power(vars[j], ec[i].first[j]));
+                       const exp_vector_t& exp_vector(ec[i].first);
+
+                       bug_on(exp_vector.size() != vars.size(),
+                               "expected " << vars.size() << " variables, "
+                               "expression has " << exp_vector.size() << " instead");
+
+                       if (exp_vector[j] != 0)
+                               tv.push_back(power(vars[j], exp_vector[j]));
                }
                tv.push_back(ec[i].second);
                ex tmp = (new mul(tv))->setflag(status_flags::dynallocated);
@@ -149,6 +177,18 @@ ex lcoeff_wrt(ex e, const exvector& x)
        return ec.rbegin()->second;
 }
 
+exp_vector_t degree_vector(ex e, const exvector& vars)
+{
+       e = e.expand();
+       exp_vector_t dvec(vars.size());
+       for (std::size_t i = vars.size(); i-- != 0; ) {
+               const int deg_i = e.degree(vars[i]);
+               e = e.coeff(vars[i], deg_i);
+               dvec[i] = deg_i;
+       }
+       return dvec;
+}
+
 cln::cl_I integer_lcoeff(const ex& e, const exvector& vars)
 {
        ex_collect_t ec;
@@ -164,4 +204,3 @@ cln::cl_I integer_lcoeff(const ex& e, const exvector& vars)
 }
 
 } // namespace GiNaC
-