Changeset 10582:180f600dfb15 in orange


Ignore:
Timestamp:
03/20/12 13:28:56 (2 years ago)
Author:
markotoplak
Branch:
default
rebase_source:
f68bdd0f20ec6f9b8ad9fdf8dd5dc6e1c46a38d4
Message:

Orange.misc to Orange.utils move: some more fixes.

Location:
Orange
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • Orange/ensemble/forest.py

    r10581 r10582  
    119119        if not self.rand: 
    120120            self.rand = random.Random(0) 
    121         self.randorange = Orange.utils.Random(self.rand.randint(0,2**31-1)) 
     121        self.randorange = Orange.misc.Random(self.rand.randint(0,2**31-1)) 
    122122 
    123123        if learner == None: 
     
    313313        if not self.rand: 
    314314            self.rand = random.Random(0) 
    315         self.randorange = Orange.utils.Random(self.rand.randint(0,2**31-1)) 
     315        self.randorange = Orange.misc.Random(self.rand.randint(0,2**31-1)) 
    316316 
    317317        if learner == None: 
  • Orange/optimization/__init__.py

    r10580 r10582  
    354354        numOfTests = sum([len(x[1]) for x in self.parameters]) 
    355355        milestones = set(range(0, numOfTests, max(numOfTests / 100, 1))) 
    356         for itercount, valueindices in enumerate(Orange.misc.counters.LimitedCounter(\ 
     356        for itercount, valueindices in enumerate(Orange.utils.counters.LimitedCounter(\ 
    357357                                        [len(x[1]) for x in self.parameters])): 
    358358            values = [self.parameters[i][1][x] for i, x \ 
  • Orange/orng/orngServerFiles.py

    r9671 r10582  
    1 from Orange.misc.serverfiles import * 
     1from Orange.utils.serverfiles import * 
    22import Orange 
    33 
     
    1212def needs_update(domain, filename, access_code=None): 
    1313    sf = _sf_with_code(access_code=access_code) 
    14     return Orange.misc.serverfiles.needs_update(domain, filename, serverfiles=sf) 
     14    return Orange.utils.serverfiles.needs_update(domain, filename, serverfiles=sf) 
    1515 
    1616def update(domain, filename, access_code=None, verbose=True): 
    1717    sf = _sf_with_code(access_code=access_code) 
    18     return Orange.misc.serverfiles.update(domain, filename, serverfiles=sf, verbose=verbose) 
     18    return Orange.utils.serverfiles.update(domain, filename, serverfiles=sf, verbose=verbose) 
    1919 
    2020def createPathForFile(target): 
  • Orange/utils/counters.py

    r10581 r10582  
    44======================= 
    55 
    6 .. index:: misc 
     6.. index:: utils 
    77.. index:: 
    8      single: misc; counters 
    9  
    10 :class:`Orange.misc.counters` contains a bunch of classes that generate sequences of various kinds. 
     8     single: utils; counters 
     9 
     10:class:`Orange.utils.counters` contains a bunch of classes that generate sequences of various kinds. 
    1111 
    1212""" 
     
    7777class LimitedCounter: 
    7878    """ 
    79     This class is similar to :class:`~Orange.misc.counters.BooleanCounter` except that the digits do not count 
     79    This class is similar to :class:`~Orange.utils.counters.BooleanCounter` except that the digits do not count 
    8080    from 0 to 1, but to the limits that are specified individually for each digit. 
    8181 
  • Orange/utils/environ.py

    r10580 r10582  
    8888     
    8989`buffer_dir`: 
    90     Directory where :obj:`Orange.misc.serverfiles` downloads are stored.   
     90    Directory where :obj:`Orange.utils.serverfiles` downloads are stored.   
    9191 
    9292`orange_no_deprecated_members`: 
  • Orange/utils/render.py

    r10581 r10582  
    44=================== 
    55 
    6 .. index:: misc 
     6.. index:: utils 
    77.. index:: 
    8    single: misc; render 
     8   single: utils; render 
    99""" 
    1010 
Note: See TracChangeset for help on using the changeset viewer.