Hunting Day: fix initial and final in som

src/xmipp/libraries/classification/som.cpp

@@ -265,10 +265,10 @@ void SOM::loadObject(std::istream& _is)
  */
 double Descent::operator()(const unsigned _step, const unsigned _nSteps) const
 {
-    if (_nSteps == 0 || initial == final || _step >= _nSteps)
-        return final;
+    if (_nSteps == 0 || initialVal == finalVal || _step >= _nSteps)
+        return finalVal;
     else
-        return final + ((initial - final) *
+        return finalVal + ((initialVal - finalVal) *
                         ((double)(_nSteps - _step) / (double)_nSteps));
 }
 
@@ -279,8 +279,8 @@ double Descent::operator()(const unsigned _step, const unsigned _nSteps) const
 */
 void Descent::printSelf(std::ostream& _os) const
 {
-    _os << initial << std::endl;
-    _os << final << std::endl;
+    _os << initialVal << std::endl;
+    _os << finalVal << std::endl;
 }
 
 /**
@@ -292,9 +292,9 @@ void Descent::readSelf(std::istream& _is)
     try
     {
         if (_is)
-            _is >> initial;
+            _is >> initialVal;
         if (_is)
-            _is >> final;
+            _is >> finalVal;
     }
     catch (std::exception& e)
     {

src/xmipp/libraries/classification/som.h

@@ -50,11 +50,11 @@ class Descent
 public:
     /**
      * Constructor
-     * Parameter: _initial
-     * Parameter: _final
+     * Parameter: _initialVal
+     * Parameter: _finalVal
      */
-    Descent(const double _initial = 1, const double _final = 0)
-            : initial(_initial), final(_final)
+    Descent(const double _initialVal = 1, const double _finalVal = 0)
+            : initialVal(_initialVal), finalVal(_finalVal)
     {}
     ;
 
@@ -124,8 +124,8 @@ class Descent
 
 
 protected:
-    double initial;
-    double final;
+    double initialVal;
+    double finalVal;
 };
 
 //---------------------------------------------------------------------------