Updated to latest JSBSim, including preliminary support for

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

diff --git a/src/FDM/JSBSim/FGTable.cpp b/src/FDM/JSBSim/FGTable.cpp
index 54ddab0b668565b9c30991a0a0605f336f30acf4..103e7e0f0b594a68c329a0c6b27c790fa9799f9e 100644 (file)
--- a/src/FDM/JSBSim/FGTable.cpp
+++ b/src/FDM/JSBSim/FGTable.cpp
@@ -37,13 +37,16 @@ INCLUDES
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
 #include "FGTable.h"
+
+#if defined ( sgi ) && !defined( __GNUC__ )
+#include <iomanip.h>
+#else
 #include <iomanip>
+#endif
 
 static const char *IdSrc = "$Id$";
 static const char *IdHdr = ID_TABLE;
 
-extern short debug_lvl;
-
 /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 CLASS IMPLEMENTATION
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
@@ -52,13 +55,21 @@ using namespace std;
 
 FGTable::FGTable(int NRows, int NCols) : nRows(NRows), nCols(NCols)
 {
-  Type = tt2D;
-  colCounter = 1;
-  rowCounter = 0;
+  if (NCols > 1) {
+    Type = tt2D;
+    colCounter = 1;
+    rowCounter = 0;
+  } else if (NCols == 1) {
+    Type = tt1D;
+    colCounter = 0;
+    rowCounter = 1;
+  } else {
+    cerr << "FGTable cannot accept 'Rows=0'" << endl;
+  }
 
   Data = Allocate();
 
-  if (debug_lvl & 2) cout << "Instantiated: FGTable" << endl;
+  Debug(0);
 }
 
 //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -70,16 +81,16 @@ FGTable::FGTable(int NRows) : nRows(NRows), nCols(1)
   rowCounter = 1;
 
   Data = Allocate();
-  if (debug_lvl & 2) cout << "Instantiated: FGTable" << endl;
+  Debug(0);
 }
 
 //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-float** FGTable::Allocate(void)
+double** FGTable::Allocate(void)
 {
-  Data = new float*[nRows+1];
+  Data = new double*[nRows+1];
   for (int r=0; r<=nRows; r++) {
-    Data[r] = new float[nCols+1];
+    Data[r] = new double[nCols+1];
     for (int c=0; c<=nCols; c++) {
       Data[r][c] = 0.0;
     }
@@ -91,16 +102,16 @@ float** FGTable::Allocate(void)
 
 FGTable::~FGTable()
 {
-  for (int r=0; r<=nRows; r++) if (Data[r]) delete Data[r];
-  if (Data) delete Data;
-  if (debug_lvl & 2) cout << "Destroyed:    FGTable" << endl;
+  for (int r=0; r<=nRows; r++) if (Data[r]) delete[] Data[r];
+  if (Data) delete[] Data;
+  Debug(1);
 }
 
 //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-float FGTable::GetValue(float key)
+double FGTable::GetValue(double key)
 {
-  float Factor, Value, Span;
+  double Factor, Value, Span;
   int r;
 
   for (r=1; r<=nRows; r++) if (Data[r][0] >= key) break;
@@ -123,9 +134,9 @@ float FGTable::GetValue(float key)
 
 //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-float FGTable::GetValue(float rowKey, float colKey)
+double FGTable::GetValue(double rowKey, double colKey)
 {
-  float rFactor, cFactor, col1temp, col2temp, Value;
+  double rFactor, cFactor, col1temp, col2temp, Value;
   int r, c;
 
   for (r=1;r<=nRows;r++) if (Data[r][0] >= rowKey) break;
@@ -171,6 +182,27 @@ void FGTable::operator<<(FGConfigFile& infile)
 
 //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
+FGTable& FGTable::operator<<(const double n)
+{
+  Data[rowCounter][colCounter] = n;
+  if (colCounter == nCols) {
+    colCounter = 0;
+    rowCounter++;
+  } else {
+    colCounter++;
+  }
+  return *this;
+}
+
+//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+FGTable& FGTable::operator<<(const int n)
+{
+  *this << (double)n;
+  return *this;
+}
+
+//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 void FGTable::Print(void)
 {
@@ -197,10 +229,50 @@ void FGTable::Print(void)
 }
 
 //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-void FGTable::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 FGTable::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: FGTable" << endl;
+    if (from == 1) cout << "Destroyed:    FGTable" << 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;
+    }
+  }
 }
 
 
+