Changeset 40


Ignore:
Timestamp:
Feb 20, 2004, 3:03:25 PM (19 years ago)
Author:
Jari Häkkinen
Message:

Removed .icc files.

Location:
trunk/src
Files:
3 deleted
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/histogram.h

    r13 r40  
     1// $Id$
     2
     3#ifndef _THEP_CPPTOOLS_HISTOGRAM_
     4#define _THEP_CPPTOOLS_HISTOGRAM_
     5
    16#include <fstream>
    27#include <iostream>
     
    49#include <gsl/gsl_histogram.h>
    510
    6 
    7 #ifndef _THEP_CPPTOOLS_HISTOGRAM_
    8 #define _THEP_CPPTOOLS_HISTOGRAM_
    911
    1012namespace thep_cpp_tools
     
    3638       Returns the intensity corresponding to bin \a n.
    3739     */
    38     inline double get_intensity( const size_t& n ) const;
     40    inline double get_intensity( const size_t& n ) const
     41      { return gsl_histogram_get(h_,n); }
    3942
    4043
     
    4245       Returns the range corresponding to bin \a n
    4346     */
    44     inline void get_range( const size_t& n, double& min, double& max ) const;
     47    inline void get_range( const size_t& n, double& min, double& max ) const
     48      { gsl_histogram_get_range(h_,n,&min,&max); }
    4549
    4650
     
    4852       Returns the number of bins in the distribution.
    4953     */
    50     inline size_t get_bins() const;
     54    inline size_t get_bins() const { return gsl_histogram_bins(h_); }
    5155
    5256
     
    6165       the histogram.
    6266     */
    63     inline double get_probability( const double& r );
     67    inline double get_probability( const double& r )
     68      { return gsl_histogram_pdf_sample(p_,r); }
    6469
    6570
     
    8691  };
    8792
    88   #include "histogram.h"
    8993
    9094}
  • trunk/src/matrix.h

    r30 r40  
    8383       To be used when writting new classes using gsl-functions.
    8484    */
    85     inline gsl_matrix* get_gsl_matrix() const; 
     85    inline gsl_matrix* get_gsl_matrix() const { return m_; } 
    8686
    8787
     
    101101       where i = row number and j = column number
    102102    */
    103     inline Type get( const size_t& i, const size_t& j ) const;
     103    inline Type get( const size_t& i, const size_t& j ) const
     104      { return gsl_matrix_get(m_,i_row,j_col); }
    104105
    105106
     
    108109       where i = row number and j = column number
    109110    */
    110     inline void set( const size_t& i, const size_t& j, const Type& val );
     111    inline void set( const size_t& i, const size_t& j, const Type& val )
     112      { gsl_matrix_set( m_, i_row, j_col, val ); }
    111113
    112114    /**
     
    114116       for all "i"
    115117    */
    116     inline void set_all( const Type& val );
     118    inline void set_all( const Type& val ) { gsl_matrix_set_all(m_,val); }
    117119
    118120
     
    225227    gsl_matrix* m_;
    226228  };
    227 #include "matrix.icc"
    228229
    229230
  • trunk/src/vector.h

    r35 r40  
    8585       To be used when writting new classes using gsl-functions.
    8686    */
    87     inline gsl_vector* get_gsl_vector() const
     87    inline gsl_vector* get_gsl_vector() const { return v_; }
    8888
    8989
     
    104104       where i = column (if row vector) or row (if column vector)
    105105    */
    106     inline Type get( const size_t& i ) const;
     106    inline Type get( const size_t& i ) const { return gsl_vector_get(v_,i); }
    107107
    108108
     
    111111       where i = column (if row vector) or row (if column vector)
    112112    */
    113     inline void set( const size_t& i, const Type& val );
     113    inline void set( const size_t& i, const Type& val )
     114      { gsl_vector_set(v_,i,val); }
    114115
    115116    /**
     
    117118       for all "i"
    118119    */
    119     inline void set_all( const Type& val );
     120    inline void set_all( const Type& val ) { gsl_vector_set_all(v_,val); }
    120121
    121122
     
    186187    bool is_col_;
    187188  };
    188 #include "vector.icc"
    189189
    190190
Note: See TracChangeset for help on using the changeset viewer.