Changeset 1009 for trunk/yat/regression


Ignore:
Timestamp:
Feb 1, 2008, 5:15:44 AM (13 years ago)
Author:
Peter
Message:

merging branch peter-dev into trunk delta 1008:994

Location:
trunk/yat/regression
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/yat/regression/Local.cc

    r1000 r1009  
    2727#include "OneDimensionalWeighted.h"
    2828#include "yat/utility/vector.h"
     29#include "yat/utility/vectorView.h"
    2930
    3031#include <algorithm>
     
    5960
    6061    size_t nof_fits=data_.size()/step_size;
    61     x_.clone(utility::vector(nof_fits));
    62     y_predicted_.clone(utility::vector(x_.size()));
    63     y_err_.clone(utility::vector(x_.size()));
     62    x_ = utility::vector(nof_fits);
     63    y_predicted_ = utility::vector(x_.size());
     64    y_err_ = utility::vector(x_.size());
    6465    sort(data_.begin(), data_.end());
    6566
     
    102103      assert(max_index<data_.size());
    103104                               
    104       utility::vector x_local(x, min_index, max_index-min_index+1);
    105       utility::vector y_local(y, min_index, max_index-min_index+1);
     105      utility::vectorView x_local(x, min_index, max_index-min_index+1);
     106      utility::vectorView y_local(y, min_index, max_index-min_index+1);
    106107
    107108      // calculating weights
  • trunk/yat/regression/MultiDimensional.cc

    r1000 r1009  
    5858    assert(x.rows()==y.size());
    5959    covariance_.clone(utility::matrix(x.columns(),x.columns()));
    60     fit_parameters_.clone(utility::vector(x.columns()));
     60    fit_parameters_ = utility::vector(x.columns());
    6161    if (work_)
    6262      gsl_multifit_linear_free(work_);
  • trunk/yat/regression/MultiDimensionalWeighted.cc

    r1000 r1009  
    5959
    6060    covariance_.clone(utility::matrix(x.columns(),x.columns()));
    61     fit_parameters_.clone(utility::vector(x.columns()));
     61    fit_parameters_ = utility::vector(x.columns());
    6262    if (work_)
    6363      gsl_multifit_linear_free(work_);
Note: See TracChangeset for help on using the changeset viewer.