Curt Olson:

[flightgear.git] / src / FDM / JSBSim / FGFactorGroup.h

diff --git a/src/FDM/JSBSim/FGFactorGroup.h b/src/FDM/JSBSim/FGFactorGroup.h
index 0484119a1afcddfa4372358fedd33b990d81c2d3..d4fb17de7332bef2d7f4e7c855908e2a95630237 100644 (file)
--- a/src/FDM/JSBSim/FGFactorGroup.h
+++ b/src/FDM/JSBSim/FGFactorGroup.h
@@ -62,6 +62,8 @@ using std::vector;
 FORWARD DECLARATIONS
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
+namespace JSBSim {
+
 class FGFDMExec;
 class FGState;
 class FGAtmosphere;
@@ -74,44 +76,42 @@ class FGAuxiliary;
 class FGOutput;
 
 /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-COMMENTS, REFERENCES, and NOTES [use "class documentation" below for API docs]
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 CLASS DOCUMENTATION
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
 /** This class encapsulates the functionality needed to manage a factor group
     i.e. factor*(coeff1 + coeff2 + coeff3)
     @author Tony Peden
-    @see -
 */
 
 /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 CLASS DECLARATION
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
-class FGFactorGroup: public FGCoefficient {
-  public:
-    FGFactorGroup(FGFDMExec* fdmex);
-    ~FGFactorGroup();
-    
-    bool Load(FGConfigFile *AC_cfg);
-    double TotalValue(void);
-    //string GetCoefficientStrings(void);
-    //string GetCoefficientValues(void);
-    inline double GetSD(void) { return SDtotal; }
-    inline double GetFactorSD(void) { return FGCoefficient::GetSD(); }
-    
-  private:
-    FGFDMExec *FDMExec;
-    string name;
-    string description;
-    typedef vector<FGCoefficient*> CoeffArray;
-    CoeffArray sum;
-    double SDtotal;
-    void Debug(int from);
+class FGFactorGroup: public FGCoefficient
+{
+public:
+  FGFactorGroup(FGFDMExec* fdmex);
+  ~FGFactorGroup();
+  
+  bool Load(FGConfigFile *AC_cfg);
+  double TotalValue(void);
+  inline double GetValue(void) const { return totalValue; }
+  inline double GetSD(void) { return SDtotal; }
+  inline double GetFactorSD(void) { return FGCoefficient::GetSD(); }
+  
+  void bind(FGPropertyManager* parent);
+  void unbind(void);
+
+private:
+  typedef vector<FGCoefficient*> CoeffArray;
+  CoeffArray sum;
+  double SDtotal;
+  double totalValue;
+  string description;
+  string name;
+  FGPropertyManager *node;
+  void Debug(int from);
 };
-    
+}    
 #endif