Skip to content

GitLab

Commit e79ffa52 authored by Kirill Terekhov's avatar Kirill Terekhov
Browse files

Few fixes and unit test

parent 40108e63
Hide whitespace changes
Inline Side-by-side
Source/Headers/inmost_dense.h
View file @ e79ffa52
......@@ -468,11 +468,12 @@ namespace INMOST
template<typename typeB>
Matrix & operator =(Matrix<typeB> const & other)
{
if( n*m != other.n*other.m ) space.resize(other.n*other.m);
for(enumerator i = 0; i < other.n*other.m; ++i)
space[i] = get_value(other.space[i]);
n = other.n;
m = other.m;
if( Cols()*Rows() != other.Cols()*other.Rows() ) space.resize(other.Cols()*other.Rows());
for(enumerator i = 0; i < other.Rows(); ++i)
for(enumerator j = 0; j < other.Cols(); ++j)
assign((*this)(i,j),other(i,j));
n = other.Rows();
m = other.Cols();
return *this;
}
// i is in [0,n] - row index
......@@ -737,6 +738,8 @@ namespace INMOST
const Var * data() const {return space.data();}
enumerator Rows() const {return n;}
enumerator Cols() const {return m;}
enumerator & Rows() {return n;}
enumerator & Cols() {return m;}
void Print(INMOST_DATA_REAL_TYPE threshold = 1.0e-10) const
{
for(enumerator k = 0; k < n; ++k)
......
Source/Headers/inmost_expression.h
View file @ e79ffa52
......@@ -1824,18 +1824,25 @@ template<class A> __INLINE INMOST_DATA_REAL_TY
__INLINE void set_value(INMOST::multivar_expression_reference & Arg, const INMOST::multivar_expression & Val) {Arg.SetValue(Val.GetValue()); }
__INLINE void set_value(INMOST::multivar_expression_reference & Arg, const INMOST::multivar_expression_reference & Val) {Arg.SetValue(Val.GetValue()); }
__INLINE void assign(INMOST::var_expression & Arg, INMOST_DATA_REAL_TYPE Val) {Arg = Val;}
__INLINE void assign(INMOST::multivar_expression & Arg, INMOST_DATA_REAL_TYPE Val) {Arg = Val; }
__INLINE void assign(INMOST::multivar_expression_reference & Arg, INMOST_DATA_REAL_TYPE Val) {Arg = Val; }
__INLINE void assign(INMOST_DATA_REAL_TYPE & Arg, INMOST_DATA_REAL_TYPE Val) {Arg = Val;}
__INLINE void assign(INMOST_DATA_REAL_TYPE & Arg, const INMOST::var_expression & Val) {Arg = Val.GetValue();}
__INLINE void assign(INMOST_DATA_REAL_TYPE & Arg, const INMOST::multivar_expression & Val) {Arg = Val.GetValue();}
__INLINE void assign(INMOST_DATA_REAL_TYPE & Arg, const INMOST::multivar_expression_reference & Val) {Arg = Val.GetValue();}
__INLINE void assign(INMOST::multivar_expression & Arg, INMOST_DATA_REAL_TYPE Val) {Arg = Val; }
__INLINE void assign(INMOST::multivar_expression & Arg, const INMOST::var_expression & Val) {Arg = Val; }
__INLINE void assign(INMOST::multivar_expression & Arg, const INMOST::multivar_expression & Val) {Arg = Val; }
__INLINE void assign(INMOST::multivar_expression & Arg, const INMOST::multivar_expression_reference & Val) {Arg = Val; }
__INLINE void assign(INMOST::multivar_expression & Arg, const INMOST::hessian_multivar_expression & Val) {Arg = Val; }
__INLINE void assign(INMOST::multivar_expression_reference & Arg, INMOST_DATA_REAL_TYPE Val) {Arg = Val; }
__INLINE void assign(INMOST::multivar_expression_reference & Arg, const INMOST::var_expression & Val) {Arg = Val; }
__INLINE void assign(INMOST::multivar_expression_reference & Arg, const INMOST::multivar_expression & Val) {Arg = Val; }
__INLINE void assign(INMOST::multivar_expression_reference & Arg, const INMOST::multivar_expression_reference & Val) {Arg = Val; }
__INLINE void assign(INMOST::multivar_expression_reference & Arg, const INMOST::hessian_multivar_expression & Val) {Arg = Val; }
__INLINE void assign(INMOST::hessian_multivar_expression & Arg, INMOST_DATA_REAL_TYPE Val) {Arg = Val; }
__INLINE void assign(INMOST::hessian_multivar_expression & Arg, const INMOST::var_expression & Val) {Arg = Val; }
__INLINE void assign(INMOST::hessian_multivar_expression & Arg, const INMOST::multivar_expression & Val) {Arg = Val; }
__INLINE void assign(INMOST::hessian_multivar_expression & Arg, const INMOST::multivar_expression_reference & Val) {Arg = Val; }
__INLINE void assign(INMOST::hessian_multivar_expression & Arg, const INMOST::hessian_multivar_expression & Val) {Arg = Val; }
template<class A> __INLINE INMOST::soft_abs_expression<A> soft_fabs(INMOST::shell_expression<A> const & Arg, INMOST_DATA_REAL_TYPE tol) { return INMOST::soft_abs_expression<A>(Arg,tol); }
__INLINE INMOST_DATA_REAL_TYPE soft_fabs(INMOST_DATA_REAL_TYPE Arg, INMOST_DATA_REAL_TYPE tol) {return ::sqrt(Arg*Arg+tol*tol);}
template<class A> __INLINE INMOST::soft_sign_expression<A> soft_sign(INMOST::shell_expression<A> const & Arg, INMOST_DATA_REAL_TYPE tol) { return INMOST::soft_sign_expression<A>(Arg,tol); }
......
Tests/CMakeLists.txt
View file @ e79ffa52
if(USE_AUTODIFF)
add_subdirectory(autodiff_test000)
add_subdirectory(autodiff_test001)
endif(USE_AUTODIFF)
if(USE_SOLVER)
......
Tests/autodiff_test001/CMakeLists.txt 0 → 100644
View file @ e79ffa52
project(autodiff_test001)
set(SOURCE main.cpp)
add_executable(autodiff_test001 ${SOURCE})
target_link_libraries(autodiff_test001 inmost)
if(USE_MPI)
message("linking autodiff_test001 with MPI")
target_link_libraries(autodiff_test001 ${MPI_LIBRARIES})
if(MPI_LINK_FLAGS)
set_target_properties(autodiff_test001 PROPERTIES LINK_FLAGS "${MPI_LINK_FLAGS}")
endif()
endif(USE_MPI)
add_test(NAME autodiff_test001_hessian_0 COMMAND $<TARGET_FILE:autodiff_test001> 0)
Tests/autodiff_test001/main.cpp 0 → 100644
View file @ e79ffa52
#include <cstdio>
#include <cmath>
#include "inmost.h"
using namespace INMOST;
int main(int argc,char ** argv)
{
int test = 0;
if (argc > 1) test = atoi(argv[1]);
double x = 0.5;
double y = 0.25;
double z = 0.15;
double dx, dy, dz, dxdx, dydy, dzdz, dxdy, dxdz, dydz;
unknown vx(x,0), vy(y,1), vz(z,2);
hessian_variable f;
if( test == 0 ) //check derivative and hessian of sin(x*x+y*y)
{
double arg = 8*((z-0.5)*(z-0.5)+(y-0.5)*(y-0.5)+(x-0.5)*(x-0.5));
dx = 2*sin(arg)+16*(x-0.5)*(2*x-1)*cos(arg);
dy = 16*(2*x-1)*(y-0.5)*cos(arg);
dz = 16*(2*x-1)*cos(arg)*(z-0.5);
dxdx = -256*(x-0.5)*(x-0.5)*(2*x-1)*sin(arg)+16*(2*x-1)*cos(arg)+64*(x-0.5)*cos(arg);
dxdy = 32*(y-0.5)*cos(arg)-256*(x-0.5)*(2*x-1)*(y-0.5)*sin(arg);
dxdz = 32*cos(arg)*(z-0.5)-256*(x-0.5)*(2*x-1)*sin(arg)*(z-0.5);
dydy = 16*(2*x-1)*cos(arg)-256*(2*x-1)*(y-0.5)*(y-0.5)*sin(arg);
dydz = -256*(2*x-1)*(y-0.5)*sin(arg)*(z-0.5);
dzdz = 16*(2*x-1)*cos(arg)-256*(2*x-1)*sin(arg)*(z-0.5)*(z-0.5);
f = sin(8*((vx-0.5)*(vx-0.5)+(vy-0.5)*(vy-0.5)+(vz-0.5)*(vz-0.5)))*(2*vx-1);
}
//mixed derivative computed twice: dxdy and dydx
dxdy *= 2;
dxdz *= 2;
dydz *= 2;
double vdx = f.GetRow()[0];
double vdy = f.GetRow()[1];
double vdz = f.GetRow()[2];
double vdxdx = f.GetHessianRow()[Sparse::HessianRow::make_index(0,0)];
double vdydy = f.GetHessianRow()[Sparse::HessianRow::make_index(1,1)];
double vdzdz = f.GetHessianRow()[Sparse::HessianRow::make_index(2,2)];
double vdxdy = f.GetHessianRow()[Sparse::HessianRow::make_index(0,1)];
double vdxdz = f.GetHessianRow()[Sparse::HessianRow::make_index(0,2)];
double vdydz = f.GetHessianRow()[Sparse::HessianRow::make_index(1,2)];
bool error = false;
std::cout << std::setw(10) << "derivative " << std::setw(10) << "original " << std::setw(10) << "computed" << std::endl;
std::cout << std::setw(10) << "dx " << std::setw(10) << dx << std::setw(10) << vdx << std::endl;
std::cout << std::setw(10) << "dy " << std::setw(10) << dy << std::setw(10) << vdy << std::endl;
std::cout << std::setw(10) << "dz " << std::setw(10) << dz << std::setw(10) << vdz << std::endl;
std::cout << std::setw(10) << "dxdx " << std::setw(10) << dxdx << std::setw(10) << vdxdx << std::endl;
std::cout << std::setw(10) << "dxdy " << std::setw(10) << dxdy << std::setw(10) << vdxdy << std::endl;
std::cout << std::setw(10) << "dxdz " << std::setw(10) << dxdz << std::setw(10) << vdxdz << std::endl;
std::cout << std::setw(10) << "dydy " << std::setw(10) << dydy << std::setw(10) << vdydy << std::endl;
std::cout << std::setw(10) << "dydz " << std::setw(10) << dydz << std::setw(10) << vdydz << std::endl;
std::cout << std::setw(10) << "dzdz " << std::setw(10) << dzdz << std::setw(10) << vdzdz << std::endl;
if( std::abs(dx-vdx) > 1.0e-9 ) error = true, std::cout << "Error in dx: " << std::abs(dx-vdx) << " original " << dx << " computed " << vdx << std::endl;
if( std::abs(dy-vdy) > 1.0e-9 ) error = true, std::cout << "Error in dy: " << std::abs(dy-vdy) << " original " << dy << " computed " << vdy << std::endl;
if( std::abs(dz-vdz) > 1.0e-9 ) error = true, std::cout << "Error in dz: " << std::abs(dz-vdz) << " original " << dz << " computed " << vdz << std::endl;
if( std::abs(dxdx-vdxdx) > 1.0e-9 ) error = true, std::cout << "Error in dxdx: " << std::abs(dxdx-vdxdx) << " original " << dxdx << " computed " << vdxdx << std::endl;
if( std::abs(dxdy-vdxdy) > 1.0e-9 ) error = true, std::cout << "Error in dxdy: " << std::abs(dxdy-vdxdy) << " original " << dxdy << " computed " << vdxdy << std::endl;
if( std::abs(dxdz-vdxdz) > 1.0e-9 ) error = true, std::cout << "Error in dxdz: " << std::abs(dxdz-vdxdz) << " original " << dxdz << " computed " << vdxdz << std::endl;
if( std::abs(dydy-vdydy) > 1.0e-9 ) error = true, std::cout << "Error in dydy: " << std::abs(dydy-vdydy) << " original " << dydy << " computed " << vdydy << std::endl;
if( std::abs(dydz-vdydz) > 1.0e-9 ) error = true, std::cout << "Error in dydz: " << std::abs(dydz-vdydz) << " original " << dydz << " computed " << vdydz << std::endl;
if( std::abs(dzdz-vdzdz) > 1.0e-9 ) error = true, std::cout << "Error in dzdz: " << std::abs(dzdz-vdzdz) << " original " << dzdz << " computed " << vdzdz << std::endl;
if( error ) return -1;
return 0;
}
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