fix warnings

agrolib/climate/crit3dElabList.cpp

@@ -1,9 +1,9 @@
 #include <QString>
 #include <QDate>
 #include <QDebug>
+
 #include "crit3dElabList.h"
 #include "commonConstants.h"
-#include "climate.h"
 
 
 Crit3DElabList::Crit3DElabList()

agrolib/crit3dDate/crit3dDate.h

@@ -1,9 +1,7 @@
 #ifndef CRIT3DDATE_H
 #define CRIT3DDATE_H
 
-    #ifndef _STRING_
-        #include <string>
-    #endif
+    #include <string>
 
     #ifndef HOUR_SECONDS
         #define HOUR_SECONDS 3600

agrolib/gis/color.cpp

@@ -23,13 +23,13 @@
     gantolini@arpae.it
 */
 
-#include <algorithm>
-#include <math.h>
-
 #include "commonConstants.h"
 #include "basicMath.h"
 #include "color.h"
 
+#include <algorithm>
+#include <math.h>
+
 
 Crit3DColor::Crit3DColor()
 {

agrolib/gis/geoMap.cpp

@@ -24,9 +24,8 @@
 */
 
 
-#include "commonConstants.h"
 #include "geoMap.h"
-#include "math.h"
+#include <math.h>
 
 namespace gis
 {

agrolib/gis/gis.cpp

@@ -598,10 +598,10 @@ namespace gis
     {
         // è possibile sapere in quale cella (row,col) si trova la stazione?
         std::vector<float> distance(stations.size());
-        for (int i=0;i<stations.size();i++)
+            for (int i=0; i < int(stations.size()); i++)
         {
             distance[i] = (float)(stations[i][0] - cells[0][0])*(stations[i][0] - cells[0][0])+(stations[i][1] - cells[0][1])*(stations[i][1] - cells[0][1]);
-            for (int j=1;j<cells[i].size();j++)
+            for (int j=1; j < int(cells[i].size()); j++)
             {
                 distance[i] = MINVALUE(distance[i],(stations[i][0] - cells[j][0])*(stations[i][0] - cells[j][0])+(stations[i][1] - cells[j][1])*(stations[i][1] - cells[j][1]));
             }
@@ -615,10 +615,10 @@ namespace gis
     {
         // è possibile sapere in quale cella (row,col) si trova la stazione?
         std::vector<int> distance(stations.size());
-        for (int i=0; i<stations.size(); i++)
+        for (int i=0; i < int(stations.size()); i++)
         {
-            distance[i] = abs(stations[i][0] - cells[0][0])+abs(stations[i][1] - cells[0][1]);
-            for (int j=1;j<cells[i].size();j++)
+            distance[i] = abs(stations[i][0] - cells[0][0]) + abs(stations[i][1] - cells[0][1]);
+            for (int j=1; j < int(cells[i].size()); j++)
             {
                 distance[i] = MINVALUE(distance[i],abs(stations[i][0] - cells[j][0])+abs(stations[i][1] - cells[j][1]));
             }

agrolib/gis/gis.h

@@ -1,12 +1,9 @@
 #ifndef GIS_H
 #define GIS_H
 
-    #ifndef _VECTOR_
-        #include <vector>
-    #endif
-    #ifndef _STRING_
-        #include <string>
-    #endif
+    #include <vector>
+    #include <string>
+
     #ifndef CRIT3DCOLOR_H
         #include "color.h"
     #endif

agrolib/interpolation/interpolation.cpp

@@ -27,6 +27,7 @@
 #include <math.h>
 #include <vector>
 #include <algorithm>
+#include <functional>
 
 #include "commonConstants.h"
 #include "basicMath.h"
@@ -41,8 +42,6 @@
 #include "interpolationSettings.h"
 #include "meteo.h"
 
-#include <functional>
-#include <cmath>
 
 using namespace std;
 
@@ -1583,7 +1582,7 @@ void calculateFirstGuessCombinations(Crit3DProxy* myProxy)
     else
         paramIndex = {0,2};
 
-    for (int k = 0; k < paramIndex.size(); k++)
+    for (int k = 0; k < int(paramIndex.size()); k++)
     {
         for (int m = 1; m < numSteps+1; m++)
         {
@@ -1685,7 +1684,7 @@ bool setFittingParameters_otherProxies(int elevationPos, Crit3DInterpolationSett
 
     for (unsigned i=0; i < myCombination.getProxySize(); i++)
     {
-        if (i != elevationPos && myCombination.isProxyActive(i) && myCombination.isProxySignificant(i))
+        if (i != unsigned(elevationPos) && myCombination.isProxyActive(i) && myCombination.isProxySignificant(i))
         {
             mySettings->addFittingFunction(functionLinear_intercept);
             myFunc.push_back(functionLinear_intercept);
@@ -1869,7 +1868,7 @@ void detrendingElevation(int elevationPos, std::vector <Crit3DInterpolationDataP
     std::vector <double> parameters = mySettings->getFittingParameters().front();
 
     float proxyValue, detrendValue;
-    for (int i = 0; i < myPoints.size(); i++)
+    for (unsigned int i = 0; i < myPoints.size(); i++)
     {
         proxyValue = myPoints[i].getProxyValue(elevationPos);
 
@@ -2035,7 +2034,7 @@ bool multipleDetrendingOtherProxiesFitting(int elevationPos, std::vector <Crit3D
             weights.push_back(1);
     }
 
-    if (mySettings->getUseLocalDetrending() && othersPoints.size() < mySettings->getMinPointsLocalDetrending())
+    if (mySettings->getUseLocalDetrending() && int(othersPoints.size()) < mySettings->getMinPointsLocalDetrending())
     {
         for (int pos = 0; pos < proxyNr; pos++)
         {
@@ -2093,18 +2092,19 @@ void detrendingOtherProxies(int elevationPos, std::vector<Crit3DInterpolationDat
 
     // detrending
     float detrendValue;
-    for (int i = 0; i < myPoints.size(); i++)
+    for (unsigned int i = 0; i < myPoints.size(); i++)
     {
         proxyValues.clear();
 
-        for (int pos=0; pos < mySettings->getProxyNr(); pos++)
+        for (int pos=0; pos < int(mySettings->getProxyNr()); pos++)
         {
             if (pos != elevationPos && mySettings->getCurrentCombination().isProxyActive(pos) && mySettings->getCurrentCombination().isProxySignificant(pos))
             {
                 proxyValue = myPoints[i].getProxyValue(pos);
-                if (!isEqual(proxyValue, NODATA))
+                if (! isEqual(proxyValue, NODATA))
                     proxyValues.push_back(double(proxyValue));
-                else {
+                else
+                {
                     parameters.erase(parameters.begin()+proxyValues.size());
                     myFunc.erase(myFunc.begin()+proxyValues.size());
                 }
@@ -2141,10 +2141,10 @@ bool glocalDetrendingFitting(std::vector <Crit3DInterpolationDataPoint> &myPoint
         if (! temp.empty())
         {
             std::vector<Crit3DInterpolationDataPoint> subsetPoints;
-            for (int l = 0; l < temp.size(); l++)
+            for (unsigned int l = 0; l < temp.size(); l++)
             {
 
-                for (int k = 0; k < myPoints.size(); k++)
+                for (unsigned int k = 0; k < myPoints.size(); k++)
                     if (myPoints[k].index == temp[l])
                     {
                         subsetPoints.push_back(myPoints[k]);
@@ -2326,7 +2326,6 @@ bool preInterpolation(std::vector <Crit3DInterpolationDataPoint> &myPoints, Crit
                       Crit3DClimateParameters* myClimate, Crit3DMeteoPoint* myMeteoPoints, int nrMeteoPoints,
                       meteoVariable myVar, Crit3DTime myTime, std::string &errorStr)
 {
-
     if (myVar == precipitation || myVar == dailyPrecipitation)
     {
         int nrPrecNotNull;
@@ -2459,7 +2458,7 @@ bool getMultipleDetrendingValues(Crit3DInterpolationSettings mySettings, const s
     }
 
     for (unsigned int i=0; i < myCombination.getProxySize(); i++)
-        if (i != elevationPos && myCombination.isProxyActive(i) && myCombination.isProxySignificant(i))
+        if (i != unsigned(elevationPos) && myCombination.isProxyActive(i) && myCombination.isProxySignificant(i))
         {
             if (allProxyValues[i] == NODATA)
             {
@@ -2473,6 +2472,7 @@ bool getMultipleDetrendingValues(Crit3DInterpolationSettings mySettings, const s
     return (activeProxyValues.size() > 0);
 }
 
+
 bool getProxyValuesXY(float x, float y, Crit3DInterpolationSettings* mySettings, std::vector<double> &myValues)
 {
     float myValue;
@@ -2502,6 +2502,7 @@ bool getProxyValuesXY(float x, float y, Crit3DInterpolationSettings* mySettings,
     return proxyComplete;
 }
 
+
 float getFirstIntervalHeightValue(std::vector <Crit3DInterpolationDataPoint> &myPoints, bool useLapseRateCode)
 {
     float maxPointsZ = getMaxHeight(myPoints, useLapseRateCode);
@@ -2518,5 +2519,3 @@ float getFirstIntervalHeightValue(std::vector <Crit3DInterpolationDataPoint> &my
     return getFirstIntervalHeightValue;
 }
 
-
-

agrolib/interpolation/interpolationPoint.cpp

@@ -28,6 +28,7 @@
 #include "gis.h"
 #include "commonConstants.h"
 
+
 Crit3DInterpolationDataPoint::Crit3DInterpolationDataPoint()
 {
     index = NODATA;

agrolib/interpolation/interpolationSettings.cpp

@@ -29,6 +29,7 @@
 #include "basicMath.h"
 #include "commonConstants.h"
 
+
 bool Crit3DInterpolationSettings::getPrecipitationAllZero() const
 {
     return precipitationAllZero;
@@ -279,7 +280,7 @@ std::vector<std::vector<double> > Crit3DInterpolationSettings::getFittingParamet
 
 std::vector<double> Crit3DInterpolationSettings::getProxyFittingParameters(int tempIndex)
 {
-    if (tempIndex < fittingParameters.size())
+    if (tempIndex < int(fittingParameters.size()))
         return fittingParameters[tempIndex];
     else {
         fittingParameters.resize(tempIndex + 1);
@@ -317,7 +318,7 @@ void Crit3DInterpolationSettings::addFittingFunction(const std::function<double
 TFittingFunction Crit3DInterpolationSettings::getChosenElevationFunction()
 {
     int elPos = NODATA;
-    for (int i = 0; i < getProxyNr(); i++)
+    for (int i = 0; i < int(getProxyNr()); i++)
         if (getProxyPragaName(getProxy(i)->getName()) == proxyHeight)
             elPos = i;
 
@@ -341,7 +342,7 @@ void Crit3DInterpolationSettings::setChosenElevationFunction(TFittingFunction ch
     if (getUseMultipleDetrending()) clearFitting();
 
     int elPos = NODATA;
-    for (int i = 0; i < getProxyNr(); i++)
+    for (int i = 0; i < int(getProxyNr()); i++)
     {
         if (getProxyPragaName(getProxy(i)->getName()) == proxyHeight)
             elPos = i;
@@ -607,7 +608,7 @@ Crit3DProxy* Crit3DInterpolationSettings::getProxy(unsigned pos)
 
 int Crit3DInterpolationSettings::getProxyPosFromName(TProxyVar name)
 {
-    for (int i = 0; i < getProxyNr(); i++)
+    for (int i = 0; i < int(getProxyNr()); i++)
     {
         if (getProxyPragaName(getProxyName(i)) == name)
             return i;
@@ -620,7 +621,7 @@ bool Crit3DInterpolationSettings::isGlocalReady(bool isGrid)
 {
     if (getMacroAreasMap() != nullptr && getMacroAreas().size() > 0)
     {
-        for (int i = 0; i < getMacroAreas().size(); i++)
+        for (int i = 0; i < int(getMacroAreas().size()); i++)
         {
             if ((isGrid && getMacroAreas()[i].getAreaCellsGrid().size() > 0) ||
                 (!isGrid && getMacroAreas()[i].getAreaCellsDEM().size() > 0))

agrolib/interpolation/kriging.cpp

@@ -12,6 +12,7 @@
 
     #include "kriging.h"
 
+
     /*! global variables */
     static short mode;
     static int dim;

agrolib/interpolation/spatialControl.cpp

@@ -1,6 +1,6 @@
 #include <iostream>
 #include <stdio.h>
-#include <cmath>
+#include <math.h>
 
 #include "commonConstants.h"
 #include "basicMath.h"

agrolib/mathFunctions/furtherMathFunctions.cpp

@@ -1565,11 +1565,10 @@ namespace interpolation
                 break;
         }
 
-
         return counter;
-
     }
 
+
     int bestFittingMarquardt_nDimension_clean(double (*func)(std::vector<std::function<double(double, std::vector<double>&)>>&, std::vector<double>& , std::vector <std::vector <double>>&),
                                         std::vector<std::function<double(double, std::vector<double>&)>>& myFunc,
                                         std::vector <std::vector <double>>& parametersMin, std::vector <std::vector <double>>& parametersMax,
@@ -1578,21 +1577,21 @@ namespace interpolation
                                         std::vector <std::vector <double>>& x ,std::vector<double>& y,
                                         std::vector<double>& weights)
     {
-        int i,j;
         int nrData = int(y.size());
         std::vector <int> nrParameters(parameters.size());
         int nrParametersTotal = 0;
-        for (i=0; i<parameters.size();i++)
+        for (unsigned i=0; i < parameters.size();i++)
         {
             nrParameters[i]= int(parameters[i].size());
             nrParametersTotal += nrParameters[i];
         }
+
         std::vector <std::vector <double>> bestParameters(parameters.size());
         std::vector <std::vector <int>> correspondenceTag(2,std::vector<int>(nrParametersTotal));
         int counterTag = 0;
-        for (i=0; i<parameters.size();i++)
+        for (unsigned i=0; i < parameters.size();i++)
         {
-            for (j=0; j<nrParameters[i];j++)
+            for (int j=0; j < nrParameters[i];j++)
             {
                 correspondenceTag[0][counterTag] = i;
                 correspondenceTag[1][counterTag] = j;
@@ -1602,23 +1601,22 @@ namespace interpolation
             bestParameters[i].resize(nrParameters[i]) ;
         }
 
-        double R2;
         std::vector<double> ySim(nrData);
 
         fittingMarquardt_nDimension_noSquares(func,myFunc,parametersMin, parametersMax,
                                               parameters, parametersDelta,correspondenceTag, maxIterationsNr,
                                               myEpsilon, x, y, weights);
 
-        for (i=0;i<nrData;i++)
+        for (int i=0;i < nrData; i++)
         {
             ySim[i]= func(myFunc,x[i], parameters);
         }
-        R2 = computeWeighted_R2(y,ySim,weights);
+        double R2 = computeWeighted_R2(y,ySim,weights);
 
         return 1;
-
     }
 
+
     int bestFittingMarquardt_nDimension_clean(double (*func)(std::vector<std::function<double(double, std::vector<double>&)>>&, std::vector<double>& , std::vector <std::vector <double>>&),
                                               std::vector<std::function<double(double, std::vector<double>&)>>& myFunc,
                                               std::vector <std::vector <double>>& parametersMin, std::vector <std::vector <double>>& parametersMax,
@@ -2567,7 +2565,7 @@ namespace interpolation
         std::vector<double> ySim(nrData);
 
         //grigliato
-        for (int k = 0; k < firstGuessCombinations.size(); k++)
+        for (int k = 0; k < int(firstGuessCombinations.size()); k++)
         {
             parameters = firstGuessCombinations[k];
             fittingMarquardt_nDimension_noSquares_singleFunction(func,parametersMin,