Merge remote-tracking branch 'origin/master' into headless_build_fix

Author: ayla

src/Core/Algorithms/Base/Variable.h

@@ -34,6 +34,9 @@
 #include <iosfwd>
 #include <boost/variant.hpp>
 #include <boost/filesystem/path.hpp>
+#ifndef Q_MOC_RUN
+#include <boost/iterator/counting_iterator.hpp>
+#endif
 #include <Core/Datatypes/DatatypeFwd.h>
 #include <Core/Algorithms/Base/Name.h>
 #include <Core/Algorithms/Base/Option.h>
@@ -93,7 +96,7 @@ namespace Algorithms {
   SCISHARE Variable makeVariable(const std::string& name, const Variable::Value& value);
 
   template <typename ... Ts>
-  Variable::List makeVariableList(Ts&&... params)
+  Variable::List makeAnonymousVariableList(Ts&&... params)
   {
     std::vector<Variable::Value> values{params...};
     Variable::List vars;
@@ -102,6 +105,26 @@ namespace Algorithms {
     return vars;
   }
 
+  template <typename ... Ts, size_t N>
+  Variable::List makeNamedVariableList(const Name (&namesList)[N], Ts&&... params)
+  {
+    std::vector<Variable::Value> values{ params... };
+    
+    auto namesIter = &namesList[0];
+    Variable::List vars;
+    std::transform(values.begin(), values.end(), std::back_inserter(vars),
+      [&namesIter](const Variable::Value& val) { return Variable(*namesIter++, val); });
+    return vars;
+  }
+
+  template <typename Func>
+  Variable::List makeHomogeneousVariableList(Func valueGenerator, size_t num)
+  {
+    Variable::List vars;
+    std::transform(boost::counting_iterator<size_t>(0), boost::counting_iterator<size_t>(num), std::back_inserter(vars), [valueGenerator](size_t i) { return makeVariable("", valueGenerator(i)); });
+    return vars;
+  }
+
   typedef Variable AlgorithmParameter;
   typedef Variable::List VariableList;
   typedef Datatypes::SharedPointer<Variable> VariableHandle;