Commit b6aa7f79 authored by Laurent Belcour's avatar Laurent Belcour

Compile core on Visual studio

parent 88f080da
......@@ -121,7 +121,7 @@ class arguments
if(_map.count(key) > 0)
{
std::string s = _map.find(key)->second;
if(s[0] == '\[') // Is an array of type [a, b, c]
if(s[0] == '[') // Is an array of type [a, b, c]
{
int i = 0;
size_t pos = 1;
......
......@@ -144,8 +144,7 @@ class data_params : public data
virtual vec value(vec in, vec out) const
{
std::cerr << "<<ERROR>> not implemented: " << __func__ << std::endl;
throw;
NOT_IMPLEMENTED();
}
// Load data from a file
......
......@@ -10,6 +10,32 @@ struct param_info
std::string info;
};
#ifdef WIN32
std::map<params::input, const param_info> create_map()
{
std::map<params::input, const param_info> _map;
/* 1D Params */
_map.insert(std::make_pair<params::input, const param_info>(params::COS_TH, param_info("COS_TH", 1, "Cosine of the Half angle")));
/* 2D Params */
_map.insert(std::make_pair<params::input, const param_info>(params::RUSIN_TH_TD, param_info("RUSIN_TH_TD", 2, "Radialy symmetric Half angle parametrization")));
/* 3D Params */
_map.insert(std::make_pair<params::input, const param_info>(params::RUSIN_TH_TD_PD, param_info("RUSIN_TH_TD_PD", 3, "Isotropic Half angle parametrization")));
_map.insert(std::make_pair<params::input, const param_info>(params::ISOTROPIC_TV_TL_DPHI, param_info("ISOTROPIC_TV_TL_DPHI", 3, "Isotropic Light/View angle parametrization")));
/* 4D Params */
_map.insert(std::make_pair<params::input, const param_info>(params::RUSIN_TH_PH_TD_PD, param_info("RUSIN_TH_PH_TD_PD", 4, "Complete Half angle parametrization")));
_map.insert(std::make_pair<params::input, const param_info>(params::SPHERICAL_TL_PL_TV_PV, param_info("SPHERICAL_TL_PL_TV_PV", 4, "Complete classical parametrization")));
/* 6D Param */
_map.insert(std::make_pair<params::input, const param_info>(params::CARTESIAN, param_info("CARTESIAN", 6, "Complete vector parametrization")));
return _map;
}
static const std::map<params::input, const param_info> input_map = create_map();
#else
// Assing the input params map
static const std::map<params::input, const param_info> input_map = {
/* 1D Params */
......@@ -29,6 +55,7 @@ static const std::map<params::input, const param_info> input_map = {
/* 6D Params */
{params::CARTESIAN, {"CARTESIAN", 6, "Complete vector parametrization"}}
};
#endif
void params::to_cartesian(const double* invec, params::input intype,
double* outvec)
......
......@@ -5,6 +5,7 @@
#include <string>
// Interface
#include "common.h"
#include "function.h"
#include "data.h"
#include "fitter.h"
......@@ -24,8 +25,7 @@ class vertical_segment : public data
virtual vec operator[](int i) const ;
virtual vec value(vec in, vec out) const
{
std::cerr << "<<ERROR>> not implemented: " << __func__ << std::endl;
throw;
NOT_IMPLEMENTED();
}
//! \brief Put the sample inside the data
......
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