Context Navigation

Changeset 253

Timestamp:

Mar 3, 2005, 12:08:37 PM (17 years ago)

Author:

Peter

Message:

modified prediction function in RegressionLocal? to take a ostream

Location:

trunk/src

Files:

-                      r235
+                      r253
       y = alpha_ + beta_ * (x-m_x_);
       y_err = sqrt( alpha_var_+beta_var_*(x-m_x_)*(x-m_x_)+s2_/w );
+      x_=x;
+      y_=y;
+      y_err_=y_err;
+    }

-                      r245
+                      r253
+  }
+  void RegressionLocal::fit(const double f, const u_int step_size)
+  void RegressionLocal::fit(std::ostream& s, const double f,
+                            const u_int step_size)
+  {
     sort(data_.begin(), data_.end());
+    regressor_->print_header(s);
+    s << std::endl;
     // number of points on each side
 …
+      }
       // copying data
       // Peter, too much copying. Move the copying outside loop and
 …
       regressor_->predict(x_[x_.size()-1], y_[y_.size()-1],
                           y_err_[y_err_.size()-1]);
+      regressor_->print(s);
+      s << std::endl;
+    }
+  }
-  std::ostream& RegressionLocal::print(std::ostream& s) const
+  {
-    for (size_t i=0; i<x_.size(); i++) {
-      regressor_->print(s);
-      s << std::endl;
+    }
-    return s;
+  }

-                      r235
+                      r253
     /// data points are used and the point where the fit is done is in
     /// the middle. Starting with the smallest x, the function jumps
+    /// \a step_size point in each iteration to do the next fit
+    /// \a step_size point in each iteration to do the next
+    /// fit. Result is sent to ostream \a s.
     ///
     void fit(const double fraction, const u_int step_size=1);
+    void fit(std::ostream& s, const double fraction, const u_int step_size=1);
+    ///
+    /// @return prediction values and parameters
+    ///
+    std::ostream& print(std::ostream&) const;
+    ///
+    /// @return header for print()
+    ///
+    inline std::ostream& print_header(std::ostream& s) const
+    { return regressor_->print_header(s); }

Note: See TracChangeset for help on using the changeset viewer.