Merge pull request #20 from jwuttke/master

This is release 2.0.6

.appveyor.yml

@@ -25,3 +25,4 @@ build_script:
 - cd build
 - cmake -G "%CMAKE_GENERATOR%" ..
 - cmake --build . --config %BUILD_CONF% -- /clp:ErrorsOnly
+- ctest

.gitignore

@@ -2,6 +2,7 @@
 *.*.user
 html/
 *~
+*.tmp
 
 build
 mybuild

.travis.yml

@@ -7,7 +7,7 @@ os:
 # - osx (temporari)
 
 compiler:
-# - clang (problems installing qt54base, qt54multimedia)
+# - clang (problems installing qt54base)
 - gcc
 
 branches:
@@ -40,5 +40,4 @@ addons:
     - sourceline: ppa:beineri/opt-qt542-trusty
     packages:
     - qt54base
-    - qt54multimedia
     - xvfb

.travis/linux/test_Debug.sh

@@ -1,2 +1,2 @@
 cd build
-xvfb-run tests/tests
+ctest

.travis/linux/test_Release.sh

@@ -1,2 +1,2 @@
 cd build
-xvfb-run tests/tests
+ctest

io/CMakeLists.txt → 3rdparty/Caress/CMakeLists.txt

@@ -1,18 +1,15 @@
-get_filename_component(lib ${CMAKE_CURRENT_SOURCE_DIR} NAME)
+set(lib caress_loader)
 
 include_directories (
   ${CMAKE_CURRENT_SOURCE_DIR}
-  ${CMAKE_HOME_DIRECTORY}/lib
-  ${CMAKE_HOME_DIRECTORY}/core
+  ${CMAKE_HOME_DIRECTORY}/lib # for message callback
 )
 
 if (CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
   add_compile_options("-w") # legacy code with many warnings
 endif ()
 
-file (GLOB_RECURSE files *.h *.cpp)
+file (GLOB files *.h *.hpp *.cpp)
 add_library (${lib} ${files})
 
-target_link_libraries (${lib}
-  Qt5::Core
-)
+target_link_libraries (${lib} Qt5::Core)

io/Caress/car_datatypes.h → 3rdparty/Caress/car_datatypes.h

@@ -1,5 +1,5 @@
-#ifndef __DATATYPES_H__E3273490_0327_478D_9A39_DCEF3078A6F4__INCLUDED__
-#define __DATATYPES_H__E3273490_0327_478D_9A39_DCEF3078A6F4__INCLUDED__
+#ifndef CAR_DATATYPES_H
+#define CAR_DATATYPES_H
 
 #undef PLATFORM
 #undef BIG_ENDIAN
@@ -165,4 +165,4 @@ double ieee64_swap(double x);
 }
 #endif
 
-#endif /* __DATATYPES_H__E3273490_0327_478D_9A39_DCEF3078A6F4__INCLUDED__ */
+#endif // CAR_DATATYPES_H

io/Caress/car_globals.h → 3rdparty/Caress/car_globals.h

@@ -17,8 +17,8 @@ update history:
 
 ------------------------------------------------------------------------*/
 
-#ifndef CARESSGLOBALS_H
-#define CARESSGLOBALS_H 1
+#ifndef CAR_GLOBALS_H
+#define CAR_GLOBALS_H
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -1091,7 +1091,7 @@ enum {
     MODIDTYPE = 19,  /* short int (module ID) */
     /* cmdint - definitions */
     ONOFFTYPE = 21,       /* OT: strings "ON" or "OFF" (e.g. command CHECK) */
-    PMATRIXTYPE = 22,     /* PT: strings "XX", "XY",..., "ZZ" (cmd PMATRIX) */
+    PMATRIXTYPE = 22,     /* PT: strings "XX", "qpair",..., "ZZ" (cmd PMATRIX) */
     DAUTYPE = 23,         /* CT: strings "SI" or "MU" */
     ENUMERATIONTYPE = 24, /* EN: indicating enumeration in xx_ranges.dat */
     DAUDATATYPE = 25      /* IT: strings "I2" or "I4" in CONFIG command */
@@ -1355,4 +1355,4 @@ struct perm_module_t {
 }
 #endif
 
-#endif /* CARESSGLOBALS_H */
+#endif // CAR_GLOBALS_H

LevMar/CMakeLists.txt → 3rdparty/LevMar/CMakeLists.txt

@@ -2,7 +2,7 @@ get_filename_component(lib ${CMAKE_CURRENT_SOURCE_DIR} NAME)
 
 include_directories (
   ${CMAKE_CURRENT_SOURCE_DIR}
-  ${CMAKE_HOME_DIRECTORY}/lib
+  ${CMAKE_HOME_DIRECTORY}/core # LevMar is patched for message handling
 )
 
 file (GLOB_RECURSE files *.h *.hpp *.cpp)

LevMar/LM/levmar.h → 3rdparty/LevMar/LM/levmar.h

@@ -22,8 +22,6 @@
 #ifndef _LEVMAR_H_
 #define _LEVMAR_H_
 
-void msg_cannotSolve(unsigned int n, unsigned int m);
-
 /************************************* Start of configuration options *************************************/
 /* Note that when compiling with CMake, this configuration section is automatically generated
  * based on the user's input, see levmar.h.in

LevMar/LM/lm.cpp → 3rdparty/LevMar/LM/lm.cpp

@@ -32,12 +32,6 @@
 #include "compiler.h"
 #include "misc.h"
 
-#include "typ/typ_log.h"
-
-void msg_cannotSolve(uint n, uint m) {
-  MessageLogger::warn(str("levmar: cannot solve a problem with fewer measurements [%1] than unknowns [%2]\n").arg(n).arg(m));
-}
-
 #define EPSILON       1E-12
 #define ONE_THIRD     0.3333333334 /* 1.0/3.0 */
 

LevMar/LM/lm_core.hpp → 3rdparty/LevMar/LM/lm_core.hpp

@@ -120,7 +120,7 @@ int (*linsolver)(LM_REAL *A, LM_REAL *B, LM_REAL *x, int m)=NULL;
   mu=jacTe_inf=0.0; /* -Wall */
 
   if(n<m) {
-    msg_cannotSolve(n,m);
+    throw("more free parameters than data points");
     return LM_ERROR;
   }
 
@@ -504,7 +504,7 @@ int (*linsolver)(LM_REAL *A, LM_REAL *B, LM_REAL *x, int m)=NULL;
     updjac=newjac=0;		/* -Wall */
 
     if(n<m) {
-      msg_cannotSolve(n, m);
+      throw("more free parameters than data points");
       return LM_ERROR;
     }
 

LevMar/LM/lmbc_core.hpp → 3rdparty/LevMar/LM/lmbc_core.hpp

@@ -451,7 +451,7 @@ int (*linsolver)(LM_REAL *A, LM_REAL *B, LM_REAL *x, int m)=NULL;
   mu=jacTe_inf=t=0.0;
 
   if(n<m) {
-    msg_cannotSolve(n, m);
+    throw("more free parameters than data points");
     return LM_ERROR;
   }
 

3rdparty/Mar/CMakeLists.txt

@@ -0,0 +1,15 @@
+set(lib mar_loader)
+
+include_directories (
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_HOME_DIRECTORY}/lib # for message callback
+)
+
+if (CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
+  add_compile_options("-w") # legacy code with many warnings
+endif ()
+
+file (GLOB files *.h *.hpp *.cpp)
+add_library (${lib} ${files})
+
+target_link_libraries (${lib} Qt5::Core)

io/Mar/mar300_header.h → 3rdparty/Mar/mar300_header.h

@@ -10,8 +10,8 @@
  *
  **********************************************************************/
 
-#ifndef _MAR300_HEADER_H
-#define _MAR300_HEADER_H
+#ifndef MAR300_HEADER_H
+#define MAR300_HEADER_H
 
 #include <stdio.h>
 #include <string.h>
@@ -60,4 +60,4 @@ typedef struct {
 
 } MAR300_HEADER;
 
-#endif //_MAR300_HEADER_H
+#endif // MAR300_HEADER_H

io/Mar/mar345_header.h → 3rdparty/Mar/mar345_header.h

@@ -19,8 +19,8 @@
  *
  ***********************************************************************/
 
-#ifndef _MAR345_HEADER_H
-#define _MAR345_HEADER_H
+#ifndef MAR345_HEADER_H
+#define MAR345_HEADER_H
 
 #include <stdio.h>
 #include <string.h>
@@ -118,4 +118,4 @@ typedef struct {
 
 } MAR345_HEADER;
 
-#endif //_MAR345_HEADER_H
+#endif // MAR345_HEADER_H

3rdparty/QCustomPlot/CMakeLists.txt

@@ -0,0 +1,11 @@
+set(lib steca_QCP)
+
+include_directories (
+  ${CMAKE_CURRENT_SOURCE_DIR}
+)
+
+file (GLOB files *.h *.cpp)
+
+add_library (${lib} ${files})
+
+target_link_libraries (${lib} Qt5::Gui Qt5::Widgets)

3rdparty/googletest/CHANGES

@@ -0,0 +1,157 @@
+Changes for 1.7.0:
+
+* New feature: death tests are supported on OpenBSD and in iOS
+  simulator now.
+* New feature: Google Test now implements a protocol to allow
+  a test runner to detect that a test program has exited
+  prematurely and report it as a failure (before it would be
+  falsely reported as a success if the exit code is 0).
+* New feature: Test::RecordProperty() can now be used outside of the
+  lifespan of a test method, in which case it will be attributed to
+  the current test case or the test program in the XML report.
+* New feature (potentially breaking): --gtest_list_tests now prints
+  the type parameters and value parameters for each test.
+* Improvement: char pointers and char arrays are now escaped properly
+  in failure messages.
+* Improvement: failure summary in XML reports now includes file and
+  line information.
+* Improvement: the <testsuites> XML element now has a timestamp attribute.
+* Improvement: When --gtest_filter is specified, XML report now doesn't
+  contain information about tests that are filtered out.
+* Fixed the bug where long --gtest_filter flag values are truncated in
+  death tests.
+* Potentially breaking change: RUN_ALL_TESTS() is now implemented as a
+  function instead of a macro in order to work better with Clang.
+* Compatibility fixes with C++ 11 and various platforms.
+* Bug/warning fixes.
+
+Changes for 1.6.0:
+
+* New feature: ADD_FAILURE_AT() for reporting a test failure at the
+  given source location -- useful for writing testing utilities.
+* New feature: the universal value printer is moved from Google Mock
+  to Google Test.
+* New feature: type parameters and value parameters are reported in
+  the XML report now.
+* A gtest_disable_pthreads CMake option.
+* Colored output works in GNU Screen sessions now.
+* Parameters of value-parameterized tests are now printed in the
+  textual output.
+* Failures from ad hoc test assertions run before RUN_ALL_TESTS() are
+  now correctly reported.
+* Arguments of ASSERT_XY and EXPECT_XY no longer need to support << to
+  ostream.
+* More complete handling of exceptions.
+* GTEST_ASSERT_XY can be used instead of ASSERT_XY in case the latter
+  name is already used by another library.
+* --gtest_catch_exceptions is now true by default, allowing a test
+  program to continue after an exception is thrown.
+* Value-parameterized test fixtures can now derive from Test and
+  WithParamInterface<T> separately, easing conversion of legacy tests.
+* Death test messages are clearly marked to make them more
+  distinguishable from other messages.
+* Compatibility fixes for Android, Google Native Client, MinGW, HP UX,
+  PowerPC, Lucid autotools, libCStd, Sun C++, Borland C++ Builder (Code Gear),
+  IBM XL C++ (Visual Age C++), and C++0x.
+* Bug fixes and implementation clean-ups.
+* Potentially incompatible changes: disables the harmful 'make install'
+  command in autotools.
+
+Changes for 1.5.0:
+
+ * New feature: assertions can be safely called in multiple threads
+   where the pthreads library is available.
+ * New feature: predicates used inside EXPECT_TRUE() and friends
+   can now generate custom failure messages.
+ * New feature: Google Test can now be compiled as a DLL.
+ * New feature: fused source files are included.
+ * New feature: prints help when encountering unrecognized Google Test flags.
+ * Experimental feature: CMake build script (requires CMake 2.6.4+).
+ * Experimental feature: the Pump script for meta programming.
+ * double values streamed to an assertion are printed with enough precision
+   to differentiate any two different values.
+ * Google Test now works on Solaris and AIX.
+ * Build and test script improvements.
+ * Bug fixes and implementation clean-ups.
+
+ Potentially breaking changes:
+
+ * Stopped supporting VC++ 7.1 with exceptions disabled.
+ * Dropped support for 'make install'.
+
+Changes for 1.4.0:
+
+ * New feature: the event listener API
+ * New feature: test shuffling
+ * New feature: the XML report format is closer to junitreport and can
+   be parsed by Hudson now.
+ * New feature: when a test runs under Visual Studio, its failures are
+   integrated in the IDE.
+ * New feature: /MD(d) versions of VC++ projects.
+ * New feature: elapsed time for the tests is printed by default.
+ * New feature: comes with a TR1 tuple implementation such that Boost
+   is no longer needed for Combine().
+ * New feature: EXPECT_DEATH_IF_SUPPORTED macro and friends.
+ * New feature: the Xcode project can now produce static gtest
+   libraries in addition to a framework.
+ * Compatibility fixes for Solaris, Cygwin, minGW, Windows Mobile,
+   Symbian, gcc, and C++Builder.
+ * Bug fixes and implementation clean-ups.
+
+Changes for 1.3.0:
+
+ * New feature: death tests on Windows, Cygwin, and Mac.
+ * New feature: ability to use Google Test assertions in other testing
+   frameworks.
+ * New feature: ability to run disabled test via
+   --gtest_also_run_disabled_tests.
+ * New feature: the --help flag for printing the usage.
+ * New feature: access to Google Test flag values in user code.
+ * New feature: a script that packs Google Test into one .h and one
+   .cc file for easy deployment.
+ * New feature: support for distributing test functions to multiple
+   machines (requires support from the test runner).
+ * Bug fixes and implementation clean-ups.
+
+Changes for 1.2.1:
+
+ * Compatibility fixes for Linux IA-64 and IBM z/OS.
+ * Added support for using Boost and other TR1 implementations.
+ * Changes to the build scripts to support upcoming release of Google C++
+   Mocking Framework.
+ * Added Makefile to the distribution package.
+ * Improved build instructions in README.
+
+Changes for 1.2.0:
+
+ * New feature: value-parameterized tests.
+ * New feature: the ASSERT/EXPECT_(NON)FATAL_FAILURE(_ON_ALL_THREADS)
+   macros.
+ * Changed the XML report format to match JUnit/Ant's.
+ * Added tests to the Xcode project.
+ * Added scons/SConscript for building with SCons.
+ * Added src/gtest-all.cc for building Google Test from a single file.
+ * Fixed compatibility with Solaris and z/OS.
+ * Enabled running Python tests on systems with python 2.3 installed,
+   e.g. Mac OS X 10.4.
+ * Bug fixes.
+
+Changes for 1.1.0:
+
+ * New feature: type-parameterized tests.
+ * New feature: exception assertions.
+ * New feature: printing elapsed time of tests.
+ * Improved the robustness of death tests.
+ * Added an Xcode project and samples.
+ * Adjusted the output format on Windows to be understandable by Visual Studio.
+ * Minor bug fixes.
+
+Changes for 1.0.1:
+
+ * Added project files for Visual Studio 7.1.
+ * Fixed issues with compiling on Mac OS X.
+ * Fixed issues with compiling on Cygwin.
+
+Changes for 1.0.0:
+
+ * Initial Open Source release of Google Test