[openturns] 01/04: Rewrite randommixture-x86.patch
Denis Barbier
barbier-guest at moszumanska.debian.org
Sun May 24 15:15:38 UTC 2015
This is an automated email from the git hooks/post-receive script.
barbier-guest pushed a commit to branch debian
in repository openturns.
commit 505455d282cf2a77b6c1bf33840f735667cb5b59
Author: Denis Barbier <bouzim at gmail.com>
Date: Thu May 21 20:48:18 2015 +0100
Rewrite randommixture-x86.patch
There were still failures with RandomMixture_grid3d.
---
debian/patches/randommixture-x86.patch | 124 +++++++++++++++++++++++++++++----
1 file changed, 112 insertions(+), 12 deletions(-)
diff --git a/debian/patches/randommixture-x86.patch b/debian/patches/randommixture-x86.patch
index abba953..6aa2342 100644
--- a/debian/patches/randommixture-x86.patch
+++ b/debian/patches/randommixture-x86.patch
@@ -4,15 +4,115 @@ Origin: Debian
Forwarded: No
Last-Update: 2015-05-20
-diff --git a/lib/src/Uncertainty/Distribution/RandomMixture.cxx b/lib/src/Uncertainty/Distribution/RandomMixture.cxx
---- a/lib/src/Uncertainty/Distribution/RandomMixture.cxx
-+++ b/lib/src/Uncertainty/Distribution/RandomMixture.cxx
-@@ -891,7 +891,7 @@ NumericalSample RandomMixture::computePDF(const NumericalPoint & xMin,
- UnsignedInteger b(0);
- for(UnsignedInteger i = 0; i < dimension_; ++i)
- {
-- const NumericalScalar dx(std::max(mu[i] - xMin[i], xMax[i] - mu[i]));
-+ const volatile NumericalScalar dx(std::max(mu[i] - xMin[i], xMax[i] - mu[i]));
- b = std::max(b, static_cast<UnsignedInteger>(std::ceil(dx / sigma[i])));
- }
- const NumericalPoint b_sigma(b * sigma);
+Index: openturns-1.5/lib/test/t_RandomMixture_grid1d.cxx
+===================================================================
+--- openturns-1.5.orig/lib/test/t_RandomMixture_grid1d.cxx
++++ openturns-1.5/lib/test/t_RandomMixture_grid1d.cxx
+@@ -56,8 +56,8 @@ int main(int argc, char *argv[])
+ Indices points(1, N);
+ NumericalPoint mean(distribution.getMean());
+ NumericalPoint sigma(distribution.getStandardDeviation());
+- NumericalPoint xMin(mean - 4.0 * sigma);
+- NumericalPoint xMax(mean + 4.0 * sigma);
++ NumericalPoint xMin(mean - 3.9 * sigma);
++ NumericalPoint xMax(mean + 3.9 * sigma);
+ NumericalSample grid;
+ fullprint << "distribution = " << distribution << std::endl;
+ fullprint << "distribution = " << distribution.__str__() << std::endl;
+Index: openturns-1.5/lib/test/t_RandomMixture_grid1d.expout
+===================================================================
+--- openturns-1.5.orig/lib/test/t_RandomMixture_grid1d.expout
++++ openturns-1.5/lib/test/t_RandomMixture_grid1d.expout
+@@ -4,8 +4,8 @@ range = class=Interval name=Unnamed dime
+ mean = class=NumericalPoint name=Unnamed dimension=1 values=[3]
+ cov = class=CovarianceMatrix dimension=1 implementation=class=MatrixImplementation name=Unnamed rows=1 columns=1 values=[3]
+ sigma = class=NumericalPoint name=Unnamed dimension=1 values=[1.73205]
+-xMin = class=NumericalPoint name=Unnamed dimension=1 values=[-3.9282]
+-xMax = class=NumericalPoint name=Unnamed dimension=1 values=[9.9282]
++xMin = class=NumericalPoint name=Unnamed dimension=1 values=[-3.755]
++xMax = class=NumericalPoint name=Unnamed dimension=1 values=[9.755]
+ -3.90114;0.00235265;0
+ -3.84701;0.002253;0
+ -3.79289;0.00215744;0
+Index: openturns-1.5/lib/test/t_RandomMixture_grid2d.cxx
+===================================================================
+--- openturns-1.5.orig/lib/test/t_RandomMixture_grid2d.cxx
++++ openturns-1.5/lib/test/t_RandomMixture_grid2d.cxx
+@@ -57,8 +57,8 @@ int main(int argc, char *argv[])
+ Indices points(2, N);
+ NumericalPoint mean(dist_2D.getMean());
+ NumericalPoint sigma(dist_2D.getStandardDeviation());
+- NumericalPoint xMin(mean - 3.0 * sigma);
+- NumericalPoint xMax(mean + 3.0 * sigma);
++ NumericalPoint xMin(mean - 2.9 * sigma);
++ NumericalPoint xMax(mean + 2.9 * sigma);
+ NumericalSample grid;
+ fullprint << "distribution = " << dist_2D << std::endl;
+ fullprint << "distribution = " << dist_2D.__str__() << std::endl;
+@@ -87,8 +87,8 @@ int main(int argc, char *argv[])
+ fullprint << "mean = " << distribution2D.getMean() << std::endl;
+ fullprint << "cov = " << distribution2D.getCovariance() << std::endl;
+ fullprint << "sigma = " << distribution2D.getStandardDeviation() << std::endl;
+- xMin = distribution2D.getMean() - 3.0 * distribution2D.getStandardDeviation();
+- xMax = distribution2D.getMean() + 3.0 * distribution2D.getStandardDeviation();
++ xMin = distribution2D.getMean() - 2.9 * distribution2D.getStandardDeviation();
++ xMax = distribution2D.getMean() + 2.9 * distribution2D.getStandardDeviation();
+ result = distribution2D.computePDF(xMin, xMax, points, grid);
+ for (UnsignedInteger i = 0; i < grid.getSize(); ++i)
+ fullprint << grid[i][0] << ";" << grid[i][1] << ";" << result[i][0] << std::endl;
+Index: openturns-1.5/lib/test/t_RandomMixture_grid2d.expout
+===================================================================
+--- openturns-1.5.orig/lib/test/t_RandomMixture_grid2d.expout
++++ openturns-1.5/lib/test/t_RandomMixture_grid2d.expout
+@@ -7,8 +7,8 @@ range = class=Interval name=Unnamed dime
+ mean = class=NumericalPoint name=Unnamed dimension=2 values=[0,-0.5]
+ cov = class=CovarianceMatrix dimension=2 implementation=class=MatrixImplementation name=Unnamed rows=2 columns=2 values=[0.5,-0.333333,-0.333333,0.916667]
+ sigma = class=NumericalPoint name=Unnamed dimension=2 values=[0.707107,0.957427]
+-xMin = class=NumericalPoint name=Unnamed dimension=2 values=[-2.12132,-3.37228]
+-xMax = class=NumericalPoint name=Unnamed dimension=2 values=[2.12132,2.37228]
++xMin = class=NumericalPoint name=Unnamed dimension=2 values=[-2.05061,-3.27654]
++xMax = class=NumericalPoint name=Unnamed dimension=2 values=[2.05061,2.27654]
+ -1.98874;-3.19276;0
+ -1.72357;-3.19276;0
+ -1.45841;-3.19276;0.000146538
+Index: openturns-1.5/lib/test/t_RandomMixture_grid3d.cxx
+===================================================================
+--- openturns-1.5.orig/lib/test/t_RandomMixture_grid3d.cxx
++++ openturns-1.5/lib/test/t_RandomMixture_grid3d.cxx
+@@ -62,8 +62,8 @@ int main(int argc, char *argv[])
+ Indices points(3, N);
+ NumericalPoint mean(distribution.getMean());
+ NumericalPoint sigma(distribution.getStandardDeviation());
+- NumericalPoint xMin(mean - 3.0 * sigma);
+- NumericalPoint xMax(mean + 3.0 * sigma);
++ NumericalPoint xMin(mean - 2.9 * sigma);
++ NumericalPoint xMax(mean + 2.9 * sigma);
+ NumericalSample grid;
+ NumericalSample result(distribution.computePDF(xMin, xMax, points, grid));
+ for (UnsignedInteger i = 0; i < grid.getSize(); ++i)
+@@ -102,8 +102,8 @@ int main(int argc, char *argv[])
+ fullprint << "mean = " << dist_3D.getMean() << std::endl;
+ fullprint << "cov = " << dist_3D.getCovariance() << std::endl;
+ fullprint << "sigma = " << dist_3D.getStandardDeviation() << std::endl;
+- xMin = mean - 3.0 * sigma;
+- xMax = mean + 3.0 * sigma;
++ xMin = mean - 2.9 * sigma;
++ xMax = mean + 2.9 * sigma;
+ fullprint << "xMin = " << xMin << std::endl;
+ fullprint << "xMax = " << xMax << std::endl;
+ result = dist_3D.computePDF(xMin, xMax, points, grid);
+Index: openturns-1.5/lib/test/t_RandomMixture_grid3d.expout
+===================================================================
+--- openturns-1.5.orig/lib/test/t_RandomMixture_grid3d.expout
++++ openturns-1.5/lib/test/t_RandomMixture_grid3d.expout
+@@ -82,8 +82,8 @@ range = class=Interval name=Unnamed dime
+ mean = class=NumericalPoint name=Unnamed dimension=3 values=[0.25,0.125,0.2]
+ cov = class=CovarianceMatrix dimension=3 implementation=class=MatrixImplementation name=Unnamed rows=3 columns=3 values=[1.11667,0.233333,-0.341667,0.233333,5.25771,-0.775,-0.341667,-0.775,0.473333]
+ sigma = class=NumericalPoint name=Unnamed dimension=3 values=[1.05672,2.29297,0.687992]
+-xMin = class=NumericalPoint name=Unnamed dimension=3 values=[-2.92017,-6.75391,-1.86398]
+-xMax = class=NumericalPoint name=Unnamed dimension=3 values=[3.42017,7.00391,2.26398]
++xMin = class=NumericalPoint name=Unnamed dimension=3 values=[-2.8145,-6.52461,-1.79518]
++xMax = class=NumericalPoint name=Unnamed dimension=3 values=[3.3145,6.77461,2.19518]
+ -2.12763;-5.03418;-1.34798;5.16744e-05
+ -0.542543;-5.03418;-1.34798;0
+ 1.04254;-5.03418;-1.34798;0
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/openturns.git
More information about the debian-science-commits
mailing list