Removed FGMatrix.* because it is no longer used by JSBSim.

diff --git a/src/FDM/JSBSim/FGMatrix.cpp b/src/FDM/JSBSim/FGMatrix.cpp
deleted file mode 100644 (file)
index 6edc4f3..0000000
--- a/src/FDM/JSBSim/FGMatrix.cpp
+++ /dev/null
@@ -1,644 +0,0 @@
-/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-Module: FGMatrix.cpp
-Author: Originally by Tony Peden [formatted here (and broken??) by JSB]
-Date started: 1998
-Purpose: FGMatrix class
-Called by: Various
-
-FUNCTIONAL DESCRIPTION
---------------------------------------------------------------------------------
-
-HISTORY
---------------------------------------------------------------------------------
-??/??/??   TP   Created
-03/16/2000 JSB  Added exception throwing
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-INCLUDES
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
-
-#include "FGMatrix.h"
-
-static const char *IdSrc = "$Id$";
-static const char *IdHdr = ID_MATRIX;
-
-extern short debug_lvl;
-
-/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-CLASS IMPLEMENTATION
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
-
-double** FGalloc(int rows, int cols)
-{
-  double **A;
-
-  A = new double *[rows+1];
-  if (!A)  return NULL;
-
-  for (int i=0; i <= rows; i++){
-    A[i] = new double [cols+1];
-    if (!A[i]) return NULL;
-  }
-  return A;
-}
-
-//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-void dealloc(double **A, int rows)
-{
-  for (int i=0; i <= rows; i++) delete[] A[i];
-  delete[] A;
-}
-
-//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-FGMatrix::FGMatrix(const unsigned int r, const unsigned int c) : rows(r), cols(c)
-{
-  data = FGalloc(rows,cols);
-  InitMatrix();
-  rowCtr = colCtr = 1;
-  
-  if (debug_lvl & 2) cout << "Instantiated: FGMatrix" << endl;
-}
-
-//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-FGMatrix::FGMatrix(const FGMatrix& M)
-{
-  data  = NULL;
-  rowCtr = colCtr = 1;
-  *this = M;
-
-  if (debug_lvl & 2) cout << "Instantiated: FGMatrix" << endl;
-}
-
-//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-FGMatrix::~FGMatrix(void)
-{
-  dealloc(data,rows);
-  rowCtr = colCtr = 1;
-  rows = cols = 0;
-
-  if (debug_lvl & 2) cout << "Destroyed:    FGMatrix" << endl;
-}
-
-//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-ostream& operator<<(ostream& os, const FGMatrix& M)
-{
-  for (unsigned int i=1; i<=M.Rows(); i++) {
-    for (unsigned int j=1; j<=M.Cols(); j++) {
-      if (i == M.Rows() && j == M.Cols())
-        os << M.data[i][j];
-      else
-        os << M.data[i][j] << ", ";
-    }
-  }
-  return os;
-}
-
-//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-FGMatrix& FGMatrix::operator<<(const float ff)
-{
-  data[rowCtr][colCtr] = ff;
-  if (++colCtr > Cols()) {
-    colCtr = 1;
-    if (++rowCtr > Rows())
-      rowCtr = 1;
-  }
-  return *this;
-}
-
-//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-istream& operator>>(istream& is, FGMatrix& M)
-{
-  for (unsigned int i=1; i<=M.Rows(); i++) {
-    for (unsigned int j=1; j<=M.Cols(); j++) {
-      is >> M.data[i][j];
-    }
-  }
-  return is;
-}
-
-//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-FGMatrix& FGMatrix::operator=(const FGMatrix& M)
-{
-  if (&M != this) {
-    if (M.rows != rows || M.cols != cols) {
-      if (data != NULL) dealloc(data,rows);
-
-      rows   = M.rows;
-      cols   = M.cols;
-
-      data = FGalloc(rows,cols);
-    }
-    for (unsigned int i=1; i<=rows; i++) {
-      for (unsigned int j=1; j<=cols; j++) {
-        data[i][j] = M.data[i][j];
-      }
-    }
-  }
-  return *this;
-}
-
-//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-unsigned int FGMatrix::Rows(void) const
-{
-  return rows;
-}
-
-//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-unsigned int FGMatrix::Cols(void) const
-{
-  return cols;
-}
-
-//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-void FGMatrix::SetOParams(char delim,int width,int prec,int origin)
-{
-}
-
-//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-void FGMatrix::InitMatrix(double value)
-{
-  if (data) {
-    for (unsigned int i=0;i<=rows;i++) {
-      for (unsigned int j=0;j<=cols;j++) {
-        operator()(i,j) = value;
-      }
-    }
-  }
-}
-
-//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-void FGMatrix::InitMatrix(void)
-{
-  this->InitMatrix(0);
-}
-
-// *****************************************************************************
-// binary operators ************************************************************
-// *****************************************************************************
-
-FGMatrix FGMatrix::operator-(const FGMatrix& M)
-{
-  FGMatrix Diff(Rows(), Cols());
-
-  if ((Rows() != M.Rows()) || (Cols() != M.Cols())) {
-    MatrixException mE;
-    mE.Message = "Invalid row/column match in Matrix operator -";
-    throw mE;
-  }
-
-  for (unsigned int i=1; i<=Rows(); i++) {
-    for (unsigned int j=1; j<=Cols(); j++) {
-      Diff(i,j) = data[i][j] - M(i,j);
-    }
-  }
-  return Diff;
-}
-
-//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-void FGMatrix::operator-=(const FGMatrix &M)
-{
-  if ((Rows() != M.Rows()) || (Cols() != M.Cols())) {
-    MatrixException mE;
-    mE.Message = "Invalid row/column match in Matrix operator -=";
-    throw mE;
-  }
-
-  for (unsigned int i=1; i<=Rows(); i++) {
-    for (unsigned int j=1; j<=Cols(); j++) {
-      data[i][j] -= M(i,j);
-    }
-  }
-}
-
-//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-FGMatrix FGMatrix::operator+(const FGMatrix& M)
-{
-  FGMatrix Sum(Rows(), Cols());
-
-  if ((Rows() != M.Rows()) || (Cols() != M.Cols())) {
-    MatrixException mE;
-    mE.Message = "Invalid row/column match in Matrix operator +";
-    throw mE;
-  }
-
-  for (unsigned int i=1; i<=Rows(); i++) {
-    for (unsigned int j=1; j<=Cols(); j++) {
-      Sum(i,j) = data[i][j] + M(i,j);
-    }
-  }
-  return Sum;
-}
-
-//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-void FGMatrix::operator+=(const FGMatrix &M)
-{
-  if ((Rows() != M.Rows()) || (Cols() != M.Cols())) {
-    MatrixException mE;
-    mE.Message = "Invalid row/column match in Matrix operator +=";
-    throw mE;
-  }
-
-  for (unsigned int i=1; i<=Rows(); i++) {
-    for (unsigned int j=1; j<=Cols(); j++) {
-      data[i][j]+=M(i,j);
-    }
-  }
-}
-
-//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-FGMatrix operator*(double scalar, FGMatrix &M)
-{
-  FGMatrix Product(M.Rows(), M.Cols());
-
-  for (unsigned int i=1; i<=M.Rows(); i++) {
-    for (unsigned int j=1; j<=M.Cols(); j++) {
-      Product(i,j) = scalar*M(i,j);
-    }
-  }
-  return Product;
-}
-
-//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-void FGMatrix::operator*=(const double scalar)
-{
-  for (unsigned int i=1; i<=Rows(); i++) {
-    for (unsigned int j=1; j<=Cols(); j++) {
-      data[i][j] *= scalar;
-    }
-  }
-}
-
-//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-FGMatrix FGMatrix::operator*(const FGMatrix& M)
-{
-  FGMatrix Product(Rows(), M.Cols());
-
-  if (Cols() != M.Rows()) {
-    MatrixException mE;
-    mE.Message = "Invalid row/column match in Matrix operator *";
-    throw mE;
-  }
-
-  for (unsigned int i=1; i<=Rows(); i++) {
-    for (unsigned int j=1; j<=M.Cols(); j++)  {
-      Product(i,j) = 0;
-      for (unsigned int k=1; k<=Cols(); k++) {
-         Product(i,j) += data[i][k] * M(k,j);
-      }
-    }
-  }
-  return Product;
-}
-
-//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-void FGMatrix::operator*=(const FGMatrix& M)
-{
-  if (Cols() != M.Rows()) {
-    MatrixException mE;
-    mE.Message = "Invalid row/column match in Matrix operator *=";
-    throw mE;
-  }
-
-  double **prod;
-
-  prod = FGalloc(Rows(), M.Cols());
-  for (unsigned int i=1; i<=Rows(); i++) {
-    for (unsigned int j=1; j<=M.Cols(); j++) {
-      prod[i][j] = 0;
-      for (unsigned int k=1; k<=Cols(); k++) {
-        prod[i][j] += data[i][k] * M(k,j);
-      }
-    }
-  }
-  dealloc(data, Rows());
-  data = prod;
-  cols = M.cols;
-}
-
-//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-FGMatrix FGMatrix::operator/(const double scalar)
-{
-  FGMatrix Quot(Rows(), Cols());
-
-  if (scalar != 0) {
-    for (unsigned int i=1; i<=Rows(); i++) {
-      for (unsigned int j=1; j<=Cols(); j++)  {
-         Quot(i,j) = data[i][j]/scalar;
-      }
-    }
-    
-  } else {
-    cerr << "Attempt to divide by zero in method FGMatrix::operator/(const double scalar), object at " << this << endl; 
-  }
-  return Quot;  
-}
-
-//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-void FGMatrix::operator/=(const double scalar)
-{
-  
-  if(scalar != 0) {
-    for (unsigned int i=1; i<=Rows(); i++)  {
-      for (unsigned int j=1; j<=Cols(); j++) {
-        data[i][j]/=scalar;
-      }
-    }
-  } else 
-    cerr << "Attempt to divide by zero in method FGMatrix::operator/=(const double scalar), object " << this << endl; 
-}
-
-//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-void FGMatrix::T(void)
-{
-  if (rows==cols)
-    TransposeSquare();
-  else
-    TransposeNonSquare();
-}
-
-//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-FGColumnVector FGMatrix::operator*(const FGColumnVector& Col)
-{
-  FGColumnVector Product(Col.Rows());
-
-  if (Cols() != Col.Rows()) {
-    MatrixException mE;
-    mE.Message = "Invalid row/column match in Column Vector operator *";
-    throw mE;
-  }
-
-  for (unsigned int i=1;i<=Rows();i++) {
-    Product(i) = 0.00;
-    for (unsigned int j=1;j<=Cols();j++) {
-      Product(i) += Col(j)*data[i][j];
-    }
-  }
-  return Product;
-}
-
-//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-void FGMatrix::TransposeSquare(void)
-{
-  for (unsigned int i=1; i<=rows; i++) {
-    for (unsigned int j=i+1; j<=cols; j++) {
-      double tmp = data[i][j];
-      data[i][j] = data[j][i];
-      data[j][i] = tmp;
-    }
-  }
-}
-
-//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-void FGMatrix::TransposeNonSquare(void)
-{
-  double **tran;
-
-  tran = FGalloc(rows,cols);
-
-  for (unsigned int i=1; i<=rows; i++) {
-    for (unsigned int j=1; j<=cols; j++) {
-      tran[j][i] = data[i][j];
-    }
-  }
-
-  dealloc(data,rows);
-
-  data       = tran;
-  unsigned int m = rows;
-  rows       = cols;
-  cols       = m;
-}
-
-//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-void FGMatrix::Debug(void)
-{
-    //TODO: Add your source code here
-}
-
-//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-FGColumnVector::FGColumnVector(void):FGMatrix(3,1)
-{
-  if (debug_lvl & 2) cout << "Instantiated: FGColumnVector" << endl;
-}
-
-FGColumnVector::FGColumnVector(int m):FGMatrix(m,1) { }
-FGColumnVector::FGColumnVector(const FGColumnVector& b):FGMatrix(b) { }
-
-FGColumnVector::~FGColumnVector(void)
-{
-//  dealloc(data,rows);
-  if (debug_lvl & 2) cout << "Destroyed:    FGColumnVector" << endl;
-}
-
-//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-double& FGColumnVector::operator()(int m) const
-{
-  return FGMatrix::operator()(m,1);
-}
-
-//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-FGColumnVector operator*(const FGMatrix& Mat, const FGColumnVector& Col)
-{
-  FGColumnVector Product(Col.Rows());
-
-  if (Mat.Cols() != Col.Rows()) {
-    MatrixException mE;
-    mE.Message = "Invalid row/column match in Column Vector operator *";
-    throw mE;
-  }
-
-  for (unsigned int i=1;i<=Mat.Rows();i++) {
-    Product(i) = 0.00;
-    for (unsigned int j=1;j<=Mat.Cols();j++) {
-      Product(i) += Col(j)*Mat(i,j);
-    }
-  }
-
-  return Product;
-}
-
-//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-FGColumnVector FGColumnVector::operator+(const FGColumnVector& C)
-{
-  FGColumnVector Sum(C.Rows()); // This must be created dynamically
-                                // because we don't know the size of "C",
-                                // it could be 3 or 4 or ...
-  if (Rows() != C.Rows()) {
-    MatrixException mE;
-    mE.Message = "Invalid row/column match in Column Vector operator *";
-    throw mE;
-  }
-
-  for (unsigned int i=1; i<=C.Rows(); i++) Sum(i) = C(i) + data[i][1];
-
-  return Sum;
-}
-
-//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-FGColumnVector FGColumnVector::operator*(const double scalar)
-{
-  FGColumnVector Product(Rows());
-
-  for (unsigned int i=1; i<=Rows(); i++) Product(i) = scalar * data[i][1];
-
-  return Product;
-}
-
-//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-FGColumnVector FGColumnVector::operator-(const FGColumnVector& V)
-{
-  FGColumnVector Diff(Rows());
-
-  if ((Rows() != V.Rows()) || (Cols() != V.Cols())) {
-    MatrixException mE;
-    mE.Message = "Invalid row/column match in Column Vector operator -";
-    throw mE;
-  }
-
-  for (unsigned int i=1; i<=Rows(); i++) {
-    Diff(i) = data[i][1] - V(i);
-  }
-
-  return Diff;
-}
-
-//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-FGColumnVector FGColumnVector::operator/(const double scalar)
-{
-  FGColumnVector Quotient(Rows());
-
-  if (scalar != 0) {
-    for (unsigned int i=1; i<=Rows(); i++) Quotient(i) = data[i][1] / scalar;
-  } else {
-    cerr << "Attempt to divide by zero in method FGColumnVector::operator/(const double scalar), object " << this << endl; 
-  }
-  return Quotient;
-}
-
-//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-FGColumnVector operator*(const double scalar, const FGColumnVector& C)
-{
-  FGColumnVector Product(C.Rows());
-
-  for (unsigned int i=1; i<=C.Rows(); i++) {
-     Product(i) = scalar * C(i);
-  }
-
-  return Product;
-}
-
-//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-float FGColumnVector::Magnitude(void)
-{
-  double num=0.0;
-
-  if ((data[1][1] == 0.00) &&
-      (data[2][1] == 0.00) &&
-      (data[3][1] == 0.00))
-  {
-    return 0.00;
-  } else {
-    for (unsigned int i = 1; i<=Rows(); i++) num += data[i][1]*data[i][1];
-    return sqrt(num);
-  }
-}
-
-//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-FGColumnVector FGColumnVector::Normalize(void)
-{
-  double Mag = Magnitude();
-
-  if (Mag != 0) {
-    for (unsigned int i=1; i<=Rows(); i++)
-      for (unsigned int j=1; j<=Cols(); j++)
-        data[i][j] = data[i][j]/Mag;
-  }    
-
-  return *this;
-}
-
-//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-FGColumnVector FGColumnVector::operator*(const FGColumnVector& V)
-{
-  FGColumnVector Product(3);
-
-  if (Rows() != 3 || V.Rows() != 3) {
-    MatrixException mE;
-    mE.Message = "Invalid row count in vector cross product function";
-    throw mE;
-  }
-
-  Product(1) = data[2][1] * V(3) - data[3][1] * V(2);
-  Product(2) = data[3][1] * V(1) - data[1][1] * V(3);
-  Product(3) = data[1][1] * V(2) - data[2][1] * V(1);
-
-  return Product;
-}
-
-//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-FGColumnVector FGColumnVector::multElementWise(const FGColumnVector& V)
-{
-  FGColumnVector Product(3);
-
-  if (Rows() != 3 || V.Rows() != 3) {
-    MatrixException mE;
-    mE.Message = "Invalid row count in vector cross product function";
-    throw mE;
-  }
-
-  Product(1) = data[1][1] * V(1);
-  Product(2) = data[2][1] * V(2);
-  Product(3) = data[3][1] * V(3);
-
-  return Product;
-}
-
-//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-void FGColumnVector::Debug(void)
-{
-    //TODO: Add your source code here
-}
-
-//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-

diff --git a/src/FDM/JSBSim/FGMatrix.h b/src/FDM/JSBSim/FGMatrix.h
deleted file mode 100644 (file)
index 9d46522..0000000
--- a/src/FDM/JSBSim/FGMatrix.h
+++ /dev/null
@@ -1,162 +0,0 @@
-/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-Header: FGMatrix.h
-Author: Originally by Tony Peden [formatted and adapted here by Jon Berndt]
-Date started: Unknown
-
-HISTORY
---------------------------------------------------------------------------------
-??/??/??   TP   Created
-03/16/2000 JSB  Added exception throwing
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-SENTRY
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
-
-#ifndef FGMATRIX_H
-#define FGMATRIX_H
-
-/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-INCLUDES
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
-
-#include <stdlib.h>
-#ifdef FGFS
-#  include <math.h>
-#  include <simgear/compiler.h>
-#  include STL_STRING
-#  include STL_FSTREAM
-#  include STL_IOSTREAM
-   SG_USING_STD(string);
-#  if !defined(SG_HAVE_NATIVE_SGI_COMPILERS)
-     SG_USING_STD(ostream);
-     SG_USING_STD(istream);
-     SG_USING_STD(cerr);
-     SG_USING_STD(cout);
-     SG_USING_STD(endl);
-#  endif
-#else
-#  include <fstream>
-#  include <cmath>
-#  include <iostream>
-#  include <string>
-   using std::string;
-   using std::ostream;
-   using std::istream;
-   using std::cerr;
-   using std::cout;
-   using std::endl;
-#endif
-
-
-/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-DEFINITIONS
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
-
-#define ID_MATRIX "$Id$"
-
-/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-FORWARD DECLARATIONS
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
-
-class FGColumnVector;
-
-/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-DECLARATION: MatrixException
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
-
-class MatrixException /* :  public exception */
-{
-public:
-  string Message;
-};
-
-/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-DECLARATION: FGMatrix
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
-
-class FGMatrix
-{
-public:
-  FGMatrix(unsigned int r, unsigned int c);
-  FGMatrix(const FGMatrix& A);
-  FGMatrix(void) {};
-  ~FGMatrix(void);
-
-  FGMatrix& operator=(const FGMatrix& A);
-  inline double& operator()(unsigned int row, unsigned int col) const {return data[row][col];}
-
-  FGColumnVector operator*(const FGColumnVector& Col);
-
-  unsigned int Rows(void) const;
-  unsigned int Cols(void) const;
-
-  void T(void);
-  void InitMatrix(void);
-  void InitMatrix(double value);
-
-  FGMatrix operator-(const FGMatrix& B);
-  FGMatrix operator+(const FGMatrix& B);
-  FGMatrix operator*(const FGMatrix& B);
-  FGMatrix operator/(const double scalar);
-  FGMatrix& operator<<(const float ff);
-
-  friend ostream& operator<<(ostream& os, const FGMatrix& M);
-  friend istream& operator>>(istream& is, FGMatrix& M);
-
-  void operator-=(const FGMatrix &B);
-  void operator+=(const FGMatrix &B);
-  void operator*=(const FGMatrix &B);
-  void operator*=(const double scalar);
-  void operator/=(const double scalar);
-
-  friend FGMatrix operator*(double scalar,FGMatrix& A);
-
-  void SetOParams(char delim,int width,int prec, int origin=0);
-
-protected:
-  double **data;
-  unsigned int rows,cols;
-
-private:
-  char delim;
-  int width,prec,origin;
-  void TransposeSquare(void);
-  void TransposeNonSquare(void);
-  unsigned int rowCtr, colCtr;
-  void Debug(void);
-};
-
-/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-DECLARATION: FGColumnVector
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
-
-class FGColumnVector : public FGMatrix
-{
-public:
-  FGColumnVector(void);
-  FGColumnVector(int m);
-  FGColumnVector(const FGColumnVector& b);
-  ~FGColumnVector(void);
-
-  FGColumnVector operator*(const double scalar);
-  FGColumnVector operator*(const FGColumnVector& V);   // Cross product operator
-  FGColumnVector operator/(const double scalar);
-  FGColumnVector operator+(const FGColumnVector& B); // must not return reference
-  FGColumnVector operator-(const FGColumnVector& B);
-  float Magnitude(void);
-  FGColumnVector Normalize(void);
-
-  friend FGColumnVector operator*(const double scalar, const FGColumnVector& A);
-  friend FGColumnVector operator*(const FGMatrix& M, const FGColumnVector& V);
-
-  double& operator()(int m) const;
-
-  FGColumnVector multElementWise(const FGColumnVector& V);
-
-private:
-  void Debug(void);
-};
-
-//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-#endif

diff --git a/src/FDM/JSBSim/Makefile.am b/src/FDM/JSBSim/Makefile.am
index a141990dd9c113316d6e3a94604a05f9e0db2485..6bc440a3918b5d6620ef13be05ac8b4c097f2ff5 100644 (file)
--- a/src/FDM/JSBSim/Makefile.am
+++ b/src/FDM/JSBSim/Makefile.am
@@ -31,7 +31,6 @@ libJSBSim_a_SOURCES = \
         FGJSBBase.cpp FGJSBBase.h \
        FGLGear.cpp FGLGear.h \
         FGMassBalance.cpp FGMassBalance.h \
-       FGMatrix.cpp FGMatrix.h \
         FGMatrix33.cpp FGMatrix33.h \
        FGModel.cpp FGModel.h \
        FGNozzle.cpp FGNozzle.h \