Commit 21a54898 authored by Laurent Belcour's avatar Laurent Belcour

Correction of some bug in the data2data and rational_fitter_parallel.

parent f1d1425f
......@@ -54,8 +54,8 @@ bool rational_fitter_parallel::fit_data(const ptr<data> dat, function* fit, cons
vec y(dat->dimX() + 3*dat->dimY());
for(int k=0; k<x.size() ; ++k) { y[k] = x[k]; }
for(int k=0; k<dat->dimY(); ++k) { y[k + x.size()] = (1.0 - args.get_float("dt", 0.1)) * x[k + dat->dimX() + dat->dimY()]; }
for(int k=0; k<dat->dimY(); ++k) { y[k + x.size() + dat->dimY()] = (1.0 + args.get_float("dt", 0.1)) * x[k + dat->dimX() + 2*dat->dimY()]; }
for(int k=0; k<dat->dimY(); ++k) { y[k + x.size() + dat->dimY()] = (1.0 - args.get_float("dt", 0.1)) * x[k + dat->dimX()]; }
for(int k=0; k<dat->dimY(); ++k) { y[k + x.size() + 2*dat->dimY()] = (1.0 + args.get_float("dt", 0.1)) * x[k + dat->dimX()]; }
vs->set(y);
}
......
......@@ -99,12 +99,10 @@ int main(int argc, char** argv)
// Import data
ptr<data> d_in = NULL ;
d_in = plugins_manager::get_data(args["in-data"]) ;
ptr<data> d_in = plugins_manager::get_data(args["in-data"]) ;
d_in->load(args["input"], args);
ptr<data> d_out = NULL;
d_out = plugins_manager::get_data(args["out-data"]) ;
ptr<data> d_out = plugins_manager::get_data(args["out-data"]) ;
if(!d_in && !d_out)
{
......
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