Merge commit '373846a1b1a53a994eef904a07b41e811919292f'

ARPA-SIMC · Sep 10, 2024 · ac3226f · ac3226f
2 parents 0afdac1 + 373846a
commit ac3226f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/agrolib/interpolation/interpolation.cpp b/agrolib/interpolation/interpolation.cpp
@@ -1094,7 +1094,7 @@ void localSelection(vector <Crit3DInterpolationDataPoint> &inputPoints, vector <
         inputPoints[i].distance = gis::computeDistance(x, y, float((inputPoints[i]).point->utm.x), float((inputPoints[i]).point->utm.y));
 
     unsigned int nrValid = 0;
-    float stepRadius = 2500;           // [m]
+    float stepRadius = 1000;           // [m]
     float r0 = 0;                       // [m]
     float r1 = stepRadius;              // [m]
     unsigned int i;
@@ -1103,7 +1103,6 @@ void localSelection(vector <Crit3DInterpolationDataPoint> &inputPoints, vector <
     int maxDistance = 0;
     while (nrValid < minPoints || (mySettings.getUseLapseRateCode() && nrPrimaries < minPoints))
     {
-        maxDistance = 0;
         for (i=0; i < inputPoints.size(); i++)
         {
             if (inputPoints[i].distance != NODATA && inputPoints[i].distance > r0 && inputPoints[i].distance <= r1)
@@ -1125,7 +1124,7 @@ void localSelection(vector <Crit3DInterpolationDataPoint> &inputPoints, vector <
         for (i=0; i< selectedPoints.size(); i++)
         {
             selectedPoints[i].regressionWeight = MAXVALUE(1 - selectedPoints[i].distance / maxDistance, EPSILON);
-            //selectedPoints[i].regressionWeight = MAXVALUE(std::exp(-std::pow(selectedPoints[i].distance/((4/5*maxDistance)),7.0)),EPSILON);
+            //selectedPoints[i].regressionWeight = MAXVALUE(std::exp(-selectedPoints[i].distance*selectedPoints[i].distance/((0.5*maxDistance)*(0.5*maxDistance))),EPSILON);
             //selectedPoints[i].regressionWeight = float(MAXVALUE((-(1/std::pow(maxDistance,4)*(std::pow(selectedPoints[i].distance,4)))+1),EPSILON));
             //selectedPoints[i].regressionWeight = 1;
         }

diff --git a/agrolib/interpolation/interpolationSettings.cpp b/agrolib/interpolation/interpolationSettings.cpp
@@ -329,7 +329,7 @@ TFittingFunction Crit3DInterpolationSettings::getChosenElevationFunction()
 
 void Crit3DInterpolationSettings::setChosenElevationFunction(TFittingFunction chosenFunction)
 {
-    const double H0_MIN = -200; //height of inversion point (double piecewise) or first inversion point (triple piecewise)
+    const double H0_MIN = -350; //height of single inversion point (double piecewise) or first inversion point (triple piecewise)
     const double H0_MAX = 2500;
     const double DELTA_MIN = 300; //height difference between inversion points (for triple piecewise only)
     const double DELTA_MAX = 1000;

diff --git a/agrolib/proxyWidget/localProxyWidget.cpp b/agrolib/proxyWidget/localProxyWidget.cpp
@@ -508,14 +508,15 @@ void Crit3DLocalProxyWidget::modelLRClicked(int toggled)
         else
         {
             //TODO: local proxy graph for other proxies
-            interpolationSettings->setCurrentCombination(interpolationSettings->getSelectedCombination());
+            /*interpolationSettings->setCurrentCombination(interpolationSettings->getSelectedCombination());
             interpolationSettings->clearFitting();
             std::string errorStr;
             if (! multipleDetrendingOtherProxiesFitting(proxyPos, subsetInterpolationPoints, interpolationSettings, myVar, errorStr)) return;
 
             std::vector<std::vector<double>> parameters = interpolationSettings->getFittingParameters();
             if (!interpolationSettings->getFittingParameters().empty() && !interpolationSettings->getFittingFunction().empty())
                 detrendingOtherProxies(3, outInterpolationPoints, interpolationSettings);
+            */
 
         }
         chartView->drawModelLapseRate(point_vector);