Ignore:
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:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/extremum_seeking/esc_nn/include/esc_nn/nn_esc_1d.h

    r5 r13  
    4747        double minPeakDetect(double e_minus);
    4848        double aSwitch(double e);
     49        void reset();
    4950
    5051};
  • trunk/extremum_seeking/esc_nn/include/esc_nn/nn_esc_2d.h

    r5 r13  
    2525
    2626protected:
    27         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_;
     27        double A_,M_,ddelta1_,ddelta2_,ddelta3_,delta_,B_, mpd_init_, w_switch_old_, a_switch1_old_, a_switch2_old_, a_switch3_old_,yr_,period_;
    2828        double min_peak_,w_switch_;
    2929        std::vector<double> vel_ref_;
     
    4242        std::vector<double> monitor();
    4343        std::vector<std::string> monitorNames();
     44        void reset();
    4445protected:
    45         double wSwitch(double e_minus);
    46         double minPeakDetect(double e_minus);
     46        double wSwitch(double e);
     47        double minPeakDetect(double e);
    4748        double aSwitch1(double e);
    4849        double aSwitch2(double e);
Note: See TracChangeset for help on using the changeset viewer.