Ignore:
Timestamp:
Feb 14, 2008, 7:05:37 AM (14 years ago)
Author:
Peter
Message:

fixes #312 and added passing of data in EB constructors

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/yat/classifier/EnsembleBuilder.h

    r1079 r1087  
    5252    /// Constructor.
    5353    ///
    54     EnsembleBuilder(const Classifier&, const Sampler&);
     54    EnsembleBuilder(const Classifier&, const Data&, const Sampler&);
    5555
    5656    ///
    5757    /// Constructor.
    5858    ///
    59     EnsembleBuilder(const Classifier&, const Sampler&,
     59    EnsembleBuilder(const Classifier&, const Data&, const Sampler&,
    6060                    FeatureSelector&);
    6161
     
    116116
    117117  template <class C, class D>
    118   EnsembleBuilder<C,D>::EnsembleBuilder(const C& sc,
     118  EnsembleBuilder<C,D>::EnsembleBuilder(const C& sc, const D& data,
    119119                                        const Sampler& sampler)
    120     : mother_(sc),subset_(new SubsetGenerator<D>(sampler,sc.data()))
    121   {
    122   }
    123 
    124 
    125   template <class C, class D>
    126   EnsembleBuilder<C, D>::EnsembleBuilder(const C& sc, const Sampler& sampler,
     120    : mother_(sc),subset_(new SubsetGenerator<D>(sampler,data))
     121  {
     122  }
     123
     124
     125  template <class C, class D>
     126  EnsembleBuilder<C, D>::EnsembleBuilder(const C& sc, const D& data,
     127                                         const Sampler& sampler,
    127128                                         FeatureSelector& fs)
    128129    : mother_(sc),
    129       subset_(new SubsetGenerator<D>(sampler,sc.data(),fs))
     130      subset_(new SubsetGenerator<D>(sampler,data,fs))
    130131  {
    131132  }
Note: See TracChangeset for help on using the changeset viewer.