Changeset 8863:77c5f05eb8d7 in orange


Ignore:
Timestamp:
08/31/11 15:04:36 (3 years ago)
Author:
anze <anze.staric@…>
Branch:
default
Convert:
0f77fca4ec8563f6d241ef0abf45ff6200300d50
Message:

Renamed classes in Orange.statistics.estimate.

Location:
orange
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • orange/Orange/classification/bayes.py

    r8862 r8863  
    88    """ 
    99    Probabilistic classifier based on applying Bayes' theorem (from Bayesian 
    10     statistics) with strong (naive) independence assumptions. 
    11     If data instances are provided to the constructor, the learning algorithm 
    12     is called and the resulting classifier is returned instead of the learner. 
    13                  
    14     :rtype: :class:`Orange.classification.bayes.NaiveLearner` or 
    15             :class:`Orange.classification.bayes.NaiveClassifier` 
    16              
    17     Constructor parameters set the corresponding attributes. 
     10    statistics) with strong (naive) independence assumptions. Constructor parameters 
     11    set the corresponding attributes. 
    1812     
    1913    .. attribute:: adjust_threshold 
     
    2822     
    2923        m for m-estimate. If set, m-estimation of probabilities 
    30         will be used using :class:`Orange.statistics.estimate.ProbabilityEstimatorConstructor_m`. 
    31         This attribute is ignored if you also set estimator_constructor. 
     24        will be used using :class:`Orange.statistics.estimate.M`. 
     25        This attribute is ignored if you also set :obj:`estimator_constructor`. 
    3226         
    3327    .. attribute:: estimator_constructor 
     
    3529        Probability estimator constructor for 
    3630        prior class probabilities. Defaults to 
    37         :class:`Orange.statistics.estimate.ProbabilityEstimatorConstructor_relative`. 
    38         Setting this attribute disables the above described attribute m. 
     31        :class:`Orange.statistics.estimate.RelativeFrequency`. 
     32        Setting this attribute disables the above described attribute :obj:`m`. 
    3933         
    4034    .. attribute:: conditional_estimator_constructor 
     
    4842        Probability estimator constructor for conditional probabilities for 
    4943        continuous features. Defaults to  
    50         :class:`Orange.statistics.estimate.ProbabilityEstimatorConstructor_loess`. 
     44        :class:`Orange.statistics.estimate.Loess`. 
    5145    """ 
    5246     
  • orange/Orange/statistics/estimate.py

    r8042 r8863  
    1 """ 
    2 ====================== 
    3 Probability estimation 
    4 ====================== 
    5 """ 
    6  
    7 from orange import \ 
    8      ProbabilityEstimator, \ 
    9                ProbabilityEstimator_FromDistribution, \ 
    10           ProbabilityEstimatorConstructor, \ 
    11                ProbabilityEstimatorConstructor_Laplace, \ 
    12                ProbabilityEstimatorConstructor_kernel, \ 
    13                ProbabilityEstimatorConstructor_loess, \ 
    14                ProbabilityEstimatorConstructor_m, \ 
    15                ProbabilityEstimatorConstructor_relative, \ 
    16           ProbabilityEstimatorList 
     1import Orange 
     2from Orange.core import ProbabilityEstimator as Estimator 
     3from Orange.core import ProbabilityEstimator_FromDistribution as EstimatorFromDistribution 
     4from Orange.core import ProbabilityEstimatorConstructor as EstimatorConstructor 
     5from Orange.core import ProbabilityEstimatorConstructor_Laplace as Laplace 
     6from Orange.core import ProbabilityEstimatorConstructor_kernel as Kernel 
     7from Orange.core import ProbabilityEstimatorConstructor_loess as Loess 
     8from Orange.core import ProbabilityEstimatorConstructor_m as M 
     9from Orange.core import ProbabilityEstimatorConstructor_relative as RelativeFrequency 
  • orange/doc/Orange/rst/Orange.statistics.estimate.rst

    r8861 r8863  
    55====================== 
    66 
    7 .. class:: ProbabilityEstimator(*args, **kwds) 
    8 .. class:: ProbabilityEstimator_FromDistribution(*args, **kwds) 
    9 .. class:: ProbabilityEstimatorConstructor(*args, **kwds) 
    10 .. class:: ProbabilityEstimatorConstructor_Laplace(*args, **kwds) 
    11 .. class:: ProbabilityEstimatorConstructor_kernel(*args, **kwds) 
    12 .. class:: ProbabilityEstimatorConstructor_loess(*args, **kwds) 
    13 .. class:: ProbabilityEstimatorConstructor_m(*args, **kwds) 
    14 .. class:: ProbabilityEstimatorConstructor_relative(*args, **kwds) 
    15 .. class:: ProbabilityEstimatorList(*args, **kwds) 
     7.. class:: Estimator(*args, **kwds) 
     8.. class:: EstimatorFromDistribution(*args, **kwds) 
     9.. class:: EstimatorConstructor(*args, **kwds) 
     10.. class:: Laplace(*args, **kwds) 
     11.. class:: Kernel(*args, **kwds) 
     12.. class:: Loess(*args, **kwds) 
     13.. class:: M(*args, **kwds) 
     14.. class:: RelativeFrequency(*args, **kwds) 
  • orange/fixes/fix_changed_names.py

    r8735 r8863  
    493493           "orngEvalAttr.OrderAttributesByMeasure": "Orange.feature.scoring.OrderAttributes", 
    494494 
     495           "orange.ProbabilityEstimator": "Orange.statistics.estimate.Estimator", 
     496           "orange.ProbabilityEstimator_FromDistribution": "Orange.statistics.estimate.EstimatorFromDistribution", 
     497           "orange.ProbabilityEstimatorConstructor": "Orange.statistics.estimate.EstimatorConstructor", 
     498           "orange.ProbabilityEstimatorConstructor_Laplace": "Orange.statistics.estimate.Laplace", 
     499           "orange.ProbabilityEstimatorConstructor_kernel": "Orange.statistics.estimate.Kernel", 
     500           "orange.ProbabilityEstimatorConstructor_loess": "Orange.statistics.estimate.Loess", 
     501           "orange.ProbabilityEstimatorConstructor_m": "Orange.statistics.estimate.M", 
     502           "orange.ProbabilityEstimatorConstructor_relative": "Orange.statistics.estimate.RelativeFrequency", 
    495503           } 
    496504 
Note: See TracChangeset for help on using the changeset viewer.