From e2c3cd32410dc7f4e2d979395ed52204c57bd688 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Wed, 7 Oct 2015 11:15:09 +0200
Subject: [PATCH] corr bug that appeared when combining global fitting with m/
---
pub/lib/fit.cpp | 2 +-
pub/lib/manip.cpp | 3 ++-
pub/lib/olf.cpp | 6 +++---
3 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/pub/lib/fit.cpp b/pub/lib/fit.cpp
index 2c240fcb..58e9138d 100644
--- a/pub/lib/fit.cpp
+++ b/pub/lib/fit.cpp
@@ -352,7 +352,7 @@ void NCurveFit::fit_global( POlc fc, ROld fd, int k, const lm_control_struct& co
Par.push_back( fc->VC(j0)->P[ip] );
} else {
for( int j: data.J2J )
- if ( fc->VC(0)->ParAttr[ip]=='u' )
+ if ( fc->VC(j)->ParAttr[ip]=='u' )
Par.push_back( fc->VC(j)->P[ip] );
}
}
diff --git a/pub/lib/manip.cpp b/pub/lib/manip.cpp
index 10018529..14dea044 100644
--- a/pub/lib/manip.cpp
+++ b/pub/lib/manip.cpp
@@ -1057,7 +1057,8 @@ void NManip::files_merge( const string& opts )
fnam[i] = ' ';
}
for ( auto cp = fnam.begin(); cp != fnam.end(); ++cp )
- if (*cp==' ') fnam.erase(cp--);
+ if (*cp==' ')
+ fnam.erase(cp--);
if (fnam == "") {
static int callNo=0;
fnam = str( format( "merge%03u" ) % callNo++ );
diff --git a/pub/lib/olf.cpp b/pub/lib/olf.cpp
index 3d4d928c..70bb1fc0 100644
--- a/pub/lib/olf.cpp
+++ b/pub/lib/olf.cpp
@@ -620,10 +620,10 @@ string COlc::info_table_header() const
{
string ret = "j ";
for ( int iz=0; iz<nZ(); iz++ )
- ret += str( format( "z%i " ) % iz );
+ ret += str( format( " z%i " ) % iz );
for ( int ip=0; ip<nP; ip++ )
- ret += str( format( "p%i " ) % ip );
- ret += "oc chi^2 1-R^2";
+ ret += str( format( " p%i " ) % ip );
+ ret += " oc chi^2 1-R^2";
return ret;
}
--
GitLab