Changeset 1433

Timestamp:

Aug 25, 2008, 5:23:42 PM (15 years ago)

Author:

Peter

Message:

fixes #423

Location:

branches/0.4-stable

Files:

• test/regression_test.cc (modified) (2 diffs)
• yat/regression/Local.cc (modified) (2 diffs)
• yat/regression/Local.h (modified) (1 diff)

branches/0.4-stable/test/regression_test.cc

@@ -487 +487 @@
 
   rl.fit(10, 100);
+  if (rl.x().size()!=1000/10)
+    return false;
+  for (size_t i=0; i+1<rl.x().size(); ++i)
+    if (!suite.equal(rl.x()(i+1)-rl.x()(i),10.0))
+      return false;
 
   utility::Vector y(rl.y_predicted());
@@ -493 +498 @@
       return false;
     }
+
   return true;
 }

branches/0.4-stable/yat/regression/Local.cc

@@ -69 +69 @@
 
     size_t nof_fits=data_.size()/step_size;
-    x_ = utility::Vector(nof_fits);
-    y_predicted_ = utility::Vector(x_.size());
-    y_err_ = utility::Vector(x_.size());
+    x_.resize(nof_fits);
+    y_predicted_.resize(x_.size());
+    y_err_.resize(x_.size());
     sort(data_.begin(), data_.end());
 
-    // coying data to 2 utility vectors ONCE to use views from
+    // copying data to 2 utility vectors ONCE to use views from
     utility::Vector x(data_.size());
     utility::Vector y(data_.size());
@@ -124 +124 @@
       assert(i<y_predicted_.size());
       assert(i<y_err_.size());
+      x_(i) = x(i*step_size);
       y_predicted_(i) = regressor_->predict(x(i*step_size));
       y_err_(i) = sqrt(regressor_->standard_error2(x(i*step_size)));

branches/0.4-stable/yat/regression/Local.h

@@ -70 +70 @@
 
     ///
+    /// @param step_size Size of step between each fit
     /// @param nof_points Number of points used in each fit
-    /// @param step_size Size of step between each fit
     ///
     void fit(const size_t step_size, const size_t nof_points);