Added get for CV method

mbaudin47 · Jul 2, 2023 · 6cc2d0c · 6cc2d0c
1 parent 193bc7e
commit 6cc2d0c
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 2 deletions.
diff --git a/lib/src/Uncertainty/Algorithm/MetaModel/FunctionalChaos/FunctionalChaosValidation.cxx b/lib/src/Uncertainty/Algorithm/MetaModel/FunctionalChaos/FunctionalChaosValidation.cxx
@@ -80,7 +80,7 @@ String FunctionalChaosValidation::__repr__() const
 }
 
 /* Get result*/
-FunctionalChaosResult FunctionalChaosValidation::getResult() const
+FunctionalChaosResult FunctionalChaosValidation::getFunctionalChaosResult() const
 {
   return functionalChaosResult_;
 }
@@ -91,6 +91,12 @@ UnsignedInteger FunctionalChaosValidation::getKParameter() const
   return kParameter_;
 }
 
+/* Get the CV Method */
+UnsignedInteger FunctionalChaosValidation::getMethod() const
+{
+  return cvMethod_;
+}
+
 /* Compute cross-validation metamodel predictions */
 Sample FunctionalChaosValidation::ComputeMetamodelCrossValidationPredictions(
     const FunctionalChaosResult & functionalChaosResult,

diff --git a/...c/Uncertainty/Algorithm/MetaModel/FunctionalChaos/openturns/FunctionalChaosValidation.hxx b/...c/Uncertainty/Algorithm/MetaModel/FunctionalChaos/openturns/FunctionalChaosValidation.hxx
@@ -57,11 +57,14 @@ public:
   String __repr__() const override;
 
   /** Result accessor */
-  FunctionalChaosResult getResult() const;
+  FunctionalChaosResult getFunctionalChaosResult() const;
 
   /** Get the K-parameter */
   UnsignedInteger getKParameter() const;
 
+  /** Get the CV Method */
+  UnsignedInteger getMethod() const;
+
   /** Method save() stores the object through the StorageManager */
   void save(Advocate & adv) const override;
 

diff --git a/lib/src/Uncertainty/Algorithm/MetaModel/LinearModel/LinearModelValidation.cxx b/lib/src/Uncertainty/Algorithm/MetaModel/LinearModel/LinearModelValidation.cxx
@@ -146,6 +146,12 @@ LinearModelResult LinearModelValidation::getLinearModelResult() const
   return linearModelResult_;
 }
 
+/* Get the CV Method */
+UnsignedInteger LinearModelValidation::getMethod() const
+{
+  return cvMethod_;
+}
+
 /* Method save() stores the object through the StorageManager */
 void LinearModelValidation::save(Advocate & adv) const
 {

diff --git a/lib/src/Uncertainty/Algorithm/MetaModel/LinearModel/openturns/LinearModelValidation.hxx b/lib/src/Uncertainty/Algorithm/MetaModel/LinearModel/openturns/LinearModelValidation.hxx
@@ -65,6 +65,9 @@ public:
   /** Get the K parameter */
   UnsignedInteger getKParameter() const;
 
+  /** Get the CV Method */
+  UnsignedInteger getMethod() const;
+
   /** Method save() stores the object through the StorageManager */
   void save(Advocate & adv) const override;
 

diff --git a/lib/test/t_FunctionalChaosValidation_ishigami.cxx b/lib/test/t_FunctionalChaosValidation_ishigami.cxx
@@ -81,6 +81,7 @@ int main(int, char *[])
     FunctionalChaosValidation validationLOO(chaosResult, FunctionalChaosValidation::LEAVEONEOUT);
     const Point mseLOOAnalytical(validationLOO.computeMeanSquaredError());
     fullprint << "Analytical LOO MSE = " << mseLOOAnalytical << std::endl;
+    assert_equal(validationLOO.getMethod(), UnsignedInteger(LinearModelValidation::LEAVEONEOUT));
 
     // Naive leave-one-out
     Point residualsLOO(samplingSize);
@@ -126,6 +127,7 @@ int main(int, char *[])
     FunctionalChaosValidation validationKFold(chaosResult, FunctionalChaosValidation::KFOLD, kFoldParameter);
     fullprint << "KFold with K = " << kFoldParameter << std::endl;
     assert_equal(validationKFold.getKParameter(), kFoldParameter);
+    assert_equal(validationKFold.getMethod(), UnsignedInteger(LinearModelValidation::KFOLD));
 
     // Compute mean squared error
     const Point mseKFoldAnalytical(validationKFold.computeMeanSquaredError());

diff --git a/lib/test/t_LinearModelValidation_std.cxx b/lib/test/t_LinearModelValidation_std.cxx
@@ -63,6 +63,7 @@ int main(int, char *[])
     // Create LOO validation
     LinearModelValidation validationLOO(result, LinearModelValidation::LEAVEONEOUT);
     fullprint << validationLOO.__str__() << std::endl;
+    assert_equal(validationLOO.getMethod(), UnsignedInteger(LinearModelValidation::LEAVEONEOUT));
 
     // Compute analytical LOO MSE
     fullprint << "Compute Analytical LOO MSE" << std::endl;
@@ -111,6 +112,7 @@ int main(int, char *[])
     LinearModelValidation validationKFold(result, LinearModelValidation::KFOLD, kFoldParameter);
     fullprint << validationKFold.__str__() << std::endl;
     assert_equal(validationKFold.getKParameter(), kFoldParameter);
+    assert_equal(validationKFold.getMethod(), UnsignedInteger(LinearModelValidation::KFOLD));
 
     // Compute analytical KFold MSE
     const Point mseKFoldAnalytical(validationKFold.computeMeanSquaredError());