Commit fe418c83 authored by Jason Rhinelander's avatar Jason Rhinelander

0.3.7-1~jessie1 backport

parent f1d0686f
eris (0.3.7-1~jessie1) stable; urgency=low
* Release 0.3.7
* Removed upstream-applied patches
* README: proper debian packages; no more cpack
* Updated comment about .so versions
* Fix MathJax CDN use when MathJax not installed
* Reverted unintended commit from fracdist
* sim->other<O>() was missing a test on O != Good
* Remove hack needed for g++-4.8
* Merge src/eris, include/eris -> eris/
* Fix include path stripping
* README repository updates and reorganization
-- Jason Rhinelander <jason@imaginary.ca> Tue, 03 Nov 2015 15:06:00 -0500
eris (0.3.6-2~jessie1) stable; urgency=medium
* Eigen 3.2.2 fix for jessie: don't specify size of null vector
......
From: Jason Rhinelander <jason@imaginary.ca>
Date: Thu, 29 Oct 2015 12:16:20 -0400
Subject: Allow overriding MATHJAX_PATH
The given path is used as-is, even if it doesn't (yet?) exist.
---
doc/CMakeLists.txt | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index d80e7fa..e80acc2 100644
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -9,7 +9,9 @@ endif()
# Can set NO_MATHJAX to true to skip looking for the system MathJax, in which
# case the default (MathJax via public CDN) will be used by doxygen.
set(mathjax_usable_path "")
-if (NOT NO_MATHJAX)
+if (MATHJAX_PATH)
+ set(mathjax_usable_path "${MATHJAX_PATH}")
+elseif (NOT NO_MATHJAX)
find_package(MathJax 2.3)
if(MATHJAX_FOUND)
set(mathjax_usable_path "${MATHJAX_PATH}")
From: Jason Rhinelander <jason@imaginary.ca>
Date: Thu, 29 Oct 2015 16:35:34 -0400
Subject: Eigen 3.2.2 fix: don't specify size of null vector
This results in a compilation error on jessie, and isn't needed (the
default constructor does what we want anyway).
---
src/eris/belief/BayesianLinearRestricted.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/eris/belief/BayesianLinearRestricted.cpp b/src/eris/belief/BayesianLinearRestricted.cpp
index 01db10a..fb082a5 100644
--- a/src/eris/belief/BayesianLinearRestricted.cpp
+++ b/src/eris/belief/BayesianLinearRestricted.cpp
@@ -168,7 +168,7 @@ void BayesianLinearRestricted::gibbsInitialize(const Ref<const VectorXd> &initia
if (not gibbs_r_Rbeta_) gibbs_r_Rbeta_.reset(
restrict_size_ == 0
- ? new VectorXd(0)
+ ? new VectorXd()
: new VectorXd(r() - R() * beta_));
const auto &r_minus_Rbeta_ = *gibbs_r_Rbeta_;
@@ -230,7 +230,7 @@ const VectorXd& BayesianLinearRestricted::drawGibbs() {
if (not gibbs_r_Rbeta_) gibbs_r_Rbeta_.reset(
restrict_size_ == 0
- ? new VectorXd(0)
+ ? new VectorXd()
: new VectorXd(r() - R() * beta_));
const auto &r_minus_Rbeta_ = *gibbs_r_Rbeta_;
0001-Allow-overriding-MATHJAX_PATH.patch
0002-Eigen-3.2.2-fix-don-t-specify-size-of-null-vector.patch
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment