Changeset 18 for trunk/extremum_seeking/esc_nn/include

Timestamp:

01/03/13 15:27:56 (12 years ago)

Author:

wcaarls

Message:

Updated extremum_seeking to revision 1177

Location:

trunk/extremum_seeking/esc_nn/include/esc_nn

Files:

• nn_esc_1d.h (added)
• nn_esc_2d.h (modified) (2 diffs)

trunk/extremum_seeking/esc_nn/include/esc_nn/nn_esc_2d.h

@@ -26 +26 @@
 protected:
         double A_,M_,ddelta1_,ddelta2_,ddelta3_,delta_,B_, mpd_init_, w_switch_old_, a_switch1_old_, a_switch2_old_, a_switch3_old_,yr_,period_;
-        double min_peak_,w_switch_;
-        std::vector<double> vel_ref_;
+        double min_peak_,w_switch_, stoping_min_val_, obj_val_cycle_init_;
+        int stopping_cycle_number_, nn_cycle_count_;
+        std::vector<double> vel_ref_,vel_ref_old_;
         bool initialized_,min_peak_detect_init_;
+
 
 public:
         NNESC2D();
-
-        NNESC2D(double A,double M, double B, double ddelta1, double ddelta2, double ddelta3, double delta, double period);
-
-        void init(double A, double M, double B, double ddelta1, double ddelta2, double ddelta3, double delta, double period);
+        NNESC2D(double A,double M, double B, double ddelta1, double ddelta2, double ddelta3, double delta, double period, int stopping_cycle_number, double stoping_min_val);
+        void init(double A, double M, double B, double ddelta1, double ddelta2, double ddelta3, double delta, double period, int stopping_cycle_number, double stoping_min_val);
 
         std::vector<double> step(double obj_val);
@@ -43 +43 @@
         std::vector<std::string> monitorNames();
         void reset();
+        bool isStoppingConditionsMet();
 protected:
         double wSwitch(double e);