Skip to content

Commit

Permalink
Format
Browse files Browse the repository at this point in the history
  • Loading branch information
nim65s committed Dec 13, 2019
1 parent c33aaf1 commit 29f71ed
Showing 1 changed file with 8 additions and 15 deletions.
23 changes: 8 additions & 15 deletions include/parametric-curves/text-file.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -55,31 +55,24 @@ struct TextFile : public AbstractCurve<Numeric, Point> {
public:
virtual bool loadTextFile(const std::string& fileName) {
Eigen::MatrixXd data = parametriccurves::utils::readMatrixFromFile(fileName);
if(data.cols()==size)
{
std::cout<<"Setting derivatives to zero"<<std::endl;
if (data.cols() == size) {
std::cout << "Setting derivatives to zero" << std::endl;
posValues = data;
velValues.setZero(size);
accValues.setZero(size);
}
else if (data.cols()==2*size)
{
} else if (data.cols() == 2 * size) {
posValues = data.leftCols(size);
velValues = data.rightCols(size);
accValues = accValues.setZero(size);
}
else if (data.cols()==3*size)
{
} else if (data.cols() == 3 * size) {
posValues = data.leftCols(size);
velValues = data.middleCols(size,size);
velValues = data.middleCols(size, size);
accValues = data.rightCols(size);
}
else
{
std::cout<<"Unexpected number of columns (expected "<<3*size<<", found "<<data.cols()<<")\n";
} else {
std::cout << "Unexpected number of columns (expected " << 3 * size << ", found " << data.cols() << ")\n";
return false;
}
this->t_max = timeStep*(double)data.rows();
this->t_max = timeStep * (double)data.rows();
this->t_min = 0.0;
x_init = posValues.row(0);
return true;
Expand Down

0 comments on commit 29f71ed

Please sign in to comment.