- Fix GCC 2.95.x brokenness.

[ginac.git] / ginac / inifcns.cpp

diff --git a/ginac/inifcns.cpp b/ginac/inifcns.cpp
index 7081eb5b333ebe22f7fd365e80a0a513d60e0603..e2714cf2ccbd98b1c49e7c68cab18ac45e3a1d49 100644 (file)
--- a/ginac/inifcns.cpp
+++ b/ginac/inifcns.cpp
@@ -29,8 +29,6 @@
 #include "lst.h"
 #include "matrix.h"
 #include "mul.h"
-#include "ncmul.h"
-#include "numeric.h"
 #include "power.h"
 #include "relational.h"
 #include "pseries.h"
@@ -475,15 +473,15 @@ ex lsolve(const ex &eqns, const ex &symbols)
                for (unsigned c=0; c<symbols.nops(); c++) {
                        ex co = eq.coeff(ex_to_symbol(symbols.op(c)),1);
                        linpart -= co*symbols.op(c);
-                       sys.set(r,c,co);
+                       sys(r,c) = co;
                }
                linpart = linpart.expand();
-               rhs.set(r,0,-linpart);
+               rhs(r,0) = -linpart;
        }
        
        // test if system is linear and fill vars matrix
        for (unsigned i=0; i<symbols.nops(); i++) {
-               vars.set(i,0,symbols.op(i));
+               vars(i,0) = symbols.op(i);
                if (sys.has(symbols.op(i)))
                        throw(std::logic_error("lsolve: system is not linear"));
                if (rhs.has(symbols.op(i)))
@@ -509,79 +507,6 @@ ex lsolve(const ex &eqns, const ex &symbols)
        return sollist;
 }
 
-/** non-commutative power. */
-ex ncpow(const ex & basis, unsigned exponent)
-{
-       if (exponent == 0)
-               return _ex1();
-
-       exvector v;
-       v.reserve(exponent);
-       for (unsigned i=0; i<exponent; ++i)
-               v.push_back(basis);
-
-       return ncmul(v, true);
-}
-
-// Symmetrize/antisymmetrize over a vector of objects
-static ex symm(const ex & e, exvector::const_iterator first, exvector::const_iterator last, bool asymmetric)
-{
-       // Need at least 2 objects for this operation
-       int num = last - first;
-       if (num < 2)
-               return e;
-
-       // Sort object vector, transform it into a list, and make a copy so we
-       // will know which objects get substituted for which
-       exlist iv_lst;
-       iv_lst.insert(iv_lst.begin(), first, last);
-       shaker_sort(iv_lst.begin(), iv_lst.end(), ex_is_less());
-       lst orig_lst(iv_lst);
-
-       // Loop over all permutations (the first permutation, which is the
-       // identity, is unrolled)
-       ex sum = e;
-       while (next_permutation(iv_lst.begin(), iv_lst.end(), ex_is_less())) {
-               ex term = e.subs(orig_lst, lst(iv_lst));
-               if (asymmetric) {
-                       exlist test_lst = iv_lst;
-                       term *= permutation_sign(test_lst.begin(), test_lst.end(), ex_is_less());
-               }
-               sum += term;
-       }
-       return sum / factorial(numeric(num));
-}
-
-ex symmetrize(const ex & e, exvector::const_iterator first, exvector::const_iterator last)
-{
-       return symm(e, first, last, false);
-}
-
-ex antisymmetrize(const ex & e, exvector::const_iterator first, exvector::const_iterator last)
-{
-       return symm(e, first, last, true);
-}
-
-/** Symmetrize expression over a list of objects (symbols, indices). */
-ex ex::symmetrize(const lst & l) const
-{
-       exvector v;
-       v.reserve(l.nops());
-       for (unsigned i=0; i<l.nops(); i++)
-               v.push_back(l.op(i));
-       return symm(*this, v.begin(), v.end(), false);
-}
-
-/** Antisymmetrize expression over a list of objects (symbols, indices). */
-ex ex::antisymmetrize(const lst & l) const
-{
-       exvector v;
-       v.reserve(l.nops());
-       for (unsigned i=0; i<l.nops(); i++)
-               v.push_back(l.op(i));
-       return symm(*this, v.begin(), v.end(), true);
-}
-
 /** Force inclusion of functions from initcns_gamma and inifcns_zeta
  *  for static lib (so ginsh will see them). */
 unsigned force_include_tgamma = function_index_tgamma;