Ignore:
Timestamp:
03/19/12 12:14:20 (2 years ago)
Author:
markotoplak
Branch:
default
rebase_source:
92659cf777626f5bc411357989a821dd2083e466
Message:

Moved deprecation functions, progress bar support and environ into Orange.utils. Orange imports cleanly, although it is not tested yet.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • Orange/ensemble/forest.py

    r10565 r10580  
    55import random 
    66import copy 
    7 from Orange.misc import deprecated_keywords 
     7from Orange.utils import deprecated_keywords 
    88 
    99def _default_small_learner(attributes=None, rand=None, base=None): 
     
    4949        return r 
    5050 
    51 _RandomForestSimpleTreeLearner = Orange.misc.deprecated_members({"weightID":"weight_id", "examples":"instances"})(_RandomForestSimpleTreeLearner) 
     51_RandomForestSimpleTreeLearner = Orange.utils.deprecated_members({"weightID":"weight_id", "examples":"instances"})(_RandomForestSimpleTreeLearner) 
    5252    
    5353class RandomForestLearner(Orange.core.Learner): 
     
    163163        return RandomForestClassifier(classifiers = classifiers, name=self.name,\ 
    164164                    domain=instances.domain, class_var=instances.domain.class_var) 
    165 RandomForestLearner = Orange.misc.deprecated_members({"examples":"instances"})(RandomForestLearner) 
     165RandomForestLearner = Orange.utils.deprecated_members({"examples":"instances"})(RandomForestLearner) 
    166166 
    167167class RandomForestClassifier(orange.Classifier): 
     
    265265    def __reduce__(self): 
    266266        return type(self), (self.classifiers, self.name, self.domain, self.class_var), dict(self.__dict__) 
    267 RandomForestClassifier = Orange.misc.deprecated_members({"resultType":"result_type", "classVar":"class_var", "example":"instance"})(RandomForestClassifier) 
     267RandomForestClassifier = Orange.utils.deprecated_members({"resultType":"result_type", "classVar":"class_var", "example":"instance"})(RandomForestClassifier) 
    268268### MeasureAttribute_randomForests 
    269269 
Note: See TracChangeset for help on using the changeset viewer.