Updated to match changes in radiostack.[ch]xx

[flightgear.git] / src / FDM / JSBSim / FGMatrix33.cpp

diff --git a/src/FDM/JSBSim/FGMatrix33.cpp b/src/FDM/JSBSim/FGMatrix33.cpp
index f372fc3d608f450dd7954c2ecc1e23106a077036..830e99dddfb9c8715fa429b7f4f72715ca8e7f3d 100644 (file)
--- a/src/FDM/JSBSim/FGMatrix33.cpp
+++ b/src/FDM/JSBSim/FGMatrix33.cpp
@@ -35,7 +35,7 @@ FGMatrix33::FGMatrix33(void)
   InitMatrix();
   rowCtr = colCtr = 1;
   
-  if (debug_lvl & 2) cout << "Instantiated: FGMatrix33" << endl;
+  Debug(0);
 }
 
 //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -45,7 +45,7 @@ FGMatrix33::FGMatrix33(int r, int c)
   InitMatrix();
   rowCtr = colCtr = 1;
   
-  if (debug_lvl & 2) cout << "Instantiated: FGMatrix33" << endl;
+  Debug(0);
 }
 
 //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -64,7 +64,7 @@ FGMatrix33::FGMatrix33(const FGMatrix33& M)
   data[3][2] = M.data[3][2];
   data[3][3] = M.data[3][3];
 
-  if (debug_lvl & 2) cout << "Instantiated: FGMatrix33" << endl;
+  Debug(0);
 }
 
 //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -73,7 +73,7 @@ FGMatrix33::~FGMatrix33(void)
 {
   rowCtr = colCtr = 1;
 
-  if (debug_lvl & 2) cout << "Destroyed:    FGMatrix33" << endl;
+  Debug(1);
 }
 
 //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -93,7 +93,7 @@ ostream& operator<<(ostream& os, const FGMatrix33& M)
 
 //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-FGMatrix33& FGMatrix33::operator<<(const float ff)
+FGMatrix33& FGMatrix33::operator<<(const double ff)
 {
   data[rowCtr][colCtr] = ff;
   if (++colCtr > Cols()) {
@@ -304,7 +304,7 @@ FGMatrix33 FGMatrix33::operator*(const FGMatrix33& M)
 
 void FGMatrix33::operator*=(const FGMatrix33& M)
 {
-  float a,b,c;
+  double a,b,c;
   
   a = data[1][1]; b=data[1][2]; c=data[1][3];
   data[1][1] = a*M(1,1) + b*M(2,1) + c*M(3,1);
@@ -328,7 +328,7 @@ FGMatrix33 FGMatrix33::operator/(const double scalar)
 {
   FGMatrix33 Quot;
   
-  if( scalar != 0 ) {
+  if ( scalar != 0 ) {
          double tmp = 1.0/scalar;
     Quot(1,1) = data[1][1] * tmp;
     Quot(1,2) = data[1][2] * tmp;
@@ -351,7 +351,7 @@ FGMatrix33 FGMatrix33::operator/(const double scalar)
 
 void FGMatrix33::operator/=(const double scalar)
 {
-  if( scalar != 0 ) {
+  if ( scalar != 0 ) {
     double tmp = 1.0/scalar;
     data[1][1] *= tmp;
     data[1][2] *= tmp;
@@ -396,11 +396,48 @@ FGColumnVector3 FGMatrix33::operator*(const FGColumnVector3& Col)
 }
 
 //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-void FGMatrix33::Debug(void)
+//    The bitmasked value choices are as follows:
+//    unset: In this case (the default) JSBSim would only print
+//       out the normally expected messages, essentially echoing
+//       the config files as they are read. If the environment
+//       variable is not set, debug_lvl is set to 1 internally
+//    0: This requests JSBSim not to output any messages
+//       whatsoever.
+//    1: This value explicity requests the normal JSBSim
+//       startup messages
+//    2: This value asks for a message to be printed out when
+//       a class is instantiated
+//    4: When this value is set, a message is displayed when a
+//       FGModel object executes its Run() method
+//    8: When this value is set, various runtime state variables
+//       are printed out periodically
+//    16: When set various parameters are sanity checked and
+//       a message is printed out when they go out of bounds
+
+void FGMatrix33::Debug(int from)
 {
-    //TODO: Add your source code here
-}
+  if (debug_lvl <= 0) return;
 
-//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+  if (debug_lvl & 1) { // Standard console startup message output
+    if (from == 0) { // Constructor
+
+    }
+  }
+  if (debug_lvl & 2 ) { // Instantiation/Destruction notification
+    if (from == 0) cout << "Instantiated: FGMatrix33" << endl;
+    if (from == 1) cout << "Destroyed:    FGMatrix33" << endl;
+  }
+  if (debug_lvl & 4 ) { // Run() method entry print for FGModel-derived objects
+  }
+  if (debug_lvl & 8 ) { // Runtime state variables
+  }
+  if (debug_lvl & 16) { // Sanity checking
+  }
+  if (debug_lvl & 64) {
+    if (from == 0) { // Constructor
+      cout << IdSrc << endl;
+      cout << IdHdr << endl;
+    }
+  }
+}