QPR-12013 -- Cleanup

Author: NathanielVolfango

Docs/UserGuide/simmcalibration.tex

@@ -64,7 +64,7 @@ \subsubsection{SIMM Calibration}
 A SIMM Calibration is defined by a {\tt <SIMMCalibration>} node that defines a particular SIMM version, i.e.\ it defines a single set of risk weights, correlations, concentration thresholds and currency groups. The {\tt <SIMMCalibration>} has the following components:
 
 \begin{enumerate}
-  \item Version names - {\tt <VersionNames>}} \\
+  \item Version names - {\tt <VersionNames>} \\
     This may contain any number of {\tt <Name>} sub-nodes, where each value will be associated with the given SIMM
     calibration. In order to use a given calibration, one of its names must be specified in the "version" parameter of the
     SIMM analytic (see Listing \ref{lst:ore_simm}). In the example lsting \ref{lst:simmcalibration_data} above, the SIMM

OREAnalytics/orea/simm/simmcalibration.cpp

@@ -515,7 +515,7 @@ void SimmCalibration::RiskClassData::fromXML(XMLNode* node) {
     }
 }
 
-const string& SimmCalibration::version() const {
+const string SimmCalibration::version() const {
     if (versionNames_.empty()) {
         return "";
     } else {
@@ -655,7 +655,7 @@ const boost::shared_ptr<SimmCalibration>& SimmCalibrationData::getById(const str
     return data_.at(id);
 }
 
-const boost::shared_ptr<SimmCalibration>& SimmCalibrationData::getBySimmVersion(const string& version) const {
+const boost::shared_ptr<SimmCalibration> SimmCalibrationData::getBySimmVersion(const string& version) const {
     for (const auto& kv : data_) {
         const auto& simmCalibrationData = kv.second;
         for (const string& scVersion : simmCalibrationData->versionNames()) {

OREAnalytics/orea/simm/simmcalibration.hpp

@@ -267,7 +267,7 @@ class SimmCalibration : public ore::data::XMLSerializable {
     SimmCalibration() {}
     SimmCalibration(ore::data::XMLNode* node) { fromXML(node); }
 
-    const std::string& version() const;
+    const std::string version() const;
     const std::vector<std::string>& versionNames() const { return versionNames_; }
     const std::vector<std::pair<std::string, std::string>>& additionalFields() const { return additionalFields_; }
 
@@ -308,7 +308,7 @@ class SimmCalibrationData : public ore::data::XMLSerializable {
     void add(const boost::shared_ptr<SimmCalibration>&);
     bool hasId(const std::string& id) const { return data_.find(id) != data_.end(); }
     const boost::shared_ptr<SimmCalibration>& getById(const std::string& id) const;
-    const boost::shared_ptr<SimmCalibration>& getBySimmVersion(const std::string& id) const;
+    const boost::shared_ptr<SimmCalibration> getBySimmVersion(const std::string& id) const;
 
 private:
     std::map<std::string, boost::shared_ptr<SimmCalibration>> data_;

OREAnalytics/orea/simm/simmconfigurationbase.cpp

@@ -62,9 +62,8 @@ vector<string> lookup(const RiskType& rt, const map<RiskType, vector<string>>& m
 }
 
 std::ostream& operator<<(std::ostream& out, const tuple<string, string, string>& tup) {
-    string res =
-        "[Bucket: '" + std::get<0>(tup) + "', Label1: '" + std::get<1>(tup) + "', Label2: '" + std::get<2>(tup) + "']";
-    out << res;
+    return out << "[Bucket: '" << std::get<0>(tup) << "', Label1: '" << std::get<1>(tup) << "', Label2: '"
+               << std::get<2>(tup) << "']";
 }
 
 string periodToLabels2(const QuantLib::Period& p) {

OREData/ored/utilities/xmlutils.cpp

@@ -449,7 +449,7 @@ string XMLUtils::getAttribute(XMLNode* node, const string& attrName) {
 }
 
 vector<XMLNode*> XMLUtils::getChildrenNodes(XMLNode* node, const string& name) {
-    QL_REQUIRE(node, "XMLUtils::getChildredNodes(" << name << ") node is NULL");
+    QL_REQUIRE(node, "XMLUtils::getChildrenNodes(" << name << ") node is NULL");
     vector<XMLNode*> res;
     const char* p = name.empty() ? nullptr : name.c_str();
     for (xml_node<>* c = node->first_node(p); c; c = c->next_sibling(p))