Merge pull request #4053 from gateway240/alex/initilizer-list

Add initializer list support to the Array class

Author: nickbianco

OpenSim/Common/Array.h

@@ -34,6 +34,7 @@
 
 #include <algorithm>
 #include <cstddef>
+#include <initializer_list>
 #include <iostream>
 #include <iterator>
 #include <sstream>
@@ -60,6 +61,10 @@ class Array {
     Array& operator=(Array&&) noexcept = default;
     ~Array() noexcept = default;
 
+    Array(std::initializer_list<T> initList) :
+    _defaultValue{}, _storage(initList.begin(), initList.end())
+    {}
+
     explicit Array(T aDefaultValue = T(), int aSize = 0, int aCapacity = 1) :
         _defaultValue{std::move(aDefaultValue)}
     {

OpenSim/Common/Test/testArray.cpp

@@ -26,6 +26,8 @@
 
 using namespace OpenSim;
 
+constexpr double tol = std::numeric_limits<double>::epsilon() * 10;
+
 namespace
 {
     template<typename T>
@@ -129,3 +131,47 @@ TEST_CASE("Array set keeps size if within bounds")
     REQUIRE(vals.size() == 1);
     REQUIRE(vals.get(0) == 4);  
 }
+
+TEST_CASE("Array initializer list works with integers")
+{
+    Array<int> vals{-1, 2, 4};
+
+    REQUIRE(vals.get(0) == -1);
+    REQUIRE(vals.get(1) == 2);
+    REQUIRE(vals.get(2) == 4);
+}
+
+TEST_CASE("Array constructor initialization works")
+{
+    Array<int> vals(-1, 2);
+
+    REQUIRE(vals.get(0) == -1);
+    REQUIRE(vals.get(1) == -1);
+}
+
+TEST_CASE("Array initializer list works with doubles")
+{
+    Array<double> vals{-1.5, 2.2, 4.6};
+
+    REQUIRE_THAT(vals.get(0), Catch::Matchers::WithinAbs(-1.5,tol));
+    REQUIRE_THAT(vals.get(1), Catch::Matchers::WithinAbs(2.2,tol));
+    REQUIRE_THAT(vals.get(2), Catch::Matchers::WithinAbs(4.6,tol));
+}
+
+TEST_CASE("Array initializer list works with doubles and alternate syntax")
+{
+    Array<double> vals = {-1.5, 2.2, 4.6};
+
+    REQUIRE_THAT(vals.get(0), Catch::Matchers::WithinAbs(-1.5,tol));
+    REQUIRE_THAT(vals.get(1), Catch::Matchers::WithinAbs(2.2,tol));
+    REQUIRE_THAT(vals.get(2), Catch::Matchers::WithinAbs(4.6,tol));
+}
+
+TEST_CASE("Array initializer list works with booleans")
+{
+    Array<bool> vals{true, false, true};
+
+    REQUIRE(vals.get(0) == true);
+    REQUIRE(vals.get(1) == false);
+    REQUIRE(vals.get(2) == true);
+}