Changeset 9857:d98d5b2edf95 in orange


Ignore:
Timestamp:
02/06/12 20:54:39 (2 years ago)
Author:
blaz <blaz.zupan@…>
Branch:
default
rebase_source:
ccd9a311a61f58981c2a09cc02dd5a9a6fedee1a
Message:

EntropyDiscretization -> Entropy

Location:
Orange
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • Orange/classification/rules.py

    r9738 r9857  
    11491149        self.rule_finder.rule_stoppingValidator = RuleValidator_LRS(alpha=1.0, min_quality=0., max_rule_complexity=max_rule_complexity - 1, min_coverage=min_coverage) 
    11501150        self.refiner = RuleBeamRefiner_Selector() 
    1151         self.refiner_arguments = SelectorAdder(discretizer=Orange.feature.discretization.EntropyDiscretization(forceAttribute=1, 
     1151        self.refiner_arguments = SelectorAdder(discretizer=Orange.feature.discretization.Entropy(forceAttribute=1, 
    11521152                                                                                           maxNumberOfIntervals=2)) 
    11531153        self.prune_arguments = prune_arguments 
     
    22212221    """ 
    22222222    def __init__(self, example=None, not_allowed_selectors=[], argument_id=None, 
    2223                  discretizer=Orange.core.EntropyDiscretization(forceAttribute=True)): 
     2223                 discretizer=Orange.feature.discretization.Entropy(forceAttribute=True)): 
    22242224        # required values - needed values of attributes 
    22252225        self.example = example 
  • Orange/feature/discretization.py

    r9856 r9857  
    5757    discretized data set:: 
    5858 
    59         discretizer = Orange.feature.dicretization.EntropyDiscretization() 
     59        discretizer = Orange.feature.dicretization.Entropy() 
    6060        disc_data = discretizer(table) 
    61         another_disc_data = Orange.feature.dicretization.EntropyDiscretization(table) 
     61        another_disc_data = Orange.feature.dicretization.Entropy(table) 
    6262 
    6363    """ 
     
    8585    :param discretizer: a discretizer that converts continuous values into 
    8686      discrete. Defaults to 
    87       :obj:`Orange.feature.discretization.EntropyDiscretization`. 
     87      :obj:`Orange.feature.discretization.Entropy`. 
    8888    :type discretizer: Orange.feature.discretization.Discretization 
    8989     
  • Orange/fixes/fix_changed_names.py

    r9852 r9857  
    7575           "orange.MeasureAttribute_cost": "Orange.feature.scoring.Cost", 
    7676           "orange.MeasureAttribute_MSE": "Orange.feature.scoring.MSE", 
     77 
     78           "orange.EntropyDiscretization": "Orange.feature.discretization.Entropy", 
     79           "orange.EquiDistDiscretization": "Orange.feature.discretization.EqualWidth", 
     80           "orange.EquiNDiscretization": "Orange.feature.discretization.EqualFreq", 
     81           "orange.BiModalDiscretization": "Orange.feature.discretization.BiModal", 
    7782 
    7883           "orngFSS.attMeasure": "Orange.feature.scoring.score_all", 
     
    485490           "orange.IntervalDiscretizer": "Orange.feature.discretization.IntervalDiscretizer", 
    486491           "orange.ThresholdDiscretizer": "Orange.feature.discretization.ThresholdDiscretizer", 
    487            "orange.EntropyDiscretization": "Orange.feature.discretization.EntropyDiscretization", 
     492           "orange.EntropyDiscretization": "Orange.feature.discretization.Entropy", 
    488493           "orange.Discrete2Continuous": "Orange.feature.discretization.Discrete2Continuous", 
    489494 
Note: See TracChangeset for help on using the changeset viewer.