Changeset 13 for trunk/extremum_seeking/esc_nn/include

Timestamp:

08/29/12 16:52:52 (12 years ago)

Author:

wcaarls

Message:

Updated extremum_seeking to revision 1017

Location:

trunk/extremum_seeking/esc_nn/include/esc_nn

Files:

• nn_esc_1d.h (modified) (1 diff)
• nn_esc_2d.h (modified) (2 diffs)

trunk/extremum_seeking/esc_nn/include/esc_nn/nn_esc_1d.h

@@ -47 +47 @@
         double minPeakDetect(double e_minus);
         double aSwitch(double e);
+        void reset();
 
 };

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

@@ -25 +25 @@
 
 protected:
-        double A_,M_,ddelta1_,ddelta2_,ddelta3_,A,delta_,B_, mpd_init_, w_switch_old_, a_switch1_old_, a_switch2_old_, a_switch3_old_,yr_,period_;
+        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_;
@@ -42 +42 @@
         std::vector<double> monitor();
         std::vector<std::string> monitorNames();
+        void reset();
 protected:
-        double wSwitch(double e_minus);
-        double minPeakDetect(double e_minus);
+        double wSwitch(double e);
+        double minPeakDetect(double e);
         double aSwitch1(double e);
         double aSwitch2(double e);