Changeset 280 for trunk/src/RegressionLocal.cc

Timestamp:

Apr 20, 2005, 6:19:31 PM (18 years ago)

Author:

Peter

Message:

modified to use vector views

File:

• trunk/src/RegressionLocal.cc (modified) (2 diffs)

trunk/src/RegressionLocal.cc

@@ -23 +23 @@
   {
     sort(data_.begin(), data_.end());
+
+    // coying data to 2 gslapi vectors ONCE to use views from
+    gslapi::vector x_total(data_.size());
+    gslapi::vector y_total(data_.size());
+    for (size_t j=0; j<x_total.size(); j++)
+      x_total(j)=data_[j].first;
+    for (size_t j=0; j<y_total.size(); j++)
+      y_total(j)=data_[j].second;
+    
     regressor_->print_header(s); 
     s << std::endl;
@@ -55 +64 @@
       }
 
-      // copying data 
-      // Peter, too much copying. Move the copying outside loop and
-      // use a vector view (when available in gslapi::vector class).
-      gslapi::vector x(nof_points);
-      gslapi::vector y(nof_points);
+      
+      
+      gslapi::vector x(x_total, min_index, nof_points);
+      //for (size_t j=0; j<x.size(); j++)
+      //  x(j)=data_[min_index+j].first;
+
+      gslapi::vector y(y_total, min_index, nof_points);
+      //for (size_t j=0; j<y.size(); j++){
+      //  y(j)=data_[min_index+j].second;
+      //}
+
+      // calculating weights
       gslapi::vector w(nof_points);
-      for (size_t j=0; j<x.size(); j++)
-        x(j)=data_[min_index+j].first;
-      for (size_t j=0; j<y.size(); j++){
-        y(j)=data_[min_index+j].second;
-      }
-      // calculating weights
       for (size_t j=0; j<y.size(); j++)
         w(j) = kernel_->weight( (x(j)-(data_[min_index].first+