X-Git-Url: https://ginac.de/ginac.git//ginac.git?a=blobdiff_plain;f=ginac%2Fmatrix.h;h=ee30601310a2a7d8646bb51d9ef3410a11bb2e57;hb=d85cc82288993d3dce31a9c849458bd576259b15;hp=99c9abc4e4ada9abfa8f3e7f3309010be32d12dc;hpb=b4be7b0f30fbb6178cf4ee83e1b3952e084bd8ca;p=ginac.git

diff --git a/ginac/matrix.h b/ginac/matrix.h
index 99c9abc4..ee306013 100644
--- a/ginac/matrix.h
+++ b/ginac/matrix.h
@@ -3,7 +3,7 @@
  *  Interface to symbolic matrices */
 
 /*
- *  GiNaC Copyright (C) 1999-2003 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2004 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
@@ -30,6 +30,65 @@
 
 namespace GiNaC {
 
+
+/** Helper template to allow initialization of matrices via an overloaded
+ *  comma operator (idea stolen from Blitz++). */
+template <typename T, typename It>
+class matrix_init {
+public:
+	matrix_init(It i) : iter(i) {}
+
+	matrix_init<T, It> operator,(const T & x)
+	{
+		*iter = x;
+		return matrix_init<T, It>(++iter);
+	}
+
+	// The following specializations produce much tighter code than the
+	// general case above
+
+	matrix_init<T, It> operator,(int x)
+	{
+		*iter = T(x);
+		return matrix_init<T, It>(++iter);
+	}
+
+	matrix_init<T, It> operator,(unsigned int x)
+	{
+		*iter = T(x);
+		return matrix_init<T, It>(++iter);
+	}
+
+	matrix_init<T, It> operator,(long x)
+	{
+		*iter = T(x);
+		return matrix_init<T, It>(++iter);
+	}
+
+	matrix_init<T, It> operator,(unsigned long x)
+	{
+		*iter = T(x);
+		return matrix_init<T, It>(++iter);
+	}
+
+	matrix_init<T, It> operator,(double x)
+	{
+		*iter = T(x);
+		return matrix_init<T, It>(++iter);
+	}
+
+	matrix_init<T, It> operator,(const symbol & x)
+	{
+		*iter = T(x);
+		return matrix_init<T, It>(++iter);
+	}
+
+private:
+	matrix_init();
+	It iter;
+};
+
+
 /** Symbolic matrices. */
 class matrix : public basic
 {
@@ -40,6 +99,14 @@ public:
 	matrix(unsigned r, unsigned c);
 	matrix(unsigned r, unsigned c, const exvector & m2);
 	matrix(unsigned r, unsigned c, const lst & l);
+
+	// First step of initialization of matrix with a comma-separated seqeuence
+	// of expressions. Subsequent steps are handled by matrix_init<>::operator,().
+	matrix_init<ex, exvector::iterator> operator=(const ex & x)
+	{
+		m[0] = x;
+		return matrix_init<ex, exvector::iterator>(++m.begin());
+	}
 	
 	// functions overriding virtual functions from base classes
 public:
@@ -53,6 +120,7 @@ public:
 	ex add_indexed(const ex & self, const ex & other) const;
 	ex scalar_mul_indexed(const ex & self, const numeric & other) const;
 	bool contract_with(exvector::iterator self, exvector::iterator other, exvector & v) const;
+	ex conjugate() const;
 
 protected:
 	bool match_same_type(const basic & other) const;
@@ -76,7 +144,7 @@ public:
 	matrix transpose() const;
 	ex determinant(unsigned algo = determinant_algo::automatic) const;
 	ex trace() const;
-	ex charpoly(const symbol & lambda) const;
+	ex charpoly(const ex & lambda) const;
 	matrix inverse() const;
 	matrix solve(const matrix & vars, const matrix & rhs,
 	             unsigned algo = solve_algo::automatic) const;
@@ -129,7 +197,7 @@ inline ex determinant(const matrix & m, unsigned options = determinant_algo::aut
 inline ex trace(const matrix & m)
 { return m.trace(); }
 
-inline ex charpoly(const matrix & m, const symbol & lambda)
+inline ex charpoly(const matrix & m, const ex & lambda)
 { return m.charpoly(lambda); }
 
 inline matrix inverse(const matrix & m)