Skip to content
GitLab
Commit f3c59a17 authored by Max Lyon's avatar Max Lyon
Browse files

Merge branch 'master' into Fix_warnings-GF

parents e1c73f7a f0a5cb80
Show whitespace changes
Inline Side-by-side
.gitlab-ci.yml
View file @ f3c59a17
......@@ -27,3 +27,14 @@ macos-c++98:
script: "CI/ci-mac.sh C++98"
tags:
- Apple
CoMISo-VS2013-Qt-5.5.1-x64:
variables:
BUILD_PLATFORM: "VS2013"
ARCHITECTURE: "x64"
QT_VERSION: "Qt5.5.1"
script: "CI\\Windows.bat"
tags:
- VS2013
- Qt551
Base @ 67657013
Subproject commit c64f3c23896891472361fc185e219fad116430e4
Subproject commit 6765701392af0f0aff93e91c6199aaa94b27d74f
CI/Windows.bat 0 → 100644
View file @ f3c59a17
git submodule init
git submodule update --remote
mkdir rel
cd rel
IF "%ARCHITECTURE%" == "x64" (
set ARCH_VS= Win64
set STRING_ARCH=64-Bit
) else (
set ARCH_VS=
set STRING_ARCH=32-Bit
)
IF "%QT_VERSION%" == "Qt5.3.1" (
set QT_REV=5.3
set QT_SUFFIX=_opengl
)
IF "%QT_VERSION%" == "Qt5.5.1" (
set QT_REV=5.5
set QT_SUFFIX=
)
IF "%BUILD_PLATFORM%" == "VS2013" (
set LIBPATH=C:/libs/VS2013
set GTESTVERSION=gtest-1.6.0
set GENERATOR=Visual Studio 12%ARCH_VS%
set VS_PATH="C:\Program Files (x86)\Microsoft Visual Studio 12.0\Common7\IDE\devenv.com"
IF "%ARCHITECTURE%" == "x64" (
set QT_BASE_CONFIG=-DQT5_INSTALL_PATH=C:\Qt\%QT_VERSION%-vs2013-%STRING_ARCH%\%QT_REV%\msvc2013_64%QT_SUFFIX%
)
IF "%ARCHITECTURE%" == "x32" (
set QT_BASE_CONFIG=-DQT5_INSTALL_PATH=C:\Qt\%QT_VERSION%-vs2013-%STRING_ARCH%\%QT_REV%\msvc2013%QT_SUFFIX%
)
SET BOOST_ROOT=
)
IF "%BUILD_PLATFORM%" == "VS2015" (
set LIBPATH=C:/libs/VS2015
set GTESTVERSION=gtest-1.7.0
set GENERATOR=Visual Studio 14%ARCH_VS%
set VS_PATH="C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7\IDE\devenv.com"
set QT_BASE_CONFIG=TODO
)
set CMAKE_CONFIGURATION=%QT_BASE_CONFIG% -DGLUT_INCLUDE_DIR="%LIBPATH%\%ARCHITECTURE%\freeglut-2.8.1\include" -DGLUT_glut_LIBRARY="%LIBPATH%\%ARCHITECTURE%\freeglut-2.8.1\lib\freeglut.lib" -DGLEW_INCLUDE_DIR="%LIBPATH%\%ARCHITECTURE%\glew-1.10.0\include" -DGLEW_LIBRARY="%LIBPATH%\%ARCHITECTURE%\glew-1.10.0\lib\glew32.lib" -DBOOST_ROOT="%LIBPATH%/%ARCHITECTURE%/boost_1_59_0" -DBOOST_LIBRARYDIR="%LIBPATH%/%ARCHITECTURE%/boost_1_59_0/lib64-msvc-12.0" -DCGAL_INCLUDE_DIR="%LIBPATH%/%ARCHITECTURE%/CGAL-4.7/include" -DCGAL_LIBRARY_DIR="%LIBPATH%/%ARCHITECTURE%/CGAL-4.7/lib" -DCGAL_BIN_DIR="%LIBPATH%/%ARCHITECTURE%/CGAL-4.7/bin" -DMUMPS_INCLUDE_DIR="%LIBPATH%/%ARCHITECTURE%/Ipopt-3.11.9/Ipopt/MSVisualStudio/v8-ifort/installed/include" -DMUMPS_LIBRARY="%LIBPATH%/%ARCHITECTURE%/Ipopt-3.11.9/Ipopt/MSVisualStudio/v8-ifort/installed/lib/CoinMumpsC.lib"
"C:\Program Files (x86)\CMake\bin\cmake.exe" -DGTEST_PREFIX="%LIBPATH%\%ARCHITECTURE%\%GTESTVERSION%" -G "%GENERATOR%" -DCMAKE_BUILD_TYPE=Release -DOPENFLIPPER_BUILD_UNIT_TESTS=TRUE %CMAKE_CONFIGURATION% ..
IF %errorlevel% NEQ 0 exit /b %errorlevel%
%VS_PATH% /Build "Release" CoMISo.sln /Project "ALL_BUILD"
IF %errorlevel% NEQ 0 exit /b %errorlevel%
CMakeLists.txt
View file @ f3c59a17
......@@ -19,29 +19,9 @@ set( WANT_COMISO_QT ON CACHE BOOL "Enable Qt support in CoMISo" )
if( WANT_COMISO_QT )
# try to use QT5 if possible otherwise stick to QT4
set (FORCE_QT4 ON CACHE BOOL "Use Qt4 even if Qt5 was found")
# Qt5 or Qt4?
if (NOT FORCE_QT4)
acg_qt5 ()
else()
set (QT5_FOUND false)
endif()
# Fallback to qt4 if not found or forced
if (NOT QT5_FOUND)
message(STATUS "Using QT4 for CoMISo")
acg_qt4 (4.7.0)
else ()
message(STATUS "Using QT5 for CoMISo")
endif ()
# QT settings in CoMISo
if( QT4_FOUND)
add_definitions (-DQT4_FOUND)
set (COMISO_QT_CONFIG_FILE_SETTINGS "#define COMISO_QT_AVAILABLE 1" )
elseif( QT5_FOUND)
if( QT5_FOUND)
add_definitions (-DQT5_FOUND)
set (COMISO_QT_CONFIG_FILE_SETTINGS "#define COMISO_QT_AVAILABLE 1" )
else()
......@@ -418,16 +398,11 @@ of_list_filter ( sources )
# remove template cc files from source file list
acg_drop_templates (sources)
if( QT4_FOUND )
# genereate uic and moc targets
acg_qt4_autouic (uic_targets ${ui})
acg_qt4_automoc (moc_targets ${headers})
list (APPEND COMISO_LINK_LIBRARIES ${QT_LIBRARIES})
elseif ( QT5_FOUND )
# genereate uic and moc targets
acg_qt5_autouic (uic_targets ${ui})
acg_qt5_automoc (moc_targets ${headers})
list (APPEND COMISO_LINK_LIBRARIES ${QT_LIBRARIES})
if ( QT5_FOUND )
# genereate uic and moc targets
acg_qt5_autouic (uic_targets ${ui})
acg_qt5_automoc (moc_targets ${headers})
list (APPEND COMISO_LINK_LIBRARIES ${QT_LIBRARIES})
endif()
acg_add_library (CoMISo SHARED ${uic_targets} ${sources} ${headers} ${moc_targets})
......@@ -522,6 +497,9 @@ if (COMISO_BUILD_EXAMPLES )
if( EXISTS "${CMAKE_SOURCE_DIR}/Examples/small_finite_element/CMakeLists.txt" )
add_subdirectory (Examples/small_finite_element)
endif()
if( EXISTS "${CMAKE_SOURCE_DIR}/Examples/small_AQP/CMakeLists.txt" )
add_subdirectory (Examples/small_AQP)
endif()
endif (COMISO_BUILD_EXAMPLES )
......
Examples/small_AQP/CMakeLists.txt 0 → 100644
View file @ f3c59a17
include (CoMISoExample)
acg_add_executable (small_AQP ${sources} ${headers} )
# enable rpath linking
set_target_properties(small_AQP PROPERTIES INSTALL_RPATH_USE_LINK_PATH 1)
target_link_libraries (small_AQP
CoMISo
${COMISO_LINK_LIBRARIES}
)
Examples/small_AQP/main.cc 0 → 100644
View file @ f3c59a17
/*===========================================================================*\
* *
* CoMISo *
* Copyright (C) 2008-2009 by Computer Graphics Group, RWTH Aachen *
* www.rwth-graphics.de *
* *
*---------------------------------------------------------------------------*
* This file is part of CoMISo. *
* *
* CoMISo is free software: you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation, either version 3 of the License, or *
* (at your option) any later version. *
* *
* CoMISo 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 General Public License for more details. *
* *
* You should have received a copy of the GNU General Public License *
* along with CoMISo. If not, see <http://www.gnu.org/licenses/>. *
* *
\*===========================================================================*/
#include <CoMISo/Config/config.hh>
#include <CoMISo/Utils/StopWatch.hh>
#include <vector>
#include <CoMISo/NSolver/FiniteElementProblem.hh>
#include <CoMISo/NSolver/NPDerivativeChecker.hh>
#include <CoMISo/NSolver/IPOPTSolver.hh>
#include <CoMISo/NSolver/AcceleratedQuadraticProxy.hh>
// create log barrier term for triangle orientation
class TriangleOrientationLogBarrierElement
{
public:
// define dimensions
const static int NV = 6;
const static int NC = 1;
typedef Eigen::Matrix<size_t,NV,1> VecI;
typedef Eigen::Matrix<double,NV,1> VecV;
typedef Eigen::Matrix<double,NC,1> VecC;
typedef Eigen::Triplet<double> Triplet;
inline double eval_f (const VecV& _x, const VecC& _c) const
{
return -_c[0]*std::log((-_x[0]+_x[2])*(-_x[1]+_x[5])-(-_x[0]+_x[4])*(-_x[1]+_x[3]));
}
inline void eval_gradient(const VecV& _x, const VecC& _c, VecV& _g) const
{
// get c*determinant
double d = _c[0]/((-_x[0]+_x[2])*(-_x[1]+_x[5])-(-_x[0]+_x[4])*(-_x[1]+_x[3]));
_g[0] = -d*(-_x[5]+_x[3]);
_g[1] = -d*(-_x[2]+_x[4]);
_g[2] = -d*(-_x[1]+_x[5]);
_g[3] = -d*( _x[0]-_x[4]);
_g[4] = -d*( _x[1]-_x[3]);
_g[5] = -d*(-_x[0]+_x[2]);
}
inline void eval_hessian (const VecV& _x, const VecC& _c, std::vector<Triplet>& _triplets) const
{
double d = 1.0/((-_x[0]+_x[2])*(-_x[1]+_x[5])-(-_x[0]+_x[4])*(-_x[1]+_x[3]));
VecV g;
g[0] = d*(-_x[5]+_x[3]);
g[1] = d*(-_x[2]+_x[4]);
g[2] = d*(-_x[1]+_x[5]);
g[3] = d*( _x[0]-_x[4]);
g[4] = d*( _x[1]-_x[3]);
g[5] = d*(-_x[0]+_x[2]);
_triplets.clear();
for(unsigned int i=0; i<NV; ++i)
for(unsigned int j=0; j<NV; ++j)
{
double v = _c[0]*g[i]*g[j];
_triplets.push_back(Triplet(i,j,v));
_triplets.push_back(Triplet(j,i,v));
}
d *= _c[0];
_triplets.push_back(Triplet(0,5, d));
_triplets.push_back(Triplet(0,3,-d));
_triplets.push_back(Triplet(5,0, d));
_triplets.push_back(Triplet(3,0,-d));
_triplets.push_back(Triplet(1,2, d));
_triplets.push_back(Triplet(1,4,-d));
_triplets.push_back(Triplet(2,1, d));
_triplets.push_back(Triplet(4,1,-d));
_triplets.push_back(Triplet(2,1, d));
_triplets.push_back(Triplet(2,5,-d));
_triplets.push_back(Triplet(1,2, d));
_triplets.push_back(Triplet(5,2,-d));
_triplets.push_back(Triplet(3,4, d));
_triplets.push_back(Triplet(3,0,-d));
_triplets.push_back(Triplet(4,3, d));
_triplets.push_back(Triplet(0,3,-d));
_triplets.push_back(Triplet(4,3, d));
_triplets.push_back(Triplet(4,1,-d));
_triplets.push_back(Triplet(3,4, d));
_triplets.push_back(Triplet(1,4,-d));
_triplets.push_back(Triplet(5,0, d));
_triplets.push_back(Triplet(5,2,-d));
_triplets.push_back(Triplet(0,5, d));
_triplets.push_back(Triplet(2,5,-d));
}
inline double max_feasible_step(const VecV& _x, const VecV& _v, const VecC& _c)
{
double a = ((-_v[0]+_v[2])*(-_v[1]+_v[5])-(-_v[0]+_v[4])*(-_v[1]+_v[3]));
double b = ((-_x[0]+_x[2])*(-_v[1]+_v[5])+(-_v[0]+_v[2])*(-_x[1]+_x[5])-(-_x[0]+_x[4])*(-_v[1]+_v[3])-(-_v[0]+_v[4])*(-_x[1]+_x[3]));
double c = (-_x[0]+_x[2])*(-_x[1]+_x[5])-(-_x[0]+_x[4])*(-_x[1]+_x[3]);
double a2 = a*a;
double b2 = b*b;
double c2 = c*c;
double eps = 1e-9*(a2+b2+c2);
// special case a=0?
if(a2 <= eps)
{
if(b2 <= eps) // special case a=b=0
{
if(c2 <= eps) return 0.0; // special case a=b=c=0
else return DBL_MAX; // special case a=b=0 & c!=0
}
else // special case a=0 & b!=0
{
double t=-c/b;
if( t>=0 ) return t;
else return DBL_MAX;
}
}
else
{
// discriminant
double d = b*b-4*a*c;
if(d < 0 ) return DBL_MAX;
else
{
d = std::sqrt(d);
double t1 = (-b+d)/(2.0*a);
double t2 = (-b-d)/(2.0*a);
if(t1 < 0.0) t1 = DBL_MAX;
if(t2 < 0.0) t2 = DBL_MAX;
return std::min(t1,t2);
}
}
}
};
// create a simple finite element (x-c)^2
class SimpleElement2
{
public:
// define dimensions
const static int NV = 1;
const static int NC = 1;
typedef Eigen::Matrix<size_t,NV,1> VecI;
typedef Eigen::Matrix<double,NV,1> VecV;
typedef Eigen::Matrix<double,NC,1> VecC;
typedef Eigen::Triplet<double> Triplet;
inline double eval_f(const VecV& _x, const VecC& _c) const
{
return std::pow(_x[0]-_c[0],2);
}
inline void eval_gradient(const VecV& _x, const VecC& _c, VecV& _g) const
{
_g[0] = 2.0*(_x[0]-_c[0]);
}
inline void eval_hessian (const VecV& _x, const VecC& _c, std::vector<Triplet>& _triplets) const
{
_triplets.clear();
_triplets.push_back(Triplet(0,0,2));
}
inline double max_feasible_step(const VecV& _x, const VecV& _v, const VecC& _c)
{
return DBL_MAX;
}
};
//------------------------------------------------------------------------------------------------------
// Example main
int main(void)
{
{
TriangleOrientationLogBarrierElement tolbe;
TriangleOrientationLogBarrierElement::VecV x; x << 0.0, 0.0, 2.0, 0.0, 1.0, 1.0;
TriangleOrientationLogBarrierElement::VecV v; v << 0.0, 0.0, 0.0, 0.0,-1.0,-1.0;
TriangleOrientationLogBarrierElement::VecC c; c << 1.0;
std::cerr << "max feasible step: " << tolbe.max_feasible_step(x,v,c) << std::endl;
}
std::cout << "---------- 1) Get an instance of a FiniteElementProblem..." << std::endl;
// first create sets of different finite elements
COMISO::FiniteElementSet<TriangleOrientationLogBarrierElement> fe_set;
TriangleOrientationLogBarrierElement::VecI tidx;
tidx << 0,1,2,3,4,5;
TriangleOrientationLogBarrierElement::VecC c;
c[0] = 1.0;
fe_set.instances().add_element(tidx, c);
std::cerr << "T1" << std::endl;
// second set for boundary conditions
COMISO::FiniteElementSet<SimpleElement2> fe_set2;
SimpleElement2::VecI idx;
SimpleElement2::VecC c2;
idx[0] = 0; c2[0] = 0.0; fe_set2.instances().add_element(idx, c2);
idx[0] = 1; c2[0] = 0.0; fe_set2.instances().add_element(idx, c2);
idx[0] = 2; c2[0] = 2.0; fe_set2.instances().add_element(idx, c2);
idx[0] = 3; c2[0] = 0.0; fe_set2.instances().add_element(idx, c2);
idx[0] = 4; c2[0] = 1.0; fe_set2.instances().add_element(idx, c2);
idx[0] = 5; c2[0] = -2.0; fe_set2.instances().add_element(idx, c2);
std::cerr << "T2" << std::endl;
// then create finite element problem and add sets
COMISO::FiniteElementProblem fe_problem(6);
fe_problem.add_set(&fe_set );
fe_problem.add_set(&fe_set2);
std::cerr << "T3" << std::endl;
// set initial values
fe_problem.x()[0] = 0.0;
fe_problem.x()[1] = 0.0;
fe_problem.x()[2] = 2.0;
fe_problem.x()[3] = 0.0;
fe_problem.x()[4] = 1.0;
fe_problem.x()[5] = 1.0;
std::cerr << "T4" << std::endl;
std::cout << "---------- 2) (optional for debugging) Check derivatives of problem..." << std::endl;
COMISO::NPDerivativeChecker npd;
npd.check_all(&fe_problem);
// check if IPOPT solver available in current configuration
#if( COMISO_IPOPT_AVAILABLE)
std::cout << "---------- 3) Get IPOPT solver... " << std::endl;
COMISO::IPOPTSolver ipsol;
std::cout << "---------- 4) Solve..." << std::endl;
// there are no constraints -> provide an empty vector
std::vector<COMISO::NConstraintInterface*> constraints;
ipsol.solve(&fe_problem, constraints);
#endif
// print result
for(unsigned int i=0; i<fe_problem.x().size(); ++i)
std::cerr << "x[" << i << "] = " << fe_problem.x()[i] << std::endl;
std::cout << "---------- 5) Get AQP Solver... " << std::endl;
COMISO::AcceleratedQuadraticProxy aqp;
std::cout << "---------- 6) Solve..." << std::endl;
// there are no constraints -> provide an empty vector
// then create finite element problems
// first the nonlinear part
COMISO::FiniteElementProblem fe_problem2(6);
fe_problem2.add_set(&fe_set );
// second the quadratic part
COMISO::FiniteElementProblem fe_problem3(6);
fe_problem3.add_set(&fe_set2);
// set initial values
fe_problem3.x()[0] = 0.0;
fe_problem3.x()[1] = 0.0;
fe_problem3.x()[2] = 2.0;
fe_problem3.x()[3] = 0.0;
fe_problem3.x()[4] = 1.0;
fe_problem3.x()[5] = 1.0;
COMISO::AcceleratedQuadraticProxy::SMatrixD A(0,6);
A.setZero();
COMISO::AcceleratedQuadraticProxy::VectorD b; b.resize(0);
// alternatively with constraints
// COMISO::AcceleratedQuadraticProxy::SMatrixD A(2,6);
// A.setZero(); A.coeffRef(0,0) = 1.0; A.coeffRef(1,1) = 1.0;
// COMISO::AcceleratedQuadraticProxy::VectorD b(2);
// b[0] = b[1] = 0.0;
// solve
aqp.solve(&fe_problem3, &fe_problem2, A, b);
// print result
for(unsigned int i=0; i<fe_problem3.x().size(); ++i)
std::cerr << "x[" << i << "] = " << fe_problem3.x()[i] << std::endl;
return 0;
}
Examples/small_finite_element/main.cc
View file @ f3c59a17
......@@ -63,6 +63,12 @@ public:
_triplets.push_back(Triplet(0,1,-2));
_triplets.push_back(Triplet(1,0,-2));
}
inline double max_feasible_step(const VecV& _x, const VecV& _v, const VecC& _c)
{
return DBL_MAX;
}
};
// create a simple finite element (x-c)^2
......@@ -94,6 +100,12 @@ public:
_triplets.clear();
_triplets.push_back(Triplet(0,0,2));
}
inline double max_feasible_step(const VecV& _x, const VecV& _v, const VecC& _c)
{
return DBL_MAX;
}
};
......
Examples/small_nsolver/main.cc
View file @ f3c59a17
......@@ -96,7 +96,7 @@ public:
}
// advanced properties
virtual bool constant_hessian() { return false; }
virtual bool constant_hessian() const { return false; }
};
......
NSolver/AcceleratedQuadraticProxy.hh 0 → 100644
View file @ f3c59a17
//=============================================================================
//
// CLASS AcceleratedQuadraticProxy
//
//=============================================================================
#ifndef COMISO_ACCELERATEDQUADRATICPROXY_HH
#define COMISO_ACCELERATEDQUADRATICPROXY_HH
//== COMPILE-TIME PACKAGE REQUIREMENTS ========================================
#include <CoMISo/Config/config.hh>
//== INCLUDES =================================================================
#include <CoMISo/Config/CoMISoDefines.hh>
#include <CoMISo/Utils/StopWatch.hh>
#include "NProblemInterface.hh"
//== FORWARDDECLARATIONS ======================================================
//== NAMESPACES ===============================================================
namespace COMISO {
//== CLASS DEFINITION =========================================================
/** \class AcceleratedQuadraticProxy AcceleratedQuadraticProxy.hh <CoMISo/NSolver/AcceleratedQuadraticProxy.hh>
Brief Description.
A more elaborate description follows.
*/
class COMISODLLEXPORT AcceleratedQuadraticProxy
{
public:
typedef Eigen::VectorXd VectorD;
typedef Eigen::SparseMatrix<double> SMatrixD;
typedef Eigen::Triplet<double> Triplet;
/// Default constructor
AcceleratedQuadraticProxy(const double _eps = 1e-6, const int _max_iters = 1000, const double _accelerate = 100.0, const double _alpha_ls=0.2, const double _beta_ls = 0.6)
: eps_(_eps), max_iters_(_max_iters), accelerate_(_accelerate), alpha_ls_(_alpha_ls), beta_ls_(_beta_ls) {}
/// Destructor
~AcceleratedQuadraticProxy() {}
// solve without linear constraints
int solve(NProblemInterface* _quadratic_problem, NProblemInterface* _nonlinear_problem, bool _update_factorization = true)
{
SMatrixD A(0,_quadratic_problem->n_unknowns());
VectorD b(VectorD::Index(0));
return solve(_quadratic_problem, _nonlinear_problem, A, b, _update_factorization);
}
// solve with linear constraints
int solve(NProblemInterface* _quadratic_problem, NProblemInterface* _nonlinear_problem, const SMatrixD& _A, const VectorD& _b, bool _update_factorization = true)
{
// time solution procedure
COMISO::StopWatch sw; sw.start();
// number of unknowns
int n = _quadratic_problem->n_unknowns();
// number of constraints
int m = _b.size();
std::cerr << "optmize via AQP with " << n << " unknowns and " << m << " linear constraints" << std::endl;
// initialize vectors of unknowns (cache last two steps)
VectorD x1(n);
_quadratic_problem->initial_x(x1.data());
VectorD x2 = x1;
// storage of acceleration vector and update vector dx and rhs of KKT system
VectorD dx(n+m), rhs(n+m), g(n);
rhs.setZero();
// resize temp vector for line search (and set to x1 to approx Hessian correctly if _quadratic problem is non-quadratic!)
x_ls_ = x1;