Merge branch 'mergetests' into 'master'

Merging branch

See merge request !20

.circleci/config.yml

+#
+#
+#  ******************************************************************************
+#  MontiCAR Modeling Family, www.se-rwth.de
+#  Copyright (c) 2017, Software Engineering Group at RWTH Aachen,
+#  All rights reserved.
+#
+#  This project is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU Lesser General Public
+#  License as published by the Free Software Foundation; either
+#  version 3.0 of the License, or (at your option) any later version.
+#  This library is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+#  Lesser General Public License for more details.
+#
+#  You should have received a copy of the GNU Lesser General Public
+#  License along with this project. If not, see <http://www.gnu.org/licenses/>.
+# *******************************************************************************
+#
+
 # Java Maven CircleCI 2.0 configuration file
 #
 # Check https://circleci.com/docs/2.0/language-java/ for more details

.gitlab-ci.yml

+#
+#
+#  ******************************************************************************
+#  MontiCAR Modeling Family, www.se-rwth.de
+#  Copyright (c) 2017, Software Engineering Group at RWTH Aachen,
+#  All rights reserved.
+#
+#  This project is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU Lesser General Public
+#  License as published by the Free Software Foundation; either
+#  version 3.0 of the License, or (at your option) any later version.
+#  This library is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+#  Lesser General Public License for more details.
+#
+#  You should have received a copy of the GNU Lesser General Public
+#  License along with this project. If not, see <http://www.gnu.org/licenses/>.
+# *******************************************************************************
+#
+
 stages:
 - windows
-- linux
+#- linux
 
-masterJobLinux:
-  stage: linux
-  image: maven:3-jdk-8
+#masterJobLinux:
+#  stage: linux
+#  image: maven:3-jdk-8
 #  image: atlassian/default-image:1
-  script:
+#  script:
 #  - gcc --help
-  - mvn -Dmaven.wagon.http.ssl.insecure=true -Dmaven.wagon.http.ssl.allowall=true -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -B  clean deploy --settings settings.xml
-  - cat target/site/jacoco/index.html
-  - mvn package sonar:sonar -s settings.xml
-  only:
-  - master
+#  - mvn -Dmaven.wagon.http.ssl.insecure=true -Dmaven.wagon.http.ssl.allowall=true -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -B  clean deploy --settings settings.xml
+#  - cat target/site/jacoco/index.html
+#  - mvn package sonar:sonar -s settings.xml
+#  only:
+#  - master
 
 masterJobWindows:
   stage: windows
@@ -21,18 +42,21 @@ masterJobWindows:
   tags:
   - Windows10
 
-BranchJobLinux:
-  stage: linux
-  image: maven:3-jdk-8
+#BranchJobLinux:
+#  stage: linux
+#  image: maven:3-jdk-8
+#  script:
+#  - mvn -Dmaven.wagon.http.ssl.insecure=true -Dmaven.wagon.http.ssl.allowall=true -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -B  clean install --settings settings.xml
+#  - cat target/site/jacoco/index.html
+#  except:
+#  - master
+
+BranchJobWindows:
+  stage: windows
   script:
   - mvn -Dmaven.wagon.http.ssl.insecure=true -Dmaven.wagon.http.ssl.allowall=true -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -B  clean install --settings settings.xml
   - cat target/site/jacoco/index.html
   except:
   - master
-
-BranchJobWindows:
-  stage: windows
-  script:
-  - mvn -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -B  clean install --settings settings.xml
   tags:
   - Windows10

compileCPPTests.bat

+@REM
+@REM
+@REM  ******************************************************************************
+@REM  MontiCAR Modeling Family, www.se-rwth.de
+@REM  Copyright (c) 2017, Software Engineering Group at RWTH Aachen,
+@REM  All rights reserved.
+@REM
+@REM  This project is free software; you can redistribute it and/or
+@REM  modify it under the terms of the GNU Lesser General Public
+@REM  License as published by the Free Software Foundation; either
+@REM  version 3.0 of the License, or (at your option) any later version.
+@REM  This library is distributed in the hope that it will be useful,
+@REM  but WITHOUT ANY WARRANTY; without even the implied warranty of
+@REM  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+@REM  Lesser General Public License for more details.
+@REM
+@REM  You should have received a copy of the GNU Lesser General Public
+@REM  License along with this project. If not, see <http://www.gnu.org/licenses/>.
+@REM *******************************************************************************
+@REM
+
+subst N: .
+cd /D N:\
+cd native
+call variables.bat
+call compileTestsArmadilloBackendOpenBLAS.bat %PROJECT_ROOT%%1 %PROJECT_ROOT%%2

compileCPPTests.sh

+#!/bin/bash
+#
+#
+#  ******************************************************************************
+#  MontiCAR Modeling Family, www.se-rwth.de
+#  Copyright (c) 2017, Software Engineering Group at RWTH Aachen,
+#  All rights reserved.
+#
+#  This project is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU Lesser General Public
+#  License as published by the Free Software Foundation; either
+#  version 3.0 of the License, or (at your option) any later version.
+#  This library is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+#  Lesser General Public License for more details.
+#
+#  You should have received a copy of the GNU Lesser General Public
+#  License along with this project. If not, see <http://www.gnu.org/licenses/>.
+# *******************************************************************************
+#
+
+
+cd native
+sh variables.sh
+sh compileTestsArmadilloBackendOpenBLAS.sh %PROJECT_ROOT%%1 %PROJECT_ROOT%%2
+
+exit
\ No newline at end of file

executeStreamTest.bat

+@REM
+@REM
+@REM  ******************************************************************************
+@REM  MontiCAR Modeling Family, www.se-rwth.de
+@REM  Copyright (c) 2017, Software Engineering Group at RWTH Aachen,
+@REM  All rights reserved.
+@REM
+@REM  This project is free software; you can redistribute it and/or
+@REM  modify it under the terms of the GNU Lesser General Public
+@REM  License as published by the Free Software Foundation; either
+@REM  version 3.0 of the License, or (at your option) any later version.
+@REM  This library is distributed in the hope that it will be useful,
+@REM  but WITHOUT ANY WARRANTY; without even the implied warranty of
+@REM  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+@REM  Lesser General Public License for more details.
+@REM
+@REM  You should have received a copy of the GNU Lesser General Public
+@REM  License along with this project. If not, see <http://www.gnu.org/licenses/>.
+@REM *******************************************************************************
+@REM
+
+subst N: .
+cd /D N:
+cd native
+call variables.bat
+cd %PROJECT_ROOT%%1
+xcopy /s /y "N:\native\lib\win" "%PROJECT_ROOT%%1"
+call TestsForCurrentModel.exe
\ No newline at end of file

executeStreamTest.sh

+#!/bin/bash
+#
+#
+#  ******************************************************************************
+#  MontiCAR Modeling Family, www.se-rwth.de
+#  Copyright (c) 2017, Software Engineering Group at RWTH Aachen,
+#  All rights reserved.
+#
+#  This project is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU Lesser General Public
+#  License as published by the Free Software Foundation; either
+#  version 3.0 of the License, or (at your option) any later version.
+#  This library is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+#  Lesser General Public License for more details.
+#
+#  You should have received a copy of the GNU Lesser General Public
+#  License along with this project. If not, see <http://www.gnu.org/licenses/>.
+# *******************************************************************************
+#
+
+
+cd native
+sh variables.sh
+cd %PROJECT_ROOT%%1
+sh TestsForCurrentModel.exe
\ No newline at end of file

native/armadillo/include/armadillo.h

+/**
+ *
+ *  ******************************************************************************
+ *  MontiCAR Modeling Family, www.se-rwth.de
+ *  Copyright (c) 2017, Software Engineering Group at RWTH Aachen,
+ *  All rights reserved.
+ *
+ *  This project is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 3.0 of the License, or (at your option) any later version.
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this project. If not, see <http://www.gnu.org/licenses/>.
+ * *******************************************************************************
+ */
+#include "armadillo"
+#include <iosfwd>
+#include <string>
+#include <cstdint>
+#include <vector>
+#include <memory>
+#include <cstddef>
+#include <sstream>
+#include <type_traits>
+#include <utility>
+#include <tuple>
+#include <ctime>
+#include <ratio>
+#include <chrono>
+#include <ostream>
+#include <signal.h>
+#include <exception>
+#include <stdexcept>
+#include <streambuf>
+#include <fstream>
+#include <map>
+#include <set>
+#include <algorithm>
+#include <cstring>
+#include <cfloat>
+#include <cstdio>
+#include <assert.h>
+#include <cmath>
+#include <limits>
+#include <cassert>
+//#include <AfxWin.h>
+#include <windows.h>
+#include <unistd.h>
+#include <stdbool.h>
+#include <sys/types.h>
+//#include <sys/sysctl.h>
+#include <cerrno>
+#include <crtdbg.h>
+#include <iomanip>
+#include <cstdlib>
+#include <ios>
+#include <iostream>
+#include <cctype>
+

native/armadillo/include/armadillo_bits/BaseCube_bones.hpp

+// Copyright 2008-2016 Conrad Sanderson (http://conradsanderson.id.au)
+// Copyright 2008-2016 National ICT Australia (NICTA)
+// 
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
+// 
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// ------------------------------------------------------------------------
+
+
+//! \addtogroup BaseCube
+//! @{
+
+
+
+template<typename elem_type, typename derived>
+struct BaseCube_eval_Cube
+  {
+  arma_inline const derived& eval() const;
+  };
+
+
+template<typename elem_type, typename derived>
+struct BaseCube_eval_expr
+  {
+  arma_inline Cube<elem_type> eval() const;   //!< force the immediate evaluation of a delayed expression
+  };
+
+
+template<typename elem_type, typename derived, bool condition>
+struct BaseCube_eval {};
+
+template<typename elem_type, typename derived>
+struct BaseCube_eval<elem_type, derived, true>  { typedef BaseCube_eval_Cube<elem_type, derived>  result; };
+
+template<typename elem_type, typename derived>
+struct BaseCube_eval<elem_type, derived, false> { typedef BaseCube_eval_expr<elem_type, derived> result; };
+
+
+
+//! Analog of the Base class, intended for cubes
+template<typename elem_type, typename derived>
+struct BaseCube
+  : public BaseCube_eval<elem_type, derived, is_Cube<derived>::value>::result
+  {
+  arma_inline const derived& get_ref() const;
+  
+  inline void print(                           const std::string extra_text = "") const;
+  inline void print(std::ostream& user_stream, const std::string extra_text = "") const;
+  
+  inline void raw_print(                           const std::string extra_text = "") const;
+  inline void raw_print(std::ostream& user_stream, const std::string extra_text = "") const;
+  
+  inline arma_warn_unused elem_type min() const;
+  inline arma_warn_unused elem_type max() const;
+  
+  inline arma_warn_unused uword index_min() const;
+  inline arma_warn_unused uword index_max() const;
+  };
+
+
+
+//! @}

native/armadillo/include/armadillo_bits/BaseCube_meat.hpp

+// Copyright 2008-2016 Conrad Sanderson (http://conradsanderson.id.au)
+// Copyright 2008-2016 National ICT Australia (NICTA)
+// 
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
+// 
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// ------------------------------------------------------------------------
+
+
+//! \addtogroup BaseCube
+//! @{
+
+
+
+template<typename elem_type, typename derived>
+arma_inline
+const derived&
+BaseCube<elem_type,derived>::get_ref() const
+  {
+  return static_cast<const derived&>(*this);
+  }
+
+
+
+template<typename elem_type, typename derived>
+inline
+void
+BaseCube<elem_type,derived>::print(const std::string extra_text) const
+  {
+  const unwrap_cube<derived> tmp( (*this).get_ref() );
+  
+  tmp.M.impl_print(extra_text);
+  }
+
+
+
+template<typename elem_type, typename derived>
+inline
+void
+BaseCube<elem_type,derived>::print(std::ostream& user_stream, const std::string extra_text) const
+  {
+  const unwrap_cube<derived> tmp( (*this).get_ref() );
+  
+  tmp.M.impl_print(user_stream, extra_text);
+  }
+  
+
+
+template<typename elem_type, typename derived>
+inline
+void
+BaseCube<elem_type,derived>::raw_print(const std::string extra_text) const
+  {
+  const unwrap_cube<derived> tmp( (*this).get_ref() );
+  
+  tmp.M.impl_raw_print(extra_text);
+  }
+
+
+
+template<typename elem_type, typename derived>
+inline
+void
+BaseCube<elem_type,derived>::raw_print(std::ostream& user_stream, const std::string extra_text) const
+  {
+  const unwrap_cube<derived> tmp( (*this).get_ref() );
+  
+  tmp.M.impl_raw_print(user_stream, extra_text);
+  }
+
+
+
+template<typename elem_type, typename derived>
+inline
+arma_warn_unused
+elem_type
+BaseCube<elem_type,derived>::min() const
+  {
+  return op_min::min( (*this).get_ref() );
+  }
+
+
+
+template<typename elem_type, typename derived>
+inline
+arma_warn_unused
+elem_type
+BaseCube<elem_type,derived>::max() const
+  {
+  return op_max::max( (*this).get_ref() );
+  }
+
+
+
+template<typename elem_type, typename derived>
+inline
+arma_warn_unused
+uword
+BaseCube<elem_type,derived>::index_min() const
+  {
+  const ProxyCube<derived> P( (*this).get_ref() );
+  
+  uword index = 0;
+  
+  if(P.get_n_elem() == 0)
+    {
+    arma_debug_check(true, "index_min(): object has no elements");
+    }
+  else
+    {
+    op_min::min_with_index(P, index);
+    }
+  
+  return index;
+  }
+
+
+
+template<typename elem_type, typename derived>
+inline
+arma_warn_unused
+uword
+BaseCube<elem_type,derived>::index_max() const
+  {
+  const ProxyCube<derived> P( (*this).get_ref() );
+  
+  uword index = 0;
+  
+  if(P.get_n_elem() == 0)
+    {
+    arma_debug_check(true, "index_max(): object has no elements");
+    }
+  else
+    {
+    op_max::max_with_index(P, index);
+    }
+  
+  return index;
+  }
+
+
+
+//
+// extra functions defined in BaseCube_eval_Cube
+
+template<typename elem_type, typename derived>
+arma_inline
+const derived&
+BaseCube_eval_Cube<elem_type, derived>::eval() const
+  {
+  arma_extra_debug_sigprint();
+  
+  return static_cast<const derived&>(*this);
+  }
+
+
+
+//
+// extra functions defined in BaseCube_eval_expr
+
+template<typename elem_type, typename derived>
+arma_inline
+Cube<elem_type>
+BaseCube_eval_expr<elem_type, derived>::eval() const
+  {
+  arma_extra_debug_sigprint();
+  
+  return Cube<elem_type>( static_cast<const derived&>(*this) );
+  }
+
+
+
+//! @}

native/armadillo/include/armadillo_bits/Base_bones.hpp

+// Copyright 2008-2016 Conrad Sanderson (http://conradsanderson.id.au)
+// Copyright 2008-2016 National ICT Australia (NICTA)
+// 
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
+// 
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// ------------------------------------------------------------------------
+
+
+//! \addtogroup Base
+//! @{
+
+
+
+template<typename derived>
+struct Base_inv_yes
+  {
+  arma_inline const Op<derived,op_inv> i() const;   //!< matrix inverse
+  
+  arma_deprecated inline const Op<derived,op_inv> i(const bool ) const;   //!< kept only for compatibility with old user code
+  arma_deprecated inline const Op<derived,op_inv> i(const char*) const;   //!< kept only for compatibility with old user code
+  };
+
+
+template<typename derived>
+struct Base_inv_no
+  {
+  };
+
+
+template<typename derived, bool condition>
+struct Base_inv {};
+
+template<typename derived>
+struct Base_inv<derived, true>  { typedef Base_inv_yes<derived> result; };
+
+template<typename derived>
+struct Base_inv<derived, false> { typedef Base_inv_no<derived>  result; };
+
+
+
+template<typename elem_type, typename derived>
+struct Base_eval_Mat
+  {
+  arma_inline const derived& eval() const;
+  };
+
+
+template<typename elem_type, typename derived>
+struct Base_eval_expr
+  {
+  arma_inline Mat<elem_type> eval() const;   //!< force the immediate evaluation of a delayed expression
+  };
+
+
+template<typename elem_type, typename derived, bool condition>
+struct Base_eval {};
+
+template<typename elem_type, typename derived>
+struct Base_eval<elem_type, derived, true>  { typedef Base_eval_Mat<elem_type, derived>  result; };