Merge branch 'main' of https://github.com/juanmanzanero/lion-cpp

juanmanzanero · Nov 20, 2023 · 5829271 · 5829271
2 parents 9c48178 + 4dc0fdf
commit 5829271
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 3 deletions.
diff --git a/lion/foundation/utils.h b/lion/foundation/utils.h
@@ -144,6 +144,10 @@ constexpr T smooth_step(const T &x, S eps);
 template <typename T>
 constexpr std::vector<T> linspace(T lo, T hi, std::size_t num_points);
 
+template<typename T>
+constexpr std::vector<T> iota(T lo, std::size_t num_points, T increment = T{ 1 });
+
+
 template<typename T>
 inline T trapz(const std::vector<T>& x, const std::vector<T>& y);
 

diff --git a/lion/foundation/utils.hpp b/lion/foundation/utils.hpp
@@ -448,6 +448,25 @@ constexpr std::vector<T> linspace(T lo, T hi, std::size_t num_points)
 }
 
 
+template<typename T>
+constexpr std::vector<T> iota(T lo, std::size_t num_points, T increment)
+{
+    //
+    // Returns a vector of size "num_points" whose first
+    // element is equal to "lo" and its rest of elements
+    // are sequentially increased by "increment".
+    //
+
+    std::vector<T> ret(num_points);
+    for (auto &&r : ret) {
+        r = lo;
+        lo += increment;
+    }
+
+    return ret;
+}
+
+
 template<typename T>
 inline T trapz(const std::vector<T>& x, const std::vector<T>& y)
 {

diff --git a/lion/io/Xml_document.h b/lion/io/Xml_document.h
@@ -1,7 +1,7 @@
 #ifndef __XML_DOCUMENT_H__
 #define __XML_DOCUMENT_H__
 
-#include "lion/thirdparty/include/tinyxml2.h"
+#include "tinyxml2.h"
 
 #include "Xml_element.h"
 

diff --git a/lion/io/Xml_element.h b/lion/io/Xml_element.h
@@ -1,12 +1,13 @@
 #ifndef __XML_ELEMENT_H__
 #define __XML_ELEMENT_H__
 
-#include "lion/thirdparty/include/tinyxml2.h"
+#include "tinyxml2.h"
+
+#include "lion/thirdparty/include/logger.hpp"
 #include "lion/foundation/utils.hpp"
 #include "lion/math/vector3d.hpp"
 #include "lion/math/matrix3x3.h"
 #include "lion/math/matrix_extensions.h"
-#include "lion/thirdparty/include/logger.hpp"
 
 class Xml_element
 {