Changeset 896 for library/bdm/estim/arx.cpp

Timestamp:

04/09/10 09:31:37 (14 years ago)

Author:

mido

Message:

cleanup of MemDS and its descendants
bdmtoolbox/CMakeLists.txt slightly changed to avoid unnecessary MEX condition
"indeces" replaced by "indices"

Files:

• library/bdm/estim/arx.cpp (modified) (3 diffs)

library/bdm/estim/arx.cpp

@@ -148 +148 @@
 @param Eg0 a copy of prior GiW density before estimation
 @param Egll likelihood of the current Eg
-@param indeces current indeces
+@param indices current indices
 \return best likelihood in the structure below the given one
 */
-double egiw_bestbelow ( egiw Eg, egiw Eg0, double Egll, ivec &indeces ) { //parameter Eg is a copy!
+double egiw_bestbelow ( egiw Eg, egiw Eg0, double Egll, ivec &indices ) { //parameter Eg is a copy!
         ldmat Vo = Eg._V(); //copy
         ldmat Vo0 = Eg._V(); //copy
@@ -164 +164 @@
         double belll = Egll;
 
-        ivec tmpindeces;
-        ivec maxindeces = indeces;
-
-
-        cout << "bb:(" << indeces << ") ll=" << Egll << endl;
+        ivec tmpindices;
+        ivec maxindices = indices;
+
+
+        cout << "bb:(" << indices << ") ll=" << Egll << endl;
 
         //try to remove only one rv
@@ -186 +186 @@
                 //
                 if ( tmpll > Egll ) { //increase of the likelihood
-                        tmpindeces = indeces;
-                        tmpindeces.del ( i );
+                        tmpindices = indices;
+                        tmpindices.del ( i );
                         //search for a better match in this substructure
-                        belll = egiw_bestbelow ( Eg, Eg0, tmpll, tmpindeces );
+                        belll = egiw_bestbelow ( Eg, Eg0, tmpll, tmpindices );
                         if ( belll > maxll ) { //better match found
                                 maxll = belll;
-                                maxindeces = tmpindeces;
+                                maxindices = tmpindices;
                         }
                 }
         }
-        indeces = maxindeces;
+        indices = maxindices;
         return maxll;
 }