Changeset 19fc57b in git

Timestamp:

Jun 13, 2005, 11:46:35 AM (18 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

9b2e40337f961f59313156623380c600a101bb81

Parents:

f6202187ee8c7e5f4a1be04fd61af7b6987429bc

Message:

*hannes: c++ std::


git-svn-id: file:///usr/local/Singular/svn/trunk@8352 2c84dea3-7e68-4137-9b89-c4e89433aadc

Location:

factory

Files:

• ftmpl_matrix.h (modified) (1 diff)
• templates/ftmpl_matrix.h (modified) (2 diffs)

factory/ftmpl_matrix.h

@@ -1 +1 @@
 /* emacs edit mode for this file is -*- C++ -*- */
-/* $Id: ftmpl_matrix.h,v 1.1 1998-03-10 14:43:26 schmidt Exp $ */
+/* $Id: ftmpl_matrix.h,v 1.2 2005-06-13 09:46:35 Singular Exp $ */
 
 #ifndef INCL_MATRIX_H
+#define INCL_MATRIX_H
 
-//{{{ docu
-//
-// ftmpl_matrix.h - wrapper for `templates/ftmpl_matrix.h'.
-//
-// This file exists for convenience only.
-//
-// `INCL_MATRIX_H' is defined in `templates/ftmpl_matrix.h'.
-//
-//}}}
+#include <factoryconf.h>
 
-#ifdef macintosh
-#include <:templates:ftmpl_matrix.h>
-#else
-#include "templates/ftmpl_matrix.h"
+#ifndef NOSTREAMIO
+#include <iostream.h>
+#endif /* NOSTREAMIO */
+
+template <class T>
+class SubMatrix;
+
+template <class T>
+class Matrix;
+
+#ifndef NOSTREAMIO
+template <class T>
+ostream& operator<< (ostream &, const Matrix<T> &);
 #endif
 
+template <class T>
+class Matrix
+{
+private:
+    int NR, NC;
+    T ** elems;
+#ifndef NOSTREAMIO
+    void printrow ( ostream & s, int i ) const;
+#endif /* NOSTREAMIO */
+    typedef T* T_ptr;
+public:
+    Matrix() : NR(0), NC(0), elems(0) {}
+    Matrix( int nr, int nc );
+    Matrix( const Matrix<T>& M );
+    ~Matrix();
+    Matrix<T>& operator= ( const Matrix<T>& M );
+    int rows() const { return NR; }
+    int columns() const { return NC; }
+    SubMatrix<T> operator[] ( int i );
+    const SubMatrix<T> operator[] ( int i ) const;
+    T& operator() ( int row, int col );
+    T operator() ( int row, int col ) const;
+    SubMatrix<T> operator() ( int rmin, int rmax, int cmin, int cmax );
+    const SubMatrix<T> operator() ( int rmin, int rmax, int cmin, int cmax ) const;
+    void swapRow( int i, int j );
+    void swapColumn( int i, int j );
+#ifndef NOSTREAMIO
+    void print( ostream& s ) const;
+    friend ostream & operator<< <T>( ostream & s, const Matrix<T>& M );
+#endif /* NOSTREAMIO */
+    friend class SubMatrix<T>;
+};
+    template <class T>
+    Matrix<T> operator+ ( const Matrix<T>& lhs, const Matrix<T>& rhs );
+    template <class T>
+    Matrix<T> operator- ( const Matrix<T>& lhs, const Matrix<T>& rhs );
+    template <class T>
+    Matrix<T> operator* ( const Matrix<T>& lhs, const Matrix<T>& rhs );
+    template <class T>
+    Matrix<T> operator* ( const Matrix<T>& lhs, const T& rhs );
+    template <class T>
+    Matrix<T> operator* ( const T& lhs, const Matrix<T>& rhs );
+
+template <class T>
+class SubMatrix
+{
+private:
+    int r_min, r_max, c_min, c_max;
+    Matrix<T>& M;
+    // we do not provide a default ctor, so nobody can declare an empty SubMatrix
+    SubMatrix( int rmin, int rmax, int cmin, int cmax, const Matrix<T> & m );
+public:
+    SubMatrix( const SubMatrix<T> & S );
+    SubMatrix<T>& operator= ( const SubMatrix<T>& S );
+    SubMatrix<T>& operator= ( const Matrix<T>& S );
+    operator Matrix<T>() const;
+    T operator[] ( int i ) const;
+    T& operator[] ( int i );
+    friend class Matrix<T>;
+};
+
+#ifndef NOSTREAMIO
+template <class T>
+ostream & operator<< ( ostream & s, const Matrix<T>& M );
+#endif /* NOSTREAMIO */
+
 #endif /* ! INCL_MATRIX_H */

factory/templates/ftmpl_matrix.h

@@ -1 +1 @@
 /* emacs edit mode for this file is -*- C++ -*- */
-/* $Id: ftmpl_matrix.h,v 1.10 2005-01-13 15:11:36 Singular Exp $ */
+/* $Id: ftmpl_matrix.h,v 1.11 2005-06-13 09:46:35 Singular Exp $ */
 
 #ifndef INCL_MATRIX_H
@@ -19 +19 @@
 #ifndef NOSTREAMIO
 template <class T>
-std::ostream& operator<< (std::ostream &, const Matrix<T> &);
+ostream& operator<< (ostream &, const Matrix<T> &);
 #endif