code tested against clang, apple-clang compilers. Fixed segfault caus…

…ed by bad_cast in clang

.github/workflows/Dockerfile

@@ -6,6 +6,7 @@ FROM alpine:latest
 # base system dependencies
 RUN apk --no-cache add --update \
     g++ \
+    clang \
     libstdc++ \
     cmake \
     git \

.github/workflows/test-linux-clang.yml

@@ -0,0 +1,21 @@
+name: test-linux-clang
+on:
+  push:
+     branches: [ stable, develop ]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    container:
+      image: alepalu/fdapde-docker-linux:latest
+    steps:
+    - name: checkout repository
+      uses: actions/checkout@v2
+      with:
+        submodules: 'recursive'
+    - name: run_tests
+      run: |
+        cd test/
+        export Eigen3_DIR=/usr/share/cmake/Modules # reguired to let eigen3 work with CMake in alpine
+        chmod +x run_tests.sh
+        ./run_tests.sh --compiler clang

.github/workflows/test-workflow.yml → .github/workflows/test-linux-gcc.yml

@@ -1,4 +1,4 @@
-name: test-workflow
+name: test-linux-gcc
 on:
   push:
      branches: [ stable, develop ]
@@ -7,7 +7,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     container:
-      image: alepalu/fdapde-docker-image:latest
+      image: alepalu/fdapde-docker-linux:latest
     steps:
     - name: checkout repository
       uses: actions/checkout@v2
@@ -18,4 +18,4 @@ jobs:
         cd test/
         export Eigen3_DIR=/usr/share/cmake/Modules # reguired to let eigen3 work with CMake in alpine
         chmod +x run_tests.sh
-        ./run_tests.sh
+        ./run_tests.sh --compiler gcc

.github/workflows/test-macos-clang.yml

@@ -0,0 +1,21 @@
+name: test-macos-clang
+on:
+  push:
+     branches: [ stable, develop ]
+
+jobs:
+  build:
+    runs-on: macos-latest
+    steps:
+    - name: checkout repository
+      uses: actions/checkout@v2
+      with:
+        submodules: 'recursive'
+    - name: install_deps
+      run: |
+        brew install eigen
+    - name: run_tests
+      run: |
+        cd test/
+        chmod +x run_tests.sh
+        ./run_tests.sh --compiler clang

README.md

@@ -2,9 +2,11 @@
 
 <h5> Physics-Informed Spatial and Functional Data Analysis </h5> </div>
 
-![test-linux-gcc](https://img.shields.io/github/actions/workflow/status/fdaPDE/fdaPDE-cpp/test-workflow.yml?branch=stable&label=test-linux-gcc)
+![test-linux-gcc](https://img.shields.io/github/actions/workflow/status/fdaPDE/fdaPDE-cpp/test-linux-gcc.yml?branch=stable&label=test-linux-gcc)
+![test-linux-clang](https://img.shields.io/github/actions/workflow/status/fdaPDE/fdaPDE-cpp/test-linux-clang.yml?branch=stable&label=test-linux-clang)
+![test-macos-clang](https://img.shields.io/github/actions/workflow/status/fdaPDE/fdaPDE-cpp/test-macos-clang.yml?branch=stable&label=test-macos-clang)
 
-fdaPDE is a C++ library for the analysis of spatial data and functional data observed over complex multidimensional domains, featuring a Partial Differential Equation regularization. 
+fdaPDE is a C++ library for the analysis of spatial and functional data observed over complex multidimensional domains, featuring a Partial Differential Equation regularization. 
 
 It is built on top of the [fdaPDE Core Library](https://github.com/fdaPDE/fdaPDE-core).
 

fdaPDE/models/model_wrappers.h

@@ -80,7 +80,7 @@ template <> struct IStatModel<SpaceTimeParabolic> {
     DEFINE_BASE_STAT_MODEL_INTERFACE;
     void set_lambda(const SVector<2>& lambda) { fdapde::invoke<void, 6>(*this, lambda); }
     void set_lambda_T(double lambda_T) { fdapde::invoke<void, 7>(*this, lambda_T); }
-    void set_initial_condition(const DVector<double>& s, bool shift = true) {
+    void set_initial_condition(const DMatrix<double>& s, bool shift = true) {
         fdapde::invoke<void, 8>(*this, s, shift);
     }
 };

fdaPDE/models/space_time_parabolic_base.h

@@ -125,66 +125,6 @@ class SpaceTimeParabolicBase : public SpaceTimeBase<Model, SpaceTimeParabolic> {
     // destructor
     virtual ~SpaceTimeParabolicBase() = default;
 };
-
-  /*
-// base class for parabolic regularization, iterative solver
-template <typename Model>
-class SpaceTimeParabolicBase<Model, Iterative> : public SpaceTimeBase<Model, SpaceTimeParabolic> {
-   protected:
-    typedef SpaceTimeBase<Model, SpaceTimeParabolic> Base;
-    using Base::df_;     // model's data
-    using Base::model;   // underlying model object
-    using Base::pde_;    // regularizing term in space
-    using Base::time_;   // time interval [0,T]
-
-    DMatrix<double> s_;   // N x 1 initial condition vector
-    DMatrix<double> u_;   // discretized forcing [1/DeltaT * (u_1 + R_0*s) \ldots u_n]
-    double DeltaT_;       // time step (assumes equidistant points in time)
-
-   public:
-    // constructor
-    SpaceTimeParabolicBase() = default;
-    SpaceTimeParabolicBase(const pde_ptr& pde, const DVector<double>& time) : Base(pde, time) { }
-    // init data required for iterative solution of parabolic regularization
-    void init_regularization() {
-        // compute time step (assuming equidistant points)
-        DeltaT_ = time_[1] - time_[0];
-        u_ = pde_.force();   // compute forcing term
-        // correct first n rows of discretized force as (u_1 + R0*s/DeltaT)
-        u_.block(0, 0, model().n_basis(), 1) += (1.0 / DeltaT_) * (pde_.R0() * s_);
-    }
-
-    // getters
-    const SpMatrix<double>& R0() const { return pde_.R0(); }   // mass matrix in space
-    const SpMatrix<double>& R1() const { return pde_.R1(); }   // discretization of differential operator L
-    DMatrix<double> u(std::size_t k) const {                    // discretization of forcing term u at time k
-        return u_.block(model().n_basis() * k, 0, model().n_basis(), 1);
-    }
-    double DeltaT() const { return DeltaT_; }
-    const DMatrix<double>& s() const { return s_; }          // initial condition
-    std::size_t n_basis() const { return pde_.n_dofs(); }   // number of basis functions
-
-    void P() { return; } // TODO
-  
-    // setters
-    // shift = true, cause the removal of the first time instant of data, in case it has been used to estimate the IC
-    void set_initial_condition(const DMatrix<double>& s, bool shift = true) {
-        s_ = s;
-        if (shift) { // left shrink time domain by one node
-            std::size_t m = time_.rows();       // number of time instants
-            time_ = time_.tail(m - 1).eval();   // correct time interval [0,T] (eval() to avoid aliasing)
-            pde_.set_forcing(pde_.forcing_data().rightCols(m - 1));
-            // remove from data the first time instant, reindex points
-            model().set_data(df_.tail(model().n_spatial_locs()).extract(), true);
-        }
-    }
-    void set_tolerance(double tol) { tol_ = tol; }
-    void set_max_iter(std::size_t max_iter) { max_iter_ = max_iter; }
-
-    // destructor
-    virtual ~SpaceTimeParabolicBase() = default;
-};
-  */
 
 }   // namespace models
 }   // namespace fdapde

test/run_tests.sh

@@ -1,9 +1,73 @@
 #!/bin/sh
 
-# cd into build directory
+# set defaults
+SCRIPT_NAME=$(basename "$0")
 BUILD_DIR=build/
+MEMCHECK=false
+COMPILER="gcc"
+
+help()
+{
+    echo "Usage: .run_tests.sh [options]
+
+       -m --memcheck         use valgrind to checks for memory errors
+       -c --compiler         sets compiler (gcc/clang), default gcc
+       -h --help             shows this message"
+    exit 2
+}
+
+clean_build_dir()
+{
+    if [ -d "$BUILD_DIR" ];
+    then
+	rm -r build/CMakeCache.txt build/CMakeFiles/
+    fi
+}
+
+## parse command line inputs
+SHORT=m,c:,h
+LONG=memcheck,compiler:,help
+OPTS=$(getopt -a --n "$SCRIPT_NAME" --options $SHORT --longoptions $LONG -- "$@") 
+
+eval set -- "$OPTS"
+
+while :; do
+    case "$1" in
+	-m | --memcheck )
+	    MEMCHECK=true
+	    shift 1
+	    ;;
+	-c | --compiler )
+	    COMPILER="$2"
+	    shift 2
+	    ;;
+	-h | --help )
+	    help
+	    ;;
+	--)
+	    shift;
+	    break
+	    ;;
+	*)
+	    echo "Unexpected option: $1"
+	    help
+	    ;;
+    esac
+done
+
+## set CMake compiler
+if [ "$COMPILER" = "gcc" ]; then
+    export CC=/usr/bin/gcc
+    export CXX=/usr/bin/g++
+elif [ "$COMPILER" = "clang" ]; then
+    export CC=/usr/bin/clang
+    export CXX=/usr/bin/clang++
+fi
+
+# cd into build directory
 if [ -d "$BUILD_DIR" ];
 then
+    clean_build_dir
     cd build/
 else
     mkdir build/
@@ -12,4 +76,11 @@ fi
 
 cmake -Wno-dev ../CMakeLists.txt
 make
-./fdapde_test
+
+if [ "$MEMCHECK" = true ]; then
+    valgrind --leak-check=full --track-origins=yes ./fdapde_test
+else
+    ./fdapde_test
+fi
+
+rm fdapde_test