Hello community,
here is the log from the commit of package armadillo for openSUSE:Factory
checked in at 2020-07-24 13:35:48
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/armadillo (Old)
and /work/SRC/openSUSE:Factory/.armadillo.new.3592 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "armadillo"
Fri Jul 24 13:35:48 2020 rev:137 rq:822610 version:9.900.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/armadillo/armadillo.changes 2020-06-23
21:07:29.402403515 +0200
+++ /work/SRC/openSUSE:Factory/.armadillo.new.3592/armadillo.changes
2020-07-24 13:36:07.770725455 +0200
@@ -1,0 +2,6 @@
+Wed Jul 22 09:24:53 UTC 2020 - Atri Bhattacharya <badshah...@gmail.com>
+
+- Update to version 9.900.2:
+ * Bug-fix release, no changelog from upstream.
+
+-------------------------------------------------------------------
Old:
----
armadillo-9.900.1.tar.xz
New:
----
armadillo-9.900.2.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ armadillo.spec ++++++
--- /var/tmp/diff_new_pack.Jm4ozg/_old 2020-07-24 13:36:10.890728558 +0200
+++ /var/tmp/diff_new_pack.Jm4ozg/_new 2020-07-24 13:36:10.894728562 +0200
@@ -18,7 +18,7 @@
%define soname libarmadillo9
Name: armadillo
-Version: 9.900.1
+Version: 9.900.2
Release: 0
Summary: C++ matrix library with interfaces to LAPACK and ATLAS
License: Apache-2.0
++++++ armadillo-9.900.1.tar.xz -> armadillo-9.900.2.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/armadillo-9.900.1/CMakeLists.txt
new/armadillo-9.900.2/CMakeLists.txt
--- old/armadillo-9.900.1/CMakeLists.txt 2016-06-16 18:21:11.000000000
+0200
+++ new/armadillo-9.900.2/CMakeLists.txt 2016-06-16 18:21:12.000000000
+0200
@@ -466,6 +466,12 @@
endif()
endif()
+
+if(MINGW OR MSYS OR CYGWIN OR MSVC)
+ # MinGW doesn't correctly handle thread_local
+ set(ARMA_USE_EXTERN_CXX11_RNG false)
+endif()
+
message(STATUS "ARMA_USE_EXTERN_CXX11_RNG = ${ARMA_USE_EXTERN_CXX11_RNG}")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/armadillo-9.900.1/README.md
new/armadillo-9.900.2/README.md
--- old/armadillo-9.900.1/README.md 2016-06-16 18:21:11.000000000 +0200
+++ new/armadillo-9.900.2/README.md 2016-06-16 18:21:12.000000000 +0200
@@ -366,7 +366,7 @@
Armadillo will enable extra features (such as move constructors)
when a C++11/C++14 compiler is detected. You can also force Armadillo
-to make use C++11 features by defining ARMA_USE_CXX11 before
+to make use of C++11 features by defining ARMA_USE_CXX11 before
`#include <armadillo>` in your code.
You may need to explicitly enable C++11 mode in your compiler.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/armadillo-9.900.1/docs.html
new/armadillo-9.900.2/docs.html
--- old/armadillo-9.900.1/docs.html 2016-06-16 18:21:11.000000000 +0200
+++ new/armadillo-9.900.2/docs.html 2016-06-16 18:21:12.000000000 +0200
@@ -25,7 +25,8 @@
<!--
body
{
- font-family: "Trebuchet MS", "Droid Sans", sans-serif;
+ /* font-family: "Trebuchet MS", "Droid Sans", sans-serif; */
+ font-family: "Trebuchet MS", sans-serif;
color: #000000;
background-color: #FFFFFF;
/* font-size: 10pt; */
@@ -2363,121 +2364,120 @@
<li>
Provide access to individual elements or objects stored in a container object
(ie. <i>Mat</i>, <i>Col</i>, <i>Row</i>, <i>Cube</i>, <i>field</i>)<br>
- <br>
+<br>
<ul>
- <table style="text-align: left; width: 100%;"
- border="0" cellpadding="2" cellspacing="2">
- <tbody>
- <tr>
- <td style="vertical-align: top;">
- <code>(n)</code>
- </td>
- <td style="vertical-align: top;"> <br>
- </td>
- <td style="vertical-align: top;">
+<table style="text-align: left; width: 100%;" border="0" cellpadding="2"
cellspacing="2">
+<tbody>
+ <tr>
+ <td style="vertical-align: top;">
+ <code>(n)</code>
+ </td>
+ <td style="vertical-align: top;"> <br>
+ </td>
+ <td style="vertical-align: top;">
For <i>vec</i> and <i>rowvec</i>, access the <i>n</i>-th element.
For <i>mat</i>, <i>cube</i> and <i>field</i>, access the <i>n</i>-th
element/object under the assumption of a flat layout,
with column-major ordering of data (ie. column by column).
A <i>std::logic_error</i> exception is thrown if the requested element is
out of bounds.
The bounds check can be <a href="#element_access_bounds_check_note">optionally
disabled</a> at compile-time to get more speed.
- </td>
- </tr>
+ </td>
+</tr>
<tr>
<td> </td>
<td> </td>
<td> </td>
</tr>
- <tr>
- <td style="vertical-align: top;">
-
<code>.at(n)</code> or <code>[n]</code>
- </td>
- <td style="vertical-align: top;"><br>
- </td>
- <td style="vertical-align: top;">
-As for <i>(n)</i>, but without a bounds check.
+<tr>
+ <td style="vertical-align: top;">
+ <code>.at(n)</code> or <code>[n]</code>
+ </td>
+ <td style="vertical-align: top;"><br>
+ </td>
+ <td style="vertical-align: top;">
+As for <code>(n)</code>, but without a bounds check.
Not recommended for use unless your code has been thoroughly debugged.
- </td>
- </tr>
+ </td>
+</tr>
<tr>
<td> </td>
<td> </td>
<td> </td>
</tr>
- <tr>
- <td style="vertical-align: top;">
- <code>(i,j)</code>
- </td>
- <td style="vertical-align: top;"><br>
- </td>
- <td style="vertical-align: top;">
+<tr>
+ <td style="vertical-align: top;">
+ <code>(i,j)</code>
+ </td>
+ <td style="vertical-align: top;"><br>
+ </td>
+ <td style="vertical-align: top;">
For <i>mat</i> and <i>2D field</i> classes, access the element/object stored
at the <i>i</i>-th row and <i>j</i>-th column.
A <i>std::logic_error</i> exception is thrown if the requested element is
out of bounds.
The bounds check can be <a href="#element_access_bounds_check_note">optionally
disabled</a> at compile-time to get more speed.
- </td>
- </tr>
+ </td>
+</tr>
<tr>
<td> </td>
<td> </td>
<td> </td>
</tr>
- <tr>
- <td style="vertical-align: top;">
- <code>.at(i,j)</code>
- </td>
- <td style="vertical-align: top;"><br>
- </td>
- <td style="vertical-align: top;">
-As for <i>(i,j)</i>, but without a bounds check.
+<tr>
+ <td style="vertical-align: top;">
+ <code>.at(i,j)</code>
+ </td>
+ <td style="vertical-align: top;"><br>
+ </td>
+ <td style="vertical-align: top;">
+As for <code>(i,j)</code>, but without a bounds check.
Not recommended for use unless your code has been thoroughly debugged.
</td>
- <td style="vertical-align: top;"><br>
- </td>
- </tr>
+ <td style="vertical-align: top;"><br>
+ </td>
+</tr>
<tr>
<td> </td>
<td> </td>
<td> </td>
</tr>
- <tr>
- <td style="vertical-align: top;">
- <code>(i,j,k)</code>
- </td>
- <td style="vertical-align: top;"><br>
- </td>
- <td style="vertical-align: top;">
+<tr>
+ <td style="vertical-align: top;">
+ <code>(i,j,k)</code>
+ </td>
+ <td style="vertical-align: top;"><br>
+ </td>
+ <td style="vertical-align: top;">
For <i>cube</i> and <i>3D field</i> classes, access the element/object stored
at the <i>i</i>-th row, <i>j</i>-th column and <i>k</i>-th slice.
A <i>std::logic_error</i> exception is thrown if the requested element is
out of bounds.
The bounds check can be <a href="#element_access_bounds_check_note">optionally
disabled</a> at compile-time to get more speed.
- </td>
- </tr>
+ </td>
+</tr>
<tr>
<td> </td>
<td> </td>
<td> </td>
</tr>
- <tr>
- <td style="vertical-align: top;">
- <code>.at(i,j,k)</code>
- </td>
- <td style="vertical-align: top;"><br>
- </td>
- <td style="vertical-align: top;">
-As for <i>(i,j,k)</i>, but without a bounds check.
+<tr>
+ <td style="vertical-align: top;">
+ <code>.at(i,j,k)</code>
+ </td>
+ <td style="vertical-align: top;"><br>
+ </td>
+ <td style="vertical-align: top;">
+As for <code>(i,j,k)</code>, but without a bounds check.
Not recommended for use unless your code has been thoroughly debugged.</td>
- </tr>
- </tbody>
- </table>
+ </tr>
+ </tbody>
+</table>
</ul>
</li>
<br>
<a name="element_access_bounds_check_note"></a>
<li>
-The bounds checks used by the <i>(n)</i>, <i>(i,j)</i> and <i>(i,j,k)</i>
element access forms
+The bounds checks used by the <code>(n)</code>, <code>(i,j)</code> and
<code>(i,j,k)</code> element access forms
can be disabled by defining the <a
href="#config_hpp_arma_no_debug">ARMA_NO_DEBUG</a> macro
-before including the <i>armadillo</i> header file (eg. <i>#define
ARMA_NO_DEBUG</i>).
-Alternatively, the <i>.at(n)</i>, <i>.at(i,j)</i> and <i>.at(i,j,k)</i>
element access forms can be used,
+before including the <i>armadillo</i> header file (eg. <code>#define
ARMA_NO_DEBUG</code>).
+Alternatively, the <code>.at(n)</code>, <code>.at(i,j)</code> and
<code>.at(i,j,k)</code> element access forms can be used,
which do not have bounds checks.
-Either way, disabling the bounds checks is not recommended until your code has
been thoroughly tested and debugged
+Either way, <b>disabling the bounds checks is not recommended</b> until your
code has been thoroughly tested and debugged
-- it's better to write correct code first, and then maximise its speed.
</li>
<br>
@@ -2488,6 +2488,12 @@
</li>
<br>
<li>
+<b>Caveat:</b>
+accessing elements via <code>[i,j]</code> and <code>[i,j,k]</code> does not
work correctly in C++;
+instead use <code>(i,j)</code> and <code>(i,j,k)</code>
+</li>
+<br>
+<li>
Examples:
<ul>
<pre>
@@ -18901,47 +18907,22 @@
<ul>
<li>faster <a href="#solve">solve()</a> for under/over-determined systems</li>
<li>faster <a href="#eig_gen">eig_gen()</a> and <a
href="#eig_pair">eig_pair()</a> for large matrices</li>
-<li>expanded <a href="#eig_gen">eig_gen()</a> and <a
href="#eig_pair">eig_pair()</a> to optionally provide left and right
eigenvectors</li>
-</ul>
-</li>
-<br>
-<a name="version_9880"></a>
-<li>Version 9.880:
-<ul>
-<li>expanded <a href="#qr">qr()</a> to optionally use pivoted
decomposition</li>
-<li>updated <a href="#constants">physical constants</a> to NIST 2018 CODATA
values</li>
-<li>added <code>ARMA_DONT_USE_CXX11_MUTEX</code> <a
href="#config_hpp">confguration option</a> to disable use of
<i>std::mutex</i></li>
-</ul>
-</li>
-<br>
-<a name="version_9870"></a>
-<li>Version 9.870:
-<ul>
<li>faster handling of matrix multiplication expressions by <a
href="#diagvec">diagvec()</a> and <a href="#diagmat">diagmat()</a></li>
-<li>added <a href="#trimat_ind">trimatu_ind()</a> and <a
href="#trimat_ind">trimatl_ind()</a></li>
-<li>more consistent detection of sparse vector expressions</li>
-</ul>
-</li>
-<br>
-<a name="version_9860"></a>
-<li>Version 9.860:
-<ul>
-<li>added <a href="#powmat">powmat()</a></li>
-<li>faster access to columns in sparse submatrix views</li>
<li>faster handling of relational expressions by <a
href="#accu">accu()</a></li>
<li>faster handling of sympd matrices by <a href="#expmat">expmat()</a>, <a
href="#logmat">logmat()</a>, <a href="#sqrtmat">sqrtmat()</a></li>
-<li>workaround for <a href="#save_load_mat">save/load</a> issues with HDF5
v1.12</li>
-</ul>
-</li>
-<br>
-<a name="version_9850"></a>
-<li>Version 9.850:
-<ul>
-<li>faster handling of compound expressions by <a
href="#diagmat">diagmat()</a></li>
-<li>expanded <a href="#save_load_mat">.save()</a> and <a
href="#save_load_mat">.load()</a> to handle CSV files with headers via
<i>csv_name(filename,header)</i> specification</li>
+<li>faster access to columns in sparse submatrix views</li>
+<li>added <a href="#quantile">quantile()</a></li>
+<li>added <a href="#powmat">powmat()</a></li>
+<li>added <a href="#trimat_ind">trimatu_ind()</a> and <a
href="#trimat_ind">trimatl_ind()</a></li>
<li>added <a href="#log_normpdf">log_normpdf()</a></li>
<li>added <a href="#is_zero">.is_zero()</a></li>
-<li>added <a href="#quantile">quantile()</a></li>
+<li>added <code>ARMA_DONT_USE_CXX11_MUTEX</code> <a
href="#config_hpp">configuration option</a> to disable use of
<i>std::mutex</i></li>
+<li>expanded <a href="#eig_gen">eig_gen()</a> and <a
href="#eig_pair">eig_pair()</a> to optionally provide left and right
eigenvectors</li>
+<li>expanded <a href="#qr">qr()</a> to optionally use pivoted
decomposition</li>
+<li>expanded <a href="#save_load_mat">.save()</a> and <a
href="#save_load_mat">.load()</a> to handle CSV files with headers via
<i>csv_name(filename,header)</i> specification</li>
+<li>more consistent detection of sparse vector expressions</li>
+<li>updated <a href="#constants">physical constants</a> to NIST 2018 CODATA
values</li>
+<li>workaround for <a href="#save_load_mat">save/load</a> issues with HDF5
v1.12</li>
</ul>
</li>
<br>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/armadillo-9.900.1/include/armadillo_bits/SpMat_meat.hpp
new/armadillo-9.900.2/include/armadillo_bits/SpMat_meat.hpp
--- old/armadillo-9.900.1/include/armadillo_bits/SpMat_meat.hpp 2016-06-16
18:21:11.000000000 +0200
+++ new/armadillo-9.900.2/include/armadillo_bits/SpMat_meat.hpp 2016-06-16
18:21:12.000000000 +0200
@@ -6601,10 +6601,6 @@
* Insert an element at the given position, and return a reference to it.
* The element will be set to 0, unless otherwise specified.
* If the element already exists, its value will be overwritten.
- *
- * @param in_row Row of new element.
- * @param in_col Column of new element.
- * @param in_val Value to set new element to (default 0).
*/
template<typename eT>
inline
@@ -6693,9 +6689,6 @@
/**
* Delete an element at the given position.
- *
- * @param in_row Row of element to be deleted.
- * @param in_col Column of element to be deleted.
*/
template<typename eT>
inline
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/armadillo-9.900.1/include/armadillo_bits/arma_version.hpp
new/armadillo-9.900.2/include/armadillo_bits/arma_version.hpp
--- old/armadillo-9.900.1/include/armadillo_bits/arma_version.hpp
2016-06-16 18:21:11.000000000 +0200
+++ new/armadillo-9.900.2/include/armadillo_bits/arma_version.hpp
2016-06-16 18:21:12.000000000 +0200
@@ -21,7 +21,7 @@
#define ARMA_VERSION_MAJOR 9
#define ARMA_VERSION_MINOR 900
-#define ARMA_VERSION_PATCH 1
+#define ARMA_VERSION_PATCH 2
#define ARMA_VERSION_NAME "Nocturnal Misbehaviour"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/armadillo-9.900.1/include/armadillo_bits/op_sort_meat.hpp
new/armadillo-9.900.2/include/armadillo_bits/op_sort_meat.hpp
--- old/armadillo-9.900.1/include/armadillo_bits/op_sort_meat.hpp
2016-06-16 18:21:11.000000000 +0200
+++ new/armadillo-9.900.2/include/armadillo_bits/op_sort_meat.hpp
2016-06-16 18:21:12.000000000 +0200
@@ -115,9 +115,6 @@
return;
}
- arma_debug_check( (sort_type > 1), "sort(): parameter 'sort_type' must be 0
or 1" );
- arma_debug_check( (X.has_nan()), "sort(): detected NaN"
);
-
if(dim == 0) // sort the contents of each column
{
arma_extra_debug_print("op_sort::apply(): dim = 0");
@@ -177,12 +174,15 @@
typedef typename T1::elem_type eT;
const quasi_unwrap<T1> U(in.m);
-
- const Mat<eT>& X = U.M;
+ const Mat<eT>& X = U.M;
const uword sort_type = in.aux_uword_a;
const uword dim = in.aux_uword_b;
+ arma_debug_check( (sort_type > 1), "sort(): parameter 'sort_type' must be 0
or 1" );
+ arma_debug_check( (dim > 1), "sort(): parameter 'dim' must be 0 or 1"
);
+ arma_debug_check( (X.has_nan()), "sort(): detected NaN"
);
+
if(U.is_alias(out))
{
Mat<eT> tmp;
@@ -208,24 +208,34 @@
typedef typename T1::elem_type eT;
- const quasi_unwrap<T1> U(in.m);
-
+ const unwrap<T1> U(in.m); // not using quasi_unwrap, to ensure there is
no aliasing with subviews
const Mat<eT>& X = U.M;
const uword sort_type = in.aux_uword_a;
- const uword dim = (T1::is_xvec) ? uword(U.M.is_rowvec() ? 1 : 0) :
uword((T1::is_row) ? 1 : 0);
- if(U.is_alias(out))
+ arma_debug_check( (sort_type > 1), "sort(): parameter 'sort_type' must be 0
or 1" );
+ arma_debug_check( (X.has_nan()), "sort(): detected NaN"
);
+
+ out = X; // not checking for aliasing, to allow inplace sorting of vectors
+
+ if(out.n_elem <= 1) { return; }
+
+ eT* out_mem = out.memptr();
+
+ eT* start_ptr = out_mem;
+ eT* endp1_ptr = &out_mem[out.n_elem];
+
+ if(sort_type == 0)
{
- Mat<eT> tmp;
-
- op_sort::apply_noalias(tmp, X, sort_type, dim);
+ arma_lt_comparator<eT> comparator;
- out.steal_mem(tmp);
+ std::sort(start_ptr, endp1_ptr, comparator);
}
else
{
- op_sort::apply_noalias(out, X, sort_type, dim);
+ arma_gt_comparator<eT> comparator;
+
+ std::sort(start_ptr, endp1_ptr, comparator);
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/armadillo-9.900.1/misc/armadillo.spec
new/armadillo-9.900.2/misc/armadillo.spec
--- old/armadillo-9.900.1/misc/armadillo.spec 2016-06-16 18:21:11.000000000
+0200
+++ new/armadillo-9.900.2/misc/armadillo.spec 2016-06-16 18:21:12.000000000
+0200
@@ -1,5 +1,5 @@
Name: armadillo
-Version: 9.100.0
+Version: 9.900.x
Release: 1%{?dist}
Summary: Fast C++ matrix library with syntax similar to MATLAB and
Octave
@@ -93,9 +93,8 @@
%doc README.md index.html docs.html
%doc examples armadillo_icon.png
%doc armadillo_joss_2016.pdf
-%doc arma_spmat_icms_2018.pdf
-%doc arma_gmm_joss_2017.pdf
-%doc arma_gmm_spcs_2017.pdf
-%doc rcpp_armadillo_csda_2014.pdf
+%doc armadillo_lncs_2018.pdf
%doc armadillo_nicta_2010.pdf
+%doc armadillo_spcs_2017.pdf
+%doc rcpp_armadillo_csda_2014.pdf
%doc mex_interface
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/armadillo-9.900.1/misc/doxygen.config
new/armadillo-9.900.2/misc/doxygen.config
--- old/armadillo-9.900.1/misc/doxygen.config 2016-06-16 18:21:11.000000000
+0200
+++ new/armadillo-9.900.2/misc/doxygen.config 2016-06-16 18:21:12.000000000
+0200
@@ -1,51 +1,63 @@
-# Doxyfile 1.5.8
+# Doxyfile 1.8.17
#---------------------------------------------------------------------------
# Project related configuration options
#---------------------------------------------------------------------------
-
DOXYFILE_ENCODING = UTF-8
-PROJECT_NAME = "Armadillo Technical"
-PROJECT_NUMBER = ""
-OUTPUT_DIRECTORY =
+PROJECT_NAME = "Doxygen Generated"
+PROJECT_NUMBER =
+PROJECT_BRIEF =
+PROJECT_LOGO =
+OUTPUT_DIRECTORY =
CREATE_SUBDIRS = NO
+ALLOW_UNICODE_NAMES = NO
OUTPUT_LANGUAGE = English
+OUTPUT_TEXT_DIRECTION = None
BRIEF_MEMBER_DESC = YES
REPEAT_BRIEF = YES
-ABBREVIATE_BRIEF =
+ABBREVIATE_BRIEF =
ALWAYS_DETAILED_SEC = YES
INLINE_INHERITED_MEMB = NO
FULL_PATH_NAMES = NO
-STRIP_FROM_PATH =
-STRIP_FROM_INC_PATH =
-SHORT_NAMES = YES
+STRIP_FROM_PATH =
+STRIP_FROM_INC_PATH =
+SHORT_NAMES = NO
JAVADOC_AUTOBRIEF = NO
+JAVADOC_BANNER = NO
QT_AUTOBRIEF = NO
MULTILINE_CPP_IS_BRIEF = YES
INHERIT_DOCS = YES
SEPARATE_MEMBER_PAGES = NO
TAB_SIZE = 2
-ALIASES =
+ALIASES =
+TCL_SUBST =
OPTIMIZE_OUTPUT_FOR_C = NO
OPTIMIZE_OUTPUT_JAVA = NO
OPTIMIZE_FOR_FORTRAN = NO
OPTIMIZE_OUTPUT_VHDL = NO
-EXTENSION_MAPPING =
+OPTIMIZE_OUTPUT_SLICE = NO
+EXTENSION_MAPPING =
+MARKDOWN_SUPPORT = YES
+TOC_INCLUDE_HEADINGS = 5
+AUTOLINK_SUPPORT = YES
BUILTIN_STL_SUPPORT = YES
CPP_CLI_SUPPORT = NO
SIP_SUPPORT = NO
IDL_PROPERTY_SUPPORT = YES
DISTRIBUTE_GROUP_DOC = NO
+GROUP_NESTED_COMPOUNDS = NO
SUBGROUPING = YES
+INLINE_GROUPED_CLASSES = NO
+INLINE_SIMPLE_STRUCTS = NO
TYPEDEF_HIDES_STRUCT = NO
-SYMBOL_CACHE_SIZE = 0
-
+LOOKUP_CACHE_SIZE = 0
#---------------------------------------------------------------------------
# Build related configuration options
#---------------------------------------------------------------------------
-
EXTRACT_ALL = YES
EXTRACT_PRIVATE = YES
+EXTRACT_PRIV_VIRTUAL = NO
+EXTRACT_PACKAGE = NO
EXTRACT_STATIC = YES
EXTRACT_LOCAL_CLASSES = YES
EXTRACT_LOCAL_METHODS = NO
@@ -57,222 +69,239 @@
INTERNAL_DOCS = NO
CASE_SENSE_NAMES = NO
HIDE_SCOPE_NAMES = NO
+HIDE_COMPOUND_REFERENCE= NO
SHOW_INCLUDE_FILES = YES
+SHOW_GROUPED_MEMB_INC = NO
+FORCE_LOCAL_INCLUDES = NO
INLINE_INFO = YES
SORT_MEMBER_DOCS = NO
SORT_BRIEF_DOCS = NO
+SORT_MEMBERS_CTORS_1ST = NO
SORT_GROUP_NAMES = NO
SORT_BY_SCOPE_NAME = NO
+STRICT_PROTO_MATCHING = NO
GENERATE_TODOLIST = YES
GENERATE_TESTLIST = YES
GENERATE_BUGLIST = YES
GENERATE_DEPRECATEDLIST= YES
-ENABLED_SECTIONS =
+ENABLED_SECTIONS =
MAX_INITIALIZER_LINES = 30
SHOW_USED_FILES = NO
-SHOW_DIRECTORIES = YES
SHOW_FILES = YES
SHOW_NAMESPACES = YES
-FILE_VERSION_FILTER =
-LAYOUT_FILE =
-
+FILE_VERSION_FILTER =
+LAYOUT_FILE =
+CITE_BIB_FILES =
#---------------------------------------------------------------------------
-# configuration options related to warning and progress messages
+# Configuration options related to warning and progress messages
#---------------------------------------------------------------------------
-
QUIET = YES
WARNINGS = NO
WARN_IF_UNDOCUMENTED = YES
WARN_IF_DOC_ERROR = YES
WARN_NO_PARAMDOC = NO
+WARN_AS_ERROR = NO
WARN_FORMAT = "$file:$line: $text"
-WARN_LOGFILE =
-
+WARN_LOGFILE =
#---------------------------------------------------------------------------
-# configuration options related to the input files
+# Configuration options related to the input files
#---------------------------------------------------------------------------
-
-INPUT = build_aux/doxygen/ \
- include/ \
- include/armadillo_bits
-
+INPUT = include/ include/armadillo_bits/ src/ misc/
INPUT_ENCODING = UTF-8
-
-FILE_PATTERNS = armadillo \
- *.hpp \
- *.doxy
-
+FILE_PATTERNS = armadillo *.hpp *.cpp *.doxy
RECURSIVE = NO
-EXCLUDE =
+EXCLUDE =
EXCLUDE_SYMLINKS = NO
-EXCLUDE_PATTERNS =
-EXCLUDE_SYMBOLS =
-EXAMPLE_PATH =
-EXAMPLE_PATTERNS =
+EXCLUDE_PATTERNS =
+EXCLUDE_SYMBOLS =
+EXAMPLE_PATH =
+EXAMPLE_PATTERNS =
EXAMPLE_RECURSIVE = NO
-IMAGE_PATH =
-INPUT_FILTER =
-FILTER_PATTERNS =
+IMAGE_PATH =
+INPUT_FILTER =
+FILTER_PATTERNS =
FILTER_SOURCE_FILES = NO
-
+FILTER_SOURCE_PATTERNS =
+USE_MDFILE_AS_MAINPAGE =
#---------------------------------------------------------------------------
-# configuration options related to source browsing
+# Configuration options related to source browsing
#---------------------------------------------------------------------------
-
SOURCE_BROWSER = YES
-INLINE_SOURCES = YES
+INLINE_SOURCES = NO
STRIP_CODE_COMMENTS = NO
REFERENCED_BY_RELATION = YES
REFERENCES_RELATION = YES
REFERENCES_LINK_SOURCE = YES
+SOURCE_TOOLTIPS = YES
USE_HTAGS = NO
VERBATIM_HEADERS = YES
-
#---------------------------------------------------------------------------
-# configuration options related to the alphabetical class index
+# Configuration options related to the alphabetical class index
#---------------------------------------------------------------------------
-
ALPHABETICAL_INDEX = YES
COLS_IN_ALPHA_INDEX = 5
-IGNORE_PREFIX =
-
+IGNORE_PREFIX =
#---------------------------------------------------------------------------
-# configuration options related to the HTML output
+# Configuration options related to the HTML output
#---------------------------------------------------------------------------
-
GENERATE_HTML = YES
-HTML_OUTPUT = docs_tech
+HTML_OUTPUT = doxygen_generated
HTML_FILE_EXTENSION = .html
-HTML_HEADER =
-HTML_FOOTER = build_aux/doxygen/blank_footer.html
-HTML_STYLESHEET =
-HTML_ALIGN_MEMBERS = YES
+HTML_HEADER =
+HTML_FOOTER = misc/blank_footer.html
+HTML_STYLESHEET =
+HTML_EXTRA_STYLESHEET =
+HTML_EXTRA_FILES =
+HTML_COLORSTYLE_HUE = 220
+HTML_COLORSTYLE_SAT = 100
+HTML_COLORSTYLE_GAMMA = 80
+HTML_TIMESTAMP = NO
+HTML_DYNAMIC_MENUS = YES
HTML_DYNAMIC_SECTIONS = NO
+HTML_INDEX_NUM_ENTRIES = 100
GENERATE_DOCSET = NO
DOCSET_FEEDNAME = "Doxygen generated docs"
DOCSET_BUNDLE_ID = org.doxygen.Project
+DOCSET_PUBLISHER_ID = org.doxygen.Publisher
+DOCSET_PUBLISHER_NAME = Publisher
GENERATE_HTMLHELP = NO
-CHM_FILE =
-HHC_LOCATION =
+CHM_FILE =
+HHC_LOCATION =
GENERATE_CHI = NO
-CHM_INDEX_ENCODING =
+CHM_INDEX_ENCODING =
BINARY_TOC = NO
TOC_EXPAND = NO
GENERATE_QHP = NO
-QCH_FILE =
-QHP_NAMESPACE =
+QCH_FILE =
+QHP_NAMESPACE =
QHP_VIRTUAL_FOLDER = doc
-QHP_CUST_FILTER_NAME =
-QHP_CUST_FILTER_ATTRS =
-QHP_SECT_FILTER_ATTRS =
-QHG_LOCATION =
+QHP_CUST_FILTER_NAME =
+QHP_CUST_FILTER_ATTRS =
+QHP_SECT_FILTER_ATTRS =
+QHG_LOCATION =
+GENERATE_ECLIPSEHELP = NO
+ECLIPSE_DOC_ID = org.doxygen.Project
DISABLE_INDEX = NO
-ENUM_VALUES_PER_LINE = 4
GENERATE_TREEVIEW = YES
+ENUM_VALUES_PER_LINE = 4
TREEVIEW_WIDTH = 250
+EXT_LINKS_IN_WINDOW = NO
FORMULA_FONTSIZE = 10
-
+FORMULA_TRANSPARENT = YES
+FORMULA_MACROFILE =
+USE_MATHJAX = NO
+MATHJAX_FORMAT = HTML-CSS
+MATHJAX_RELPATH = https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/
+MATHJAX_EXTENSIONS =
+MATHJAX_CODEFILE =
+SEARCHENGINE = NO
+SERVER_BASED_SEARCH = NO
+EXTERNAL_SEARCH = NO
+SEARCHENGINE_URL =
+SEARCHDATA_FILE = searchdata.xml
+EXTERNAL_SEARCH_ID =
+EXTRA_SEARCH_MAPPINGS =
#---------------------------------------------------------------------------
-# configuration options related to the LaTeX output
+# Configuration options related to the LaTeX output
#---------------------------------------------------------------------------
-
GENERATE_LATEX = NO
-LATEX_OUTPUT = latex
-LATEX_CMD_NAME = latex
+LATEX_OUTPUT =
+LATEX_CMD_NAME =
MAKEINDEX_CMD_NAME = makeindex
+LATEX_MAKEINDEX_CMD = makeindex
COMPACT_LATEX = NO
PAPER_TYPE = a4wide
-EXTRA_PACKAGES =
-LATEX_HEADER =
+EXTRA_PACKAGES =
+LATEX_HEADER =
+LATEX_FOOTER =
+LATEX_EXTRA_STYLESHEET =
+LATEX_EXTRA_FILES =
PDF_HYPERLINKS = NO
USE_PDFLATEX = NO
LATEX_BATCHMODE = NO
LATEX_HIDE_INDICES = NO
-
+LATEX_SOURCE_CODE = NO
+LATEX_BIB_STYLE = plain
+LATEX_TIMESTAMP = NO
+LATEX_EMOJI_DIRECTORY =
#---------------------------------------------------------------------------
-# configuration options related to the RTF output
+# Configuration options related to the RTF output
#---------------------------------------------------------------------------
-
GENERATE_RTF = NO
RTF_OUTPUT = rtf
COMPACT_RTF = NO
RTF_HYPERLINKS = NO
-RTF_STYLESHEET_FILE =
-RTF_EXTENSIONS_FILE =
-
+RTF_STYLESHEET_FILE =
+RTF_EXTENSIONS_FILE =
+RTF_SOURCE_CODE = NO
#---------------------------------------------------------------------------
-# configuration options related to the man page output
+# Configuration options related to the man page output
#---------------------------------------------------------------------------
-
GENERATE_MAN = NO
MAN_OUTPUT = man
MAN_EXTENSION = .3
+MAN_SUBDIR =
MAN_LINKS = NO
-
#---------------------------------------------------------------------------
-# configuration options related to the XML output
+# Configuration options related to the XML output
#---------------------------------------------------------------------------
-
GENERATE_XML = NO
XML_OUTPUT = xml
-XML_SCHEMA =
-XML_DTD =
XML_PROGRAMLISTING = YES
-
+XML_NS_MEMB_FILE_SCOPE = NO
#---------------------------------------------------------------------------
-# configuration options for the AutoGen Definitions output
+# Configuration options related to the DOCBOOK output
+#---------------------------------------------------------------------------
+GENERATE_DOCBOOK = NO
+DOCBOOK_OUTPUT = docbook
+DOCBOOK_PROGRAMLISTING = NO
+#---------------------------------------------------------------------------
+# Configuration options for the AutoGen Definitions output
#---------------------------------------------------------------------------
-
GENERATE_AUTOGEN_DEF = NO
-
#---------------------------------------------------------------------------
-# configuration options related to the Perl module output
+# Configuration options related to the Perl module output
#---------------------------------------------------------------------------
-
GENERATE_PERLMOD = NO
PERLMOD_LATEX = NO
PERLMOD_PRETTY = YES
-PERLMOD_MAKEVAR_PREFIX =
-
+PERLMOD_MAKEVAR_PREFIX =
#---------------------------------------------------------------------------
-# Configuration options related to the preprocessor
+# Configuration options related to the preprocessor
#---------------------------------------------------------------------------
-
ENABLE_PREPROCESSING = NO
MACRO_EXPANSION = YES
EXPAND_ONLY_PREDEF = YES
SEARCH_INCLUDES = YES
-INCLUDE_PATH =
-INCLUDE_FILE_PATTERNS =
-PREDEFINED =
-EXPAND_AS_DEFINED =
+INCLUDE_PATH =
+INCLUDE_FILE_PATTERNS =
+PREDEFINED =
+EXPAND_AS_DEFINED =
SKIP_FUNCTION_MACROS = NO
-
#---------------------------------------------------------------------------
-# Configuration::additions related to external references
+# Configuration options related to external references
#---------------------------------------------------------------------------
-
-TAGFILES =
-GENERATE_TAGFILE =
+TAGFILES =
+GENERATE_TAGFILE =
ALLEXTERNALS = NO
EXTERNAL_GROUPS = YES
-PERL_PATH = /usr/bin/perl
-
+EXTERNAL_PAGES = YES
#---------------------------------------------------------------------------
-# Configuration options related to the dot tool
+# Configuration options related to the dot tool
#---------------------------------------------------------------------------
-
CLASS_DIAGRAMS = YES
-MSCGEN_PATH =
+DIA_PATH =
HIDE_UNDOC_RELATIONS = NO
HAVE_DOT = NO
-DOT_FONTNAME = FreeSans
+DOT_NUM_THREADS = 0
+DOT_FONTNAME =
DOT_FONTSIZE = 10
-DOT_FONTPATH =
+DOT_FONTPATH =
CLASS_GRAPH = YES
COLLABORATION_GRAPH = YES
GROUP_GRAPHS = YES
UML_LOOK = NO
+UML_LIMIT_NUM_FIELDS = 10
TEMPLATE_RELATIONS = YES
INCLUDE_GRAPH = YES
INCLUDED_BY_GRAPH = YES
@@ -281,17 +310,17 @@
GRAPHICAL_HIERARCHY = YES
DIRECTORY_GRAPH = YES
DOT_IMAGE_FORMAT = png
-DOT_PATH =
-DOTFILE_DIRS =
+INTERACTIVE_SVG = NO
+DOT_PATH =
+DOTFILE_DIRS =
+MSCFILE_DIRS =
+DIAFILE_DIRS =
+PLANTUML_JAR_PATH =
+PLANTUML_CFG_FILE =
+PLANTUML_INCLUDE_PATH =
DOT_GRAPH_MAX_NODES = 50
MAX_DOT_GRAPH_DEPTH = 0
-DOT_TRANSPARENT = YES
+DOT_TRANSPARENT = NO
DOT_MULTI_TARGETS = NO
GENERATE_LEGEND = YES
DOT_CLEANUP = YES
-
-#---------------------------------------------------------------------------
-# Options related to the search engine
-#---------------------------------------------------------------------------
-
-SEARCHENGINE = NO
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/armadillo-9.900.1/misc/main.doxy
new/armadillo-9.900.2/misc/main.doxy
--- old/armadillo-9.900.1/misc/main.doxy 2016-06-16 18:21:11.000000000
+0200
+++ new/armadillo-9.900.2/misc/main.doxy 2016-06-16 18:21:12.000000000
+0200
@@ -4,16 +4,8 @@
\htmlonly
<br>
-See the associated technical report for an overview of the internal
architecture:
+Main page: <a href=http://arma.sourceforge.net>http://arma.sourceforge.net</a>
<br>
-<ul>
-Conrad Sanderson.
-<br>Armadillo: An Open Source C++ Linear Algebra Library for Fast Prototyping
and Computationally Intensive Experiments.
-<br>Technical Report, NICTA, 2010.
-<br>
-<br><a href="http://arma.sourceforge.net/armadillo_nicta_2010.pdf";>online
PDF</a>
-
-</ul>
\endhtmlonly
*/
