Ignore:
Timestamp:
Mar 5, 2008, 6:56:01 PM (14 years ago)
Author:
Peter
Message:

fixes #345

File:
1 edited

Legend:

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

    r1201 r1206  
    4949  /// not contain any data or values, but rather is a lookup into a
    5050  /// Kernel object. Each row and each column corresponds to a row and
    51   /// a column in the Kernel, respectively. This design allow for fast
     51  /// a column in the Kernel, respectively. This design allows for fast
    5252  /// creation of sub-kernels, which is a common operation in most
    5353  /// traning/validation procedures.
    5454  ///
    55   /// A KernelLookup can be created directly from a Kernel or from an
    56   /// other KernelLookup. In the latter case, the resulting
     55  /// A KernelLookup can be created directly from a Kernel or from
     56  /// another KernelLookup. In the latter case, the resulting
    5757  /// KernelLookup is looking directly into the underlying Kernel to
    5858  /// avoid multiple lookups.
     
    154154
    155155    ///
    156     /// Constructor taking the column (default) or row index vector as
     156    /// Constructor taking the column (default) or row index as
    157157    /// input. If @a row is false the created KernelLookup will have
    158158    /// equally many rows as @a kernel.
     
    165165    /// undefined.
    166166    ///
    167     KernelLookup(const KernelLookup& kernel, const utility::Index&,
     167    KernelLookup(const KernelLookup& kl, const utility::Index&,
    168168                 const bool row=false);
    169169
     
    211211    /// \throw if KernelLookup is weighted
    212212    ///
    213     utility::SmartPtr<const MatrixLookup> data(void) const;
     213    MatrixLookup data(void) const;
    214214
    215215    ///
     
    221221    /// \throw if KernelLookup is unweighted
    222222    ///
    223     utility::SmartPtr<const MatrixLookupWeighted> data_weighted(void) const;
     223    MatrixLookupWeighted data_weighted(void) const;
    224224
    225225    /**
     
    268268       KernelLookup.
    269269    */
    270     utility::SmartPtr<const KernelLookup>
    271     selected(const utility::Index& index) const;
     270    KernelLookup selected(const utility::Index& index) const;
    272271   
    273272    /**
     
    281280       this was built from.
    282281    */
    283     utility::SmartPtr<const KernelLookup>
    284     test_kernel(const MatrixLookup& data) const;
     282    KernelLookup test_kernel(const MatrixLookup& data) const;
    285283
    286284    /**
     
    293291       between the passed @a data and the internal underlying data @a
    294292       this was built from.
    295    
    296        @note Returns a dynamically allocated KernelLookup, which has
    297        to be deleted by the caller to avoid memory leaks.
    298     */
    299     utility::SmartPtr<const KernelLookup>
    300     test_kernel(const MatrixLookupWeighted& data) const;
     293    */
     294    KernelLookup test_kernel(const MatrixLookupWeighted& data) const;
    301295
    302296    /**
Note: See TracChangeset for help on using the changeset viewer.