Hello community, here is the log from the commit of package armadillo for openSUSE:Factory checked in at 2011-12-14 14:33:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/armadillo (Old) and /work/SRC/openSUSE:Factory/.armadillo.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "armadillo", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/armadillo/armadillo.changes 2011-12-12 16:56:06.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.armadillo.new/armadillo.changes 2011-12-14 14:33:06.000000000 +0100 @@ -1,0 +2,7 @@ +Mon Dec 12 11:52:42 UTC 2011 - [email protected] + +- Update to version 2.4.2: + + Clarified documentation for .reshape() + + Fix for handling of empty matrices by .resize() + +------------------------------------------------------------------- Old: ---- armadillo-2.4.1.tar.gz New: ---- armadillo-2.4.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ armadillo.spec ++++++ --- /var/tmp/diff_new_pack.thABcI/_old 2011-12-14 14:33:08.000000000 +0100 +++ /var/tmp/diff_new_pack.thABcI/_new 2011-12-14 14:33:08.000000000 +0100 @@ -18,7 +18,7 @@ Name: armadillo -Version: 2.4.1 +Version: 2.4.2 Release: 1 License: LGPL-3.0+ Summary: Fast C++ matrix library with interfaces to LAPACK and ATLAS ++++++ armadillo-2.4.1.tar.gz -> armadillo-2.4.2.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/armadillo-2.4.1/CMakeLists.txt new/armadillo-2.4.2/CMakeLists.txt --- old/armadillo-2.4.1/CMakeLists.txt 2011-12-06 13:48:50.000000000 +0100 +++ new/armadillo-2.4.2/CMakeLists.txt 2011-12-12 02:07:42.000000000 +0100 @@ -16,7 +16,7 @@ set(ARMA_MAJOR 2) set(ARMA_MINOR 4) -set(ARMA_PATCH 1) +set(ARMA_PATCH 2) message(STATUS "Configuring Armadillo ${ARMA_MAJOR}.${ARMA_MINOR}.${ARMA_PATCH}") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/armadillo-2.4.1/docs/index.html new/armadillo-2.4.2/docs/index.html --- old/armadillo-2.4.1/docs/index.html 2011-12-07 11:50:52.000000000 +0100 +++ new/armadillo-2.4.2/docs/index.html 2011-12-12 06:28:33.000000000 +0100 @@ -17,7 +17,7 @@ <tbody> <tr> <td style="text-align: left; vertical-align: top;"> - <font size=+2><b>Reference for Armadillo 2.4.1</b></font> + <font size=+2><b>Reference for Armadillo 2.4.2</b></font> <br> <font size=-1><b>(Loco Lounge Lizard)</b></font> </td> @@ -500,10 +500,8 @@ </li> <br> <li><b>Caveat:</b> -For mathematical correctness, scalars are treated as 1x1 matrices -during initialisation. -As such, the code below <b>will not</b> generate a 5x5 matrix with -every element equal to 123.0: +For mathematical correctness, scalars are treated as 1x1 matrices during initialisation. +As such, the code below <b>will not</b> generate a 5x5 matrix with every element equal to 123.0: <ul> <pre> mat A(5,5); @@ -739,10 +737,8 @@ </li> <br> <li><b>Caveat:</b> -For mathematical correctness, scalars are treated as 1x1 matrices -during initialisation. -As such, the code below <b>will not</b> generate a column vector with -every element equal to 123.0: +For mathematical correctness, scalars are treated as 1x1 matrices during initialisation. +As such, the code below <b>will not</b> generate a column vector with every element equal to 123.0: <ul> <pre> vec q(5); @@ -965,10 +961,8 @@ <br> <li> <b>Caveat:</b> -For mathematical correctness, scalars are treated as 1x1 matrices -during initialisation. -As such, the code below <b>will not</b> generate a row vector with -every element equal to 123.0: +For mathematical correctness, scalars are treated as 1x1 matrices during initialisation. +As such, the code below <b>will not</b> generate a row vector with every element equal to 123.0: <ul> <pre> rowvec r(5); @@ -1205,10 +1199,8 @@ </ul> </li> <li> -For mathematical correctness, scalars are treated as 1x1x1 cubes -during initialisation. -As such, the code below <b>will not</b> generate a cube with -every element equal to 123.0: +For mathematical correctness, scalars are treated as 1x1x1 cubes during initialisation. +As such, the code below <b>will not</b> generate a cube with every element equal to 123.0: <ul> <pre> cube c(5,6,7); @@ -1521,7 +1513,8 @@ vec b = X.diag(1); vec c = X.diag(-2); -X.diag() = randu<vec>(5); +X.diag() = randu<vec>(5); +X.diag() += 6; </pre> </ul> </li> @@ -1530,6 +1523,7 @@ See also: <ul> <li><a href="#diagvec">diagvec()</a></li> +<li><a href="#submat">submatrix views</a></li> </ul> </li> </ul> @@ -3268,7 +3262,7 @@ Recreate the object according to given size specifications, with the elements taken from the previous version of the object, either column-wise (dim=0) or row-wise (dim=1); -the elements in the recreated object are placed column-wise +the elements in the generated object are placed column-wise (ie. the first column is filled up before filling the second column) </li> <br> <li> @@ -3276,6 +3270,10 @@ </li> <br> <li> +This function can be used to vectorise a matrix (ie. concatenate all the columns or rows) +</li> +<br> +<li> The new total number of elements (according to the specified size) doesn't have to be the same as the previous total number of elements in the object </li> <br> @@ -3306,6 +3304,9 @@ <pre> mat A = randu<mat>(4,5); A.reshape(5,4); + +// vectorise A into a column vector: +A.reshape(A.n_elem, 1); </pre> </ul> </li> @@ -3812,7 +3813,7 @@ </li> <br> <li> -If you need to explicitly preserve data, use <a href="#reshape_member">.reshape()</a> +If you need to explicitly preserve data, use <a href="#reshape_member">.reshape()</a> or <a href="#resize_member">.resize()</a> </li> <br> <li> @@ -4110,6 +4111,7 @@ <li> See also: <ul> +<li><a href="#diag">.diag()</a></li> <li><a href="#colptr">.colptr()</a></li> <li><a href="#in_range">.in_range()</a></li> <li><a href="#find">find()</a></li> @@ -4908,6 +4910,7 @@ <li><a href="#randu_randn_member">.randu() & .randn()</a> (member functions)</li> <li><a href="#ones_standalone">ones()</a></li> <li><a href="#zeros_standalone">zeros()</a></li> +<li><a href="#shuffle">shuffle()</a></li> <li><a href="http://cplusplus.com/reference/clibrary/cstdlib/srand/";>std::srand()</a></li> <li><a href="#api_changes">API changes</a></li> </ul> @@ -6395,6 +6398,7 @@ <li><a href="#diagvec">diagvec()</a></li> <li><a href="#trimat">trimatu() / trimatl()</a></li> <li><a href="#symmat">symmatu() / symmatl()</a></li> +<li><a href="#reshape">reshape()</a></li> </ul> </li> <br> @@ -6612,7 +6616,7 @@ <li> Generate a matrix/cube sized according to given size specifications, whose elements are taken from the given matrix/cube, either column-wise (dim=0) or row-wise (dim=1); -the elements in the generated object are placed column-wise +the elements in the generated object are placed column-wise (ie. the first column is filled up before filling the second column) </li> <br> <li> @@ -6620,6 +6624,10 @@ </li> <br> <li> +This function can be used to create a vector representation of a matrix (ie. concatenate all the columns or rows) +</li> +<br> +<li> The total number of elements in the generated matrix/cube doesn't have to be the same as the total number of elements in the given matrix/cube </li> <br> @@ -6662,6 +6670,7 @@ <li><a href="#resize">resize()</a></li> <li><a href="#as_scalar">as_scalar()</a></li> <li><a href="#conv_to">conv_to()</a></li> +<li><a href="#diagmat">diagmat()</a></li> </ul> </li> <br> @@ -6715,7 +6724,6 @@ <br><b>shuffle(rowvec, dim=0)</b> <br><b>shuffle(colvec, dim=0)</b> <ul> -<br> <li> Shuffle the rows (dim=0) or columns (dim=1) of a matrix or vector </li> @@ -6729,8 +6737,16 @@ </pre> </ul> </li> +<br> +<li> +See also: +<ul> +<li><a href="#randu_randn_standalone">randu() / randn()</a></li> +<li><a href="#sort">sort()</a></li> </ul> +</li> <br> +</ul> <hr class="greyline"><br> <a name="sort"></a> @@ -6755,8 +6771,16 @@ </pre> </ul> </li> +<li> +See also: +<ul> +<li><a href="#sort_index">sort_index()</a></li> +<li><a href="#shuffle">shuffle()</a></li> +<li><a href="#randu_randn_standalone">randu() / randn()</a></li> </ul> +</li> <br> +</ul> <hr class="greyline"><br> <a name="sort_index"></a> @@ -6789,6 +6813,7 @@ See also: <ul> <li><a href="#find">find()</a></li> +<li><a href="#sort">sort()</a></li> </ul> </li> <br> @@ -9153,8 +9178,8 @@ </td> <td style="vertical-align: top;"> - initialisation via <a href="#element_initialisation">element initialisation</a>; - special element <i>endr</i> indicates <i>end of row</i> + <a href="#element_initialisation">element initialisation</a>, + with special element <i>endr</i> indicating <i>end of row</i> </td> </tr> <tr> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/armadillo-2.4.1/include/armadillo_bits/arma_version.hpp new/armadillo-2.4.2/include/armadillo_bits/arma_version.hpp --- old/armadillo-2.4.1/include/armadillo_bits/arma_version.hpp 2011-12-06 13:48:50.000000000 +0100 +++ new/armadillo-2.4.2/include/armadillo_bits/arma_version.hpp 2011-12-12 02:07:42.000000000 +0100 @@ -18,7 +18,7 @@ #define ARMA_VERSION_MAJOR 2 #define ARMA_VERSION_MINOR 4 -#define ARMA_VERSION_PATCH 1 +#define ARMA_VERSION_PATCH 2 #define ARMA_VERSION_NAME "Loco Lounge Lizard" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/armadillo-2.4.1/include/armadillo_bits/op_resize_meat.hpp new/armadillo-2.4.2/include/armadillo_bits/op_resize_meat.hpp --- old/armadillo-2.4.1/include/armadillo_bits/op_resize_meat.hpp 2011-12-06 13:45:01.000000000 +0100 +++ new/armadillo-2.4.2/include/armadillo_bits/op_resize_meat.hpp 2011-12-08 04:58:05.000000000 +0100 @@ -48,7 +48,7 @@ out.zeros(); } - if(out.n_elem > 0) + if( (out.n_elem > 0) && (A.n_elem > 0) ) { const uword end_row = (std::min)(out_n_rows, A_n_rows) - 1; const uword end_col = (std::min)(out_n_cols, A_n_cols) - 1; @@ -98,7 +98,7 @@ out.zeros(); } - if(out.n_elem > 0) + if( (out.n_elem > 0) && (A.n_elem > 0) ) { const uword end_row = (std::min)(out_n_rows, A_n_rows) - 1; const uword end_col = (std::min)(out_n_cols, A_n_cols) - 1; -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
