Changeset 13 for trunk/extremum_seeking/esc_approx/src

Timestamp:

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

Author:

wcaarls

Message:

Updated extremum_seeking to revision 1017

Location:

trunk/extremum_seeking/esc_approx/src

Files:

• approx_esc_1d.cpp (modified) (2 diffs)
• approx_esc_2d.cpp (modified) (2 diffs)

trunk/extremum_seeking/esc_approx/src/approx_esc_1d.cpp

@@ -35 +35 @@
         k_grad_ = k_grad;
         init_vel_ = init_vel;
-        sample_ = 0;
         sampling_ = sampling;
-        ptr_ = 0;
         states_.resize(data_size);
         obj_vals_.resize(data_size);
+        sample_ = 0;
+        ptr_ = 0;
         initialized_ = true;
 }
@@ -111 +111 @@
         return std::vector<std::string>();
 }
+
+void ApproxESC1D::reset(){
+        sample_ = 0;
+        ptr_ = 0;
+}

trunk/extremum_seeking/esc_approx/src/approx_esc_2d.cpp

@@ -33 +33 @@
         k_grad_ = k_grad;
         init_vel_ = init_vel;
+        sampling_ = sampling;
         sample_ = 0;
-        sampling_ = sampling;
         ptr_ = 0;
-        states_ = Eigen::MatrixXf::Zero(2,data_size);
+        states_ = Eigen::MatrixXf::Zero(2,data_size_);
         obj_vals_ = Eigen::VectorXf::Zero(data_size_);
         state_curr_.resize(2);
@@ -133 +133 @@
         return std::vector<std::string>();
 }
+
+void ApproxESC2D::reset(){
+        sample_ = 0;
+        ptr_ = 0;
+        states_ = Eigen::MatrixXf::Zero(2,data_size_);
+        obj_vals_ = Eigen::VectorXf::Zero(data_size_);
+}