Fix Linux build

Author: jschueller

.ci_support/run_docker_linux.sh

@@ -7,7 +7,7 @@ mkdir build && cd build
 cmake -DCMAKE_INSTALL_PREFIX=~/.local \
       -DCMAKE_UNITY_BUILD=ON \
       -DCMAKE_CXX_FLAGS="-Wall -Wextra -Wpedantic -Wshadow -Werror -D_GLIBCXX_ASSERTIONS --coverage" \
-      -DSWIG_COMPILE_FLAGS="-O1 -Wno-unused-parameter" \
+      -DSWIG_COMPILE_FLAGS="-O1 -Wno-unused-parameter -Wno-shadow" \
       -DUSE_SPHINX=ON -DSPHINX_FLAGS="-W -T -j4" \
       /io
 make install

lib/src/VineCopula.cxx

@@ -20,9 +20,6 @@
  */
 #include "otvine/VineCopula.hxx"
 #include <openturns/PersistentObjectFactory.hxx>
-#include <openturns/ClaytonCopula.hxx>
-#include <openturns/GumbelCopula.hxx>
-#include <openturns/FrankCopula.hxx>
 
 #include <vinecopulib.hpp>
 
@@ -140,28 +137,6 @@ String VineCopula::__repr__() const
   return oss;
 }
 
-Distribution VineCopula::asNative() const
-{
-  if (p_vinecop_->get_dim() != 2)
-    throw NotYetImplementedException(HERE) << "dim is not 2";
-  std::vector<std::vector<vinecopulib::Bicop> > pairs = p_vinecop_->get_all_pair_copulas();
-  if (pairs.size() != 1 && pairs[0].size() != 1)
-    throw NotYetImplementedException(HERE) << "tree contains more than one node";
-  vinecopulib::Bicop bicop = pairs[0][0];
-  int rotation = bicop.get_rotation();
-  if (rotation != 0)
-    throw NotYetImplementedException(HERE) << "rotation is not 0";
-  const Scalar theta = bicop.get_parameters()(0, 0);
-  if (bicop.get_family_name() == "Clayton")
-    return ClaytonCopula(theta);
-  else if (bicop.get_family_name() == "Frank")
-    return FrankCopula(theta);
-  else if (bicop.get_family_name() == "Gumbel")
-    return GumbelCopula(theta);
-  else
-    throw NotYetImplementedException(HERE) << "unknown family: " << bicop.get_family_name();
-}
-
 /* Method save() stores the object through the StorageManager */
 void VineCopula::save(Advocate & adv) const
 {

lib/src/VineCopulaFactory.cxx

@@ -20,6 +20,9 @@
  */
 #include "otvine/VineCopulaFactory.hxx"
 #include <openturns/PersistentObjectFactory.hxx>
+#include <openturns/ClaytonCopula.hxx>
+#include <openturns/GumbelCopula.hxx>
+#include <openturns/FrankCopula.hxx>
 
 #include <vinecopulib.hpp>
 
@@ -47,7 +50,7 @@ VineCopulaFactory * VineCopulaFactory::clone() const
 }
 
 /* example of a func that return a point squared. */
-VineCopula VineCopulaFactory::buildAsNative(const Sample & sample) const
+Distribution VineCopulaFactory::build(const Sample & sample) const
 {
   const UnsignedInteger dimension = sample.getDimension();
   const UnsignedInteger size = sample.getSize();
@@ -57,21 +60,36 @@ VineCopula VineCopulaFactory::buildAsNative(const Sample & sample) const
       data(i, j) = sample(i, j);
   Pointer <vinecopulib::Vinecop> p_vinecop = new vinecopulib::Vinecop(dimension);
   std::vector<vinecopulib::BicopFamily> family_set;
-#if 1
+#if 0
   family_set = {
     vinecopulib::BicopFamily::clayton,
     vinecopulib::BicopFamily::gumbel,
     vinecopulib::BicopFamily::frank};
 #endif
   vinecopulib::FitControlsVinecop controls(family_set);
   p_vinecop->select(data, controls);
+
+#if 0
+  std::vector<std::vector<vinecopulib::Bicop> > pairs = p_vinecop->get_all_pair_copulas();
+  if (p_vinecop->get_dim() == 2 && pairs.size() == 1 && pairs[0].size() == 1)
+  {
+    vinecopulib::Bicop bicop = pairs[0][0];
+    int rotation = bicop.get_rotation();
+    if (rotation == 0)
+    {
+      const Scalar theta = bicop.get_parameters()(0, 0);
+      if (bicop.get_family_name() == "Clayton")
+        return ClaytonCopula(theta);
+      else if (bicop.get_family_name() == "Frank")
+        return FrankCopula(theta);
+      else if (bicop.get_family_name() == "Gumbel")
+        return GumbelCopula(theta);
+    }
+  }
+#endif
   return VineCopula(p_vinecop);
 }
 
-Distribution VineCopulaFactory::build(const Sample & sample) const
-{
-  return buildAsNative(sample);
-}
 
 /* String converter */
 String VineCopulaFactory::__repr__() const

lib/src/otvine/VineCopula.hxx

@@ -56,9 +56,6 @@ protected:
   OT::Bool equals(const DistributionImplementation & other) const override;
 public:
 
-  /** Convert to native OT distribution if possible */
-  OT::Distribution asNative() const;
-
   /** String converter */
   OT::String __repr__() const override;
 

lib/src/otvine/VineCopulaFactory.hxx

@@ -48,7 +48,6 @@ public:
 
   /** example of a func that return a point squared. **/
   OT::Distribution build(const OT::Sample & sample) const;
-  VineCopula buildAsNative(const OT::Sample & sample) const;
 
   /** String converter */
   OT::String __repr__() const override;

python/test/t_VineCopulaFactory_std.py

@@ -24,5 +24,3 @@
 
 factory2 = ot.ClaytonCopulaFactory()
 print(factory2.build(sample))
-
-print(factory.buildAsNative(sample).asNative())