Changeset 1121 for trunk/yat/regression


Ignore:
Timestamp:
Feb 22, 2008, 4:29:56 PM (13 years ago)
Author:
Peter
Message:

fixes #308

Location:
trunk/yat/regression
Files:
7 edited

Legend:

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

    r1120 r1121  
    2525#include "MultiDimensional.h"
    2626#include "yat/utility/Exception.h"
    27 #include "yat/utility/matrix.h"
     27#include "yat/utility/Matrix.h"
    2828#include "yat/utility/VectorBase.h"
    2929#include "yat/utility/Vector.h"
     
    4949
    5050
    51   const utility::matrix& MultiDimensional::covariance(void) const
     51  const utility::Matrix& MultiDimensional::covariance(void) const
    5252  {
    5353    return covariance_;
     
    5555
    5656
    57   void MultiDimensional::fit(const utility::matrix& x,
     57  void MultiDimensional::fit(const utility::Matrix& x,
    5858                             const utility::VectorBase& y)
    5959  {
  • trunk/yat/regression/MultiDimensional.h

    r1120 r1121  
    2525*/
    2626
    27 #include "yat/utility/matrix.h"
     27#include "yat/utility/Matrix.h"
    2828#include "yat/utility/VectorBase.h"
    2929
     
    5454    /// @brief covariance of parameters
    5555    ///
    56     const utility::matrix& covariance(void) const;
     56    const utility::Matrix& covariance(void) const;
    5757
    5858    /**
     
    6464       dimension errors).
    6565    */
    66     void fit(const utility::matrix& X, const utility::VectorBase& y);
     66    void fit(const utility::Matrix& X, const utility::VectorBase& y);
    6767
    6868    ///
     
    9595    double chisquare_;
    9696    double s2_;
    97     utility::matrix covariance_;
     97    utility::Matrix covariance_;
    9898    utility::Vector fit_parameters_;
    9999    gsl_multifit_linear_workspace* work_;
  • trunk/yat/regression/MultiDimensionalWeighted.cc

    r1120 r1121  
    2424#include "MultiDimensionalWeighted.h"
    2525#include "yat/statistics/AveragerWeighted.h"
    26 #include "yat/utility/matrix.h"
     26#include "yat/utility/Matrix.h"
    2727#include "yat/utility/Vector.h"
    2828
     
    5151
    5252
    53   void MultiDimensionalWeighted::fit(const utility::matrix& x,
     53  void MultiDimensionalWeighted::fit(const utility::Matrix& x,
    5454                                     const utility::VectorBase& y,
    5555                                     const utility::VectorBase& w)
  • trunk/yat/regression/MultiDimensionalWeighted.h

    r1120 r1121  
    2525*/
    2626
    27 #include "yat/utility/matrix.h"
     27#include "yat/utility/Matrix.h"
    2828#include "yat/utility/Vector.h"
    2929
     
    6363       dimension errors).
    6464    */
    65     void fit(const utility::matrix& X, const utility::VectorBase& y,
     65    void fit(const utility::Matrix& X, const utility::VectorBase& y,
    6666             const utility::VectorBase& w);
    6767
     
    9494  private:
    9595    double chisquare_;
    96     utility::matrix covariance_;
     96    utility::Matrix covariance_;
    9797    utility::Vector fit_parameters_;
    9898    double s2_;
  • trunk/yat/regression/Polynomial.cc

    r1120 r1121  
    2525
    2626#include "Polynomial.h"
    27 #include "yat/utility/matrix.h"
     27#include "yat/utility/Matrix.h"
    2828#include "yat/utility/VectorBase.h"
    2929
     
    4343
    4444
    45   const utility::matrix& Polynomial::covariance(void) const
     45  const utility::Matrix& Polynomial::covariance(void) const
    4646  {
    4747    return md_.covariance();
     
    5353  {
    5454    add(ap_, x.begin(), x.end(), y.begin());
    55     utility::matrix X=utility::matrix(x.size(),power_+1,1);
     55    utility::Matrix X=utility::Matrix(x.size(),power_+1,1);
    5656    for (size_t i=0; i<X.rows(); ++i)
    5757      for (u_int j=1; j<X.columns(); j++)
  • trunk/yat/regression/Polynomial.h

    r1120 r1121  
    5959    /// @brief covariance of parameters
    6060    ///
    61     const utility::matrix& covariance(void) const;
     61    const utility::Matrix& covariance(void) const;
    6262
    6363    ///
  • trunk/yat/regression/PolynomialWeighted.cc

    r1120 r1121  
    2424
    2525#include "PolynomialWeighted.h"
    26 #include "yat/utility/matrix.h"
     26#include "yat/utility/Matrix.h"
    2727#include "yat/utility/Vector.h"
    2828
     
    5454    utility::Vector dummy(x.size(), 1.0);
    5555    add(ap_,x.begin(), x.end(),y.begin(),dummy.begin(),w.begin());
    56     utility::matrix X=utility::matrix(x.size(),power_+1,1);
     56    utility::Matrix X=utility::Matrix(x.size(),power_+1,1);
    5757    for (size_t i=0; i<X.rows(); ++i)
    5858      for (u_int j=1; j<X.columns(); j++)
Note: See TracChangeset for help on using the changeset viewer.