Commit 3911242c authored by Laurent Belcour's avatar Laurent Belcour
Browse files

Adding Visual studio compile for the rest of the projet

parent b6aa7f79
......@@ -242,3 +242,7 @@ template<typename T> int is_in(std::vector<T> ve, T v)
std::cerr << "<<ERROR>> not implemented " << __FILE__ \
<< ":" << __LINE__ << std::endl; \
throw
#ifdef WIN32
#define M_PI 3.14159265
#endif
......@@ -307,6 +307,8 @@ std::ofstream& type_definition(std::ofstream& out, int nY)
out << "float " ;
else
out << "vec" << nY ;
return out;
}
std::ofstream& type_affectation(std::ofstream& out, const std::string& name, const vec& x, int nY, int n=0, int s=0, int S=1)
......
......@@ -17,8 +17,6 @@
#define isnan(X) ((X != X))
#endif
using namespace std;
fitter* provide_fitter()
{
return new rational_fitter_quadprog();
......
......@@ -72,7 +72,7 @@ int main(int argc, char** argv)
f << "#PARAM_IN COS_TH" << std::endl;
for(int i=0; i<nbx; ++i)
{
const float x = i / (float)nbx ;
const double x = i / (float)nbx ;
// const float d[3] = {0.1, 0.0, 0.5};
const float d[3] = {0.0, 0.0, 0.0};
const float z1 = d[0] + 0.2 * std::pow(x, 1.5) ;
......@@ -91,8 +91,8 @@ int main(int argc, char** argv)
f << "#PARAM_IN COS_TH" << std::endl;
for(int i=0; i<nbx; ++i)
{
const float x = i / (float)nbx ;
const float z = 0.1 + 0.5 * std::pow(x, 1.5) ;
const double x = i / (float)nbx ;
const double z = 0.1 + 0.5 * std::pow(x, 1.5) ;
f << x << "\t" << z << std::endl ;
}
......
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