Replace all new and delete in FGDistributor by unique_ptr. Also constified some methods of FGDistributor and FGCondition.

Author: bcoconni

src/math/FGCondition.cpp

@@ -157,7 +157,7 @@ FGCondition::FGCondition(const string& test, std::shared_ptr<FGPropertyManager>
 
 //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-bool FGCondition::Evaluate(void )
+bool FGCondition::Evaluate(void) const
 {
   bool pass = false;
 
@@ -213,7 +213,7 @@ bool FGCondition::Evaluate(void )
 
 //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-void FGCondition::PrintCondition(string indent)
+void FGCondition::PrintCondition(string indent) const
 {
   string scratch;
 

src/math/FGCondition.h

@@ -68,8 +68,8 @@ class JSBSIM_API FGCondition : public FGJSBBase
   FGCondition(const std::string& test, std::shared_ptr<FGPropertyManager> PropertyManager,
               Element* el);
 
-  bool Evaluate(void);
-  void PrintCondition(std::string indent="  ");
+  bool Evaluate(void) const;
+  void PrintCondition(std::string indent="  ") const;
 
 private:
 

src/models/flight_control/FGDistributor.cpp

@@ -71,7 +71,7 @@ FGDistributor::FGDistributor(FGFCS* fcs, Element* element)
     auto current_case = make_unique<Case>();
     Element* test_element = case_element->FindElement("test");
     try {
-      if (test_element) current_case->SetTest(new FGCondition(test_element, PropertyManager));
+      if (test_element) current_case->SetTest(test_element, PropertyManager);
     } catch (BaseException& e) {
       FGXMLLogging log(fcs->GetExec()->GetLogger(), test_element, LogLevel::FATAL);
       log << LogFormat::RED << e.what() << LogFormat::RESET << "\n\n";
@@ -81,11 +81,11 @@ FGDistributor::FGDistributor(FGFCS* fcs, Element* element)
     while (prop_val_element) {
       string value_string = prop_val_element->GetAttributeValue("value");
       string property_string = prop_val_element->GetDataLine();
-      current_case->AddPropValPair(new PropValPair(property_string, value_string,
-                                                   PropertyManager, prop_val_element));
+      current_case->AddPropValPair(property_string, value_string, PropertyManager,
+                                   prop_val_element);
       prop_val_element = case_element->FindNextElement("property");
     }
-    Cases.push_back(current_case.release());
+    Cases.push_back(std::move(current_case));
     case_element = element->FindNextElement("case");
   }
 
@@ -94,18 +94,10 @@ FGDistributor::FGDistributor(FGFCS* fcs, Element* element)
 
 //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-FGDistributor::~FGDistributor()
-{
-  for (auto Case: Cases) delete Case;
-  Debug(1);
-}
-
-//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
 bool FGDistributor::Run(void )
 {
   bool completed = false;
-  for (auto Case: Cases) { // Loop through all Cases
+  for (auto& Case: Cases) { // Loop through all Cases
     if (Case->HasTest()) {
       if (Case->GetTestResult() && !((Type == eExclusive) && completed)) {
         Case->SetPropValPairs();
@@ -146,19 +138,19 @@ void FGDistributor::Debug(int from)
     if (from == 0) { // Constructor
       FGLogging log(fcs->GetExec()->GetLogger(), LogLevel::DEBUG);
       unsigned int ctr=0;
-      for (auto Case: Cases) {
+      for (const auto& Case: Cases) {
         log << "      Case: " << fixed << ctr << "\n";
         if (Case->HasTest()) {
-          Case->GetTest()->PrintCondition("        ");
+          Case->GetTest().PrintCondition("        ");
         } else {
           log << "        Set these properties by default: \n";
         }
         log << "\n";
-        for (auto propVal = Case->IterPropValPairs(); propVal != Case->EndPropValPairs(); ++propVal) {
-          log << "        Set property " << (*propVal)->GetPropName();
-          if ((*propVal)->GetLateBoundProp()) log << " (late bound)";
-          log << " to " << (*propVal)->GetValString();
-          if ((*propVal)->GetLateBoundValue()) log << " (late bound)";
+        for (const auto& propVal: *Case) {
+          log << "        Set property " << propVal->GetPropName();
+          if (propVal->GetLateBoundProp()) log << " (late bound)";
+          log << " to " << propVal->GetValString();
+          if (propVal->GetLateBoundValue()) log << " (late bound)";
           log << "\n";
         }
         ctr++;

src/models/flight_control/FGDistributor.h

@@ -131,16 +131,14 @@ class FGDistributor  : public FGFCSComponent
              that represents this distributor component */
   FGDistributor(FGFCS* fcs, Element* element);
 
-  /// Destructor
-  ~FGDistributor();
-
   /** Executes the distributor logic.
       @return true - always*/
   bool Run(void) override;
 
 private:
 
   enum eType {eInclusive=0, eExclusive} Type;
+  template<typename T> using vector_of_unique_ptr = std::vector<std::unique_ptr<T>>;
 
   class PropValPair {
   public:
@@ -154,15 +152,14 @@ class FGDistributor  : public FGFCSComponent
         Prop->SetValue(Val->GetValue());
       }
       catch(...) {
-        throw(Prop->GetName()+" in distributor component is not known");
+        throw BaseException(Prop->GetName()+" in distributor component is not known");
       }
     }
 
-    std::string GetPropName() { return Prop->GetName(); }
-    std::string GetValString() { return Val->GetName(); }
-    bool GetLateBoundProp() { return Prop->IsLateBound(); }
-    bool GetLateBoundValue() {return Val->IsLateBound();
-    }
+    std::string GetPropName() const { return Prop->GetName(); }
+    std::string GetValString() const { return Val->GetName(); }
+    bool GetLateBoundProp() const { return Prop->IsLateBound(); }
+    bool GetLateBoundValue() const { return Val->IsLateBound(); }
   private:
     FGPropertyValue_ptr Prop;
     FGParameterValue_ptr Val;
@@ -172,30 +169,30 @@ class FGDistributor  : public FGFCSComponent
   public:
     Case() : Test(nullptr) {}
 
-    ~Case() {
-      for (auto pair: PropValPairs) delete pair;
-      delete Test;
+    void SetTest(Element* test_element, std::shared_ptr<FGPropertyManager> propMan) {
+      Test = std::make_unique<FGCondition>(test_element, propMan);
+    }
+    const FGCondition& GetTest(void) const noexcept { return *Test; }
+    void AddPropValPair(const std::string& property, const std::string& value,
+                        std::shared_ptr<FGPropertyManager> propManager, Element* prop_val_el) {
+      PropValPairs.push_back(std::make_unique<PropValPair>(property, value, propManager, prop_val_el));
     }
-
-    void SetTest(FGCondition* test) {Test = test;}
-    FGCondition* GetTest(void) {return Test;}
-    void AddPropValPair(PropValPair* pvPair) {PropValPairs.push_back(pvPair);}
     void SetPropValPairs() {
-      for (auto pair: PropValPairs) pair->SetPropToValue();
+      for (auto& pair: PropValPairs) pair->SetPropToValue();
     }
-    std::vector<PropValPair*>::const_iterator IterPropValPairs(void) const
+    vector_of_unique_ptr<PropValPair>::const_iterator begin(void) const
     { return PropValPairs.cbegin(); }
-    std::vector<PropValPair*>::const_iterator EndPropValPairs(void) const
+    vector_of_unique_ptr<PropValPair>::const_iterator end(void) const
     { return PropValPairs.cend(); }
-    bool HasTest() {return Test != nullptr;}
-    bool GetTestResult() { return Test->Evaluate(); }
+    bool HasTest() const noexcept { return Test != nullptr; }
+    bool GetTestResult() const { return Test->Evaluate(); }
 
   private:
-    FGCondition* Test;
-    std::vector <PropValPair*> PropValPairs;
+    std::unique_ptr<FGCondition> Test;
+    vector_of_unique_ptr<PropValPair> PropValPairs;
   };
 
-  std::vector <Case*> Cases;
+  vector_of_unique_ptr<Case> Cases;
 
   void Debug(int from) override;
 };