Commit 507dc269 authored by Laurent Belcour's avatar Laurent Belcour

Correction of an error in the CGAL plugin.

Adding the system dependant CGAL prf file.
parent 519747e4
# This configuration file is part of ALTA library
#
# Configuration file for CGAL library in the case where it is installed in
# the default location for your configuration.
macx {
INCLUDEPATH += /opt/local/include
LIBS += -L/opt/local/lib
}
win32 {
INCLUDEPATH += "C:\Program Files\CGAL-4.4\include"
LIBS += -L"C:\Program Files\CGAL-4.4\lib"
}
LIBS += -lCGAL -lCGAL_Core
......@@ -54,14 +54,17 @@ bool rational_fitter_cgal::fit_data(const ptr<data>& dat, ptr<function>& fit, co
int temp_np = _min_np, temp_nq = _min_nq ;
while(temp_np <= _max_np || temp_nq <= _max_nq)
{
timer time ;
timer time ;
time.start() ;
r->setSize(temp_np, temp_nq);
if(fit_data(d, temp_np, temp_nq, r))
{
time.stop();
std::cout << "<<INFO>> got a fit using np = " << temp_np << " & nq = " << temp_nq << " " << std::endl ;
std::cout << "<<INFO>> it took " << time << std::endl ;
time.stop();
std::cout << "<<INFO>> got a fit using np = " << temp_np
<< " & nq = " << temp_nq << " " << std::endl
<< "<<INFO>> it took " << time << std::endl ;
return true ;
}
......@@ -97,8 +100,6 @@ bool rational_fitter_cgal::fit_data(const ptr<vertical_segment>& d, int np, int
for(int j=0; j<d->dimY(); ++j)
{
rational_function_1d* rs = r->get(j);
rs->resize(np, nq);
if(!fit_data(d, np, nq, j, rs))
{
return false ;
......
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