From fb00a82cdd8f41bbee5e61f4de30d0ce4e72c29b Mon Sep 17 00:00:00 2001
From: pospelov <pospelov@fz-juelich.de>
Date: Fri, 25 Jan 2013 20:33:43 +0100
Subject: [PATCH] Occasionally missed fixes from Walter
---
App/inc/ROOTMinimizerFunction.h | 4 ++--
App/src/FitSuiteObserverFactory.cpp | 4 ++--
App/src/ROOTMinimizer.cpp | 12 ++++++------
Core/Fitting/inc/FitSuiteObjects.h | 2 +-
Core/Fitting/src/FitSuiteObjects.cpp | 2 +-
Tests/UnitTests/TestCore/TestCore | Bin 1562280 -> 1562280 bytes
shared.pri | 3 +++
7 files changed, 15 insertions(+), 12 deletions(-)
diff --git a/App/inc/ROOTMinimizerFunction.h b/App/inc/ROOTMinimizerFunction.h
index 407c7bbc584..73525b67656 100644
--- a/App/inc/ROOTMinimizerFunction.h
+++ b/App/inc/ROOTMinimizerFunction.h
@@ -43,7 +43,7 @@ public:
typedef ROOT::Math::BasicFitMethodFunction<ROOT::Math::IMultiGenFunction>::Type_t Type_t;
ROOTMinimizerGradientFunction(IMinimizer::function_gradient_t fun_gradient, size_t npars, size_t ndatasize)
- : ROOT::Math::FitMethodFunction(npars, ndatasize)
+ : ROOT::Math::FitMethodFunction((int)npars, (int)ndatasize)
, m_fun_gradient(fun_gradient) { }
virtual ~ROOTMinimizerGradientFunction(){}
@@ -61,7 +61,7 @@ private:
double DoEval(const double * pars) const {
double chi2 = 0.0;
for(size_t i_data=0; i_data<NPoints(); ++i_data) {
- double res = DataElement(pars, i_data);
+ double res = DataElement(pars, (unsigned)i_data);
chi2 += res*res;
}
return chi2/double(NPoints());
diff --git a/App/src/FitSuiteObserverFactory.cpp b/App/src/FitSuiteObserverFactory.cpp
index 177206ab6e8..a0812c200e9 100644
--- a/App/src/FitSuiteObserverFactory.cpp
+++ b/App/src/FitSuiteObserverFactory.cpp
@@ -249,8 +249,8 @@ void FitSuiteObserverWriteTree::update(IObservable *subject)
event->parnames.push_back( (*it)->getName().c_str() );
event->parfixed.push_back( (*it)->isFixed() );
}
- event->niter = fitSuite->getNCalls();
- event->nstrategy = fitSuite->getNStrategy();
+ event->niter = (int)fitSuite->getNCalls();
+ event->nstrategy = (int)fitSuite->getNStrategy();
// appending data to the tree
tree->Fill();
diff --git a/App/src/ROOTMinimizer.cpp b/App/src/ROOTMinimizer.cpp
index 9a2ed04bae9..7efb3ece37e 100644
--- a/App/src/ROOTMinimizer.cpp
+++ b/App/src/ROOTMinimizer.cpp
@@ -74,15 +74,15 @@ void ROOTMinimizer::setParameter(size_t index, const FitParameter *par)
{
bool success;
if( par->isFixed() ) {
- success=m_root_minimizer->SetFixedVariable(index, par->getName().c_str(), par->getValue());
+ success=m_root_minimizer->SetFixedVariable((int)index, par->getName().c_str(), par->getValue());
}else if(par->hasLowerAndUpperLimits() ) {
- success=m_root_minimizer->SetLimitedVariable(index, par->getName().c_str(), par->getValue(), par->getStep(), par->getLowerLimit(), par->getUpperLimit());
+ success=m_root_minimizer->SetLimitedVariable((int)index, par->getName().c_str(), par->getValue(), par->getStep(), par->getLowerLimit(), par->getUpperLimit());
} else if(par->hasLowerLimit() && !par->hasUpperLimit() ) {
- success=m_root_minimizer->SetLowerLimitedVariable(index, par->getName().c_str(), par->getValue(), par->getStep(), par->getLowerLimit());
+ success=m_root_minimizer->SetLowerLimitedVariable((int)index, par->getName().c_str(), par->getValue(), par->getStep(), par->getLowerLimit());
} else if( par->hasUpperLimit() && !par->hasLowerLimit() ) {
- success=m_root_minimizer->SetUpperLimitedVariable(index, par->getName().c_str(), par->getValue(), par->getStep(), par->getUpperLimit());
+ success=m_root_minimizer->SetUpperLimitedVariable((int)index, par->getName().c_str(), par->getValue(), par->getStep(), par->getUpperLimit());
} else if( !par->hasUpperLimit() && !par->hasLowerLimit() && !par->isFixed() ) {
- success=m_root_minimizer->SetVariable(index, par->getName().c_str(), par->getValue(), par->getStep());
+ success=m_root_minimizer->SetVariable((int)index, par->getName().c_str(), par->getValue(), par->getStep());
} else {
throw LogicErrorException("ROOTMinimizer::setVariable() -> Strange place... I wish I knew how I got here.");
}
@@ -114,7 +114,7 @@ void ROOTMinimizer::minimize()
void ROOTMinimizer::setChiSquaredFunction(function_chi2_t fun_chi2, size_t nparameters)
{
delete m_chi2_func;
- m_chi2_func = new ROOTMinimizerChiSquaredFunction(fun_chi2, nparameters);
+ m_chi2_func = new ROOTMinimizerChiSquaredFunction(fun_chi2, (int)nparameters);
if( !isGradientBasedAgorithm() ) m_root_minimizer->SetFunction(*m_chi2_func);
}
diff --git a/Core/Fitting/inc/FitSuiteObjects.h b/Core/Fitting/inc/FitSuiteObjects.h
index e12df2c92b6..4cc681a5cda 100644
--- a/Core/Fitting/inc/FitSuiteObjects.h
+++ b/Core/Fitting/inc/FitSuiteObjects.h
@@ -59,7 +59,7 @@ public:
//! get residuals for single data element
//! @pars global_index index accross all OutputData defined
- double getResidualValue(int global_index);
+ double getResidualValue(size_t global_index);
//! get experiment
const Experiment *getExperiment(size_t i_item = 0) const { return m_fit_objects[check_index(i_item)]->getExperiment(); }
diff --git a/Core/Fitting/src/FitSuiteObjects.cpp b/Core/Fitting/src/FitSuiteObjects.cpp
index 8505f051ca5..5ee8c7ddf1d 100644
--- a/Core/Fitting/src/FitSuiteObjects.cpp
+++ b/Core/Fitting/src/FitSuiteObjects.cpp
@@ -94,7 +94,7 @@ double FitSuiteObjects::calculateChiSquaredValue()
}
-double FitSuiteObjects::getResidualValue(int global_index)
+double FitSuiteObjects::getResidualValue(size_t global_index)
{
size_t index(0);
const FitObject *fitObject = getObjectForGlobalDataIndex(global_index, index);
diff --git a/Tests/UnitTests/TestCore/TestCore b/Tests/UnitTests/TestCore/TestCore
index ee0d5dca1e19f318bfa1a06b7dacae52cc15050c..44b854532744c320768a04063beb72933079e387 100755
GIT binary patch
delta 78
zcmZ3nHh#t0_=Xn77N!>F7M2#)7Pc1l7LFFq7OocV7M>Q~7QPn#Edl`=OvmoF2Wbej
i2Wbel2Wbek2Wbem2Wg132Wg152Wg0H57H11TL%CNzZlj4
delta 78
zcmZ3nHh#t0_=Xn77N!>F7M2#)7Pc1l7LFFq7OocV7M>Q~7QPn#Edl`=Oj{4P2Wbej
i2Wbel2Wbek2Wbem2Wg132Wg152Wg0H57H11TL%CH%^0fy
diff --git a/shared.pri b/shared.pri
index edbef2729bb..41839c83b4e 100644
--- a/shared.pri
+++ b/shared.pri
@@ -102,6 +102,9 @@ QMAKE_CXXFLAGS_DEBUG += -fdiagnostics-show-option # to find out in gcc which opt
QMAKE_CXXFLAGS_RELEASE += -g # -ffast-math removed because of problems with NaNs
#QMAKE_STRIP=: # produces non-stripped (very large) libraries
+#QMAKE_CXXFLAGS_RELEASE += -pedantic -Wall -Wextra -Wcast-align -Wcast-qual -Wctor-dtor-privacy -Wdisabled-optimization -Wformat=2 -Winit-self -Wlogical-op -Wmissing-declarations -Wmissing-include-dirs -Wnoexcept -Wold-style-cast -Woverloaded-virtual -Wredundant-decls -Wshadow -Wsign-conversion -Wsign-promo -Wstrict-null-sentinel -Wstrict-overflow=5 -Wswitch-default -Wundef -Werror -Wno-unused
+#QMAKE_CXXFLAGS_RELEASE += -pedantic -Wall -Wextra -Wcast-align -Wcast-qual -Wctor-dtor-privacy -Wdisabled-optimization -Wformat=2 -Winit-self -Wmissing-declarations -Wmissing-include-dirs -Wold-style-cast -Woverloaded-virtual -Wredundant-decls -Wshadow -Wsign-conversion -Wsign-promo -Wstrict-overflow=5 -Wswitch-default -Werror -Wno-unused
+
# to compile with GPERFTOOLS support for code profiling
#CONFIG+=GPERFTOOLS
CONFIG(GPERFTOOLS) {
--
GitLab