Changeset 9694:c756222dc4cc in orange


Ignore:
Timestamp:
02/06/12 12:05:50 (2 years ago)
Author:
Jure Zbontar <jure.zbontar@…>
Branch:
default
Message:

Rename RandomGenerator with Random in code.

Location:
orange/Orange
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • orange/Orange/ensemble/forest.py

    r9349 r9694  
    126126        if not self.rand: 
    127127            self.rand = random.Random(0) 
    128         self.randorange = Orange.core.RandomGenerator(self.rand.randint(0,2**31-1)) 
     128        self.randorange = Orange.misc.Random(self.rand.randint(0,2**31-1)) 
    129129 
    130130        if learner == None: 
     
    320320        if not self.rand: 
    321321            self.rand = random.Random(0) 
    322         self.randorange = Orange.core.RandomGenerator(self.rand.randint(0,2**31-1)) 
     322        self.randorange = Orange.misc.Random(self.rand.randint(0,2**31-1)) 
    323323 
    324324        if learner == None: 
  • orange/Orange/evaluation/reliability.py

    r9663 r9694  
    223223 
    224224select_with_repeat = Orange.core.MakeRandomIndicesMultiple() 
    225 select_with_repeat.random_generator = Orange.core.RandomGenerator() 
     225select_with_repeat.random_generator = Orange.misc.Random() 
    226226 
    227227def get_reliability_estimation_list(res, i): 
  • orange/Orange/evaluation/testing.py

    r9620 r9694  
    204204        :param stratified: sets, whether indices should be stratified 
    205205        :param preprocessors: a list of preprocessors to be used on data. 
    206         :param random_generator: random seed or random generator for selection 
    207                of indices 
     206        :param random_generator: :obj:`Orange.misc.RandomGenerator` object. 
    208207        :param callback: a function that will be called after each fold is 
    209208               computed. 
  • orange/Orange/statistics/distribution.py

    r9550 r9694  
    8484        :obj:`True` if distribution is normalized. 
    8585 
    86     .. attribute:: randomGenerator 
    87  
    88         A pseudo-random number generator used for method :obj:`random`. 
     86    .. attribute:: random_generator 
     87 
     88        A pseudo-random number generator used for method :obj:`Orange.misc.Random`. 
    8989 
    9090    .. method:: __init__(variable[, data[, weightId=0]]) 
     
    150150        :obj:`keys`). 
    151151 
    152         The method uses :obj:`randomGenerator`. If none has been constructed or 
     152        The method uses :obj:`random_generator`. If none has been constructed or 
    153153        assigned yet, a new one is constructed and stored for further use. 
    154154 
Note: See TracChangeset for help on using the changeset viewer.