Ignore:
Timestamp:
02/07/12 19:19:21 (2 years ago)
Author:
blaz <blaz.zupan@…>
Branch:
default
Children:
9945:ba7e22d4ebc5, 9963:7598327495d7
Parents:
9943:364085431ea7 (diff), 9942:32d14842ffc7 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Resolved conflicts in discretization.

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • docs/reference/rst/Orange.feature.discretization.rst

    r9927 r9944  
    11.. py:currentmodule:: Orange.feature.discretization 
    22 
    3 ################################### 
    4 Discretization (``discretization``) 
    5 ################################### 
     3########################################### 
     4Feature discretization (``discretization``) 
     5########################################### 
    66 
    77.. index:: discretization 
  • docs/reference/rst/Orange.feature.discretization.rst

    r9943 r9944  
    342342continuous variable by adding a prefix ``D_``. The values of the new attributes 
    343343are computed automatically when they are needed using a transformation 
    344 function :obj:`~Orange.data.variable.Variable.get_value_from` 
    345 (see :class:`Orange.data.variable.Variable`) which encodes the discretization:: 
     344function :obj:`~Orange.feature.Descriptor.get_value_from` 
     345(see :class:`Orange.feature.Descriptor`) which encodes the discretization:: 
    346346 
    347347    >>> sep_w 
Note: See TracChangeset for help on using the changeset viewer.