Commit 32934e82 authored by David Bommes's avatar David Bommes

fixed (some) DLL-Exports

git-svn-id: http://www.openflipper.org/svnrepo/CoMISo/trunk@80 1355f012-dd97-4b2f-ae87-10fa9f823a57
parent c90dbd9a
......@@ -11,6 +11,7 @@
//== INCLUDES =================================================================
#include <CoMISo/Config/CoMISoDefines.hh>
#include <iostream>
#include <gmm/gmm.h>
......@@ -33,7 +34,7 @@ namespace COMISO {
*/
class LinearConstraintHandlerPenalty
class COMISODLLEXPORT LinearConstraintHandlerPenalty
{
public:
......
......@@ -13,6 +13,8 @@
#include <gmm/gmm.h>
#include <CoMISo/Config/CoMISoDefines.hh>
//== FORWARDDECLARATIONS ======================================================
//== NAMESPACES ===============================================================
......@@ -29,7 +31,7 @@ namespace COMISO {
A more elaborate description follows.
*/
class NConstraintGmmInterface
class COMISODLLEXPORT NConstraintGmmInterface
{
public:
......
......@@ -18,6 +18,8 @@
#include <gmm/gmm.h>
#include "NProblemGmmInterface.hh"
#include <CoMISo/Config/CoMISoDefines.hh>
//== FORWARDDECLARATIONS ======================================================
//== NAMESPACES ===============================================================
......@@ -34,7 +36,7 @@ namespace COMISO {
A more elaborate description follows.
*/
class NPDerivativeChecker
class COMISODLLEXPORT NPDerivativeChecker
{
public:
......
......@@ -11,6 +11,7 @@
//== INCLUDES =================================================================
#include <CoMISo/Config/CoMISoDefines.hh>
#include <gmm/gmm.h>
#include "NProblemGmmInterface.hh"
#include "LinearConstraintHandlerElimination.hh"
......@@ -36,7 +37,7 @@ problem into an unconstrained one.
// ConstraintHandler working with Elimination approach
class NPLinearConstraintsElimination : public NProblemGmmInterface, public LinearConstraintHandlerElimination
class COMISODLLEXPORT NPLinearConstraintsElimination : public NProblemGmmInterface, public LinearConstraintHandlerElimination
{
public:
......@@ -163,7 +164,7 @@ private:
// ConstraintHandler working with Penalty
class NPLinearConstraintsPenalty : public NProblemGmmInterface, public LinearConstraintHandlerPenalty
class COMISODLLEXPORT NPLinearConstraintsPenalty : public NProblemGmmInterface, public LinearConstraintHandlerPenalty
{
public:
......
......@@ -18,6 +18,8 @@
#include <gmm/gmm.h>
#include "NProblemGmmInterface.hh"
#include <CoMISo/Config/CoMISoDefines.hh>
//== FORWARDDECLARATIONS ======================================================
//== NAMESPACES ===============================================================
......@@ -34,7 +36,7 @@ namespace COMISO {
A more elaborate description follows.
*/
class NPTiming : public NProblemGmmInterface
class COMISODLLEXPORT NPTiming : public NProblemGmmInterface
{
public:
......
......@@ -13,6 +13,8 @@
#include <gmm/gmm.h>
#include <CoMISo/Config/CoMISoDefines.hh>
//== FORWARDDECLARATIONS ======================================================
//== NAMESPACES ===============================================================
......@@ -29,7 +31,7 @@ namespace COMISO {
A more elaborate description follows.
*/
class NProblemGmmInterface
class COMISODLLEXPORT NProblemGmmInterface
{
public:
......
......@@ -14,6 +14,8 @@
#define EIGEN_YES_I_KNOW_SPARSE_MODULE_IS_NOT_STABLE_YET
#include <Eigen/Sparse>
#include <CoMISo/Config/CoMISoDefines.hh>
//== FORWARDDECLARATIONS ======================================================
//== NAMESPACES ===============================================================
......@@ -30,7 +32,7 @@ namespace COMISO {
A more elaborate description follows.
*/
class NProblemInterface
class COMISODLLEXPORT NProblemInterface
{
public:
......
......@@ -11,6 +11,7 @@
//== INCLUDES =================================================================
#include <CoMISo/Config/CoMISoDefines.hh>
#include <gmm/gmm.h>
#include "NProblemGmmInterface.hh"
......@@ -30,7 +31,7 @@ namespace COMISO {
A more elaborate description follows.
*/
class NewtonSolver
class COMISODLLEXPORT NewtonSolver
{
public:
......
......@@ -14,6 +14,7 @@
//== INCLUDES =================================================================
#include <CoMISo/Config/CoMISoDefines.hh>
#include <mpi.h>
#include <tao.h>
#include <gmm/gmm.h>
......@@ -36,7 +37,7 @@ namespace COMISO {
A more elaborate description follows.
*/
class TAOSolver
class COMISODLLEXPORT TAOSolver
{
public:
......
......@@ -14,6 +14,8 @@
#include "NProblemGmmInterface.hh"
#include <gmm/gmm.h>
#include <CoMISo/Config/CoMISoDefines.hh>
//== FORWARDDECLARATIONS ======================================================
//== NAMESPACES ===============================================================
......@@ -31,7 +33,7 @@ namespace COMISO {
A more elaborate description follows.
*/
class TestInterface : public NProblemGmmInterface
class COMISODLLEXPORT TestInterface : public NProblemGmmInterface
{
public:
......
......@@ -1091,6 +1091,18 @@ void inspect_matrix( const MatrixT& _A)
}
//-----------------------------------------------------------------------------
template<class MatrixT>
void print_dense( const MatrixT& _A)
{
gmm::dense_matrix<double> A(gmm::mat_nrows(_A), gmm::mat_ncols(_A));
gmm::copy(_A, A);
std::cerr << A << std::endl;
}
//-----------------------------------------------------------------------------
#ifndef COMISO_NCHOLMOD
......
......@@ -240,6 +240,11 @@ void factored_to_quadratic( MatrixT& _F, MatrixT2& _Q, VectorT& _rhs);
template<class MatrixT>
void inspect_matrix( const MatrixT& _A);
/// Print the matrix as dense matrix
template<class MatrixT>
void print_dense( const MatrixT& _A);
#ifndef COMISO_NCHOLMOD
/// GMM to Cholmod_sparse interface
......
......@@ -143,6 +143,7 @@ MISolver::solve_direct_rounding(
StopWatch sw;
// performance comparison code
if(0)
{
sw.start();
COMISO::SparseQRSolver spqr;
......@@ -158,6 +159,7 @@ MISolver::solve_direct_rounding(
}
// performance comparison code
if(0)
{
sw.start();
COMISO::UMFPACKSolver umf;
......@@ -173,6 +175,7 @@ MISolver::solve_direct_rounding(
}
// performance comparison code
if(0)
{
sw.start();
COMISO::CholmodSolver chol;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment