Release version v0.3.0

87a80da9 · Dominik Bongartz · 171cb79b · 87a80da9 · 87a80da9 · 87a80da9
Commit 87a80da9 authored Jun 12, 2020 by Dominik Bongartz
75 changed files
--- a/.gitmodules
+++ b/.gitmodules
@@ -40,3 +40,9 @@
 [submodule "dep/libale"]
 	path = dep/libale
 	url = https://git.rwth-aachen.de/avt.svt/public/libale.git
+[submodule "dep/json"]
+	path = dep/json
+	url = https://git.rwth-aachen.de/avt.svt/public/thirdparty/json.git
+[submodule "dep/melon"]
+	path = dep/melon
+	url = https://git.rwth-aachen.de/avt.svt/public/melon.git
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,9 +4,15 @@ project(MAiNGO CXX)

 #--------------------------- Options --------------------------------
 set(MAiNGO_use_filib TRUE CACHE BOOL "Use filib++ as interval library (otherwise, the more basic interval library within MC++ will be used.")
-set(MAiNGO_build_parser TRUE CACHE BOOL "Build MAiNGO executable with parser.")
+set(MAiNGO_build_parser TRUE CACHE BOOL "Build MAiNGO executable with parser (not compatible with Intel compiler due to missing C++17 features).")
 set(MAiNGO_build_standalone FALSE CACHE BOOL "Build MAiNGO as standalone solver with problem.h.")
+set(MAiNGO_build_melon TRUE CACHE BOOL "Build MAiNGO executable with the MeLOn toolbox (not compatible with Intel compiler due to missing C++17 features).")
 set(MAiNGO_use_mpi FALSE CACHE BOOL "Build parallel version of MAiNGO.")
+set(MAiNGO_build_test FALSE CACHE BOOL "Build MAiNGO test cases.")
+if(MAiNGO_build_test)
+    # The parser is required for the tests
+    set(MAiNGO_build_parser TRUE CACHE INTERNAL "Build MAiNGO executable with parser." FORCE)
+endif()


 #------------------------ MAiNGO library -----------------------------
@@ -21,13 +27,16 @@ target_include_directories(maingo-core
 )
 target_link_libraries(maingo-core
    babbase
-	fadbad
+    fadbad
    mcpp
    nlopt
    ipopt
    clp
    cplex-ilo cplex-concert cplex-lib
 )
+if(MAiNGO_build_melon)
+    target_link_libraries(maingo-core melon)
+endif()
 if(MAiNGO_use_filib)
    target_link_libraries(maingo-core filib)
    target_compile_definitions(maingo-core PRIVATE USE_FILIB)
@@ -49,21 +58,21 @@ if(NOT(MSVC))
 else()
    target_compile_options(maingo-core
        PRIVATE
-			#/MP is for multithread compilation in MSVC
-			#/Qpar is parallel source code generation
+            #/MP is for multithread compilation in MSVC
+            #/Qpar is parallel source code generation
            $<$<CXX_COMPILER_ID:MSVC>:/MP;/Qpar>
    )
 endif()
 if(MAiNGO_build_parser)
-	add_library(parser STATIC
-		${PARSER_SRC}
-	)
-	target_include_directories(parser
-		PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/inc
-	)
-	target_link_libraries(parser ale babbase mcpp)
-	set_target_properties(parser PROPERTIES CXX_STANDARD 17)
-	target_link_libraries(maingo-core parser)
+    add_library(parser STATIC
+        ${PARSER_SRC}
+    )
+    target_include_directories(parser
+        PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/inc
+    )
+    target_link_libraries(parser ale babbase mcpp)
+    set_target_properties(parser PROPERTIES CXX_STANDARD 17)
+    target_link_libraries(maingo-core parser)
 endif()
 target_link_libraries(maingo-core knitro) # knitro always needs to be linked last because of incompatibility with several math routines

@@ -73,7 +82,7 @@ if(MAiNGO_use_mpi)
    include(${MAiNGO_SOURCE_DIR}/FindMPI.cmake)
    target_include_directories(maingo-core PRIVATE ${MPI_INCLUDE_DIR})
    target_compile_definitions(maingo-core PRIVATE HAVE_MAiNGO_MPI) # Define pre-processor variable HAVE_MAiNGO_MPI
-	target_link_libraries(maingo-core optimized "${MPI_LIBST}" debug "${MPI_LIBSTD}" )
+    target_link_libraries(maingo-core optimized "${MPI_LIBST}" debug "${MPI_LIBSTD}" )
 endif()


@@ -81,32 +90,36 @@ endif()
 if(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR)

    # --------------- Dependencies ---------------------------
-	function(add_dependency_subdir DEPENDENCY)
-		if(EXISTS ${PROJECT_SOURCE_DIR}/dep/${DEPENDENCY}/CMakeLists.txt)
-			add_subdirectory(${PROJECT_SOURCE_DIR}/dep/${DEPENDENCY})
-			message("${DEPENDENCY} OK.")
-			message("=================================================================")
-		else()
-			message(FATAL_ERROR "Error: Could not find CMakeLists.txt at ${PROJECT_SOURCE_DIR}/dep/${DEPENDENCY}. Did you initialize and update all submodules (cf. Readme.md or doc/html/index.html)?")
-		endif()
-	endfunction(add_dependency_subdir DEPENDENCY)
-	add_dependency_subdir(babbase)
-	add_dependency_subdir(fadbad)
+    function(add_dependency_subdir DEPENDENCY)
+        if(EXISTS ${PROJECT_SOURCE_DIR}/dep/${DEPENDENCY}/CMakeLists.txt)
+            add_subdirectory(${PROJECT_SOURCE_DIR}/dep/${DEPENDENCY})
+            message("${DEPENDENCY} OK.")
+            message("=================================================================")
+        else()
+            message(FATAL_ERROR "Error: Could not find CMakeLists.txt at ${PROJECT_SOURCE_DIR}/dep/${DEPENDENCY}. Did you initialize and update all submodules (cf. Readme.md or doc/html/index.html)?")
+        endif()
+    endfunction(add_dependency_subdir DEPENDENCY)
+    add_dependency_subdir(babbase)
+    add_dependency_subdir(fadbad)
    if(MAiNGO_use_filib OR MCPP_use_filib)
-		add_dependency_subdir(filib)
+        add_dependency_subdir(filib)
+    endif()
+    add_dependency_subdir(blas)
+    add_dependency_subdir(lapack)
+    add_dependency_subdir(cpplapack)
+    add_dependency_subdir(mcpp)
+    add_dependency_subdir(mumps)
+    add_dependency_subdir(ipopt)
+    add_dependency_subdir(nlopt)
+    add_dependency_subdir(knitro)
+    add_dependency_subdir(clp)
+    add_dependency_subdir(cplex)
+    if(MAiNGO_build_melon)
+        add_dependency_subdir(melon)
+        add_dependency_subdir(json)
    endif()
-	add_dependency_subdir(blas)
-	add_dependency_subdir(lapack)
-	add_dependency_subdir(cpplapack)
-	add_dependency_subdir(mcpp)
-	add_dependency_subdir(mumps)
-	add_dependency_subdir(ipopt)
-	add_dependency_subdir(nlopt)
-	add_dependency_subdir(knitro)
-	add_dependency_subdir(clp)
-	add_dependency_subdir(cplex)
    if(MAiNGO_build_parser)
-		add_dependency_subdir(libale)
+        add_dependency_subdir(libale)
    endif()

    # --------- Setup the Executable/.dll output Directory -------------
@@ -134,19 +147,21 @@ if(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR)
            )
            set_target_properties(MAiNGO PROPERTIES LINK_FLAGS /ignore:4099) #/ignore:4099 disables annoying linker warning because cplex does not provide debugging information
        endif()
-		if(MAiNGO_use_mpi)
-			target_include_directories(MAiNGO PRIVATE ${MPI_INCLUDE_DIR})
-			target_compile_definitions(MAiNGO PRIVATE HAVE_MAiNGO_MPI) # Define pre-processor variable HAVE_MAiNGO_MPI
-			target_link_libraries(MAiNGO optimized "${MPI_LIBST}" debug "${MPI_LIBSTD}" )
-		endif()
-	endif()
+        if(MAiNGO_use_mpi)
+            target_include_directories(MAiNGO PRIVATE ${MPI_INCLUDE_DIR})
+            target_compile_definitions(MAiNGO PRIVATE HAVE_MAiNGO_MPI) # Define pre-processor variable HAVE_MAiNGO_MPI
+            target_link_libraries(MAiNGO optimized "${MPI_LIBST}" debug "${MPI_LIBSTD}" )
+        endif()
+    endif()

    # --------------- Standalone MAiNGO executable (for C++ API) ---------------------------
    if (MAiNGO_build_standalone)
        add_executable(MAiNGOcpp
            ${PROJECT_SOURCE_DIR}/examples/mainCppApi.cpp
        )
-        target_link_libraries(MAiNGOcpp maingo-core)
+        target_link_libraries(MAiNGOcpp
+            maingo-core
+        )
        set_target_properties(MAiNGOcpp PROPERTIES CXX_STANDARD 14)
        if(NOT(MSVC))
            target_compile_options(MAiNGOcpp
@@ -164,11 +179,43 @@ if(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR)
            set_target_properties(MAiNGOcpp PROPERTIES LINK_FLAGS /ignore:4099) #/ignore:4099 disables annoying linker warning because cplex does not provide debugging information
        endif()

-		if(MAiNGO_use_mpi)
-			target_include_directories(MAiNGOcpp PRIVATE ${MPI_INCLUDE_DIR})
-			target_compile_definitions(MAiNGOcpp PRIVATE HAVE_MAiNGO_MPI) # Define pre-processor variable HAVE_MAiNGO_MPI
-			target_link_libraries(MAiNGOcpp optimized "${MPI_LIBST}" debug "${MPI_LIBSTD}" )
-		endif()
+        if(MAiNGO_use_mpi)
+            target_include_directories(MAiNGOcpp PRIVATE ${MPI_INCLUDE_DIR})
+            target_compile_definitions(MAiNGOcpp PRIVATE HAVE_MAiNGO_MPI) # Define pre-processor variable HAVE_MAiNGO_MPI
+            target_link_libraries(MAiNGOcpp optimized "${MPI_LIBST}" debug "${MPI_LIBSTD}" )
+        endif()
+    endif()
+
+    # --------------- MAiNGO Tests ---------------------------
+    if(MAiNGO_build_test)
+        add_executable(test-maingo
+            ${PROJECT_SOURCE_DIR}/testcases/main.cpp
+        )
+        target_include_directories(test-maingo
+            PRIVATE ${PROJECT_SOURCE_DIR}/example
+        )
+        target_link_libraries(test-maingo maingo-core)
+        set_target_properties(test-maingo PROPERTIES CXX_STANDARD 17)
+        if(NOT(MSVC))
+            target_compile_options(test-maingo
+                PRIVATE
+                    $<$<CXX_COMPILER_ID:Intel>: $<$<NOT:$<CONFIG:DEBUG>>:-O3> $<$<CONFIG:DEBUG>:-O0>>
+                    $<$<CXX_COMPILER_ID:GNU>: $<$<NOT:$<CONFIG:DEBUG>>:-O3> $<$<CONFIG:DEBUG>:-O0>>
+                    $<$<CXX_COMPILER_ID:AppleClang>: $<$<NOT:$<CONFIG:DEBUG>>:-O3> $<$<CONFIG:DEBUG>:-O0>>
+                    $<$<CXX_COMPILER_ID:Clang>: $<$<NOT:$<CONFIG:DEBUG>>:-O3> $<$<CONFIG:DEBUG>:-O0>>
+            )
+        else()
+            target_compile_options(test-maingo
+                PRIVATE
+                    $<$<CXX_COMPILER_ID:MSVC>:/MP;/Qpar>
+            )
+            set_target_properties(test-maingo PROPERTIES LINK_FLAGS /ignore:4099) #/ignore:4099 disables annoying linker warning because cplex does not provide debugging information
+        endif()
+        if(MAiNGO_use_mpi)
+            target_include_directories(test-maingo PRIVATE ${MPI_INCLUDE_DIR})
+            target_compile_definitions(test-maingo PRIVATE HAVE_MAiNGO_MPI) # Define pre-processor variable HAVE_MAiNGO_MPI
+            target_link_libraries(test-maingo optimized "${MPI_LIBST}" debug "${MPI_LIBSTD}" )
+        endif()
    endif()

 endif()
\ No newline at end of file
--- a/Readme.md
+++ b/Readme.md
 # ![MAiNGO](doc/images/MAiNGO.png) <br> McCormick-based Algorithm for mixed-integer Nonlinear Global Optimization

-Thank you for using the beta version 0.2.1 of MAiNGO! If you have any issues, concerns, or comments, please communicate them using the "Issues"
+Thank you for using the beta version 0.3.0 of MAiNGO! If you have any issues, concerns, or comments, please communicate them using the "Issues"
 functionality in [GitLab](https://git.rwth-aachen.de/avt.svt/public/maingo.git)	 or send an e-mail to MAiNGO@avt.rwth-aachen.de.

 ## How to cite
@@ -61,16 +61,17 @@ If you are new to MAiNGO, we recommend looking at the following documents in thi

 ## Example applications

-MAiNGO has been successfully applied to flowsheet-optimization problems ([Bongartz & Mitsos 2017a](https://link.springer.com/article/10.1007/s10898-017-0547-4), [Bongartz & Mitsos 2017b](https://www.sciencedirect.com/science/article/pii/B9780444639653501070), [Bongartz & Mitsos 2019](https://aiche.onlinelibrary.wiley.com/doi/full/10.1002/aic.16507)),
-optimization problems with artificial neural networks ([Rall et al. 2018](https://www.sciencedirect.com/science/article/pii/S0376738818324293), [Schweidtmann & Mitsos 2018](https://link.springer.com/article/10.1007/s10957-018-1396-0), [Rall et al. 2020](https://doi.org/10.1016/j.memsci.2020.117860)),
-hybrid mechanistic models ([Schweidtmann et al. 2019a](https://www.sciencedirect.com/science/article/abs/pii/S009813541830886X), [Schweidtmann et al. 2019b](https://www.sciencedirect.com/science/article/pii/B9780128186343501570), [Huster et al. 2019a](https://www.sciencedirect.com/science/article/pii/B9780128185971500680), [Huster et al. 2019b](https://link.springer.com/article/10.1007/s11081-019-09454-1)),
+MAiNGO has been successfully applied to flowsheet-optimization problems ([Bongartz & Mitsos 2017a](https://link.springer.com/article/10.1007/s10898-017-0547-4), [Bongartz & Mitsos 2019](https://aiche.onlinelibrary.wiley.com/doi/full/10.1002/aic.16507), [Bongartz et al. 2020](https://link.springer.com/article/10.1007/s11081-020-09502-1)),
+optimization problems with artificial neural networks ([Schweidtmann & Mitsos 2018](https://link.springer.com/article/10.1007/s10957-018-1396-0)),
+hybrid mechanistic models with applications in energy processes ([Schweidtmann et al. 2019a](https://www.sciencedirect.com/science/article/abs/pii/S009813541830886X), [Schweidtmann et al. 2019b](https://www.sciencedirect.com/science/article/pii/B9780128186343501570), [Huster et al. 2019a](https://www.sciencedirect.com/science/article/pii/B9780128185971500680), [Huster et al. 2019b](https://link.springer.com/article/10.1007/s11081-019-09454-1)),
+hybrid mechanistic models with applications in membrane development ([Rall et al. 2019](https://www.sciencedirect.com/science/article/pii/S0376738818324293), [Rall et al. 2020](https://doi.org/10.1016/j.memsci.2020.117860)), [Rall et al. 2020b](https://doi.org/10.1016/j.memsci.2020.118208),
 and nonlinear scheduling with artificial neural networks embedded ([Schäfer et al. 2020](https://doi.org/10.1016/j.compchemeng.2019.106598)).

 ![Applications](doc/images/applications.png)

 MAiNGO works particularly well for problems which can be formulated in a reduced-space manner ([Bongartz & Mitsos 2017a](https://link.springer.com/article/10.1007/s10898-017-0547-4)).

-MAiNGO holds specialized relaxations for functions found in the field of process engineering ([Najman & Mitsos 2016](https://www.sciencedirect.com/science/article/pii/B9780444634283502721), [Najman et al. 2019](https://www.sciencedirect.com/science/article/abs/pii/S0098135419309494)).
+MAiNGO holds specialized relaxations for functions found in the field of process engineering ([Najman & Mitsos 2016](https://www.sciencedirect.com/science/article/pii/B9780444634283502721), [Najman et al. 2019](https://www.sciencedirect.com/science/article/abs/pii/S0098135419309494), [Bongartz et al. 2020](https://link.springer.com/article/10.1007/s11081-020-09502-1)).
 All implemented specialized intrinsic functions can be found at `doc/implementedFunctions/Implemented_functions.pdf`.

 ## References
@@ -79,12 +80,14 @@ Bongartz, D., Najman, J., Sass, S., & Mitsos, A. (2018). [MAiNGO - **M**cCormick
 Bongartz, D., & Mitsos, A. (2017a). [Deterministic global optimization of process flowsheets in a reduced space using McCormick relaxations](https://link.springer.com/article/10.1007/s10898-017-0547-4). *Journal of Global Optimization*, 69(4), 761-796.<br><br>
 Bongartz, D., & Mitsos, A. (2017b). [Infeasible path global flowsheet optimization using McCormick relaxations](https://www.sciencedirect.com/science/article/pii/B9780444639653501070). In *Computer Aided Chemical Engineering* (Vol. 40, pp. 631-636). Elsevier.<br><br>
 Bongartz, D., & Mitsos, A. (2019). [Deterministic global flowsheet optimization: Between equation‐oriented and sequential‐modular methods](https://aiche.onlinelibrary.wiley.com/doi/full/10.1002/aic.16507). *AIChE Journal*, 65(3), 1022-1034.<br><br>
+Bongartz, D., Najman, J., & Mitsos, A. (2020). [Deterministic global optimization of steam cycles using the IAPWS‑IF97 model](https://link.springer.com/article/10.1007/s11081-020-09502-1). *Optimization & Engineering*, in press.<br><br>
 Huster, W. R., Schweidtmann, A. M., & Mitsos, A. (2019a). [Impact of accurate working fluid properties on the globally optimal design of an organic Rankine cycle](https://www.sciencedirect.com/science/article/pii/B9780128185971500680). In *Computer Aided Chemical Engineering* (Vol. 47, pp. 427-432). Elsevier.<br><br>
 Huster, W. R., Schweidtmann, A. M., & Mitsos, A. (2019b). [Working fluid selection for organic rankine cycles via deterministic global optimization of design and operation](https://link.springer.com/article/10.1007/s11081-019-09454-1). *Optimization and Engineering*, 1-20.<br><br>
 Najman, J., & Mitsos, A. (2016). [Convergence order of McCormick relaxations of LMTD function in heat exchanger networks](https://www.sciencedirect.com/science/article/pii/B9780444634283502721). In *Computer Aided Chemical Engineering* (Vol. 38, pp. 1605-1610). Elsevier.<br><br>
 Najman, J., Bongartz, D., & Mitsos, A. (2019). [Relaxations of thermodynamic property and costing models in process engineering](https://www.sciencedirect.com/science/article/abs/pii/S0098135419309494). *Computers & Chemical Engineering*, 130, 106571.<br><br>
 Rall, D., Menne, D., Schweidtmann, A. M., Kamp, J., von Kolzenberg, L., Mitsos, A., & Wessling, M. (2019). [Rational design of ion separation membranes](https://www.sciencedirect.com/science/article/pii/S0376738818324293). *Journal of membrane science*, 569, 209-219.<br><br>
 Rall, D., Schweidtmann, A. M., Aumeier, B. M., Kamp, J., Karwe, J., Ostendorf, K., Mitsos, A., & Wessling, M. (2020). [Simultaneous rational design of ion separation membranes and processes](https://doi.org/10.1016/j.memsci.2020.117860 ). *Journal of Membrane Science*, 117860.<br><br>
+Rall, D., Schweidtmann, A. M., Kruse, M.,Evdochenko, E., Mitsos, A., & Wessling, M. (2020). [Multi-scale membrane process optimization with high-fidelity ion transport models through machine learning](https://doi.org/10.1016/j.memsci.2020.118208). *Journal of Membrane Science*, 118208.<br><br>
 Schäfer, P., Schweidtmann, A. M., Lenz, P. H., Markgraf, H. M., & Mitsos, A. (2020). [Wavelet-based grid-adaptation for nonlinear scheduling subject to time-variable electricity prices](https://doi.org/10.1016/j.compchemeng.2019.106598). *Computers & Chemical Engineering*, 132, 106598.<br><br>
 Schweidtmann, A. M., & Mitsos, A. (2018) [Deterministic Global Optimization with Artificial Neural Networks Embedded](https://link.springer.com/article/10.1007/s10957-018-1396-0). *Journal of Optimization Theory and Applications*, 180, 925–948.<br><br>
 Schweidtmann, A. M., Huster, W. R., Lüthje, J. T., & Mitsos, A. (2019a). [Deterministic global process optimization: Accurate (single-species) properties via artificial neural networks](https://www.sciencedirect.com/science/article/abs/pii/S009813541830886X). *Computers & Chemical Engineering*, 121, 67-74.<br><br>

--- a/ReleaseNotes.txt
+++ b/ReleaseNotes.txt
+Release version 0.3.0 (June 12th, 2020):
+	- New features:
+		- MAiNGO now uses the toolkit MeLOn - Machine Learning Models for Optimization
+			- MeLOn contains tools for modeling and training different machine learning models such as artificial neural networks or Gaussian processes
+			- The models from MeLOn can now be used when writing problems for the C++-API of MAiNGO
+			- These models use some custom relaxations available in MAiNGO through MC++ for faster convergence
+			- In order to use MeLOn within MAiNGO, the Cmake flag MAiNGO_build_melon needs to be set to true (default)
+			- Note that MeLOn is not compatible with current Intel Compilers due to missing C++17 features
+	- MAiNGO algorithm:
+		- The parser now preserves the order of variable declaration and does not eliminate variables that do not occur in the problem
+		- Added new intrinsic functions (for more details, see doc/implementedFunctions/Implemented_functions.pdf):
+			- Common acquisition functions for Bayesian optimization:
+				- Lower confidence bound
+				- Expected improvement
+				- Probability of improvement
+	- Examples & documentation:
+		- Examples were added for the use of the models from MeLOn:
+			- An example for problems with artificial neural networks embedded
+			- An example for problems with Gaussian processes embedded (e.g., minimizing the prediction or variance of a Gaussian process)
+			- An example for using MAiNGO within Bayesian optimization (i.e., maximizing/minimizing typical acquisition functions for Bayesian optimization that use Gaussian processes)
+		- The documentation for building MAiNGO was improved
+		- A section on the output written by MAiNGO was added
+	- Third party libraries:
+		- Included MeLOn (see above)
+		- Upgraded to new MUMPS version 5.3.1.
+
+
 Release version 0.2.1 (February 17th, 2020):
 	- Examples & Documentation:
 		- Updates in readmes and manual

--- a/clp @ 010f3e9e
+++ b/clp @ 010f3e9e
-Subproject commit a56017d8aa7acae3f2d28579c6b908dbe18a8f30
+Subproject commit 010f3e9eaf4e910c99ea4179282194dbc09a0f01
--- a/cplex @ 22802fe6
+++ b/cplex @ 22802fe6
-Subproject commit 6472d5b4079026fdaaebaef94ba95876fac54625
+Subproject commit 22802fe6e1d78e927bdc806bc48e305f3e944fc9
--- a/cpplapack @ a5d4fc99
+++ b/cpplapack @ a5d4fc99
-Subproject commit a2b5a021354f68a72bf71955b4bb1ab2e39fe90c
+Subproject commit a5d4fc99508e50b77001152b0cb287cde733a1fb
--- a/ipopt @ 12e44293
+++ b/ipopt @ 12e44293
-Subproject commit 15cd1f39d3812b0677790e2b04a5e0ab62ee78a7
+Subproject commit 12e44293542d176f1150af649810cd2733f905a1
--- a/json @ e713f0b0
+++ b/json @ e713f0b0
+Subproject commit e713f0b04b7c097ac79df2310c17d2f303b13a33
--- a/knitro @ 27856c39
+++ b/knitro @ 27856c39
-Subproject commit b910f32000a74b5351dbe9221e71c437196fb4e0
+Subproject commit 27856c391a5c09c7a133decab958ec40453dffcd
--- a/lapack @ 39be3fb5
+++ b/lapack @ 39be3fb5
-Subproject commit 168944cfd2fa0e412c22c73025fc857a2ad5d957
+Subproject commit 39be3fb59ae4b1a3be4446635b07fbc82098ac92
--- a/libale @ 2fc61650
+++ b/libale @ 2fc61650
-Subproject commit 647d9b1f08fd4617f66a4de68f43a058534654d2
+Subproject commit 2fc616501a5ba0fdb63b4def75f3a6f59ac3bb2c
--- a/mcpp @ ebcef32f
+++ b/mcpp @ ebcef32f
-Subproject commit 369be0232c22e6d9b28eceb1a1c4daf987fe26e7
+Subproject commit ebcef32f04b7f1acba88cc2cedeab033d68ce17d
--- a/melon @ e086d1de
+++ b/melon @ e086d1de
+Subproject commit e086d1de7d0a69fe5381e4a5231d12360ea29e57
--- a/mumps @ 8a8161e2
+++ b/mumps @ 8a8161e2
-Subproject commit 9f66ada0e835f4bde8f933dce8c72082df4a0ab4
+Subproject commit 8a8161e2f5b667bde2fdc8eaa4a0c73a8e9ea3c6
--- a/nlopt @ f748e5ea
+++ b/nlopt @ f748e5ea
-Subproject commit 0586d758851e5ed5792dc75839d97eccc2032a86
+Subproject commit f748e5ea35b595d9ca2db2ab2bd0bb2db5dbee07
--- a/doc/html/VS_Release.PNG
+++ b/doc/html/VS_Release.PNG
--- a/doc/html/_m_ai_n_g_o_8cpp.html
+++ b/doc/html/_m_ai_n_g_o_8cpp.html
@@ -5,7 +5,7 @@
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
 <meta name="generator" content="Doxygen 1.8.15"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
-<title>MAiNGO: U:/Projects/RankineOpt/Code/maingo/src/MAiNGO.cpp File Reference</title>
+<title>MAiNGO: C:/Users/dobo01/maingo/src/MAiNGO.cpp File Reference</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="jquery.js"></script>
 <script type="text/javascript" src="dynsections.js"></script>

--- a/doc/html/_m_ai_n_g_o_8h.html
+++ b/doc/html/_m_ai_n_g_o_8h.html
@@ -5,7 +5,7 @@
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
 <meta name="generator" content="Doxygen 1.8.15"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
-<title>MAiNGO: U:/Projects/RankineOpt/Code/maingo/inc/MAiNGO.h File Reference</title>
+<title>MAiNGO: C:/Users/dobo01/maingo/inc/MAiNGO.h File Reference</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="jquery.js"></script>
 <script type="text/javascript" src="dynsections.js"></script>

--- a/doc/html/_m_ai_n_g_o_8h_source.html
+++ b/doc/html/_m_ai_n_g_o_8h_source.html
--- a/doc/html/_m_ai_n_g_o_w_a_l_l_8cpp.html
+++ b/doc/html/_m_ai_n_g_o_w_a_l_l_8cpp.html
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "https://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
+<meta http-equiv="X-UA-Compatible" content="IE=9"/>
+<meta name="generator" content="Doxygen 1.8.15"/>
+<meta name="viewport" content="width=device-width, initial-scale=1"/>
+<title>MAiNGO: C:/Users/dobo01/maingo/src/MAiNGOWALL.cpp File Reference</title>
+<link href="tabs.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="jquery.js"></script>
+<script type="text/javascript" src="dynsections.js"></script>
+<link href="navtree.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="resize.js"></script>
+<script type="text/javascript" src="navtreedata.js"></script>
+<script type="text/javascript" src="navtree.js"></script>
+<script type="text/javascript">
+/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
+  $(document).ready(initResizable);
+/* @license-end */</script>
+<link href="search/search.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="search/searchdata.js"></script>
+<script type="text/javascript" src="search/search.js"></script>
+<link href="doxygen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
+<div id="titlearea">
+<table cellspacing="0" cellpadding="0">
+ <tbody>
+ <tr style="height: 56px;">
+  <td id="projectlogo"><img alt="Logo" src="mango_only.png"/></td>
+  <td id="projectalign" style="padding-left: 0.5em;">
+   <div id="projectname">MAiNGO
+   </div>
+  </td>
+ </tr>
+ </tbody>
+</table>
+</div>
+<!-- end header part -->
+<!-- Generated by Doxygen 1.8.15 -->
+<script type="text/javascript">
+/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
+var searchBox = new SearchBox("searchBox", "search",false,'Search');
+/* @license-end */
+</script>
+<script type="text/javascript" src="menudata.js"></script>
+<script type="text/javascript" src="menu.js"></script>
+<script type="text/javascript">
+/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
+$(function() {
+  initMenu('',true,false,'search.php','Search');
+  $(document).ready(function() { init_search(); });
+});
+/* @license-end */</script>
+<div id="main-nav"></div>
+</div><!-- top -->
+<div id="side-nav" class="ui-resizable side-nav-resizable">
+  <div id="nav-tree">
+    <div id="nav-tree-contents">
+      <div id="nav-sync" class="sync"></div>
+    </div>
+  </div>
+  <div id="splitbar" style="-moz-user-select:none;" 
+       class="ui-resizable-handle">
+  </div>
+</div>
+<script type="text/javascript">
+/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
+$(document).ready(function(){initNavTree('_m_ai_n_g_o_w_a_l_l_8cpp.html','');});
+/* @license-end */
+</script>
+<div id="doc-content">
+<!-- window showing the filter options -->
+<div id="MSearchSelectWindow"
+     onmouseover="return searchBox.OnSearchSelectShow()"
+     onmouseout="return searchBox.OnSearchSelectHide()"
+     onkeydown="return searchBox.OnSearchSelectKey(event)">
+</div>
+
+<!-- iframe showing the search results (closed by default) -->
+<div id="MSearchResultsWindow">
+<iframe src="javascript:void(0)" frameborder="0" 
+        name="MSearchResults" id="MSearchResults">
+</iframe>
+</div>
+
+<div class="header">
+  <div class="headertitle">
+<div class="title">MAiNGOWALL.cpp File Reference</div>  </div>
+</div><!--header-->
+<div class="contents">
+<div class="textblock"><code>#include &quot;<a class="el" href="_m_ai_n_g_o_8h_source.html">MAiNGO.h</a>&quot;</code><br />
+<code>#include &quot;<a class="el" href="_m_ai_n_g_omodel_eps_con_8h_source.html">MAiNGOmodelEpsCon.h</a>&quot;</code><br />
+<code>#include &quot;<a class="el" href="bab_8h_source.html">bab.h</a>&quot;</code><br />
+<code>#include &quot;<a class="el" href="exceptions_8h_source.html">exceptions.h</a>&quot;</code><br />
+<code>#include &quot;<a class="el" href="get_time_8h_source.html">getTime.h</a>&quot;</code><br />
+<code>#include &quot;<a class="el" href="interval_library_8h_source.html">intervalLibrary.h</a>&quot;</code><br />
+<code>#include &quot;<a class="el" href="lbp_8h_source.html">lbp.h</a>&quot;</code><br />
+<code>#include &quot;<a class="el" href="mpi_utilities_8h_source.html">mpiUtilities.h</a>&quot;</code><br />
+<code>#include &quot;<a class="el" href="ubp_8h_source.html">ubp.h</a>&quot;</code><br />
+<code>#include &quot;<a class="el" href="utilities_8h_source.html">utilities.h</a>&quot;</code><br />
+</div></div><!-- contents -->
+</div><!-- doc-content -->
+<!-- start footer part -->
+<div id="nav-path" class="navpath"><!-- id is needed for treeview function! -->
+  <ul>
+    <li class="navelem"><a class="el" href="dir_68267d1309a1af8e8297ef4c3efbcdba.html">src</a></li><li class="navelem"><a class="el" href="_m_ai_n_g_o_w_a_l_l_8cpp.html">MAiNGOWALL.cpp</a></li>
+    <li class="footer">Generated by
+    <a href="http://www.doxygen.org/index.html">
+    <img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.8.15 </li>
+  </ul>
+</div>
+</body>
+</html>
--- a/doc/html/_m_ai_n_g_odebug_8h.html
+++ b/doc/html/_m_ai_n_g_odebug_8h.html
@@ -5,7 +5,7 @@
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
 <meta name="generator" content="Doxygen 1.8.15"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
-<title>MAiNGO: U:/Projects/RankineOpt/Code/maingo/inc/MAiNGOdebug.h File Reference</title>
+<title>MAiNGO: C:/Users/dobo01/maingo/inc/MAiNGOdebug.h File Reference</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="jquery.js"></script>
 <script type="text/javascript" src="dynsections.js"></script>

--- a/doc/html/_m_ai_n_g_odebug_8h_source.html
+++ b/doc/html/_m_ai_n_g_odebug_8h_source.html
@@ -5,7 +5,7 @@
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
 <meta name="generator" content="Doxygen 1.8.15"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
-<title>MAiNGO: U:/Projects/RankineOpt/Code/maingo/inc/MAiNGOdebug.h Source File</title>
+<title>MAiNGO: C:/Users/dobo01/maingo/inc/MAiNGOdebug.h Source File</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="jquery.js"></script>
 <script type="text/javascript" src="dynsections.js"></script>

--- a/doc/html/_m_ai_n_g_oevaluator_8h.html
+++ b/doc/html/_m_ai_n_g_oevaluator_8h.html
@@ -5,7 +5,7 @@
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
 <meta name="generator" content="Doxygen 1.8.15"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
-<title>MAiNGO: U:/Projects/RankineOpt/Code/maingo/inc/MAiNGOevaluator.h File Reference</title>
+<title>MAiNGO: C:/Users/dobo01/maingo/inc/MAiNGOevaluator.h File Reference</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="jquery.js"></script>
 <script type="text/javascript" src="dynsections.js"></script>

--- a/doc/html/_m_ai_n_g_oevaluator_8h_source.html
+++ b/doc/html/_m_ai_n_g_oevaluator_8h_source.html
--- a/doc/html/_m_ai_n_g_ogetter_functions_8cpp.html
+++ b/doc/html/_m_ai_n_g_ogetter_functions_8cpp.html
@@ -5,7 +5,7 @@
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
 <meta name="generator" content="Doxygen 1.8.15"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
-<title>MAiNGO: U:/Projects/RankineOpt/Code/maingo/src/MAiNGOgetterFunctions.cpp File Reference</title>
+<title>MAiNGO: C:/Users/dobo01/maingo/src/MAiNGOgetterFunctions.cpp File Reference</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="jquery.js"></script>
 <script type="text/javascript" src="dynsections.js"></script>

--- a/doc/html/_m_ai_n_g_omodel_8h.html
+++ b/doc/html/_m_ai_n_g_omodel_8h.html
@@ -5,7 +5,7 @@
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
 <meta name="generator" content="Doxygen 1.8.15"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
-<title>MAiNGO: U:/Projects/RankineOpt/Code/maingo/inc/MAiNGOmodel.h File Reference</title>
+<title>MAiNGO: C:/Users/dobo01/maingo/inc/MAiNGOmodel.h File Reference</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="jquery.js"></script>
 <script type="text/javascript" src="dynsections.js"></script>

--- a/doc/html/_m_ai_n_g_omodel_8h_source.html
+++ b/doc/html/_m_ai_n_g_omodel_8h_source.html
--- a/doc/html/_m_ai_n_g_omodel_eps_con_8cpp.html
+++ b/doc/html/_m_ai_n_g_omodel_eps_con_8cpp.html
@@ -5,7 +5,7 @@
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
 <meta name="generator" content="Doxygen 1.8.15"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
-<title>MAiNGO: U:/Projects/RankineOpt/Code/maingo/src/MAiNGOmodelEpsCon.cpp File Reference</title>
+<title>MAiNGO: C:/Users/dobo01/maingo/src/MAiNGOmodelEpsCon.cpp File Reference</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="jquery.js"></script>
 <script type="text/javascript" src="dynsections.js"></script>

--- a/doc/html/_m_ai_n_g_omodel_eps_con_8h.html
+++ b/doc/html/_m_ai_n_g_omodel_eps_con_8h.html
@@ -5,7 +5,7 @@
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
 <meta name="generator" content="Doxygen 1.8.15"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
-<title>MAiNGO: U:/Projects/RankineOpt/Code/maingo/inc/MAiNGOmodelEpsCon.h File Reference</title>
+<title>MAiNGO: C:/Users/dobo01/maingo/inc/MAiNGOmodelEpsCon.h File Reference</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="jquery.js"></script>
 <script type="text/javascript" src="dynsections.js"></script>

--- a/doc/html/_m_ai_n_g_omodel_eps_con_8h_source.html
+++ b/doc/html/_m_ai_n_g_omodel_eps_con_8h_source.html
@@ -5,7 +5,7 @@
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
 <meta name="generator" content="Doxygen 1.8.15"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
-<title>MAiNGO: U:/Projects/RankineOpt/Code/maingo/inc/MAiNGOmodelEpsCon.h Source File</title>
+<title>MAiNGO: C:/Users/dobo01/maingo/inc/MAiNGOmodelEpsCon.h Source File</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="jquery.js"></script>
 <script type="text/javascript" src="dynsections.js"></script>
@@ -97,7 +97,7 @@ $(document).ready(function(){initNavTree('_m_ai_n_g_omodel_eps_con_8h_source.htm
 <div class="ttc" id="classmaingo_1_1_m_ai_n_g_omodel_eps_con_html_af97462f303e12760d3bff115983515d4"><div class="ttname"><a href="classmaingo_1_1_m_ai_n_g_omodel_eps_con.html#af97462f303e12760d3bff115983515d4">maingo::MAiNGOmodelEpsCon::get_initial_point</a></div><div class="ttdeci">virtual std::vector&lt; double &gt; get_initial_point()</div><div class="ttdoc">Virtual function which has to be implemented by the user in order to enable getting data on the initi...</div><div class="ttdef"><b>Definition:</b> MAiNGOmodelEpsCon.h:66</div></div>
 <div class="ttc" id="structmaingo_1_1_evaluation_container_html"><div class="ttname"><a href="structmaingo_1_1_evaluation_container.html">maingo::EvaluationContainer</a></div><div class="ttdoc">Struct for storing the values returned by model evaluation at the given point &quot;var&quot;.</div><div class="ttdef"><b>Definition:</b> evaluationContainer.h:192</div></div>
 <div class="ttc" id="classmaingo_1_1_m_ai_n_g_omodel_eps_con_html_a2f0d0fb0d9bc6abc37e3ba544612ef98"><div class="ttname"><a href="classmaingo_1_1_m_ai_n_g_omodel_eps_con.html#a2f0d0fb0d9bc6abc37e3ba544612ef98">maingo::MAiNGOmodelEpsCon::evaluate_user_model</a></div><div class="ttdeci">virtual EvaluationContainer evaluate_user_model(const std::vector&lt; Var &gt; &amp;optVars)=0</div><div class="ttdoc">Virtual function which has to be implemented by the user in order to enable evaluation of the model.</div></div>
-<div class="ttc" id="classmaingo_1_1_m_ai_n_g_omodel_html"><div class="ttname"><a href="classmaingo_1_1_m_ai_n_g_omodel.html">maingo::MAiNGOmodel</a></div><div class="ttdoc">This class is the base class for models to be solved by MAiNGO.</div><div class="ttdef"><b>Definition:</b> MAiNGOmodel.h:91</div></div>
+<div class="ttc" id="classmaingo_1_1_m_ai_n_g_omodel_html"><div class="ttname"><a href="classmaingo_1_1_m_ai_n_g_omodel.html">maingo::MAiNGOmodel</a></div><div class="ttdoc">This class is the base class for models to be solved by MAiNGO.</div><div class="ttdef"><b>Definition:</b> MAiNGOmodel.h:92</div></div>
 <div class="ttc" id="classmaingo_1_1_m_ai_n_g_omodel_eps_con_html_a5999eaab9bb4b9c7dba95ed6553da048"><div class="ttname"><a href="classmaingo_1_1_m_ai_n_g_omodel_eps_con.html#a5999eaab9bb4b9c7dba95ed6553da048">maingo::MAiNGOmodelEpsCon::set_epsilon</a></div><div class="ttdeci">void set_epsilon(const std::vector&lt; double &gt; &amp;epsilon)</div><div class="ttdoc">Function for changing the epsilon-parameters.</div><div class="ttdef"><b>Definition:</b> MAiNGOmodelEpsCon.h:73</div></div>
 <div class="ttc" id="classmaingo_1_1_m_ai_n_g_omodel_eps_con_html_a4c8484eaefea039156dceeac768e0996"><div class="ttname"><a href="classmaingo_1_1_m_ai_n_g_omodel_eps_con.html#a4c8484eaefea039156dceeac768e0996">maingo::MAiNGOmodelEpsCon::_objectiveIndex</a></div><div class="ttdeci">size_t _objectiveIndex</div><div class="ttdef"><b>Definition:</b> MAiNGOmodelEpsCon.h:100</div></div>
 <div class="ttc" id="namespacemaingo_html"><div class="ttname"><a href="namespacemaingo.html">maingo</a></div><div class="ttdoc">namespace holding all essentials of MAiNGO</div><div class="ttdef"><b>Definition:</b> aleModel.h:31</div></div>

--- a/doc/html/_m_ai_n_g_oprinting_functions_8cpp.html
+++ b/doc/html/_m_ai_n_g_oprinting_functions_8cpp.html
@@ -5,7 +5,7 @@
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
 <meta name="generator" content="Doxygen 1.8.15"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>