diff --git a/pub/src/curve.cpp b/pub/src/curve.cpp index 319a5c5f2bebe91ff7015348af7c3c932ad372cb..7c81352d16c87d9a6c9cc93c9c5d31cb46d3efe1 100644 --- a/pub/src/curve.cpp +++ b/pub/src/curve.cpp @@ -180,8 +180,8 @@ void COlc::curve_val_vec( vector<double>* ret, const vector<double>& vt, { if( !vt.size() ) throw "BUG: vectorial curve evaluation requested with empty t vector"; - cout << "DEB cvv: entry with size(vt)=" << vt.size() << "\n"; - cout << "DEB cvv: ... vt = " << vt.front() << " .. " << vt.back() << "\n"; + //cout << "DEB cvv: entry with size(vt)=" << vt.size() << "\n"; + //cout << "DEB cvv: ... vt = " << vt.front() << " .. " << vt.back() << "\n"; ret->resize( vt.size() ); CResult val; @@ -255,7 +255,7 @@ void COlc::curve_val_vec( vector<double>* ret, const vector<double>& vt, errmsg = "command '" + expr + pars + "'"; system( cmd.c_str() ); } - cout << "DEB cvv: called " << errmsg << "\n"; + //cout << "DEB cvv: called " << errmsg << "\n"; FILE *F; if( !(F = fopen( ret_fifonam.c_str(), "r")) ) @@ -275,7 +275,7 @@ void COlc::curve_val_vec( vector<double>* ret, const vector<double>& vt, // interpolation: if ( S.size()<2 ) throw errmsg + " returns only " + S(S.size()) + " valid lines"; - cout << "DEB cvv: intpol "<<vt.front()<<" .. "<<vt.back()<<"\n"; + //cout << "DEB cvv: intpol "<<vt.front()<<" .. "<<vt.back()<<"\n"; S.intpol( vt, *ret ); } fclose( F ); diff --git a/pub/src/plot.cpp b/pub/src/plot.cpp index 9fcb72cec4accb24e0ce9ab94074924d5595fb31..8806fdd4f3683eb428e32e76d7a509e12eaf976a 100644 --- a/pub/src/plot.cpp +++ b/pub/src/plot.cpp @@ -260,7 +260,7 @@ int plot_curve_refine( CPlot* plot, POlc fc, uint k, uint j, int cstyle ) else break; // regular exit } - cout << "DEB refinement #" << iref << ", xc.size=" << xc.size() << "\n"; + // cout << "DEB refinement #" <<iref<< ", xc.size=" <<xc.size()<< "\n"; // evaluate curve for grid xc: fc->curve_val_vec( &yc, xc, k, j ); // for ( uint i=0; i<xc.size(); ++i ) @@ -295,7 +295,7 @@ int plot_curve_refine( CPlot* plot, POlc fc, uint k, uint j, int cstyle ) } xn = xa; yn = ya; } - cout << "DEB merger -> " << xn.size() << "\n"; + // cout << "DEB merger -> " << xn.size() << "\n"; // for ( uint i=0; i<xn.size(); ++i ) // printf ("DEB xn yn %12.6g %12.6g\n", xn[i], yn[i] ); @@ -327,7 +327,7 @@ int plot_curve_refine( CPlot* plot, POlc fc, uint k, uint j, int cstyle ) xa.push_back( xn.back() ); ya.push_back( yn.back() ); xn = xa; yn = ya; - cout << "DEB within frame -> " << xn.size() << "\n"; + // cout << "DEB within frame -> " << xn.size() << "\n"; // for ( uint i=0; i<xn.size(); ++i ) // printf ("DEB xy %12.6g %12.6g\n", xn[i], yn[i] ); @@ -341,14 +341,14 @@ int plot_curve_refine( CPlot* plot, POlc fc, uint k, uint j, int cstyle ) (xn[i+1]-xn[i-1]); if ( !plot->Y.close_enough( yn[i], yi, 0.005 ) ) { xc.push_back( (xn[i-1] + xn[i])/2 ); - cout << "DEB disc " << xc.back() << "\n"; + // cout << "DEB disc " << xc.back() << "\n"; insert_next = true; continue; } } if ( insert_next ) { xc.push_back( (xn[i-1] + xn[i])/2 ); - cout << "DEB next " << xc.back() << "\n"; + // cout << "DEB next " << xc.back() << "\n"; insert_next = false; continue; } @@ -356,7 +356,7 @@ int plot_curve_refine( CPlot* plot, POlc fc, uint k, uint j, int cstyle ) !plot->Y.contains(yc[i-1]) ) || ( !plot->Y.contains(yc[i]) && plot->Y.contains(yc[i-1]) ) ) { - cout << "DEB edge " << xc.back() << "\n"; + // cout << "DEB edge " << xc.back() << "\n"; xc.push_back( (xn[i-1] + xn[i])/2 ); continue; } @@ -382,7 +382,7 @@ int plot_curve_refine( CPlot* plot, POlc fc, uint k, uint j, int cstyle ) if ( !plot->Y.contains(yn[i]) || i==xn.size()-1 ) { npts += xa.size(); if ( xa.size() ){ - cout << "DEB segment -> " << xa.size() << "\n"; + // cout << "DEB segment -> " << xa.size() << "\n"; plot->addSpec( true, first_seg, cstyle, xa, ya, novec, fc->V[j]->z, fc->xco.str_std(), fc->yco.str_std(),