Merge commit 'aa8ff6c55849eccf5df90c86fc7b86fb8bb72e6e'

ARPA-SIMC · Mar 15, 2024 · fd4022f · fd4022f
2 parents 47a0309 + aa8ff6c
commit fd4022f
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 4 deletions.
diff --git a/agrolib/mathFunctions/furtherMathFunctions.cpp b/agrolib/mathFunctions/furtherMathFunctions.cpp
@@ -1227,7 +1227,7 @@ namespace interpolation
                 }
             }
             iterationNr++;
-        } while (iterationNr <= maxIterationsNr && fabs(diffSSE) > myEpsilon);
+        } while (fabs(diffSSE) > myEpsilon && iterationNr <= maxIterationsNr);
         return (fabs(diffSSE) <= myEpsilon);
     }
 
@@ -1255,6 +1255,7 @@ namespace interpolation
         std::vector<double> firstEst(nrData);
         std::vector<std::vector<double>> a(nrParametersTotal, std::vector<double>(nrParametersTotal));
         std::vector<std::vector<double>> P(nrParametersTotal, std::vector<double>(nrData));
+        // matrix P corresponds to the Jacobian
         // first set of estimates
         for (i = 0; i < nrData; i++)
         {
@@ -1341,6 +1342,7 @@ namespace interpolation
             }
         }
 
+        // linear system resolution in order to get the Delta of each parameter
         parametersChange[nrPredictors - 1][nrParameters[nrPredictors-1]-1] = g[nrParametersTotal - 1] / a[nrParametersTotal - 1][nrParametersTotal - 1];
 
 

diff --git a/agrolib/pragaProject/pragaProject.cpp b/agrolib/pragaProject/pragaProject.cpp
@@ -944,16 +944,23 @@ bool PragaProject::elaborationPointsCycleGrid(bool isAnomaly, bool showInfo)
         }
     }
 
-    QDate startDate(climaUsed->yearStart(), climaUsed->genericPeriodDateStart().month(), climaUsed->genericPeriodDateStart().day());
-    QDate endDate(climaUsed->yearEnd(), climaUsed->genericPeriodDateEnd().month(), climaUsed->genericPeriodDateEnd().day());
+    QDate startDate;
+    QDate endDate;
 
     if (climaUsed->nYears() > 0)
     {
+        startDate.setDate(climaUsed->yearStart(), climaUsed->genericPeriodDateStart().month(), climaUsed->genericPeriodDateStart().day());
         endDate.setDate(climaUsed->yearEnd() + climaUsed->nYears(), climaUsed->genericPeriodDateEnd().month(), climaUsed->genericPeriodDateEnd().day());
     }
     else if (climaUsed->nYears() < 0)
     {
         startDate.setDate(climaUsed->yearStart() + climaUsed->nYears(), climaUsed->genericPeriodDateStart().month(), climaUsed->genericPeriodDateStart().day());
+        endDate.setDate(climaUsed->yearEnd(), climaUsed->genericPeriodDateEnd().month(), climaUsed->genericPeriodDateEnd().day());
+    }
+    else
+    {
+        startDate.setDate(climaUsed->yearStart(), climaUsed->genericPeriodDateStart().month(), climaUsed->genericPeriodDateStart().day());
+        endDate.setDate(climaUsed->yearEnd(), climaUsed->genericPeriodDateEnd().month(), climaUsed->genericPeriodDateEnd().day());
     }
 
      bool dataAlreadyLoaded = false;

diff --git a/agrolib/project/interpolationCmd.cpp b/agrolib/project/interpolationCmd.cpp
@@ -181,7 +181,7 @@ bool interpolateProxyGridSeries(const Crit3DProxyGridSeries& mySeries, QDate myD
         return false;
     }
 
-    if (! gis::readEsriGrid(gridNames[second].toStdString(), &secondGrid, myError)) return false;
+    if (! gis::readEsriGrid(gridNames[second].toStdString(), &secondGrid, myError))
     {
         *error = QString::fromStdString(myError);
         return false;