src/utilities/core/Compare.cpp
| Line | Branch | Exec | Source |
|---|---|---|---|
| 1 | /*********************************************************************************************************************** | ||
| 2 | * OpenStudio(R), Copyright (c) Alliance for Energy Innovation, LLC. | ||
| 3 | * See also https://openstudio.net/license | ||
| 4 | ***********************************************************************************************************************/ | ||
| 5 | |||
| 6 | #include "Compare.hpp" | ||
| 7 | #include "../idf/WorkspaceObject.hpp" | ||
| 8 | #include "../bcl/BCLComponent.hpp" | ||
| 9 | #include "Assert.hpp" | ||
| 10 | #include <OpenStudio.hxx> | ||
| 11 | |||
| 12 | #include <boost/lexical_cast.hpp> | ||
| 13 | |||
| 14 | namespace openstudio { | ||
| 15 | |||
| 16 | 45 | IstringFind::IstringFind() = default; | |
| 17 | |||
| 18 | ✗ | IstringFind::IstringFind(const std::string& target) { | |
| 19 | ✗ | addTarget(target); | |
| 20 | ✗ | } | |
| 21 | 12 | void IstringFind::addTarget(const std::string& target) { | |
| 22 | 12 | m_targets.push_back(target); | |
| 23 | 12 | } | |
| 24 | |||
| 25 | 22733 | bool IstringFind::operator()(const std::string& other) const { | |
| 26 |
2/2✓ Branch 5 taken 17181 times.
✓ Branch 6 taken 22112 times.
|
39293 | for (const std::string& target : m_targets) { |
| 27 |
3/3✓ Branch 1 taken 17181 times.
✓ Branch 3 taken 621 times.
✓ Branch 4 taken 16560 times.
|
17181 | if (istringEqual(target, other)) { |
| 28 | 621 | return true; | |
| 29 | } | ||
| 30 | } | ||
| 31 | 22112 | return false; | |
| 32 | } | ||
| 33 | |||
| 34 | 14 | bool IstringPairCompare::operator()(const std::pair<std::string, std::string>& x, const std::pair<std::string, std::string>& y) const { | |
| 35 | 14 | bool result(false); | |
| 36 | |||
| 37 |
3/3✓ Branch 2 taken 14 times.
✓ Branch 5 taken 12 times.
✓ Branch 6 taken 2 times.
|
14 | if (boost::iequals(x.first, y.first)) { |
| 38 |
1/1✓ Branch 3 taken 12 times.
|
12 | result = boost::lexicographical_compare(x.second, y.second, boost::is_iless()); |
| 39 | } else { | ||
| 40 |
1/1✓ Branch 3 taken 2 times.
|
2 | result = boost::lexicographical_compare(x.first, y.first, boost::is_iless()); |
| 41 | }; | ||
| 42 | |||
| 43 | 14 | return result; | |
| 44 | } | ||
| 45 | |||
| 46 | 57392 | bool VersionString::parseVersionString(const std::string& version) { | |
| 47 | // regex from https://semver.org/ | ||
| 48 | const boost::regex semverRegex("^(0|[1-9]\\d*)\\.(0|[1-9]\\d*)\\.(0|[1-9]\\d*)(?:-((?:0|[1-9]\\d*|\\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\\.(?:0|[1-9]\\d*|" | ||
| 49 |
1/1✓ Branch 1 taken 57392 times.
|
57392 | "\\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\\+([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?$"); |
| 50 |
1/1✓ Branch 1 taken 57392 times.
|
57392 | const boost::regex oldRegex("(\\d+)[\\.-](\\d+)(?:[\\.-](\\d+))?(?:[\\.-](\\d+))?"); |
| 51 |
1/1✓ Branch 1 taken 57392 times.
|
57392 | boost::smatch m; |
| 52 |
3/3✓ Branch 1 taken 57392 times.
✓ Branch 3 taken 56326 times.
✓ Branch 4 taken 1066 times.
|
57392 | if (boost::regex_match(version, m, semverRegex)) { |
| 53 |
4/4✓ Branch 1 taken 56326 times.
✓ Branch 4 taken 56326 times.
✓ Branch 7 taken 56326 times.
✓ Branch 10 taken 56326 times.
|
112652 | m_major = boost::lexical_cast<int>(std::string(m[1].first, m[1].second)); |
| 54 |
4/4✓ Branch 1 taken 56326 times.
✓ Branch 4 taken 56326 times.
✓ Branch 7 taken 56326 times.
✓ Branch 10 taken 56326 times.
|
56326 | m_minor = boost::lexical_cast<int>(std::string(m[2].first, m[2].second)); |
| 55 |
1/1✓ Branch 1 taken 56326 times.
|
56326 | int n = m.size(); |
| 56 |
1/2✓ Branch 0 taken 56326 times.
✗ Branch 1 not taken.
|
56326 | if (3 < n) { |
| 57 |
3/3✓ Branch 1 taken 56326 times.
✓ Branch 4 taken 56326 times.
✓ Branch 7 taken 56326 times.
|
56326 | std::string temp(m[3].first, m[3].second); |
| 58 |
1/2✓ Branch 1 taken 56326 times.
✗ Branch 2 not taken.
|
56326 | if (!temp.empty()) { |
| 59 |
2/2✓ Branch 1 taken 56326 times.
✓ Branch 4 taken 56326 times.
|
56326 | m_patch = boost::lexical_cast<int>(temp); |
| 60 | } | ||
| 61 | 56326 | } | |
| 62 |
1/2✓ Branch 0 taken 56326 times.
✗ Branch 1 not taken.
|
56326 | if (4 < n) { |
| 63 |
3/3✓ Branch 1 taken 56326 times.
✓ Branch 4 taken 56326 times.
✓ Branch 7 taken 56326 times.
|
112652 | m_patchString = std::string(m[4].first, m[4].second); |
| 64 | } | ||
| 65 |
1/2✓ Branch 0 taken 56326 times.
✗ Branch 1 not taken.
|
56326 | if (5 < n) { |
| 66 |
3/3✓ Branch 1 taken 56326 times.
✓ Branch 4 taken 56326 times.
✓ Branch 7 taken 56326 times.
|
112652 | m_buildString = std::string(m[5].first, m[5].second); |
| 67 | } | ||
| 68 |
2/3✓ Branch 1 taken 1066 times.
✓ Branch 3 taken 1066 times.
✗ Branch 4 not taken.
|
1066 | } else if (boost::regex_match(version, m, oldRegex)) { |
| 69 |
4/4✓ Branch 1 taken 1066 times.
✓ Branch 4 taken 1066 times.
✓ Branch 7 taken 1066 times.
✓ Branch 10 taken 1066 times.
|
2132 | m_major = boost::lexical_cast<int>(std::string(m[1].first, m[1].second)); |
| 70 |
4/4✓ Branch 1 taken 1066 times.
✓ Branch 4 taken 1066 times.
✓ Branch 7 taken 1066 times.
✓ Branch 10 taken 1066 times.
|
1066 | m_minor = boost::lexical_cast<int>(std::string(m[2].first, m[2].second)); |
| 71 |
1/1✓ Branch 1 taken 1066 times.
|
1066 | int n = m.size(); |
| 72 |
1/2✓ Branch 0 taken 1066 times.
✗ Branch 1 not taken.
|
1066 | if (3 < n) { |
| 73 |
3/3✓ Branch 1 taken 1066 times.
✓ Branch 4 taken 1066 times.
✓ Branch 7 taken 1066 times.
|
1066 | std::string temp(m[3].first, m[3].second); |
| 74 |
2/2✓ Branch 1 taken 79 times.
✓ Branch 2 taken 987 times.
|
1066 | if (!temp.empty()) { |
| 75 |
2/2✓ Branch 1 taken 79 times.
✓ Branch 4 taken 79 times.
|
79 | m_patch = boost::lexical_cast<int>(temp); |
| 76 | } | ||
| 77 | // old regex does not support patch string | ||
| 78 | 1066 | } | |
| 79 |
1/2✓ Branch 0 taken 1066 times.
✗ Branch 1 not taken.
|
1066 | if (4 < n) { |
| 80 |
3/3✓ Branch 1 taken 1066 times.
✓ Branch 4 taken 1066 times.
✓ Branch 7 taken 1066 times.
|
2132 | m_buildString = std::string(m[4].first, m[4].second); |
| 81 | } | ||
| 82 | } else { | ||
| 83 | ✗ | return false; | |
| 84 | } | ||
| 85 | |||
| 86 | 57392 | return true; | |
| 87 | 57392 | } | |
| 88 | |||
| 89 | 1 | VersionString::VersionString() : m_str(openStudioLongVersion()) { | |
| 90 |
2/3✓ Branch 1 taken 1 time.
✗ Branch 3 not taken.
✓ Branch 4 taken 1 time.
|
1 | if (!parseVersionString(m_str)) { |
| 91 | // This should never happen, there's a specific test in Compare_GTest.cpp for this | ||
| 92 | ✗ | OS_ASSERT(false); | |
| 93 | } | ||
| 94 | 1 | } | |
| 95 | |||
| 96 | 57391 | VersionString::VersionString(const std::string& version) : m_str(version) { | |
| 97 |
2/3✓ Branch 1 taken 57391 times.
✗ Branch 3 not taken.
✓ Branch 4 taken 57391 times.
|
57391 | if (!parseVersionString(m_str)) { |
| 98 | ✗ | LOG_FREE_AND_THROW("openstudio.utilities.VersionString", "Could not parse '" << version << "' as a version string."); | |
| 99 | } | ||
| 100 | 57391 | } | |
| 101 | |||
| 102 | 742 | VersionString::VersionString(int major, int minor) : m_major(major), m_minor(minor) { | |
| 103 |
1/1✓ Branch 1 taken 742 times.
|
742 | std::stringstream ss; |
| 104 |
3/3✓ Branch 1 taken 742 times.
✓ Branch 4 taken 742 times.
✓ Branch 7 taken 742 times.
|
742 | ss << major << "." << minor; |
| 105 |
1/1✓ Branch 1 taken 742 times.
|
742 | m_str = ss.str(); |
| 106 | 742 | } | |
| 107 | |||
| 108 |
1/1✓ Branch 2 taken 254 times.
|
254 | VersionString::VersionString(int major, int minor, int patch) : m_major(major), m_minor(minor), m_patch(patch) { |
| 109 |
1/1✓ Branch 1 taken 254 times.
|
254 | std::stringstream ss; |
| 110 |
5/5✓ Branch 1 taken 254 times.
✓ Branch 4 taken 254 times.
✓ Branch 7 taken 254 times.
✓ Branch 10 taken 254 times.
✓ Branch 13 taken 254 times.
|
254 | ss << major << "." << minor << "." << patch; |
| 111 |
1/1✓ Branch 1 taken 254 times.
|
254 | m_str = ss.str(); |
| 112 | 254 | } | |
| 113 | |||
| 114 | ✗ | VersionString::VersionString(int major, int minor, int patch, const std::string& patchString) | |
| 115 | ✗ | : m_major(major), m_minor(minor), m_patch(patch), m_patchString(patchString) { | |
| 116 | ✗ | std::stringstream ss; | |
| 117 | ✗ | ss << major << "." << minor << "." << patch << "-" << patchString; | |
| 118 | ✗ | m_str = ss.str(); | |
| 119 | ✗ | } | |
| 120 | |||
| 121 | ✗ | VersionString::VersionString(int major, int minor, int patch, const std::string& patchString, const std::string& buildString) | |
| 122 | ✗ | : m_major(major), m_minor(minor), m_patch(patch), m_patchString(patchString), m_buildString(buildString) { | |
| 123 | ✗ | std::stringstream ss; | |
| 124 | ✗ | ss << major << "." << minor << "." << patch << "-" << patchString << "+" << buildString; | |
| 125 | ✗ | m_str = ss.str(); | |
| 126 | ✗ | } | |
| 127 | |||
| 128 | 11652 | std::string VersionString::str() const { | |
| 129 | 11652 | return m_str; | |
| 130 | } | ||
| 131 | |||
| 132 | 4067464 | int VersionString::major() const { | |
| 133 | 4067464 | return m_major; | |
| 134 | } | ||
| 135 | |||
| 136 | 1533473 | int VersionString::minor() const { | |
| 137 | 1533473 | return m_minor; | |
| 138 | } | ||
| 139 | |||
| 140 | 240877 | boost::optional<int> VersionString::patch() const { | |
| 141 | 240877 | return m_patch; | |
| 142 | } | ||
| 143 | |||
| 144 | 6056 | std::string VersionString::patchString() const { | |
| 145 | 6056 | return m_patchString; | |
| 146 | } | ||
| 147 | |||
| 148 | //boost::optional<int> VersionString::build() const { | ||
| 149 | // LOG_FREE("openstudio.utilities.VersionString", Warn, "VersionString::build is deprecated, use buildString instead."); | ||
| 150 | // return boost::none; | ||
| 151 | //} | ||
| 152 | |||
| 153 | 5 | std::string VersionString::buildString() const { | |
| 154 | 5 | return m_buildString; | |
| 155 | } | ||
| 156 | |||
| 157 | 345111 | bool VersionString::operator<(const VersionString& other) const { | |
| 158 | |||
| 159 |
1/1✓ Branch 1 taken 345111 times.
|
345111 | int meCurrent = major(); |
| 160 |
1/1✓ Branch 1 taken 345111 times.
|
345111 | int otherCurrent = other.major(); |
| 161 | |||
| 162 |
2/2✓ Branch 0 taken 63589 times.
✓ Branch 1 taken 281522 times.
|
345111 | if (meCurrent < otherCurrent) { |
| 163 | 63589 | return true; | |
| 164 |
2/2✓ Branch 0 taken 87284 times.
✓ Branch 1 taken 194238 times.
|
281522 | } else if (otherCurrent < meCurrent) { |
| 165 | 87284 | return false; | |
| 166 | } | ||
| 167 | |||
| 168 |
1/3✗ Branch 0 not taken.
✓ Branch 1 taken 194238 times.
✗ Branch 3 not taken.
|
194238 | OS_ASSERT(meCurrent == otherCurrent); |
| 169 | |||
| 170 |
1/1✓ Branch 1 taken 194238 times.
|
194238 | meCurrent = minor(); |
| 171 |
1/1✓ Branch 1 taken 194238 times.
|
194238 | otherCurrent = other.minor(); |
| 172 | |||
| 173 |
2/2✓ Branch 0 taken 109354 times.
✓ Branch 1 taken 84884 times.
|
194238 | if (meCurrent < otherCurrent) { |
| 174 | 109354 | return true; | |
| 175 |
2/2✓ Branch 0 taken 24971 times.
✓ Branch 1 taken 59913 times.
|
84884 | } else if (otherCurrent < meCurrent) { |
| 176 | 24971 | return false; | |
| 177 | } | ||
| 178 | |||
| 179 |
1/3✗ Branch 0 not taken.
✓ Branch 1 taken 59913 times.
✗ Branch 3 not taken.
|
59913 | OS_ASSERT(meCurrent == otherCurrent); |
| 180 | |||
| 181 |
8/8✓ Branch 1 taken 59913 times.
✓ Branch 3 taken 59708 times.
✓ Branch 4 taken 205 times.
✓ Branch 6 taken 59708 times.
✓ Branch 8 taken 59701 times.
✓ Branch 9 taken 7 times.
✓ Branch 10 taken 59701 times.
✓ Branch 11 taken 212 times.
|
179534 | if (patch() && other.patch()) { |
| 182 |
2/2✓ Branch 1 taken 59701 times.
✓ Branch 4 taken 59701 times.
|
59701 | meCurrent = patch().get(); |
| 183 |
2/2✓ Branch 1 taken 59701 times.
✓ Branch 4 taken 59701 times.
|
59701 | otherCurrent = other.patch().get(); |
| 184 | |||
| 185 |
2/2✓ Branch 0 taken 48418 times.
✓ Branch 1 taken 11283 times.
|
59701 | if (meCurrent < otherCurrent) { |
| 186 | 48418 | return true; | |
| 187 |
2/2✓ Branch 0 taken 5444 times.
✓ Branch 1 taken 5839 times.
|
11283 | } else if (otherCurrent < meCurrent) { |
| 188 | 5444 | return false; | |
| 189 | } | ||
| 190 | |||
| 191 |
1/3✗ Branch 0 not taken.
✓ Branch 1 taken 5839 times.
✗ Branch 3 not taken.
|
5839 | OS_ASSERT(meCurrent == otherCurrent); |
| 192 | } | ||
| 193 | |||
| 194 | // When major, minor, and patch are equal, a pre-release version has lower precedence than a normal version | ||
| 195 |
1/1✓ Branch 1 taken 6051 times.
|
6051 | std::string otherPatchString = other.patchString(); |
| 196 |
5/6✓ Branch 1 taken 6036 times.
✓ Branch 2 taken 15 times.
✓ Branch 4 taken 6036 times.
✗ Branch 5 not taken.
✓ Branch 6 taken 6036 times.
✓ Branch 7 taken 15 times.
|
6051 | if (m_patchString.empty() && otherPatchString.empty()) { |
| 197 | 6036 | return false; | |
| 198 |
2/6✗ Branch 1 not taken.
✓ Branch 2 taken 15 times.
✗ Branch 4 not taken.
✗ Branch 5 not taken.
✗ Branch 6 not taken.
✓ Branch 7 taken 15 times.
|
15 | } else if (m_patchString.empty() && !otherPatchString.empty()) { |
| 199 | ✗ | return false; | |
| 200 |
5/6✓ Branch 1 taken 15 times.
✗ Branch 2 not taken.
✓ Branch 4 taken 2 times.
✓ Branch 5 taken 13 times.
✓ Branch 6 taken 2 times.
✓ Branch 7 taken 13 times.
|
15 | } else if (!m_patchString.empty() && otherPatchString.empty()) { |
| 201 | 2 | return true; | |
| 202 |
2/2✓ Branch 2 taken 7 times.
✓ Branch 3 taken 6 times.
|
13 | } else if (m_patchString < otherPatchString) { |
| 203 | 7 | return true; | |
| 204 |
2/2✓ Branch 2 taken 2 times.
✓ Branch 3 taken 4 times.
|
6 | } else if (m_patchString > otherPatchString) { |
| 205 | 2 | return false; | |
| 206 | } | ||
| 207 | |||
| 208 |
1/3✗ Branch 1 not taken.
✓ Branch 2 taken 4 times.
✗ Branch 4 not taken.
|
4 | OS_ASSERT(m_patchString == otherPatchString); |
| 209 | |||
| 210 | 4 | return false; | |
| 211 | 6051 | } | |
| 212 | |||
| 213 | 264 | bool VersionString::operator>(const VersionString& other) const { | |
| 214 | 264 | return other < *this; | |
| 215 | } | ||
| 216 | |||
| 217 | 2192 | bool VersionString::operator==(const VersionString& other) const { | |
| 218 |
4/4✓ Branch 1 taken 353 times.
✓ Branch 2 taken 1839 times.
✓ Branch 4 taken 80 times.
✓ Branch 5 taken 273 times.
|
2192 | return (!(*this < other)) && (!(other < *this)); |
| 219 | } | ||
| 220 | |||
| 221 | 52 | bool VersionString::operator!=(const VersionString& other) const { | |
| 222 | 52 | return !(*this == other); | |
| 223 | } | ||
| 224 | |||
| 225 | 109 | bool VersionString::operator<=(const VersionString& other) const { | |
| 226 | 109 | return (!(other < *this)); | |
| 227 | } | ||
| 228 | |||
| 229 | 136 | bool VersionString::operator>=(const VersionString& other) const { | |
| 230 | 136 | return (!(*this < other)); | |
| 231 | } | ||
| 232 | |||
| 233 | //bool VersionString::fidelityEqual(const VersionString& other) const | ||
| 234 | //{ | ||
| 235 | // LOG_FREE("openstudio.utilities.VersionString", Warn, "VersionString::fidelityEqual is deprecated."); | ||
| 236 | // return true; | ||
| 237 | //} | ||
| 238 | |||
| 239 | 10 | bool VersionString::isNextVersion(const VersionString& nextVersionCandidate) const { | |
| 240 |
2/2✓ Branch 1 taken 10 times.
✓ Branch 4 taken 10 times.
|
10 | VersionString variantOnThis(str()); |
| 241 |
1/1✓ Branch 1 taken 10 times.
|
10 | VersionString variantOnCandidate = nextVersionCandidate; |
| 242 | |||
| 243 |
2/3✓ Branch 1 taken 10 times.
✗ Branch 3 not taken.
✓ Branch 4 taken 10 times.
|
10 | if (variantOnCandidate <= variantOnThis) { |
| 244 | ✗ | return false; | |
| 245 | } | ||
| 246 | |||
| 247 | // now know nextVersionCandidate > this | ||
| 248 | |||
| 249 | // now have major.minor or major.minor.patch for both | ||
| 250 | |||
| 251 |
2/3✓ Branch 1 taken 10 times.
✓ Branch 3 taken 10 times.
✗ Branch 4 not taken.
|
20 | if (variantOnThis.patch()) { |
| 252 |
3/3✓ Branch 1 taken 10 times.
✓ Branch 3 taken 9 times.
✓ Branch 4 taken 1 time.
|
20 | if (variantOnCandidate.patch()) { |
| 253 |
5/5✓ Branch 1 taken 9 times.
✓ Branch 4 taken 9 times.
✓ Branch 7 taken 9 times.
✓ Branch 10 taken 9 times.
✓ Branch 13 taken 9 times.
|
9 | VersionString thisIncremented(major(), minor(), patch().get() + 1); |
| 254 |
3/3✓ Branch 1 taken 9 times.
✓ Branch 3 taken 3 times.
✓ Branch 4 taken 6 times.
|
9 | if (variantOnCandidate == thisIncremented) { |
| 255 | 3 | return true; | |
| 256 | } | ||
| 257 | // candidate has patch, but is not next patch version. to be next version, | ||
| 258 | // must have patch == 0 | ||
| 259 |
4/4✓ Branch 1 taken 6 times.
✓ Branch 4 taken 6 times.
✓ Branch 6 taken 1 time.
✓ Branch 7 taken 5 times.
|
6 | if (variantOnCandidate.patch().get() != 0) { |
| 260 | 1 | return false; | |
| 261 | } | ||
| 262 | 9 | } | |
| 263 | } | ||
| 264 | |||
| 265 | // now major.minor.patch v. major.minor or major.minor.patch v. major.minor.0 | ||
| 266 | // strip out patch numbers | ||
| 267 | // cppcheck-suppress duplicateCondition | ||
| 268 |
2/3✓ Branch 1 taken 6 times.
✓ Branch 3 taken 6 times.
✗ Branch 4 not taken.
|
12 | if (variantOnThis.patch()) { |
| 269 |
3/3✓ Branch 1 taken 6 times.
✓ Branch 4 taken 6 times.
✓ Branch 7 taken 6 times.
|
6 | variantOnThis = VersionString(variantOnThis.major(), variantOnThis.minor()); |
| 270 | } | ||
| 271 |
3/3✓ Branch 1 taken 6 times.
✓ Branch 3 taken 5 times.
✓ Branch 4 taken 1 time.
|
12 | if (variantOnCandidate.patch()) { |
| 272 |
3/3✓ Branch 1 taken 5 times.
✓ Branch 4 taken 5 times.
✓ Branch 7 taken 5 times.
|
5 | variantOnCandidate = VersionString(variantOnCandidate.major(), variantOnCandidate.minor()); |
| 273 | } | ||
| 274 | |||
| 275 | // minor increment | ||
| 276 |
3/3✓ Branch 1 taken 6 times.
✓ Branch 4 taken 6 times.
✓ Branch 7 taken 6 times.
|
6 | VersionString thisIncremented(variantOnThis.major(), variantOnThis.minor() + 1); |
| 277 |
3/3✓ Branch 1 taken 6 times.
✓ Branch 3 taken 3 times.
✓ Branch 4 taken 3 times.
|
6 | if (variantOnCandidate == thisIncremented) { |
| 278 | 3 | return true; | |
| 279 | } | ||
| 280 | |||
| 281 | // major increment | ||
| 282 |
2/2✓ Branch 1 taken 3 times.
✓ Branch 4 taken 3 times.
|
3 | thisIncremented = VersionString(variantOnThis.major() + 1, 0); |
| 283 |
3/3✓ Branch 1 taken 3 times.
✓ Branch 3 taken 1 time.
✓ Branch 4 taken 2 times.
|
3 | if (variantOnCandidate == thisIncremented) { |
| 284 | 1 | return true; | |
| 285 | } | ||
| 286 | |||
| 287 | 2 | return false; | |
| 288 | 10 | } | |
| 289 | |||
| 290 | ✗ | std::ostream& operator<<(std::ostream& os, const VersionString& version) { | |
| 291 | ✗ | os << version.str(); | |
| 292 | ✗ | return os; | |
| 293 | } | ||
| 294 | |||
| 295 | 323304 | bool WorkspaceObjectNameLess::operator()(const WorkspaceObject& a, const WorkspaceObject& b) const { | |
| 296 | 323304 | std::string aname; | |
| 297 |
1/1✓ Branch 1 taken 323304 times.
|
323304 | boost::optional<std::string> oaname = a.name(); |
| 298 |
2/2✓ Branch 0 taken 304938 times.
✓ Branch 1 taken 18366 times.
|
323304 | if (oaname) { |
| 299 |
2/2✓ Branch 1 taken 304938 times.
✓ Branch 4 taken 304938 times.
|
304938 | aname = *oaname; |
| 300 | } | ||
| 301 | 323304 | std::string bname; | |
| 302 |
1/1✓ Branch 1 taken 323304 times.
|
323304 | boost::optional<std::string> obname = b.name(); |
| 303 |
2/2✓ Branch 0 taken 303844 times.
✓ Branch 1 taken 19460 times.
|
323304 | if (obname) { |
| 304 |
2/2✓ Branch 1 taken 303844 times.
✓ Branch 4 taken 303844 times.
|
303844 | bname = *obname; |
| 305 | } | ||
| 306 |
1/1✓ Branch 1 taken 323304 times.
|
646608 | return istringLess(aname, bname); |
| 307 | 323304 | } | |
| 308 | |||
| 309 | ✗ | bool WorkspaceObjectNameGreater::operator()(const WorkspaceObject& a, const WorkspaceObject& b) const { | |
| 310 | ✗ | std::string aname; | |
| 311 | ✗ | boost::optional<std::string> oaname = a.name(); | |
| 312 | ✗ | if (oaname) { | |
| 313 | ✗ | aname = *oaname; | |
| 314 | } | ||
| 315 | ✗ | std::string bname; | |
| 316 | ✗ | boost::optional<std::string> obname = b.name(); | |
| 317 | ✗ | if (obname) { | |
| 318 | ✗ | bname = *obname; | |
| 319 | } | ||
| 320 | ✗ | return istringLess(bname, aname); | |
| 321 | ✗ | } | |
| 322 | |||
| 323 | ✗ | bool BCLComponentNameLess::operator()(const BCLComponent& a, const BCLComponent& b) const { | |
| 324 | ✗ | std::string aname; | |
| 325 | ✗ | boost::optional<std::string> oaname = a.name(); | |
| 326 | ✗ | if (oaname) { | |
| 327 | ✗ | aname = *oaname; | |
| 328 | } | ||
| 329 | ✗ | std::string bname; | |
| 330 | ✗ | boost::optional<std::string> obname = b.name(); | |
| 331 | ✗ | if (obname) { | |
| 332 | ✗ | bname = *obname; | |
| 333 | } | ||
| 334 | ✗ | return istringLess(aname, bname); | |
| 335 | ✗ | } | |
| 336 | |||
| 337 | ✗ | bool BCLComponentNameGreater::operator()(const BCLComponent& a, const BCLComponent& b) const { | |
| 338 | ✗ | std::string aname; | |
| 339 | ✗ | boost::optional<std::string> oaname = a.name(); | |
| 340 | ✗ | if (oaname) { | |
| 341 | ✗ | aname = *oaname; | |
| 342 | } | ||
| 343 | ✗ | std::string bname; | |
| 344 | ✗ | boost::optional<std::string> obname = b.name(); | |
| 345 | ✗ | if (obname) { | |
| 346 | ✗ | bname = *obname; | |
| 347 | } | ||
| 348 | ✗ | return istringLess(bname, aname); | |
| 349 | ✗ | } | |
| 350 | |||
| 351 | } // namespace openstudio | ||
| 352 |