update year + versioN

CMakeLists.txt

@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.2)
 
 set(CMAKE_CXX_STANDARD 11)
 
-project(wdm VERSION 0.1.0)
+project(wdm VERSION 0.2.2)
 
 include(cmake/options.cmake               REQUIRED)
 

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2018 Thomas Nagler
+Copyright (c) 2020 Thomas Nagler
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

docs/annotated.html

@@ -116,7 +116,7 @@
 </div>
 </div>
 <hr class="footer"/><address class="footer"><small>
-Generated on Tue May 29 2018 12:31:29 for wdm by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Tue May 29 2020 12:31:29 for wdm by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.11
 </small></address>

docs/bbeta_8hpp_source.html

@@ -103,7 +103,7 @@
 <div class="title">bbeta.hpp</div>  </div>
 </div><!--header-->
 <div class="contents">
-<div class="fragment"><div class="line"><a name="l00001"></a><span class="lineno">    1</span>&#160;<span class="comment">// Copyright © 2018 Thomas Nagler</span></div><div class="line"><a name="l00002"></a><span class="lineno">    2</span>&#160;<span class="comment">//</span></div><div class="line"><a name="l00003"></a><span class="lineno">    3</span>&#160;<span class="comment">// This file is part of the wdm library and licensed under the terms of</span></div><div class="line"><a name="l00004"></a><span class="lineno">    4</span>&#160;<span class="comment">// the MIT license. For a copy, see the LICENSE file in the root directory</span></div><div class="line"><a name="l00005"></a><span class="lineno">    5</span>&#160;<span class="comment">// or https://github.com/tnagler/wdm/blob/master/LICENSE.</span></div><div class="line"><a name="l00006"></a><span class="lineno">    6</span>&#160;</div><div class="line"><a name="l00007"></a><span class="lineno">    7</span>&#160;<span class="preprocessor">#pragma once</span></div><div class="line"><a name="l00008"></a><span class="lineno">    8</span>&#160;</div><div class="line"><a name="l00009"></a><span class="lineno">    9</span>&#160;<span class="preprocessor">#include &quot;utils.hpp&quot;</span></div><div class="line"><a name="l00010"></a><span class="lineno">   10</span>&#160;</div><div class="line"><a name="l00011"></a><span class="lineno"><a class="line" href="namespacewdm.html">   11</a></span>&#160;<span class="keyword">namespace </span><a class="code" href="namespacewdm.html">wdm</a> {</div><div class="line"><a name="l00012"></a><span class="lineno">   12</span>&#160;    </div><div class="line"><a name="l00013"></a><span class="lineno">   13</span>&#160;<span class="keyword">namespace </span>impl {</div><div class="line"><a name="l00014"></a><span class="lineno">   14</span>&#160;</div><div class="line"><a name="l00018"></a><span class="lineno">   18</span>&#160;<span class="keyword">inline</span> <span class="keywordtype">double</span> bbeta(<span class="keyword">const</span> std::vector&lt;double&gt;&amp; x,</div><div class="line"><a name="l00019"></a><span class="lineno">   19</span>&#160;                    <span class="keyword">const</span> std::vector&lt;double&gt;&amp; y,</div><div class="line"><a name="l00020"></a><span class="lineno">   20</span>&#160;                    std::vector&lt;double&gt; weights = std::vector&lt;double&gt;())</div><div class="line"><a name="l00021"></a><span class="lineno">   21</span>&#160;{</div><div class="line"><a name="l00022"></a><span class="lineno">   22</span>&#160;    utils::check_sizes(x, y, weights);</div><div class="line"><a name="l00023"></a><span class="lineno">   23</span>&#160;    <span class="keywordtype">size_t</span> n = x.size();</div><div class="line"><a name="l00024"></a><span class="lineno">   24</span>&#160;</div><div class="line"><a name="l00025"></a><span class="lineno">   25</span>&#160;    <span class="comment">// find the medians</span></div><div class="line"><a name="l00026"></a><span class="lineno">   26</span>&#160;    <span class="keywordtype">double</span> med_x = impl::median(x, weights);</div><div class="line"><a name="l00027"></a><span class="lineno">   27</span>&#160;    <span class="keywordtype">double</span> med_y = impl::median(y, weights);</div><div class="line"><a name="l00028"></a><span class="lineno">   28</span>&#160;</div><div class="line"><a name="l00029"></a><span class="lineno">   29</span>&#160;    <span class="keywordflow">if</span> (weights.size() == 0)</div><div class="line"><a name="l00030"></a><span class="lineno">   30</span>&#160;        weights = std::vector&lt;double&gt;(n, 1.0);</div><div class="line"><a name="l00031"></a><span class="lineno">   31</span>&#160;</div><div class="line"><a name="l00032"></a><span class="lineno">   32</span>&#160;    <span class="comment">// count elements in lower left and upper right quadrants</span></div><div class="line"><a name="l00033"></a><span class="lineno">   33</span>&#160;    <span class="keywordtype">double</span> w_acc{0.0};</div><div class="line"><a name="l00034"></a><span class="lineno">   34</span>&#160;    <span class="keywordflow">for</span> (<span class="keywordtype">size_t</span> i = 0; i &lt; n; i++) {</div><div class="line"><a name="l00035"></a><span class="lineno">   35</span>&#160;        <span class="keywordflow">if</span> ((x[i] &lt;= med_x) &amp;&amp; (y[i] &lt;= med_y))</div><div class="line"><a name="l00036"></a><span class="lineno">   36</span>&#160;            w_acc += weights[i];</div><div class="line"><a name="l00037"></a><span class="lineno">   37</span>&#160;        <span class="keywordflow">else</span> <span class="keywordflow">if</span> ((x[i] &gt; med_x) &amp;&amp; (y[i] &gt; med_y))</div><div class="line"><a name="l00038"></a><span class="lineno">   38</span>&#160;            w_acc += weights[i];</div><div class="line"><a name="l00039"></a><span class="lineno">   39</span>&#160;    }</div><div class="line"><a name="l00040"></a><span class="lineno">   40</span>&#160;</div><div class="line"><a name="l00041"></a><span class="lineno">   41</span>&#160;    <span class="keywordflow">return</span> 2 * w_acc / utils::sum(weights) - 1;</div><div class="line"><a name="l00042"></a><span class="lineno">   42</span>&#160;}</div><div class="line"><a name="l00043"></a><span class="lineno">   43</span>&#160;</div><div class="line"><a name="l00044"></a><span class="lineno">   44</span>&#160;}</div><div class="line"><a name="l00045"></a><span class="lineno">   45</span>&#160;</div><div class="line"><a name="l00046"></a><span class="lineno">   46</span>&#160;}</div><div class="ttc" id="namespacewdm_html"><div class="ttname"><a href="namespacewdm.html">wdm</a></div><div class="ttdoc">Weighted dependence measures. </div><div class="ttdef"><b>Definition:</b> bbeta.hpp:11</div></div>
+<div class="fragment"><div class="line"><a name="l00001"></a><span class="lineno">    1</span>&#160;<span class="comment">// Copyright © 2020 Thomas Nagler</span></div><div class="line"><a name="l00002"></a><span class="lineno">    2</span>&#160;<span class="comment">//</span></div><div class="line"><a name="l00003"></a><span class="lineno">    3</span>&#160;<span class="comment">// This file is part of the wdm library and licensed under the terms of</span></div><div class="line"><a name="l00004"></a><span class="lineno">    4</span>&#160;<span class="comment">// the MIT license. For a copy, see the LICENSE file in the root directory</span></div><div class="line"><a name="l00005"></a><span class="lineno">    5</span>&#160;<span class="comment">// or https://github.com/tnagler/wdm/blob/master/LICENSE.</span></div><div class="line"><a name="l00006"></a><span class="lineno">    6</span>&#160;</div><div class="line"><a name="l00007"></a><span class="lineno">    7</span>&#160;<span class="preprocessor">#pragma once</span></div><div class="line"><a name="l00008"></a><span class="lineno">    8</span>&#160;</div><div class="line"><a name="l00009"></a><span class="lineno">    9</span>&#160;<span class="preprocessor">#include &quot;utils.hpp&quot;</span></div><div class="line"><a name="l00010"></a><span class="lineno">   10</span>&#160;</div><div class="line"><a name="l00011"></a><span class="lineno"><a class="line" href="namespacewdm.html">   11</a></span>&#160;<span class="keyword">namespace </span><a class="code" href="namespacewdm.html">wdm</a> {</div><div class="line"><a name="l00012"></a><span class="lineno">   12</span>&#160;    </div><div class="line"><a name="l00013"></a><span class="lineno">   13</span>&#160;<span class="keyword">namespace </span>impl {</div><div class="line"><a name="l00014"></a><span class="lineno">   14</span>&#160;</div><div class="line"><a name="l00018"></a><span class="lineno">   18</span>&#160;<span class="keyword">inline</span> <span class="keywordtype">double</span> bbeta(<span class="keyword">const</span> std::vector&lt;double&gt;&amp; x,</div><div class="line"><a name="l00019"></a><span class="lineno">   19</span>&#160;                    <span class="keyword">const</span> std::vector&lt;double&gt;&amp; y,</div><div class="line"><a name="l00020"></a><span class="lineno">   20</span>&#160;                    std::vector&lt;double&gt; weights = std::vector&lt;double&gt;())</div><div class="line"><a name="l00021"></a><span class="lineno">   21</span>&#160;{</div><div class="line"><a name="l00022"></a><span class="lineno">   22</span>&#160;    utils::check_sizes(x, y, weights);</div><div class="line"><a name="l00023"></a><span class="lineno">   23</span>&#160;    <span class="keywordtype">size_t</span> n = x.size();</div><div class="line"><a name="l00024"></a><span class="lineno">   24</span>&#160;</div><div class="line"><a name="l00025"></a><span class="lineno">   25</span>&#160;    <span class="comment">// find the medians</span></div><div class="line"><a name="l00026"></a><span class="lineno">   26</span>&#160;    <span class="keywordtype">double</span> med_x = impl::median(x, weights);</div><div class="line"><a name="l00027"></a><span class="lineno">   27</span>&#160;    <span class="keywordtype">double</span> med_y = impl::median(y, weights);</div><div class="line"><a name="l00028"></a><span class="lineno">   28</span>&#160;</div><div class="line"><a name="l00029"></a><span class="lineno">   29</span>&#160;    <span class="keywordflow">if</span> (weights.size() == 0)</div><div class="line"><a name="l00030"></a><span class="lineno">   30</span>&#160;        weights = std::vector&lt;double&gt;(n, 1.0);</div><div class="line"><a name="l00031"></a><span class="lineno">   31</span>&#160;</div><div class="line"><a name="l00032"></a><span class="lineno">   32</span>&#160;    <span class="comment">// count elements in lower left and upper right quadrants</span></div><div class="line"><a name="l00033"></a><span class="lineno">   33</span>&#160;    <span class="keywordtype">double</span> w_acc{0.0};</div><div class="line"><a name="l00034"></a><span class="lineno">   34</span>&#160;    <span class="keywordflow">for</span> (<span class="keywordtype">size_t</span> i = 0; i &lt; n; i++) {</div><div class="line"><a name="l00035"></a><span class="lineno">   35</span>&#160;        <span class="keywordflow">if</span> ((x[i] &lt;= med_x) &amp;&amp; (y[i] &lt;= med_y))</div><div class="line"><a name="l00036"></a><span class="lineno">   36</span>&#160;            w_acc += weights[i];</div><div class="line"><a name="l00037"></a><span class="lineno">   37</span>&#160;        <span class="keywordflow">else</span> <span class="keywordflow">if</span> ((x[i] &gt; med_x) &amp;&amp; (y[i] &gt; med_y))</div><div class="line"><a name="l00038"></a><span class="lineno">   38</span>&#160;            w_acc += weights[i];</div><div class="line"><a name="l00039"></a><span class="lineno">   39</span>&#160;    }</div><div class="line"><a name="l00040"></a><span class="lineno">   40</span>&#160;</div><div class="line"><a name="l00041"></a><span class="lineno">   41</span>&#160;    <span class="keywordflow">return</span> 2 * w_acc / utils::sum(weights) - 1;</div><div class="line"><a name="l00042"></a><span class="lineno">   42</span>&#160;}</div><div class="line"><a name="l00043"></a><span class="lineno">   43</span>&#160;</div><div class="line"><a name="l00044"></a><span class="lineno">   44</span>&#160;}</div><div class="line"><a name="l00045"></a><span class="lineno">   45</span>&#160;</div><div class="line"><a name="l00046"></a><span class="lineno">   46</span>&#160;}</div><div class="ttc" id="namespacewdm_html"><div class="ttname"><a href="namespacewdm.html">wdm</a></div><div class="ttdoc">Weighted dependence measures. </div><div class="ttdef"><b>Definition:</b> bbeta.hpp:11</div></div>
 </div><!-- fragment --></div><!-- contents -->
 <!-- HTML footer for doxygen 1.8.8-->
 <!-- start footer part -->
@@ -113,7 +113,7 @@
 </div>
 </div>
 <hr class="footer"/><address class="footer"><small>
-Generated on Tue May 29 2018 12:31:29 for wdm by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Tue May 29 2020 12:31:29 for wdm by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.11
 </small></address>

docs/classes.html

@@ -119,7 +119,7 @@
 </div>
 </div>
 <hr class="footer"/><address class="footer"><small>
-Generated on Tue May 29 2018 12:31:29 for wdm by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Tue May 29 2020 12:31:29 for wdm by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.11
 </small></address>

docs/classwdm_1_1_indep__test-members.html

@@ -124,7 +124,7 @@
 </div>
 </div>
 <hr class="footer"/><address class="footer"><small>
-Generated on Tue May 29 2018 12:31:29 for wdm by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Tue May 29 2020 12:31:29 for wdm by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.11
 </small></address>

docs/classwdm_1_1_indep__test.html

@@ -231,7 +231,7 @@
 </div>
 </div>
 <hr class="footer"/><address class="footer"><small>
-Generated on Tue May 29 2018 12:31:29 for wdm by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Tue May 29 2020 12:31:29 for wdm by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.11
 </small></address>

docs/dir_13e138d54eb8818da29c3992edef070a.html

@@ -116,7 +116,7 @@
 </div>
 </div>
 <hr class="footer"/><address class="footer"><small>
-Generated on Tue May 29 2018 12:31:29 for wdm by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Tue May 29 2020 12:31:29 for wdm by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.11
 </small></address>

docs/dir_19b2bf9199a15c634a08b1ede1dd896a.html

@@ -116,7 +116,7 @@
 </div>
 </div>
 <hr class="footer"/><address class="footer"><small>
-Generated on Tue May 29 2018 12:31:29 for wdm by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Tue May 29 2020 12:31:29 for wdm by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.11
 </small></address>

docs/dir_49e56c817e5e54854c35e136979f97ca.html

@@ -119,7 +119,7 @@
 </div>
 </div>
 <hr class="footer"/><address class="footer"><small>
-Generated on Tue May 29 2018 12:31:29 for wdm by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Tue May 29 2020 12:31:29 for wdm by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.11
 </small></address>

docs/dir_9716b91408bcf7b26097f649d6973cae.html

@@ -116,7 +116,7 @@
 </div>
 </div>
 <hr class="footer"/><address class="footer"><small>
-Generated on Tue May 29 2018 12:31:29 for wdm by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Tue May 29 2020 12:31:29 for wdm by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.11
 </small></address>

docs/dir_98e64370d6093558065858b6bf42b719.html

@@ -116,7 +116,7 @@
 </div>
 </div>
 <hr class="footer"/><address class="footer"><small>
-Generated on Tue May 29 2018 12:31:29 for wdm by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Tue May 29 2020 12:31:29 for wdm by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.11
 </small></address>

docs/dir_cfafba98a580ce4b62f8a6fa96d7cbb0.html

@@ -116,7 +116,7 @@
 </div>
 </div>
 <hr class="footer"/><address class="footer"><small>
-Generated on Tue May 29 2018 12:31:29 for wdm by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Tue May 29 2020 12:31:29 for wdm by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.11
 </small></address>

docs/dir_d44c64559bbebec7f509842c48db8b23.html

@@ -122,7 +122,7 @@
 </div>
 </div>
 <hr class="footer"/><address class="footer"><small>
-Generated on Tue May 29 2018 12:31:29 for wdm by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Tue May 29 2020 12:31:29 for wdm by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.11
 </small></address>

docs/dir_dedda661d52f15c544835a0f3f778e7c.html

@@ -116,7 +116,7 @@
 </div>
 </div>
 <hr class="footer"/><address class="footer"><small>
-Generated on Tue May 29 2018 12:31:29 for wdm by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Tue May 29 2020 12:31:29 for wdm by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.11
 </small></address>