Merge pull request #39 from jschueller/inverse

Inverse
openturns · Jun 20, 2023 · e4c41bd · e4c41bd
2 parents cdeeef3 + 91a5afd
commit e4c41bd
Show file tree

Hide file tree

Showing 40 changed files with 2,819 additions and 12 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -138,7 +138,7 @@ endmacro ( ot_add_current_dir_to_include_dirs )
 
 set ( CPACK_PACKAGE_NAME          ${PACKAGE_NAME} )
 set ( CPACK_PACKAGE_VERSION_MAJOR 0              )
-set ( CPACK_PACKAGE_VERSION_MINOR 12              )
+set ( CPACK_PACKAGE_VERSION_MINOR 13              )
 set ( CPACK_PACKAGE_VERSION_PATCH                )
 set ( CPACK_SOURCE_GENERATOR      "TGZ;TBZ2"     )
 set (CPACK_BINARY_STGZ    OFF CACHE BOOL "STGZ")

diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+= 0.13 release (in progress)
+
+ * Add SubsetInverseSampling
+ * Add InverseFORM
+
 = 0.12 release (2023-05-17)
 
  * Maintenance

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.12
+0.13
diff --git a/distro/debian/changelog b/distro/debian/changelog
@@ -1,4 +1,4 @@
-otrobopt (0.12-0.1) unstable; urgency=low
+otrobopt (0.13-0.1) unstable; urgency=low
 
   * Non-maintainer upload.
   * Initial release.

diff --git a/distro/rpm/otrobopt.spec b/distro/rpm/otrobopt.spec
@@ -20,7 +20,7 @@ FFLAGS="${FFLAGS:-%optflags}" ; export FFLAGS ; \
 -DBUILD_SHARED_LIBS:BOOL=ON
 
 Name:           otrobopt
-Version:        0.12
+Version:        0.13
 Release:        0%{?dist}
 Summary:        OpenTURNS module
 Group:          System Environment/Libraries

diff --git a/lib/include/otrobopt/OTRobOpt.hxx b/lib/include/otrobopt/OTRobOpt.hxx
@@ -32,5 +32,7 @@
 #include "otrobopt/QuantileMeasure.hxx"
 #include "otrobopt/AggregatedMeasure.hxx"
 #include "otrobopt/MeasureFactory.hxx"
+#include "otrobopt/SubsetInverseSampling.hxx"
+#include "otrobopt/InverseFORM.hxx"
 
 #endif /* OTROBOPT_OTROBOPT_HXX */
diff --git a/lib/src/CMakeLists.txt b/lib/src/CMakeLists.txt
@@ -17,6 +17,10 @@ ot_add_source_file (MeasureFactory.cxx)
 ot_add_source_file (RobustOptimizationProblem.cxx)
 ot_add_source_file (RobustOptimizationAlgorithm.cxx)
 ot_add_source_file (SequentialMonteCarloRobustAlgorithm.cxx)
+ot_add_source_file (SubsetInverseSamplingResult.cxx)
+ot_add_source_file (SubsetInverseSampling.cxx)
+ot_add_source_file (InverseFORMResult.cxx)
+ot_add_source_file (InverseFORM.cxx)
 
 ot_install_header_file (MeasureEvaluation.hxx)
 ot_install_header_file (MeasureEvaluationImplementation.hxx)
@@ -33,7 +37,10 @@ ot_install_header_file (MeasureFactory.hxx)
 ot_install_header_file (RobustOptimizationProblem.hxx)
 ot_install_header_file (RobustOptimizationAlgorithm.hxx)
 ot_install_header_file (SequentialMonteCarloRobustAlgorithm.hxx)
-
+ot_install_header_file (SubsetInverseSamplingResult.hxx)
+ot_install_header_file (SubsetInverseSampling.hxx)
+ot_install_header_file (InverseFORMResult.hxx)
+ot_install_header_file (InverseFORM.hxx)
 
 include_directories ( ${INTERNAL_INCLUDE_DIRS} )