[SCM] Debian packaging for openturns www.openturns.org branch, debian, updated. debian/1.0-4-12-gd8d102d
Denis Barbier
bouzim at gmail.com
Mon Dec 3 07:04:16 UTC 2012
The following commit has been merged in the debian branch:
commit 1aea3fb266df087c50f09ac76a74bcccb5a78b23
Author: Denis Barbier <bouzim at gmail.com>
Date: Wed Nov 28 21:06:02 2012 +0100
Drop patches incorported upstream
bigendian-randomgenerator.patch
cmake-configdir.patch
cmake-tools.patch
fix-results-with-g++-4.7.patch
fix-tests-clang.patch
ftbfs-4.7.patch
ftbfs-clang.patch
installcheck.patch
no-link-python.patch
test-output.patch
diff --git a/debian/patches/bigendian-randomgenerator.patch b/debian/patches/bigendian-randomgenerator.patch
deleted file mode 100644
index 005a787..0000000
--- a/debian/patches/bigendian-randomgenerator.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-Description: Fix t_RandomGenerator_std unit test.
- It fails on PowerPC because of endianness.
-Author: Denis Barbier <bouzim at gmail.com>
-Origin: Debian
-Forwarded: http://trac.openturns.org/ticket/493
-Applied-Upstream: http://trac.openturns.org/changeset/2561
-Last-Update: 2012-06-15
-
-Index: openturns/lib/src/Base/Stat/dsfmt.h
-===================================================================
---- openturns.orig/lib/src/Base/Stat/dsfmt.h
-+++ openturns/lib/src/Base/Stat/dsfmt.h
-@@ -78,10 +78,17 @@ namespace tutils
- {
- uint32_t words[4];
- memcpy(&words[0], &u_[i], 16);
-+#ifdef __BIG_ENDIAN__
-+ state[4 * i ] = words[1];
-+ state[4 * i + 1] = words[0];
-+ state[4 * i + 2] = words[3];
-+ state[4 * i + 3] = words[2];
-+#else
- state[4 * i ] = words[0];
- state[4 * i + 1] = words[1];
- state[4 * i + 2] = words[2];
- state[4 * i + 3] = words[3];
-+#endif
- }
- }
-
-@@ -91,10 +98,17 @@ namespace tutils
- for (OT::UnsignedLong i = 0; i <= (uint32_t)(N); i++)
- {
- uint32_t words[4];
-+#ifdef __BIG_ENDIAN__
-+ words[1] = (uint32_t)(state[4 * i ]);
-+ words[0] = (uint32_t)(state[4 * i + 1]);
-+ words[3] = (uint32_t)(state[4 * i + 2]);
-+ words[2] = (uint32_t)(state[4 * i + 3]);
-+#else
- words[0] = (uint32_t)(state[4 * i ]);
- words[1] = (uint32_t)(state[4 * i + 1]);
- words[2] = (uint32_t)(state[4 * i + 2]);
- words[3] = (uint32_t)(state[4 * i + 3]);
-+#endif
- memcpy(&u_[i], &words[0], 16);
- }
- }
diff --git a/debian/patches/cmake-configdir.patch b/debian/patches/cmake-configdir.patch
deleted file mode 100644
index 03a8e4b..0000000
--- a/debian/patches/cmake-configdir.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Description: Let CMake install openturns.conf into
- ${OPENTURNS_SYSCONFIG_PATH}.
-Author: Denis Barbier <bouzim at gmail.com>
-Origin: Debian
-Forwarded: http://trac.openturns.org/ticket/472
-Applied-Upstream: http://trac.openturns.org/changeset/2509,http://trac.openturns.org/changeset/2510
-Last-Update: 2012-04-23
-
-Index: openturns/lib/etc/CMakeLists.txt
-===================================================================
---- openturns.orig/lib/etc/CMakeLists.txt
-+++ openturns/lib/etc/CMakeLists.txt
-@@ -32,6 +32,6 @@ configure_file ( ${CMAKE_CURRENT_SOURCE_
- @ONLY )
-
- install ( FILES ${CMAKE_CURRENT_BINARY_DIR}/openturns.conf
-- DESTINATION etc/openturns
-+ DESTINATION ${OPENTURNS_SYSCONFIG_PATH}/openturns
- PERMISSIONS OWNER_READ GROUP_READ WORLD_READ
- )
diff --git a/debian/patches/cmake-tools.patch b/debian/patches/cmake-tools.patch
deleted file mode 100644
index d14ca99..0000000
--- a/debian/patches/cmake-tools.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-Description: Fix openturns-config and openturns-module when
- built with CMake.
-Author: Denis Barbier <bouzim at gmail.com>
-Last-Update: 2012-05-19
-
-Index: openturns/lib/src/CMakeLists.txt
-===================================================================
---- openturns.orig/lib/src/CMakeLists.txt
-+++ openturns/lib/src/CMakeLists.txt
-@@ -35,6 +35,12 @@ configure_file ( ${CMAKE_CURRENT_SOURCE_
- ${CMAKE_CURRENT_BINARY_DIR}/openturns-config-build
- @ONLY
- )
-+set (WGET wget)
-+set (CURL curl)
-+set (prefix "${CMAKE_INSTALL_PREFIX}")
-+set (exec_prefix "${CMAKE_INSTALL_PREFIX}")
-+set (libdir "${INSTALL_PATH}/lib${LIB_SUFFIX}")
-+set (PACKAGE "${CPACK_PACKAGE_NAME}")
- configure_file ( ${CMAKE_CURRENT_SOURCE_DIR}/openturns-module-build.in
- ${CMAKE_CURRENT_BINARY_DIR}/openturns-module-build
- @ONLY
-Index: openturns/lib/src/openturns-config-build.cmake.in
-===================================================================
---- openturns.orig/lib/src/openturns-config-build.cmake.in
-+++ openturns/lib/src/openturns-config-build.cmake.in
-@@ -43,8 +43,8 @@ prefix=@CMAKE_INSTALL_PREFIX@
- exec_prefix=@CMAKE_INSTALL_PREFIX@
- bindir=@INSTALL_PATH@/bin
- sbindir=@INSTALL_PATH@/bin
--libdir=@OPENTURNS_INSTALL_PATH@/lib at LIB_SUFFIX@
--libexecdir=@OPENTURNS_INSTALL_PATH@/lib at LIB_SUFFIX@
-+libdir=@INSTALL_PATH@/lib at LIB_SUFFIX@
-+libexecdir=@INSTALL_PATH@/lib at LIB_SUFFIX@
- sysconfdir=@SYSCONFIG_PATH@
- datarootdir=@DATA_PATH@/$package
- mandir=@DATA_PATH@
-@@ -52,14 +52,14 @@ localedir=@DATA_PATH@
- infodir=@DATA_PATH@
- datadir=@DATA_PATH@
- m4dir=@DATA_PATH@/m4
--includedir=@OPENTURNS_INSTALL_PATH@/include
-+includedir=@INCLUDE_PATH@
- localstatedir=@DATA_PATH@
- sharedstatedir=@DATA_PATH@
-
- pkgincludedir=@INCLUDE_PATH@
- pkglibdir=@LIBRARY_PATH@
- pkgswigdir=$pkgincludedir/swig
--wrapperdir=$pkglibdir/wrappers
-+wrapperdir=@WRAPPER_PATH@
-
- if test $installed = yes
- then
diff --git a/debian/patches/fix-results-with-g++-4.7.patch b/debian/patches/fix-results-with-g++-4.7.patch
deleted file mode 100644
index 1e30552..0000000
--- a/debian/patches/fix-results-with-g++-4.7.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-Description: Without this patch, g++ 4.7 miscompiles OT, the following tests do fail:
- cppcheck_NumericalSample_std
- cppcheck_NumericalSample_computation
- cppcheck_ProcessSample_std
- cppcheck_Contour_std
- cppcheck_Distributions_draw
- cppcheck_BoxCoxFactory_std
- cppcheck_MinMax_computation
- cppcheck_VisualTest_std
-Author: Denis Barbier <bouzim at gmail.com>
-Origin: Vendor
-Forwarded: http://trac.openturns.org/ticket/495
-Applied-Upstream: http://trac.openturns.org/changeset/2559
-Last-Update: 2012-06-19
-
-
-diff --git a/lib/src/Base/Stat/NumericalSampleImplementation.cxx b/lib/src/Base/Stat/NumericalSampleImplementation.cxx
-index 3effce9..2e00f24 100644
---- a/lib/src/Base/Stat/NumericalSampleImplementation.cxx
-+++ b/lib/src/Base/Stat/NumericalSampleImplementation.cxx
-@@ -1352,7 +1352,8 @@ NumericalPoint NumericalSampleImplementation::computeVariancePerComponent() cons
- if (size_ == 1) return NumericalPoint(dimension_, 0.0);
- const NumericalPoint mean( computeMean() );
-
-- ReductionFunctor<VariancePerComponentPolicy> functor( *this, mean );
-+ const VariancePerComponentPolicy policy ( mean );
-+ ReductionFunctor<VariancePerComponentPolicy> functor( *this, policy );
- TBB::ParallelReduce( 0, size_, functor );
- functor.accumulator_ *= 1.0 / (size_ - 1);
- return functor.accumulator_;
-@@ -1537,7 +1538,8 @@ NumericalScalar NumericalSampleImplementation::computeEmpiricalCDF(const Numeric
- if (getDimension() != point.getDimension()) throw InvalidArgumentException(HERE) << "Point has incorrect dimension. Got "
- << point.getDimension() << ". Expected " << getDimension();
-
-- ReductionFunctor<CDFPolicy> functor( *this, CDFPolicy( *this, point, tail ) );
-+ const CDFPolicy policy( *this, point, tail );
-+ ReductionFunctor<CDFPolicy> functor( *this, policy );
- TBB::ParallelReduce( 0, size_, functor );
- return functor.accumulator_;
- }
-@@ -1622,7 +1624,8 @@ void NumericalSampleImplementation::translate(const NumericalPoint & translation
-
- if (size_ == 0) return;
-
-- ParallelFunctor<TranslationPolicy> functor( *this, translation );
-+ const TranslationPolicy policy( translation );
-+ ParallelFunctor<TranslationPolicy> functor( *this, policy );
- TBB::ParallelFor( 0, size_, functor );
- }
-
-@@ -1703,7 +1706,8 @@ void NumericalSampleImplementation::scale(const NumericalPoint & scaling)
-
- if (size_ == 0) return;
-
-- ParallelFunctor<ScalingPolicy> functor( *this, scaling );
-+ const ScalingPolicy policy( scaling );
-+ ParallelFunctor<ScalingPolicy> functor( *this, policy );
- TBB::ParallelFor( 0, size_, functor );
- }
-
diff --git a/debian/patches/fix-tests-clang.patch b/debian/patches/fix-tests-clang.patch
deleted file mode 100644
index b4024df..0000000
--- a/debian/patches/fix-tests-clang.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Description: Fix test failures when compiling with clang
-Author: Denis Barbier <bouzim at gmail.com>
-Origin: Debian
-Forwarded: no
-Last-Update: 2012-05-20
-
-Index: openturns/lib/src/Base/Func/MuParser/muParserBase.cpp
-===================================================================
---- openturns.orig/lib/src/Base/Func/MuParser/muParserBase.cpp
-+++ openturns/lib/src/Base/Func/MuParser/muParserBase.cpp
-@@ -1038,7 +1038,8 @@ namespace mu
- continue;
-
- case cmPOW:
-- Stack[--sidx] = MathImpl<value_type>::Pow(Stack[sidx], Stack[1+sidx]); ;
-+ --sidx;
-+ Stack[sidx] = MathImpl<value_type>::Pow(Stack[sidx], Stack[1+sidx]); ;
- continue;
-
- case cmLAND: --sidx; Stack[sidx] = Stack[sidx] && Stack[sidx+1]; continue;
diff --git a/debian/patches/ftbfs-4.7.patch b/debian/patches/ftbfs-4.7.patch
deleted file mode 100644
index 9e37784..0000000
--- a/debian/patches/ftbfs-4.7.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Description: Fix FTBFS with g++ 4.7
-Author: Denis Barbier <bouzim at gmail.com>
-Origin: Debian
-Forwarded: http://trac.openturns.org/ticket/482
-Applied-Upstream: http://trac.openturns.org/changeset/2541
-Last-Update: 2012-05-15
-
-Index: openturns/lib/src/Base/Func/MuParser/muParserTemplateMagic.h
-===================================================================
---- openturns.orig/lib/src/Base/Func/MuParser/muParserTemplateMagic.h
-+++ openturns/lib/src/Base/Func/MuParser/muParserTemplateMagic.h
-@@ -106,7 +106,7 @@ namespace mu
- static T Exp(T v) { return exp(v); }
- static T Erf(T v) { return erf(v); } // OT modification
- static T Erfc(T v) { return erfc(v); } // OT modification
-- static T Abs(T v) { return abs(v); } // OT modification
-+ static T Abs(T v) { return fabs(v); } // OT modification
- static T Sqrt(T v) { return sqrt(v); }
- static T Cbrt(T v) { return cbrt(v); } // OT modification
- static T J0(T v) { return j0(v); } // OT modification
diff --git a/debian/patches/ftbfs-clang.patch b/debian/patches/ftbfs-clang.patch
deleted file mode 100644
index be4e6de..0000000
--- a/debian/patches/ftbfs-clang.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-Description: Fix build failures when compiling with clang
-Author: Denis Barbier <bouzim at gmail.com>
-Origin: Debian
-Forwarded: http://trac.openturns.org/ticket/491
-Applied-Upstream: http://trac.openturns.org/changeset/2563
-Last-Update: 2012-06-15
-
-Index: openturns/lib/src/Base/Common/OSS.hxx
-===================================================================
---- openturns.orig/lib/src/Base/Common/OSS.hxx
-+++ openturns/lib/src/Base/Common/OSS.hxx
-@@ -231,7 +231,7 @@
-
- public:
- /// Construct from an ostream.
-- OSS_iterator(ostream_type& __s) : _M_stream(&__s), _M_string(), _M_prefix(), _M_first(true) {}
-+ OSS_iterator(ostream_type& __s) : _M_stream(&__s), _M_string(""), _M_prefix(""), _M_first(true) {}
-
- /**
- * Construct from an ostream
-Index: openturns/lib/src/Base/Common/Path.cxx
-===================================================================
---- openturns.orig/lib/src/Base/Common/Path.cxx
-+++ openturns/lib/src/Base/Common/Path.cxx
-@@ -210,7 +210,7 @@
- std::string pathToSplit = openturnsWrapperDirectory;
- unsigned int lastColonPosition = 0;
- unsigned int currentColonPosition = 0;
-- while ( ((currentColonPosition = pathToSplit.find(Os::GetDirectoryListSeparator(), lastColonPosition)) >= 0) &&
-+ while ( ((currentColonPosition = pathToSplit.find(Os::GetDirectoryListSeparator(), lastColonPosition)) != String::npos) &&
- ( currentColonPosition < pathToSplit.size() ) ) {
- FileName directory(pathToSplit, lastColonPosition, currentColonPosition - lastColonPosition);
- if (directory.size() == 0) directory = ".";
-@@ -261,7 +261,7 @@
- std::string pathToSplit = openturnsConfigDirectory;
- unsigned int lastColonPosition = 0;
- unsigned int currentColonPosition = 0;
-- while ( ((currentColonPosition = pathToSplit.find(Os::GetDirectoryListSeparator(), lastColonPosition)) >= 0) &&
-+ while ( ((currentColonPosition = pathToSplit.find(Os::GetDirectoryListSeparator(), lastColonPosition)) != String::npos) &&
- ( currentColonPosition < pathToSplit.size() ) ) {
- FileName directory(pathToSplit, lastColonPosition, currentColonPosition - lastColonPosition);
- if (directory.size() == 0) directory = ".";
-Index: openturns/lib/src/Base/Common/WrapperCommonFunctions.cxx
-===================================================================
---- openturns.orig/lib/src/Base/Common/WrapperCommonFunctions.cxx
-+++ openturns/lib/src/Base/Common/WrapperCommonFunctions.cxx
-@@ -1512,7 +1512,7 @@
- while ( 1 ) {
- /* searching shortcut in the regular expression (possibly modified in a previous pass) */
- pos2 = regexpBeforeSubstitution.find( regexpShortcut, pos1 );
-- if ( (pos2 < 0) || (pos2 > static_cast<size_t>( regexpBeforeSubstitution.size() )) ) break;
-+ if ( (pos2 == String::npos) || (pos2 > static_cast<size_t>( regexpBeforeSubstitution.size() )) ) break;
-
- newRegexp.append( regexpBeforeSubstitution, pos1, pos2-pos1 ); /* We copy the part between two substituted substrings */
- newRegexp.append( shortcutReplace ); /* We do the substitution */
-Index: openturns/lib/src/Base/Algo/kissfft.hh
-===================================================================
---- openturns.orig/lib/src/Base/Algo/kissfft.hh
-+++ openturns/lib/src/Base/Algo/kissfft.hh
-@@ -264,7 +264,8 @@
- cpx_type * twiddles = &_twiddles[0];
- cpx_type t;
- int Norig = _nfft;
-- cpx_type scratchbuf[p];
-+ std::vector<cpx_type> scratchbuf;
-+ scratchbuf.resize(p);
-
- for ( u=0; u<m; ++u ) {
- k=u;
-Index: openturns/lib/test/t_BasisSequence_std.cxx
-===================================================================
---- openturns.orig/lib/test/t_BasisSequence_std.cxx
-+++ openturns/lib/test/t_BasisSequence_std.cxx
-@@ -35,7 +35,7 @@
- {
- TESTPREAMBLE;
- OStream fullprint(std::cout);
-- UnsignedLong dimension = 3;
-+ const UnsignedLong dimension = 3;
- Description input;
- Description output[dimension];
- for ( UnsignedLong j = 0; j < dimension; ++ j )
-Index: openturns/lib/test/t_Basis_std.cxx
-===================================================================
---- openturns.orig/lib/test/t_Basis_std.cxx
-+++ openturns/lib/test/t_Basis_std.cxx
-@@ -37,7 +37,7 @@
- TESTPREAMBLE;
- OStream fullprint(std::cout);
-
-- UnsignedLong dimension = 3;
-+ const UnsignedLong dimension = 3;
- Description input;
- Description output[dimension];
- for ( UnsignedLong j = 0; j < dimension; ++ j )
diff --git a/debian/patches/installcheck.patch b/debian/patches/installcheck.patch
deleted file mode 100644
index aebd9a5..0000000
--- a/debian/patches/installcheck.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-Description: Allow running 'make installcheck' when
- building package.
-Author: Denis Barbier <bouzim at gmail.com>
-Origin: Debian
-Forwarded: http://trac.openturns.org/ticket/475
-Applied-Upstream: http://trac.openturns.org/changeset/2564
-Last-Update: 2012-06-15
-
-Index: openturns/lib/test/CMakeLists.txt
-===================================================================
---- openturns.orig/lib/test/CMakeLists.txt
-+++ openturns/lib/test/CMakeLists.txt
-@@ -27,13 +27,13 @@ cmake_minimum_required ( VERSION 2.8 )
-
- #include ( CTest )
-
--set ( NEW_PATH "$ENV{PATH}:${EXAMPLE_PATH}" )
-+set ( NEW_PATH "$ENV{PATH}:${INSTALL_DESTDIR}${EXAMPLE_PATH}" )
-
- set ( CHECK_ENVIRONMENT "OPENTURNS_CONFIG_PATH=${CMAKE_BINARY_DIR}/lib/etc" )
-
--set ( INSTALLCHECK_ENVIRONMENT "OPENTURNS_WRAPPER_PATH=${WRAPPER_PATH}"
-- "OPENTURNS_CONFIG_PATH=${SYSCONFIG_PATH}/openturns"
-- "OPENTURNS_NUMERICALSAMPLE_PATH=${SAMPLE_PATH}"
-+set ( INSTALLCHECK_ENVIRONMENT "OPENTURNS_WRAPPER_PATH=${INSTALL_DESTDIR}${WRAPPER_PATH}"
-+ "OPENTURNS_CONFIG_PATH=${INSTALL_DESTDIR}${SYSCONFIG_PATH}/openturns"
-+ "OPENTURNS_NUMERICALSAMPLE_PATH=${INSTALL_DESTDIR}${SAMPLE_PATH}"
- "PATH=${NEW_PATH}"
- )
-
-Index: openturns/python/test/CMakeLists.txt
-===================================================================
---- openturns.orig/python/test/CMakeLists.txt
-+++ openturns/python/test/CMakeLists.txt
-@@ -27,13 +27,14 @@ cmake_minimum_required ( VERSION 2.8 )
-
- #include ( CTest )
-
--set ( NEW_PATH "$ENV{PATH}:${EXAMPLE_PATH}" )
-+set ( NEW_PATH "$ENV{PATH}:${INSTALL_DESTDIR}${EXAMPLE_PATH}" )
-
--set ( PYINSTALLCHECK_ENVIRONMENT "OPENTURNS_WRAPPER_PATH=${WRAPPER_PATH}"
-- "OPENTURNS_CONFIG_PATH=${SYSCONFIG_PATH}/openturns"
-- "OPENTURNS_NUMERICALSAMPLE_PATH=${SAMPLE_PATH}"
-+set ( PYINSTALLCHECK_ENVIRONMENT "OPENTURNS_WRAPPER_PATH=${INSTALL_DESTDIR}${WRAPPER_PATH}"
-+ "OPENTURNS_CONFIG_PATH=${INSTALL_DESTDIR}${SYSCONFIG_PATH}/openturns"
-+ "OPENTURNS_NUMERICALSAMPLE_PATH=${INSTALL_DESTDIR}${SAMPLE_PATH}"
- "PATH=${NEW_PATH}"
-- "PYTHONPATH=${PYTHON_MODULE_PATH}"
-+ "LD_LIBRARY_PATH=${INSTALL_DESTDIR}${LIBRARY_PATH}"
-+ "PYTHONPATH=${INSTALL_DESTDIR}${PYTHON_MODULE_PATH}"
- )
-
- # This macro compiles on the fly and run the corresponding post-installation test
diff --git a/debian/patches/no-link-python.patch b/debian/patches/no-link-python.patch
deleted file mode 100644
index 13f803f..0000000
--- a/debian/patches/no-link-python.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Description: Do not link against python libraries, otherwise
- module cannot be loaded.
-Author: Denis Barbier <bouzim at gmail.com>
-Origin: Debian
-Bug-Debian: http://bugs.debian.org/670066
-Forwarded: no
-Last-Update: 2012-04-25
-
-Index: openturns/python/src/CMakeLists.txt
-===================================================================
---- openturns.orig/python/src/CMakeLists.txt
-+++ openturns/python/src/CMakeLists.txt
-@@ -67,7 +67,7 @@ macro ( ot_add_python_module MODULENAME
- swig_add_module ( ${MODULENAME} python ${SOURCEFILE} ${swig_other_sources} )
-
- add_dependencies ( ${SWIG_MODULE_${MODULENAME}_REAL_NAME} generate_swig_runtime )
-- swig_link_libraries ( ${MODULENAME} OT ${PYTHON_LIBRARIES} )
-+ swig_link_libraries ( ${MODULENAME} OT )
- list ( APPEND OPENTURNS_PYTHON_MODULES ${MODULENAME} )
- endmacro ( ot_add_python_module )
-
diff --git a/debian/patches/series b/debian/patches/series
index be45e67..ff3629d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,17 +1,2 @@
-#pkg.patch
-#openturns-sh4-support.patch
-#gcc45.patch
-#openturns-python26.diff
-#pth.diff
-ftbfs-4.7.patch
-cmake-configdir.patch
-cmake-tools.patch
-no-link-python.patch
-bigendian-randomgenerator.patch
-installcheck.patch
-test-output.patch
debian-soname.patch
-ftbfs-clang.patch
-fix-tests-clang.patch
fix-bigendian.patch
-fix-results-with-g++-4.7.patch
diff --git a/debian/patches/test-output.patch b/debian/patches/test-output.patch
deleted file mode 100644
index ab2f4ea..0000000
--- a/debian/patches/test-output.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Description: Fix test output, some compilers print df(x)= twice
- because exception is thrown after text is printed to stdout.
-Author: Denis Barbier <bouzim at gmail.com>
-Origin: Debian
-Forwarded: http://trac.openturns.org/ticket/492
-Applied-Upstream: http://trac.openturns.org/changeset/2562
-Last-Update: 2012-06-15
-
-Index: openturns/lib/test/t_NumericalMathFunction_analytical.cxx
-===================================================================
---- openturns.orig/lib/test/t_NumericalMathFunction_analytical.cxx
-+++ openturns/lib/test/t_NumericalMathFunction_analytical.cxx
-@@ -95,7 +95,8 @@ int main(int argc, char *argv[])
- std::cout << "f(" << x[0] << ")=" << std::scientific << std::setprecision(4) << f(x)[0] << std::endl;
- try
- {
-- std::cout << "df(" << x[0] << ")=" << std::scientific << std::setprecision(4) << f.gradient(x)(0, 0) << std::endl;
-+ NumericalScalar grad_f(f.gradient(x)(0,0));
-+ std::cout << "df(" << x[0] << ")=" << std::scientific << std::setprecision(4) << grad_f << std::endl;
- }
- catch(...)
- {
-@@ -104,7 +105,8 @@ int main(int argc, char *argv[])
- }
- try
- {
-- std::cout << "d2f(" << x[0] << ")=" << std::scientific << std::setprecision(4) << f.hessian(x)(0, 0, 0) << std::endl;
-+ NumericalScalar hess_f(f.hessian(x)(0, 0, 0));
-+ std::cout << "d2f(" << x[0] << ")=" << std::scientific << std::setprecision(4) << hess_f << std::endl;
- }
- catch(...)
- {
--
Debian packaging for openturns www.openturns.org
More information about the debian-science-commits
mailing list