Changeset 586

Timestamp:

09/29/11 17:35:47 (13 years ago)

Author:

grlod

Message:

Last modifications on dual algorithm

Location:

trunk/yao/include

Files:

• ObservationsDual.hpp (modified) (3 diffs)
• RunModelDual.hpp (modified) (4 diffs)
• RunModelM1QN3.hpp (modified) (1 diff)

trunk/yao/include/ObservationsDual.hpp

@@ -196 +196 @@
   public:
   static double *x;
+  static int currentIteration;
   inline void operator() (Trajectory *aTrajectory, int aStepTime, Module *aModule, int anOutput, int aCoordI, int aCoordJ, int aCoordK, Yst_fobs *anObservation)
   {
@@ -209 +210 @@
       &epsi);
     //! m = m - epsi (G)
-    //!anObservation->m = anObservation->m - epsi * (anObservation->gradCostValue - anObservation->innovationValue);
+    anObservation->m = anObservation->m - (epsi * (anObservation->gradCostValue - anObservation->innovationValue) / currentIteration) ;
     //anObservation->m = anObservation->m - 0.8 * (anObservation->gradCostValue - anObservation->innovationValue);
     *x++ = anObservation->m;
@@ -215 +216 @@
 };
 double *OCGradientDescent::x = NULL;
-
+int OCGradientDescent::currentIteration = 0;
 class OCUpdateState
 {

trunk/yao/include/RunModelDual.hpp

@@ -68 +68 @@
   void costSum();
   void setMinimizedM (double *aX);
-  void gradientDescent();
+  void gradientDescent(int anIteration);
 protected:
   int externalLoopId;
@@ -105 +105 @@
   aParam.ctonb = &ctonbe_;
   strcpy (aParam.normtype, "dfn");
-  aParam.impres = 5;
+  aParam.impres = Y3impres;
   aParam.imode[0] = 0;
   aParam.imode[1] = 0;
@@ -270 +270 @@
         YItRun++;
         basicIterationLoop();
-        gradientDescent();
+        gradientDescent(i);
+        printf("Cost function value : %f\n",paramM1QN3.f);
 #ifdef DEBUG
 
@@ -1076 +1077 @@
 }
 
-void RunModelDual::gradientDescent()
+void RunModelDual::gradientDescent(int anIteration)
 {
   OCGradientDescent::x = paramM1QN3.x;
+  OCGradientDescent::currentIteration = anIteration + 1;
 
   for (unsigned int i = 0; i < model->trajectories.size(); i++)

trunk/yao/include/RunModelM1QN3.hpp

@@ -85 +85 @@
   aParam.prosca = &euclid_;
   strcpy(aParam.normtype, "dfn");
-  aParam.impres=1;
+  aParam.impres=Y3impres;
   aParam.imode[0]=0;
   aParam.imode[1]=0;