Changeset 996

Show
Ignore:
Timestamp:
10/31/08 16:07:46 (2 months ago)
Author:
dutka
Message:

MERGE: trunk> svn merge -r 861:995 https://.../feuillard/devel

Added SensitivityAnalysis class by using R sensitivity package for Sobol indices computation. Might strongly evolve soon.
Fixed minor bugs in doc build process.
Make distcheck ok.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/doc/src/ExamplesGuide/Makefile.am

    r993 r996  
    2727EXTRA_DIST = \ 
    2828        OpenTURNS_ExamplesGuide.tex \ 
     29        resultatExampleBeam.tex \ 
    2930        poutre.pdf \ 
    3031        convergenceGrapheDS.pdf\ 

  • trunk/doc/src/Makefile.am

    r993 r996  
    2525include $(top_srcdir)/config/common.am 
    2626 
    27 SUBDIRS      =  ArchitectureGuide DocumentationGuide ReferenceGuide UseCasesGuide UserManual ExamplesGuide WrapperGuide GNU_free_documentation_licence ContributionGuide ExamplesGuide #CodingRulesGuide 
    28 DIST_SUBDIRS =  ArchitectureGuide DocumentationGuide ReferenceGuide UseCasesGuide UserManual ExamplesGuide WrapperGuide GNU_free_documentation_licence ContributionGuide ExamplesGuide #CodingRulesGuide 
     27DIRS         = ArchitectureGuide 
     28DIRS        += DocumentationGuide 
     29DIRS        += ReferenceGuide 
     30DIRS        += UseCasesGuide 
     31DIRS        += UserManual 
     32DIRS        += ExamplesGuide 
     33DIRS        += WrapperGuide 
     34DIRS        += GNU_free_documentation_licence 
     35DIRS        += ContributionGuide 
     36#DIRS        += CodingRulesGuide 
     37 
     38SUBDIRS      =  $(DIRS) 
     39DIST_SUBDIRS =  $(DIRS) 
    2940 
    3041EXTRA_DIST   = logoOpenTURNS.jpg 

  • trunk/gui/configure.ac

    r992 r996  
    100100OT_CHECK_DOT 
    101101 
     102# Check for BOOST 
     103OT_CHECK_BOOST 
     104 
    102105# Get object default name 
    103106OT_GET_OBJECT_DEFAULT_NAME 
    …… 
    134137test "x$WITH_DOXYGEN" = x1   && sum_doxygen=OK   || sum_doxygen="no * (optional)" 
    135138test "x$WITH_DOT" = x1       && sum_dot=OK       || sum_dot="no * (optional)" 
     139test "x$WITH_BOOST" = x1     && sum_boost=OK     || sum_dot="no * (MANDATORY)" 
    136140test "x$have_qt" = xyes      && sum_qt=OK        || sum_qt="no * (MANDATORY)" 
    137141 
    …… 
    151155  Doxygen              ${sum_doxygen} 
    152156  dot                  ${sum_dot} 
     157  BOOST                ${sum_boost} 
    153158  Qt                   ${sum_qt} 
    154159EOT 

  • trunk/lib/configure.ac

    r992 r996  
    114114# Detect R configuration (default install path redefined to /usr/lib/R) 
    115115OT_CHECK_R([/usr/lib/R]) 
    116 OT_CHECK_R_PACKAGES([base rotRPackage]) 
     116OT_CHECK_R_PACKAGES([base rotRPackage sensitivity]) 
    117117#OT_CHECK_R_BITMAP 
    118118 

  • trunk/lib/include/OTconfig.h.in

    r990 r996  
    9090/* Define to 1 if R has package rotRPackage. */ 
    9191#undef HAVE_R_PACKAGE_ROTRPACKAGE 
     92 
     93/* Define to 1 if R has package sensitivity. */ 
     94#undef HAVE_R_PACKAGE_SENSITIVITY 
    9295 
    9396/* Define to 1 if you have the <semaphore.h> header file. */ 

  • trunk/lib/m4/ot_check_r_packages.m4

    r424 r996  
    4646 
    4747    res=0 
    48     eval "test \"\${ot_cv_check_r_package_${r_package_name}}\" = yes" && res=1 
     48    eval "test \"\${ot_cv_check_r_package_${r_package_name}}\" = yes" && { res=1 ; R_PACKAGES="$R_PACKAGES ${r_package_name}"; } 
    4949 
     50    AC_SUBST(R_PACKAGES) 
    5051    AC_DEFINE_UNQUOTED(AS_TR_CPP(HAVE_R_PACKAGE_$r_package_name), [$res]) 
    5152  done 

  • trunk/lib/src/Base/Stat/Makefile.am

    r990 r996  
    5050        LinearModel.hxx \ 
    5151        CorrelationAnalysis.hxx \ 
     52        SensitivityAnalysis.hxx \ 
    5253        RandomGenerator.hxx \ 
    5354        dsfmt.h \ 
    …… 
    7677        LinearModel.cxx \ 
    7778        CorrelationAnalysis.cxx \ 
     79        SensitivityAnalysis.cxx \ 
    7880        RandomGenerator.cxx \ 
    7981        dsfmt.cxx 

  • trunk/lib/src/Base/Type/Makefile.am

    r995 r996  
    5353noinst_LTLIBRARIES    = libOTType.la 
    5454libOTType_la_LDFLAGS  = -no-undefined 
     55libOTType_la_CXXFLAGS = $(QT_CXXFLAGS) 
    5556libOTType_la_SOURCES  = \ 
    5657        Description.cxx \ 

  • trunk/lib/test/Makefile.am

    r995 r996  
    125125CHECK_TESTS += $(srcdir)/t_LinearModelFactory_std.at 
    126126CHECK_TESTS += $(srcdir)/t_LinearModel_std.at 
     127CHECK_TESTS += $(srcdir)/t_SensitivityAnalysis_std.at 
    127128CHECK_TESTS += $(srcdir)/t_NumericalSample_big.at 
    128129CHECK_TESTS += $(srcdir)/t_NumericalSample_split.at 
    …… 
    269270CHECK_PROGS += t_NumericalMathFunction_analytical 
    270271 
    271 ## Stat 
     272## Solver 
    272273CHECK_PROGS += t_Bisection_std 
    273274CHECK_PROGS += t_Brent_std 
    …… 
    280281CHECK_PROGS += t_LinearModelFactory_std 
    281282CHECK_PROGS += t_LinearModel_std 
     283CHECK_PROGS += t_SensitivityAnalysis_std 
    282284CHECK_PROGS += t_NumericalSample_big 
    283285CHECK_PROGS += t_NumericalSample_split 
    …… 
    856858t_LinearModelFactory_std_SOURCES                                   = t_LinearModelFactory_std.cxx 
    857859t_LinearModel_std_SOURCES                                          = t_LinearModel_std.cxx 
     860t_SensitivityAnalysis_std_SOURCES                                  = t_SensitivityAnalysis_std.cxx 
    858861t_NumericalSample_big_SOURCES                                      = t_NumericalSample_big.cxx 
    859862t_NumericalSample_computation_SOURCES                              = t_NumericalSample_computation.cxx 

  • trunk/lib/test/atlocal.in

    r506 r996  
    1818# 
    1919 
    20 with_xercesc=@WITH_XERCESC@ 
    2120with_bc=@WITH_BC@ 
     21for pkg in @R_PACKAGES@ "" 
     22do 
     23  test -n $pkg && eval "have_r_package_$pkg=1" 
     24done 

  • trunk/lib/test/check_testsuite.at

    r995 r996  
    8484m4_include(t_LinearModelFactory_std.at) 
    8585m4_include(t_LinearModel_std.at) 
     86m4_include(t_SensitivityAnalysis_std.at) 
    8687m4_include(t_RandomGenerator_std.at) 
    8788 

  • trunk/lib/test/t_SensitivityAnalysis_std.at

    r904 r996  
    11AT_SETUP([SensitivityAnalysis]) 
     2 
     3if test x$have_r_package_sensitivity = x1 ; 
     4then 
    25 
    36AT_KEYWORDS([std Base Stat SensitivityAnalysis RandomGenerator]) 
    …… 
    1316]], 
    1417         [ignore]) 
     18else 
     19 
     20AT_CHECK([exit 77],[0],[ignore],[ignore]) 
     21 
     22fi 
    1523 
    1624AT_CLEANUP 

  • trunk/python/configure.ac

    r992 r996  
    8585# Check for Open TURNS library 
    8686OT_CHECK_OPENTURNS 
     87 
     88# Detect R configuration (default install path redefined to /usr/lib/R) 
     89OT_CHECK_R([/usr/lib/R]) 
     90OT_CHECK_R_PACKAGES([base rotRPackage sensitivity]) 
     91#OT_CHECK_R_BITMAP 
    8792 
    8893# Check for Python 

  • trunk/python/m4/ot_check_r_packages.m4

    r424 r996  
    4646 
    4747    res=0 
    48     eval "test \"\${ot_cv_check_r_package_${r_package_name}}\" = yes" && res=1 
     48    eval "test \"\${ot_cv_check_r_package_${r_package_name}}\" = yes" && { res=1 ; R_PACKAGES="$R_PACKAGES ${r_package_name}"; } 
    4949 
     50    AC_SUBST(R_PACKAGES) 
    5051    AC_DEFINE_UNQUOTED(AS_TR_CPP(HAVE_R_PACKAGE_$r_package_name), [$res]) 
    5152  done 

  • trunk/python/src/Makefile.am

    r995 r996  
    121121        RandomGenerator.i \ 
    122122        CorrelationAnalysis.i \ 
     123        SensitivityAnalysis.i \ 
    123124        WrapperData.i \ 
    124125        WrapperFile.i \ 

  • trunk/python/src/ot.i

    r995 r996  
    108108%include RandomGenerator.i 
    109109%include CorrelationAnalysis.i 
     110%include SensitivityAnalysis.i 
    110111 
    111112/* Base/Func */ 

  • trunk/python/test/Makefile.am

    r972 r996  
    9292PYTHONINSTALLCHECK_TESTS += $(srcdir)/t_LinearModel_std.atpy 
    9393PYTHONINSTALLCHECK_TESTS += $(srcdir)/t_LinearModelFactory_std.atpy 
     94PYTHONINSTALLCHECK_TESTS += $(srcdir)/t_SensitivityAnalysis_std.atpy 
    9495PYTHONINSTALLCHECK_TESTS += $(srcdir)/t_RandomGenerator_std.atpy 
    9596PYTHONINSTALLCHECK_TESTS += $(srcdir)/t_TestResult_std.atpy 
    …… 
    305306PYTHONINSTALLCHECK_PROGS += t_LinearModel_std.py 
    306307PYTHONINSTALLCHECK_PROGS += t_LinearModelFactory_std.py 
     308PYTHONINSTALLCHECK_PROGS += t_SensitivityAnalysis_std.py 
    307309PYTHONINSTALLCHECK_PROGS += t_RandomGenerator_std.py 
    308310PYTHONINSTALLCHECK_PROGS += t_TestResult_std.py 

  • trunk/python/test/atlocal.in

    r548 r996  
    1919 
    2020with_bc=@WITH_BC@ 
     21for pkg in @R_PACKAGES@ "" 
     22do 
     23  test -n $pkg && eval "have_r_package_$pkg=1" 
     24done 
     25 

  • trunk/python/test/python_installcheck_testsuite.at

    r972 r996  
    8080m4_include(t_ConfidenceInterval_std.atpy) 
    8181m4_include(t_NumericalSample_csv.atpy) 
     82m4_include(t_SensitivityAnalysis_std.atpy) 
    8283 
    8384## Graph  

  • trunk/python/test/t_SensitivityAnalysis_std.atpy

    r904 r996  
    11AT_SETUP([SensitivityAnalysis]) 
     2 
     3if test x$have_r_package_sensitivity = x1 ; 
     4then 
    25 
    36AT_KEYWORDS([std Base Stat SensitivityAnalysis NumericalSample NumericalMathFunction]) 
    …… 
    1619         [ignore]) 
    1720 
     21else 
     22 
     23AT_CHECK([exit 77],[0],[ignore],[ignore]) 
     24 
     25fi 
     26 
    1827AT_CLEANUP