Merge branch 'master' of github.com:tickup-se/DataFrame

tickup-se · Apr 22, 2024 · 1e1dc37 · 1e1dc37
2 parents b0f3296 + 4cc31f3
commit 1e1dc37
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 18 deletions.
diff --git a/docs/HTML/DataFrame.html b/docs/HTML/DataFrame.html
@@ -383,7 +383,7 @@ <H2><font color="blue">API Reference with code samples</font></H2>
     </tr>
 
     <tr class="item" onmouseover="this.style.backgroundColor='#ffff66';" onmouseout="this.style.backgroundColor='#d4e3e5';">
-      <td title="Removes Spin Lock"><a href="https://htmlpreview.github.io/?https://github.com/hosseinmoein/DataFrame/blob/master/docs/HTML/remove_lock.html">static remove_lock</a>()</td>
+      <td title="Removes Spin Lock"><a href="https://htmlpreview.github.io/?https://github.com/hosseinmoein/DataFrame/blob/master/docs/HTML/remove_lock.html">static<BR>remove_lock()</a></td>
     </tr>
 
     <tr class="item" onmouseover="this.style.backgroundColor='#ffff66';" onmouseout="this.style.backgroundColor='#d4e3e5';">
@@ -411,7 +411,7 @@ <H2><font color="blue">API Reference with code samples</font></H2>
     </tr>
 
     <tr class="item" onmouseover="this.style.backgroundColor='#ffff66';" onmouseout="this.style.backgroundColor='#d4e3e5';">
-      <td title="Sets the Spin Lock"><a href="https://htmlpreview.github.io/?https://github.com/hosseinmoein/DataFrame/blob/master/docs/HTML/remove_lock.html">static set_lock</a>()</td>
+      <td title="Sets the Spin Lock"><a href="https://htmlpreview.github.io/?https://github.com/hosseinmoein/DataFrame/blob/master/docs/HTML/remove_lock.html">static<BR>set_lock</a>()</td>
     </tr>
 
     <tr class="item" onmouseover="this.style.backgroundColor='#ffff66';" onmouseout="this.style.backgroundColor='#d4e3e5';">
@@ -455,7 +455,7 @@ <H2><font color="blue">API Reference with code samples</font></H2>
     </tr>
 
     <tr class="item" onmouseover="this.style.backgroundColor='#ffff66';" onmouseout="this.style.backgroundColor='#d4e3e5';">
-      <td title="Visitor operation"><a href="https://htmlpreview.github.io/?https://github.com/hosseinmoein/DataFrame/blob/master/docs/HTML/visit.html">visit( 5 )<BR>visit_sync( 5 )</a></td>
+      <td title="Visitor operation"><a href="https://htmlpreview.github.io/?https://github.com/hosseinmoein/DataFrame/blob/master/docs/HTML/visit.html">visit( 5 )<BR>visit_async( 5 )</a></td>
     </tr>
 
     <tr class="item" onmouseover="this.style.backgroundColor='#ffff66';" onmouseout="this.style.backgroundColor='#d4e3e5';">

diff --git a/include/DataFrame/Vectors/VectorPtrView.h b/include/DataFrame/Vectors/VectorPtrView.h
@@ -167,13 +167,6 @@ class VectorPtrView {
     inline void clear () throw ()  { vector_.clear(); }
     inline void resize (size_type n) throw ()  { vector_.resize(n); }
 
-    inline void
-    erase (size_type pos)  { vector_.erase (vector_.begin() + pos); }
-    inline void erase (size_type first, size_type last)  {
-
-        vector_.erase (vector_.begin() + first, vector_.begin() + last);
-    }
-
     inline void insert (size_type pos, value_type *v)  {
 
         vector_.insert (vector_.begin() + pos, v);
@@ -504,6 +497,17 @@ class VectorPtrView {
     [[nodiscard]] inline std::reverse_iterator<const_iterator>
     rend() const noexcept { return (std::make_reverse_iterator(begin())); }
 
+    inline void
+    erase (size_type pos)  { vector_.erase (vector_.begin() + pos); }
+    inline void erase (size_type first, size_type last)  {
+
+        vector_.erase (vector_.begin() + first, vector_.begin() + last);
+    }
+    inline void erase (iterator begin, iterator end)  {
+
+        vector_.erase (begin, end);
+    }
+
 private:
 
     vector_type vector_ {  };
@@ -638,13 +642,6 @@ class VectorConstPtrView  {
     inline void clear () throw ()  { vector_.clear(); }
     inline void resize (size_type n) throw ()  { vector_.resize(n); }
 
-    inline void
-    erase (size_type pos)  { vector_.erase (vector_.begin() + pos); }
-    inline void erase (size_type first, size_type last)  {
-
-        vector_.erase (vector_.begin() + first, vector_.begin() + last);
-    }
-
     inline void insert (size_type pos, value_type *v)  {
 
         vector_.insert (vector_.begin() + pos, v);
@@ -831,6 +828,17 @@ class VectorConstPtrView  {
     [[nodiscard]] inline std::reverse_iterator<const_iterator>
     rend() const noexcept { return (std::make_reverse_iterator(begin())); }
 
+    inline void
+    erase (size_type pos)  { vector_.erase (vector_.begin() + pos); }
+    inline void erase (size_type first, size_type last)  {
+
+        vector_.erase (vector_.begin() + first, vector_.begin() + last);
+    }
+    inline void erase (const_iterator begin, const_iterator end)  {
+
+        vector_.erase (begin, end);
+    }
+
 private:
 
     vector_type vector_ {  };

diff --git a/test/gen_rand_tester.cc b/test/gen_rand_tester.cc
@@ -132,7 +132,8 @@ int main(int, char *[]) {
 
         r = gen_normal_dist<double>(1024);
         for (auto citer : r)
-            assert(citer == 1.0);
+            std::cout << citer << ", ";
+        std::cout << std::endl;
     }
 
     {