X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Fmatrix.h;h=acc525449dacdb355707f617a982928e4ea443b8;hp=fac033a99ec8ed70e1a4df88521f67d3003410a5;hb=27d6204effdef95a00af461fff98024e290dbaa7;hpb=0cf43f3096cbcfc7472ff9c8927c6eb74f2eeb8c

diff --git a/ginac/matrix.h b/ginac/matrix.h
index fac033a9..acc52544 100644
--- a/ginac/matrix.h
+++ b/ginac/matrix.h
@@ -40,25 +40,23 @@ public:
 	matrix(unsigned r, unsigned c, const exvector & m2);
 	matrix(unsigned r, unsigned c, const lst & l);
 	
-	// functions overriding virtual functions from bases classes
+	// functions overriding virtual functions from base classes
 public:
 	void print(const print_context & c, unsigned level = 0) const;
 	unsigned nops() const;
 	ex op(int i) const;
 	ex & let_op(int i);
-	ex expand(unsigned options=0) const;
 	ex eval(int level=0) const;
-	ex evalf(int level=0) const;
 	ex evalm(void) const {return *this;}
 	ex subs(const lst & ls, const lst & lr, bool no_pattern = false) const;
 	ex eval_indexed(const basic & i) const;
 	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;
+
 protected:
+	bool match_same_type(const basic & other) const;
 	unsigned return_type(void) const { return return_types::noncommutative; };
-	// new virtual functions which can be overridden by derived classes
-	// (none)
 	
 	// non-virtual functions in this class
 public:
@@ -134,13 +132,6 @@ inline matrix inverse(const matrix & m)
 
 // utility functions
 
-/** Return the matrix object handled by an ex.
- *  This is unsafe: you need to check the type first. */
-inline const matrix &ex_to_matrix(const ex &e)
-{
-	return static_cast<const matrix &>(*e.bp);
-}
-
 /** Specialization of is_exactly_a<matrix>(obj) for matrix objects. */
 template<> inline bool is_exactly_a<matrix>(const basic & obj)
 {