corr

pub/src/curve.cpp

@@ -143,13 +143,18 @@ void NCurveFile::ChangeExpr()
         uint nParOld = fc->nPar();
         setFunction( fc, expr );
         fc->lDoc.push_back( "ccm " + expr );
-        for( uint ip=nParOld; ip<fc->T->npar(); ip++ ){
-            fc->PCo.push_back( CCoord("p" + strg(ip), "") );
-            fc->Fixed.push_back( CList() );
+        uint nParNew = fc->T->npar();
+        fc->PCo.resize(nParNew);
+        fc->Fixed.resize(nParNew);
+        for( uint ip=nParOld; ip<nParNew; ip++ ){
+            fc->PCo[ip] = CCoord("p" + strg(ip), "");
+            fc->Fixed[ip] = CList();
+        }
+        for (uint j=0; j<fc->nJ(); j++) {
+            fc->VC(j)->P.resize( nParNew );
+            for( uint ip=nParOld; ip<nParNew; ip++ )
+                fc->VC(j)->P[ip] = 1.0;
         }
-        for (uint j=0; j<fc->nJ(); j++)
-            for( uint ip=nParOld; ip<fc->T->npar(); ip++ )
-                fc->VC(j)->P.push_back( 1.0 );
     }
 }
 
@@ -236,7 +241,7 @@ vector<string> COlc::pInfo() const
                   ProtectedSpecs.contains(j) ? '/' : ' ' );
         lin += wrd;
         for ( uint iz=0; iz<nZ(); iz++ ) {
-            snprintf( wrd, PINFO_WRD_SIZ, "%-12.7g ", VC(j)->z[iz] );
+            snprintf( wrd, PINFO_WRD_SIZ, "%-12.7g ", V[j]->z[iz] );
             lin += wrd;
         }
         for ( uint ip=0; ip<nPar(); ip++ ) {

pub/src/olf.cpp

@@ -102,6 +102,7 @@ POlc COlc::new_olc() const
 void COld::copy_mainvec( POlo fin )
 {
     POld fd = boost::dynamic_pointer_cast<class COld>( fin );
+    V.resize( fin->nJ() );
     for( uint j=0; j<fin->nJ(); ++j )
         V[j] = PZentry( new CSpec( *(fd->VS(j)) ) );
 }
@@ -109,6 +110,7 @@ void COld::copy_mainvec( POlo fin )
 void COlc::copy_mainvec( POlo fin )
 {
     POlc fc = boost::dynamic_pointer_cast<class COlc>( fin );
+    V.resize( fin->nJ() );
     for( uint j=0; j<fin->nJ(); ++j )
         V[j] = PZentry( new CCurve( *(fc->VC(j)) ) );
 }
@@ -118,6 +120,8 @@ void COlc::copy_mainvec( POlo fin )
 
 PSpec COld::VS( uint j ) const
 {
+    if( j>=V.size() )
+        throw "VS call with j=" + strg(j) + " though V.size=" + strg(V.size());
     PSpec p = boost::dynamic_pointer_cast<class CSpec>( V[j] );
     if ( !p )
         throw string( "invalid VS call" );
@@ -126,6 +130,8 @@ PSpec COld::VS( uint j ) const
 
 PCurve COlc::VC( uint j ) const
 {
+    if( j>=V.size() )
+        throw "VC call with j=" + strg(j) + " though V.size=" + strg(V.size());
     PCurve p = boost::dynamic_pointer_cast<class CCurve>( V[j] );
     if ( !p )
         throw string( "invalid VC call" );