Merge branch 'develop'

dpilger26 · Aug 5, 2021 · 6d07554 · 6d07554
2 parents 74e5754 + e7ed3ab
commit 6d07554
Show file tree

Hide file tree

Showing 1,319 changed files with 12,791 additions and 12,194 deletions.
diff --git a/README.md b/README.md
@@ -1,11 +1,11 @@
 ![NumCpp logo](https://github.com/dpilger26/NumCpp/raw/master/docs/logo/NumCppLogo.png)
 
-<!-- [![GitHub watchers](https://img.shields.io/github/watchers/dpilger26/NumCpp.svg?style=social&label=Watch&maxAge=2592000)](https://GitHub.com/dpilger26/NumCpp/watchers/)
+[![GitHub watchers](https://img.shields.io/github/watchers/dpilger26/NumCpp.svg?style=social&label=Watch&maxAge=2592000)](https://GitHub.com/dpilger26/NumCpp/watchers/)
 [![GitHub stars](https://img.shields.io/github/stars/dpilger26/NumCpp.svg?style=social&label=Star&maxAge=2592000)](https://GitHub.com/dpilger26/NumCpp/stargazers/)
-[![GitHub forks](https://img.shields.io/github/forks/dpilger26/NumCpp.svg?style=social&label=Fork&maxAge=2592000)](https://GitHub.com/dpilger26/NumCpp/network/)   -->
+[![GitHub forks](https://img.shields.io/github/forks/dpilger26/NumCpp.svg?style=social&label=Fork&maxAge=2592000)](https://GitHub.com/dpilger26/NumCpp/network/)
 
 [![Build status](https://ci.appveyor.com/api/projects/status/slxre2j64qc8ubvl/branch/master?svg=true)](https://ci.appveyor.com/project/dpilger26/numcpp/branch/master)
-[![Build Status](https://travis-ci.org/dpilger26/NumCpp.svg?branch=master)](https://travis-ci.org/dpilger26/NumCpp)
+[![Build Status](https://travis-ci.com/dpilger26/NumCpp.svg?branch=master)](https://travis-ci.com/dpilger26/NumCpp)
 [![Codacy Badge](https://api.codacy.com/project/badge/Grade/ea24c08d892e4beebd46cfca260823c1)](https://app.codacy.com/manual/dpilger26/NumCpp?utm_source=github.com&utm_medium=referral&utm_content=dpilger26/NumCpp&utm_campaign=Badge_Grade_Dashboard)
 
 # NumCpp: A Templatized Header Only C++ Implementation of the [Python NumPy Library](http://www.numpy.org)
@@ -24,9 +24,9 @@
 [![C++20](https://img.shields.io/badge/C%2B%2B-20-blue.svg)](https://isocpp.org/std/the-standard)
 
 **Compilers:**  
-Visual Studio: 2017, 2019  
-GNU: 6.5, 7.5, 8.4, 9.3, 10.1  
-Clang: 6, 7, 8, 9, 10  
+Visual Studio: 2017, 2019, 2022  
+GNU: 6.5, 7.5, 8.4, 9.3, 10.1, 11.1  
+Clang: 6, 7, 8, 9, 10, 11, 12  
 
 **Boost Versions:**  
 1.68+
@@ -85,8 +85,8 @@ Many initializer functions are provided that return `NdArray`s for common needs.
 | ```a[2:5, 5:8]```                                        | ```a(nc::Slice(2, 5), nc::Slice(5, 8))```                |
 |                                                          | ```a({2, 5}, {5, 8})```                                  |
 | ```a[:, 7]```                                            | ```a(a.rSlice(), 7)```                                   |
-| ```a[a > 5]```                                           | ```a[a > 50]```                                          |
-| ```a[a > 5] = 0```                                       | ```a.putMask(a > 50, 666)```                             |
+| ```a[a > 5]```                                           | ```a[a > 0]```                                           |
+| ```a[a > 5] = 0```                                       | ```a.putMask(a > 5, 0)```                                |
 
 ### RANDOM
 
@@ -95,10 +95,10 @@ The random module provides simple ways to create random arrays.
 | **NumPy**                                                | **NumCpp**                                               |
 |:--------------------------------------------------------:|:--------------------------------------------------------:|
 | ```np.random.seed(666)```                                | ```nc::random::seed(666)```                              |
-| ```np.random.randn(3, 4)```                              | ```nc::random::randN<double>(nc::Shape(3,4))```          |
+| ```np.random.randn(3, 4)```                              | ```nc::random::randN<double>(nc::Shape(3, 4))```         |
 |                                                          | ```nc::random::randN<double>({3, 4})```                  |
-| ```np.random.randint(0, 10, [3, 4])```                   | ```nc::random::randInt<int>(nc::Shape(3,4),0,10)```      |
-|                                                          | ```nc::random::randInt<int>({3, 4},0,10)```              |
+| ```np.random.randint(0, 10, [3, 4])```                   | ```nc::random::randInt<int>(nc::Shape(3, 4), 0, 10)```   |
+|                                                          | ```nc::random::randInt<int>({3, 4}, 0, 10)```            |
 | ```np.random.rand(3, 4)```                               | ```nc::random::rand<double>(nc::Shape(3,4))```           |
 |                                                          | ```nc::random::rand<double>({3, 4})```                   |
 | ```np.random.choice(a, 3)```                             | ```nc::random::choice(a, 3)```                           |

diff --git a/docs/doxygen/Doxyfile.in b/docs/doxygen/Doxyfile.in
@@ -795,6 +795,7 @@ INPUT                  = @CMAKE_CURRENT_SOURCE_DIR@/README.md \
                          @CMAKE_CURRENT_SOURCE_DIR@/docs/markdown/ReleaseNotes.md \
                          @CMAKE_CURRENT_SOURCE_DIR@/docs/markdown/Installation.md \
                          @CMAKE_CURRENT_SOURCE_DIR@/docs/markdown/Building.md \
+                         @CMAKE_CURRENT_SOURCE_DIR@/docs/markdown/CompilerFlags.md \
                          @CMAKE_CURRENT_SOURCE_DIR@/include \
 
 # This tag can be used to specify the character encoding of the source files

diff --git a/docs/doxygen/html/_bisection_8hpp.html b/docs/doxygen/html/_bisection_8hpp.html
@@ -28,7 +28,7 @@
   <td id="projectlogo"><img alt="Logo" src="NumCppLogoDoxygen.png"/></td>
   <td id="projectalign" style="padding-left: 0.5em;">
    <div id="projectname">NumCpp
-   &#160;<span id="projectnumber">2.4.2</span>
+   &#160;<span id="projectnumber">2.5.0</span>
    </div>
    <div id="projectbrief">A Templatized Header Only C++ Implementation of the Python NumPy Library</div>
   </td>

diff --git a/docs/doxygen/html/_bisection_8hpp_source.html b/docs/doxygen/html/_bisection_8hpp_source.html
@@ -28,7 +28,7 @@
   <td id="projectlogo"><img alt="Logo" src="NumCppLogoDoxygen.png"/></td>
   <td id="projectalign" style="padding-left: 0.5em;">
    <div id="projectname">NumCpp
-   &#160;<span id="projectnumber">2.4.2</span>
+   &#160;<span id="projectnumber">2.5.0</span>
    </div>
    <div id="projectbrief">A Templatized Header Only C++ Implementation of the Python NumPy Library</div>
   </td>

diff --git a/docs/doxygen/html/_boost_interface_8hpp.html b/docs/doxygen/html/_boost_interface_8hpp.html
@@ -28,7 +28,7 @@
   <td id="projectlogo"><img alt="Logo" src="NumCppLogoDoxygen.png"/></td>
   <td id="projectalign" style="padding-left: 0.5em;">
    <div id="projectname">NumCpp
-   &#160;<span id="projectnumber">2.4.2</span>
+   &#160;<span id="projectnumber">2.5.0</span>
    </div>
    <div id="projectbrief">A Templatized Header Only C++ Implementation of the Python NumPy Library</div>
   </td>
@@ -85,49 +85,12 @@
 </div>
 
 <div class="header">
-  <div class="summary">
-<a href="#namespaces">Namespaces</a> &#124;
-<a href="#func-members">Functions</a>  </div>
   <div class="headertitle">
 <div class="title">BoostInterface.hpp File Reference</div>  </div>
 </div><!--header-->
 <div class="contents">
-<div class="textblock"><code>#include &quot;<a class="el" href="_error_8hpp_source.html">NumCpp/Core/Internal/Error.hpp</a>&quot;</code><br />
-<code>#include &quot;<a class="el" href="_core_2_shape_8hpp_source.html">NumCpp/Core/Shape.hpp</a>&quot;</code><br />
-<code>#include &quot;<a class="el" href="_nd_array_8hpp_source.html">NumCpp/NdArray.hpp</a>&quot;</code><br />
-<code>#include &quot;<a class="el" href="_boost_numpy_ndarray_helper_8hpp_source.html">NumCpp/PythonInterface/BoostNumpyNdarrayHelper.hpp</a>&quot;</code><br />
-<code>#include &quot;boost/python.hpp&quot;</code><br />
-<code>#include &quot;boost/python/numpy.hpp&quot;</code><br />
-<code>#include &lt;map&gt;</code><br />
-<code>#include &lt;string&gt;</code><br />
-</div>
+
 <p><a href="_boost_interface_8hpp_source.html">Go to the source code of this file.</a></p>
-<table class="memberdecls">
-<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="namespaces"></a>
-Namespaces</h2></td></tr>
-<tr class="memitem:namespacenc"><td class="memItemLeft" align="right" valign="top"> &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="namespacenc.html">nc</a></td></tr>
-<tr class="separator:"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:namespacenc_1_1boost_python_interface"><td class="memItemLeft" align="right" valign="top"> &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="namespacenc_1_1boost_python_interface.html">nc::boostPythonInterface</a></td></tr>
-<tr class="separator:"><td class="memSeparator" colspan="2">&#160;</td></tr>
-</table><table class="memberdecls">
-<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="func-members"></a>
-Functions</h2></td></tr>
-<tr class="memitem:a7195ee32d5fb06600aba55dc53b193ca"><td class="memTemplParams" colspan="2">template&lt;typename dtype &gt; </td></tr>
-<tr class="memitem:a7195ee32d5fb06600aba55dc53b193ca"><td class="memTemplItemLeft" align="right" valign="top">NdArray&lt; dtype &gt;&#160;</td><td class="memTemplItemRight" valign="bottom"><a class="el" href="namespacenc_1_1boost_python_interface.html#a7195ee32d5fb06600aba55dc53b193ca">nc::boostPythonInterface::boost2Nc</a> (const boost::python::numpy::ndarray &amp;inArray)</td></tr>
-<tr class="separator:a7195ee32d5fb06600aba55dc53b193ca"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:aafe87a2533a53c470b051e7499131e47"><td class="memTemplParams" colspan="2">template&lt;typename T &gt; </td></tr>
-<tr class="memitem:aafe87a2533a53c470b051e7499131e47"><td class="memTemplItemLeft" align="right" valign="top">std::vector&lt; T &gt;&#160;</td><td class="memTemplItemRight" valign="bottom"><a class="el" href="namespacenc_1_1boost_python_interface.html#aafe87a2533a53c470b051e7499131e47">nc::boostPythonInterface::list2vector</a> (const boost::python::list &amp;inList)</td></tr>
-<tr class="separator:aafe87a2533a53c470b051e7499131e47"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:a7b68a63c83bc9e6de7ba941342e8862f"><td class="memTemplParams" colspan="2">template&lt;class Key , class Value &gt; </td></tr>
-<tr class="memitem:a7b68a63c83bc9e6de7ba941342e8862f"><td class="memTemplItemLeft" align="right" valign="top">boost::python::dict&#160;</td><td class="memTemplItemRight" valign="bottom"><a class="el" href="namespacenc_1_1boost_python_interface.html#a7b68a63c83bc9e6de7ba941342e8862f">nc::boostPythonInterface::map2dict</a> (const std::map&lt; Key, Value &gt; &amp;inMap)</td></tr>
-<tr class="separator:a7b68a63c83bc9e6de7ba941342e8862f"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:a6ab60209d41ac522bcbf51d03e03b0b6"><td class="memTemplParams" colspan="2">template&lt;typename dtype &gt; </td></tr>
-<tr class="memitem:a6ab60209d41ac522bcbf51d03e03b0b6"><td class="memTemplItemLeft" align="right" valign="top">boost::python::numpy::ndarray&#160;</td><td class="memTemplItemRight" valign="bottom"><a class="el" href="namespacenc_1_1boost_python_interface.html#a6ab60209d41ac522bcbf51d03e03b0b6">nc::boostPythonInterface::nc2Boost</a> (const NdArray&lt; dtype &gt; &amp;inArray)</td></tr>
-<tr class="separator:a6ab60209d41ac522bcbf51d03e03b0b6"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:adc8d67693f9ad1c0ea5c4cd6ff89d532"><td class="memTemplParams" colspan="2">template&lt;typename T &gt; </td></tr>
-<tr class="memitem:adc8d67693f9ad1c0ea5c4cd6ff89d532"><td class="memTemplItemLeft" align="right" valign="top">boost::python::list&#160;</td><td class="memTemplItemRight" valign="bottom"><a class="el" href="namespacenc_1_1boost_python_interface.html#adc8d67693f9ad1c0ea5c4cd6ff89d532">nc::boostPythonInterface::vector2list</a> (std::vector&lt; T &gt; &amp;inVector)</td></tr>
-<tr class="separator:adc8d67693f9ad1c0ea5c4cd6ff89d532"><td class="memSeparator" colspan="2">&#160;</td></tr>
-</table>
 <a name="details" id="details"></a><h2 class="groupheader">Detailed Description</h2>
 <div class="textblock"><dl class="section author"><dt>Author</dt><dd>David Pilger <a href="#" onclick="location.href='mai'+'lto:'+'dpi'+'lg'+'er2'+'6@'+'gma'+'il'+'.co'+'m'; return false;">dpilg<span style="display: none;">.nosp@m.</span>er26<span style="display: none;">.nosp@m.</span>@gmai<span style="display: none;">.nosp@m.</span>l.co<span style="display: none;">.nosp@m.</span>m</a> <a href="https://github.com/dpilger26/NumCpp">GitHub Repository</a></dd></dl>
 <p>License Copyright 2018-2021 David Pilger</p>