StatisKit · pfernique · Sep 26, 2017 · Nov 7, 2017 · Mar 20, 2018 · Mar 20, 2018
diff --git a/TODO.rst b/TODO.rst
diff --git a/appveyor.yml b/appveyor.yml
@@ -6,13 +6,11 @@ platform:
 
 environment:
   matrix:
-    - CONDA_RECIPE: bin/conda/libstatiskit_core-dev
-      CONDA_VERSION: 2
     - CONDA_RECIPE: bin/conda/libstatiskit_core-dev
       CONDA_VERSION: 3
     - CONDA_RECIPE: bin\conda\libstatiskit_core
-    - CONDA_RECIPE: bin\conda\python-statiskit_core
-      CONDA_VERSION: 2
+    # - CONDA_RECIPE: bin\conda\python-statiskit_core
+    #   CONDA_VERSION: 2
     - CONDA_RECIPE: bin\conda\python-statiskit_core
       CONDA_VERSION: 3
 

diff --git a/bin/conda/libstatiskit_core-dev/bld.bat b/bin/conda/libstatiskit_core-dev/bld.bat
@@ -1,6 +1,6 @@
 echo ON
 
-scons autowig --prefix=%LIBRARY_PREFIX% -j%CPU_COUNT% --autowig-no-wrappers
+scons cpp-dev --prefix=%LIBRARY_PREFIX% -j%CPU_COUNT%
 if errorlevel 1 exit 1
 
 echo OFF
diff --git a/bin/conda/libstatiskit_core-dev/build.sh b/bin/conda/libstatiskit_core-dev/build.sh
@@ -1,5 +1,9 @@
 set -ve
 
-scons autowig --prefix=$PREFIX -j$CPU_COUNT --autowig-no-wrappers
+if [[  ! ( "$(uname)" == "Linux" && "$PY3K" == "1" ) ]]; then
+   scons cpp-dev --prefix=$PREFIX -j$CPU_COUNT
+else
+    scons autowig --prefix=$PREFIX -j$CPU_COUNT --autowig-no-wrappers
+fi
 
 set +ve
diff --git a/bin/conda/libstatiskit_core-dev/meta.yaml b/bin/conda/libstatiskit_core-dev/meta.yaml
@@ -7,11 +7,12 @@ source:
 
 build:
   number: 0
+  detect_binary_files_with_prefix: False
 
 about:
   home: http://statiskit-stl.readthedocs.org
   license: Apache License 2.0
-  summary: C++ Development Files for Basic Utilities for Statistical Analyses
+  summary: C++ Development Files of Basic Utilities for Statistical Analyses
 
 requirements:
   build:
@@ -20,7 +21,8 @@ requirements:
     - libtoolchain-dev
     - libstatiskit_stl-dev
     - libstatiskit_linalg-dev
+    - libboost_core-dev
   run:
-    - python
     - libstatiskit_stl-dev
-    - libstatiskit_linalg-dev
+    - libstatiskit_linalg-dev
+    - libboost_core-dev
diff --git a/bin/conda/libstatiskit_core/meta.yaml b/bin/conda/libstatiskit_core/meta.yaml
@@ -16,8 +16,11 @@ about:
 requirements:
     build:
         - libtoolchain
-        - libstatiskit_stl-dev
-        - libstatiskit_linalg-dev
+        - libstatiskit_core-dev
+        - libstatiskit_stl
+        - libstatiskit_linalg
+        - libboost_core-dev
     run:
+        - libboost
         - libstatiskit_stl
         - libstatiskit_linalg
diff --git a/bin/conda/python-statiskit_core/bld.bat b/bin/conda/python-statiskit_core/bld.bat
@@ -1,8 +1,8 @@
 echo ON
 
-if "%PY3K%" == "1" (
-  2to3 -n -w %SRC_DIR%\src\py\autowig
-  2to3 -n -w %SRC_DIR%\test
+if "%PY3K%" == "0" (
+  3to2 -n -w %SRC_DIR%\src\py\autowig -x str
+  3to2 -n -w %SRC_DIR%\test -x str
 )
 
 scons py --prefix=%LIBRARY_PREFIX% -j%CPU_COUNT% --arch=%ARCH%

diff --git a/bin/conda/python-statiskit_core/build.sh b/bin/conda/python-statiskit_core/build.sh
@@ -1,8 +1,8 @@
 set -ve
 
-if [[ "$PY3K" = "1" ]]; then
-  2to3 -n -w $SRC_DIR/src/py/statiskit
-  2to3 -n -w $SRC_DIR/test
+if [[ "$PY3K" = "0" ]]; then
+  3to2 -n -w $SRC_DIR/src/py/statiskit -x str
+  3to2 -n -w $SRC_DIR/test -x str
 fi
 
 scons py --prefix=$PREFIX -j$CPU_COUNT

diff --git a/bin/conda/python-statiskit_core/meta.yaml b/bin/conda/python-statiskit_core/meta.yaml
@@ -11,15 +11,20 @@ build:
 about:
   home: http://statiskit-core.readthedocs.io
   license: Apache License 2.0
+  summary: A Python Interface from C++ Library of Basic Utilities for Statistical Analyses
 
 requirements:
   build:
     - libtoolchain
     - python-toolchain
-    - libboost_python-dev
+    - libboost_core-dev
+    - libstatiskit_core-dev
     - libstatiskit_core
+    - libboost_python-dev
+    - libboost_python
     - python
   run:
+    - libboost_python
     - libstatiskit_core
     - python-statiskit_linalg
     - python-statiskit_stl

diff --git a/script.py b/script.py
diff --git a/src/cpp/SConscript b/src/cpp/SConscript
@@ -17,12 +17,13 @@ Alias("autowig", targets)
 Alias("install", targets)
 
 wigenv = cppenv.Clone(tools = ['wig'])
+wigenv.AppendUnique(CPPDEFINES=['EIGEN_NO_STATIC_ASSERT', 'AUTOWIG'])
 targets = wigenv.BoostPythonWIG('statiskit_core', [target for target in targets if target.name.endswith('.h')],
                                 module='../py/wrapper/_core.cpp',
                                 decorator='../py/statiskit/core/_core.py',
-                                parser_bootstrap=3,
+                                parser_bootstrap=1,
                                 controller='AutoWIG.py',
-                                depends=['statiskit_linalg', 'statiskit_stl'])
+                                depends=['statiskit_linalg'])
 Alias("autowig", targets)
 wigenv.Depends(targets, "cpp-dev")
 

diff --git a/src/cpp/base.h b/src/cpp/base.h
@@ -69,7 +69,7 @@ namespace statiskit
 
         /** Get the random generator
          * 
-         * The random generator used is the <a href="http://www.boost.org/doc/libs/1_60_0/doc/html/boost/random/mt19937.html">Mersenne Twister</a> random generator of the Boost.Random library
+         * The random generator used is the <a href="http://www.boost.org /doc/libs/1_60_0/doc/html/boost/random/mt19937.html">Mersenne Twister</a> random generator of the Boost.Random library
          */
         STATISKIT_CORE_API boost::mt19937& get_random_generator();
 
@@ -200,5 +200,7 @@ namespace statiskit
 namespace std { template<typename T, typename... Args> unique_ptr<T> make_unique(Args&&... args); }
 #endif
 
+#ifndef AUTOWIG
 #include "base.hpp"
 #endif
+#endif
diff --git a/src/cpp/data.cpp b/src/cpp/data.cpp
@@ -2,6 +2,9 @@
 
 namespace statiskit
 { 
+    UnivariateData::~UnivariateData()
+    {}
+
     Index UnivariateData::size() const
     {
         Index index = 0;
@@ -166,6 +169,9 @@ namespace statiskit
         return maximum;
     }
 
+    UnivariateData::Generator::~Generator()
+    {}
+
     unsigned int NamedData::__index = 0;
 
     NamedData::NamedData()
@@ -357,6 +363,9 @@ namespace statiskit
         { throw proxy_connection_error(); }
         return 1;
     }
+
+    MultivariateData::~MultivariateData()
+    {}
 
     Index MultivariateData::size() const
     {
@@ -382,6 +391,8 @@ namespace statiskit
         return total;
     }
 
+    MultivariateData::Generator::~Generator()
+    {}
 
     MultivariateDataFrame::MultivariateDataFrame()
     {

diff --git a/src/cpp/data.h b/src/cpp/data.h
@@ -17,8 +17,12 @@ namespace statiskit
         typedef UnivariateEvent event_type;
         typedef WeightedUnivariateData weighted_type;
 
+        virtual ~UnivariateData() = 0;
+
         struct STATISKIT_CORE_API Generator
         {
+            virtual ~Generator() = 0;
+
             virtual bool is_valid() const = 0;
 
             virtual Generator& operator++() = 0;
@@ -46,7 +50,7 @@ namespace statiskit
             NamedData();
             NamedData(const std::string& name);
             NamedData(const NamedData& named_data);
-            ~NamedData();
+            virtual ~NamedData();
 
             const std::string& get_name() const;
             void set_name(const std::string& name);
@@ -115,8 +119,12 @@ namespace statiskit
         typedef MultivariateEvent event_type;
         typedef WeightedMultivariateData weighted_type;
 
+        virtual ~MultivariateData() = 0;
+
         struct STATISKIT_CORE_API Generator
         {
+            virtual ~Generator() = 0;
+
             virtual bool is_valid() const = 0;
 
             virtual Generator& operator++() = 0;
@@ -608,5 +616,7 @@ namespace statiskit
     };*/
 }
 
+#ifndef AUTOWIG
 #include "data.hpp"
 #endif
+#endif
diff --git a/src/cpp/distribution.cpp b/src/cpp/distribution.cpp
@@ -3,6 +3,9 @@
 
 namespace statiskit
 {
+    UnivariateDistribution::~UnivariateDistribution()
+    {}
+
     double UnivariateDistribution::loglikelihood(const UnivariateData& data) const
     {
         double llh = 0.;
@@ -1355,10 +1358,10 @@ namespace statiskit
     }
 
     double LaplaceDistribution::ldf(const double& value) const
-    { return abs(_mu - value) / _sigma - log(2*_sigma); }
+    { return fabs(_mu - value) / _sigma - log(2*_sigma); }
 
     double LaplaceDistribution::pdf(const double& value) const
-    { return  0.5 * exp( abs(_mu - value) / _sigma) / _sigma; }
+    { return  0.5 * exp(fabs(_mu - value) / _sigma) / _sigma; }
 
     double LaplaceDistribution::cdf(const double& value) const
     {
@@ -1994,6 +1997,12 @@ namespace statiskit
         return llh;        
     }
 
+    UnivariateConditionalDistribution::~UnivariateConditionalDistribution()
+    {}
+
+    MultivariateDistribution::~MultivariateDistribution()
+    {}
+
     double MultivariateDistribution::loglikelihood(const MultivariateData& data) const
     {
         double llh = 0.;
@@ -2301,6 +2310,9 @@ namespace statiskit
         return p;
     }
 
+    MultivariateConditionalDistribution::~MultivariateConditionalDistribution()
+    {}
+
     double MultivariateConditionalDistribution::loglikelihood(const MultivariateConditionalData& data) const
     {
         double llh = 0.;

diff --git a/src/cpp/distribution.h b/src/cpp/distribution.h
@@ -24,6 +24,8 @@ namespace statiskit
     {	
         typedef UnivariateData data_type;
 
+        virtual ~UnivariateDistribution() = 0;
+
     	/// \brief Get the number of parameters of the distribution.
         virtual unsigned int get_nb_parameters() const = 0;
 
@@ -1982,6 +1984,8 @@ namespace statiskit
     {
         typedef UnivariateDistribution response_type;
 
+        virtual ~UnivariateConditionalDistribution() = 0;
+
         /// \Brief This is an operation of conditioning that returns the conditional distribution \f$ Y \vert \boldsymbol{X} = \boldsymbol{x} \f$.
         virtual const UnivariateDistribution* operator() (const MultivariateEvent& event) const = 0;
 
@@ -2013,6 +2017,8 @@ namespace statiskit
         typedef MultivariateData data_type;
         typedef UnivariateDistribution marginal_type;
 
+        virtual ~MultivariateDistribution() = 0;
+
         /// \brief Get the number of components of the distribution.
         virtual Index get_nb_components() const = 0;
 
@@ -2153,27 +2159,21 @@ namespace statiskit
     typedef IndependentMultivariateDistribution< DiscreteMultivariateDistribution > DiscreteIndependentMultivariateDistribution;
     typedef IndependentMultivariateDistribution< ContinuousMultivariateDistribution > ContinuousIndependentMultivariateDistribution;*/
 
-    /** \Brief This class MultivariateConditionalDistribution represents the conditional distribution \f$ Y \vert \boldsymbol{X} \f$ of an univariate random component \f$ Y\f$ given a multivariate component \f$ \boldsymbol{X} \f$.
-     *
-     */
+
     struct STATISKIT_CORE_API MultivariateConditionalDistribution
     {
         typedef MultivariateDistribution response_type;
 
+        virtual ~MultivariateConditionalDistribution() = 0;
+
         virtual Index get_nb_components() const = 0;
 
-        /// \Brief This is an operation of conditioning that returns the conditional distribution \f$ Y \vert \boldsymbol{X} = \boldsymbol{x} \f$.
         virtual const MultivariateDistribution* operator() (const MultivariateEvent& event) const = 0;
 
         double loglikelihood(const MultivariateConditionalData& data) const;
 
-        /// \Brief Get the sample space of the response component \f$ Y \f$.
-        //virtual std::unique_ptr< MultivariateSampleSpace > get_response_space() const = 0;
-
-        /// \Brief Get the sample space of the explanatory components \f$ \boldsymbol{X} \f$.
         virtual const MultivariateSampleSpace* get_explanatory_space() const = 0;
 
-        /// \Brief Get the number of parameters of the \f$ Y \vert \boldsymbol{X} \f$.
         virtual unsigned int get_nb_parameters() const = 0;
 
         virtual std::unique_ptr< MultivariateConditionalDistribution > copy() const = 0;
@@ -2331,5 +2331,7 @@ namespace statiskit
     typedef std::vector< ContinuousMultivariateDistribution* > ContinuousMultivariateDistributionVector;
 }
 
+#ifndef AUTOWIG
 #include "distribution.hpp"
 #endif
+#endif