only change the static_cast in std::pow

This commit is contained in:
Andreas Fabri 2015-08-02 10:03:55 +02:00
parent 87a406ab81
commit edccf5f807
1 changed files with 4 additions and 3 deletions

View File

@ -416,6 +416,7 @@ fill_matrix(InputIterator begin, InputIterator end,
//compute and store transformed points //compute and store transformed points
std::vector<Point_3> pts_in_fitting_basis; std::vector<Point_3> pts_in_fitting_basis;
pts_in_fitting_basis.reserve(this->nb_input_pts);
CGAL_For_all(begin,end){ CGAL_For_all(begin,end){
Point_3 cur_pt = transf_points(D2L_converter(*begin)); Point_3 cur_pt = transf_points(D2L_converter(*begin));
pts_in_fitting_basis.push_back(cur_pt); pts_in_fitting_basis.push_back(cur_pt);
@ -440,11 +441,11 @@ fill_matrix(InputIterator begin, InputIterator end,
for (std::size_t k=0; k <= d; k++) { for (std::size_t k=0; k <= d; k++) {
for (std::size_t i=0; i<=k; i++) { for (std::size_t i=0; i<=k; i++) {
M.set(line_count, k*(k+1)/2+i, M.set(line_count, k*(k+1)/2+i,
std::pow(x,static_cast<double>(k-i)) std::pow(x,static_cast<int>(k-i))
* std::pow(y,static_cast<double>(i)) * std::pow(y,static_cast<int>(i))
/( fact(static_cast<unsigned int>(i)) * /( fact(static_cast<unsigned int>(i)) *
fact(static_cast<unsigned int>(k-i)) fact(static_cast<unsigned int>(k-i))
*std::pow(this->preconditionning,static_cast<double>(k)))); *std::pow(this->preconditionning,static_cast<int>(k))));
} }
} }
line_count++; line_count++;