Changeset 10651:4f6fcf57db06 in orange


Ignore:
Timestamp:
03/27/12 10:25:25 (2 years ago)
Author:
markotoplak
Branch:
default
rebase_source:
c0345c92b88fe45b1d5a7c1676861e97eaf8b37c
Message:

Moved caching, collections, debugging, fileutil, r, testing from misc to utils.

Files:
35 edited
6 moved

Legend:

Unmodified
Added
Removed
  • Orange/OrangeCanvas/orngSignalManager.py

    r10580 r10651  
    99 
    1010import orange 
    11 from Orange.misc import debugging 
     11from Orange.utils import debugging 
    1212 
    1313Single = 2 
  • Orange/OrangeWidgets/OWBaseWidget.py

    r10580 r10651  
    2424import orange 
    2525from Orange import misc 
    26 from Orange.misc import debugging as orngDebugging 
     26import Orange.utils 
     27from Orange.utils import debugging as orngDebugging 
    2728from string import * 
    2829from orngSignalManager import * 
  • Orange/__init__.py

    r10636 r10651  
    126126_import("misc") 
    127127_import("misc.selection") 
    128 #_import("misc.r") 
    129128 
    130129_import("utils") #TODO hide utils from the user 
  • Orange/data/preprocess/scaling.py

    r10580 r10651  
    5959from Orange.data import preprocess 
    6060 
    61 from Orange.misc import caching 
     61from Orange.utils import caching 
    6262 
    6363import warnings 
  • Orange/testing/unit/__init__.py

    r10180 r10651  
    1 from Orange.misc.testing import * 
     1from Orange.utils.testing import * 
  • Orange/testing/unit/tests/test_association.py

    r10273 r10651  
    11from __future__ import division 
    22from Orange import associate 
    3 from Orange.misc import testing 
    4 from Orange.misc.testing import test_on_data, datasets_driven 
     3from Orange.utils import testing 
     4from Orange.utils.testing import test_on_data, datasets_driven 
    55try: 
    66    import unittest2 as unittest 
  • Orange/testing/unit/tests/test_bayes.py

    r10318 r10651  
    1 from Orange.misc import testing 
     1from Orange.utils import testing 
    22 
    33# TODO: test different prob estimators 
  • Orange/testing/unit/tests/test_c45.py

    r10278 r10651  
    1 from Orange.misc import testing 
     1from Orange.utils import testing 
    22try: 
    33    import unittest2 as unittest 
  • Orange/testing/unit/tests/test_data_utils.py

    r10278 r10651  
    1 from Orange.misc import testing 
     1from Orange.utils import testing 
    22from Orange.data import utils 
    33import Orange 
  • Orange/testing/unit/tests/test_demo.py

    r10278 r10651  
    1 from Orange.misc import testing 
    2 from Orange.misc.testing import data_driven, datasets_driven, test_on_data 
     1from Orange.utils import testing 
     2from Orange.utils.testing import data_driven, datasets_driven, test_on_data 
    33try: 
    44    import unittest2 as unittest 
  • Orange/testing/unit/tests/test_distance.py

    r10278 r10651  
    33except: 
    44    import unittest 
    5 from Orange.misc import testing 
    6 from Orange.misc.testing import datasets_driven, test_on_data 
     5from Orange.utils import testing 
     6from Orange.utils.testing import datasets_driven, test_on_data 
    77 
    88from Orange.distance import * 
  • Orange/testing/unit/tests/test_earth.py

    r10329 r10651  
    11import Orange 
    2 from Orange.misc import testing 
    3 from Orange.misc.testing import datasets_driven, test_on_data, test_on_datasets 
     2from Orange.utils import testing 
     3from Orange.utils.testing import datasets_driven, test_on_data, test_on_datasets 
    44from Orange.regression import earth 
    55 
  • Orange/testing/unit/tests/test_ensemble.py

    r10278 r10651  
    44    import unittest 
    55 
    6 from Orange.misc import testing 
    7 from Orange.misc.testing import datasets_driven, test_on_datasets 
     6from Orange.utils import testing 
     7from Orange.utils.testing import datasets_driven, test_on_datasets 
    88 
    99@datasets_driven(datasets=testing.CLASSIFICATION_DATASETS) 
  • Orange/testing/unit/tests/test_feature_selection.py

    r10522 r10651  
    1 import Orange.misc.testing as testing 
     1import Orange.utils.testing as testing 
    22from Orange.feature import selection, scoring 
    33import Orange 
  • Orange/testing/unit/tests/test_hclustering.py

    r10278 r10651  
    77from Orange.distance import * 
    88 
    9 import Orange.misc.testing as testing 
     9import Orange.utils.testing as testing 
    1010import Orange 
    1111try: 
  • Orange/testing/unit/tests/test_io.py

    r10278 r10651  
    44    import unittest 
    55import Orange 
    6 from Orange.misc import testing 
     6from Orange.utils import testing 
    77import os, sys 
    88 
  • Orange/testing/unit/tests/test_kmeans.py

    r10278 r10651  
    33except: 
    44    import unittest 
    5 from Orange.misc import testing 
     5from Orange.utils import testing 
    66from Orange.clustering import kmeans 
    77from Orange.clustering.kmeans import Clustering 
  • Orange/testing/unit/tests/test_knn.py

    r10385 r10651  
    44    import unittest 
    55import Orange 
    6 from Orange.misc import testing 
    7 from Orange.misc.testing import datasets_driven, test_on_data 
     6from Orange.utils import testing 
     7from Orange.utils.testing import datasets_driven, test_on_data 
    88from Orange.classification import knn 
    99from Orange.distance import Euclidean 
  • Orange/testing/unit/tests/test_lasso.py

    r10434 r10651  
    1 from Orange.misc import testing 
    2 from Orange.misc.testing import datasets_driven, test_on_data, test_on_datasets 
     1from Orange.utils import testing 
     2from Orange.utils.testing import datasets_driven, test_on_data, test_on_datasets 
    33from Orange.regression import lasso 
    44import Orange 
  • Orange/testing/unit/tests/test_linear.py

    r10278 r10651  
    11import Orange 
    2 from Orange.misc import testing 
    3 from Orange.misc.testing import datasets_driven 
     2from Orange.utils import testing 
     3from Orange.utils.testing import datasets_driven 
    44from Orange.classification.svm import LinearLearner 
    55try: 
  • Orange/testing/unit/tests/test_linregression.py

    r10278 r10651  
    1 from Orange.misc import testing 
    2 from Orange.misc.testing import datasets_driven, test_on_data, test_on_datasets 
     1from Orange.utils import testing 
     2from Orange.utils.testing import datasets_driven, test_on_data, test_on_datasets 
    33from Orange.regression import linear 
    44import Orange 
  • Orange/testing/unit/tests/test_logreg.py

    r10384 r10651  
    1 from Orange.misc import testing 
     1from Orange.utils import testing 
    22try: 
    33    import unittest2 as unittest 
  • Orange/testing/unit/tests/test_majority.py

    r10278 r10651  
    1 from Orange.misc import testing 
    2 from Orange.misc.testing import datasets_driven, test_on_data 
     1from Orange.utils import testing 
     2from Orange.utils.testing import datasets_driven, test_on_data 
    33from Orange.classification import majority 
    44from Orange.statistics import distribution 
  • Orange/testing/unit/tests/test_mds.py

    r10278 r10651  
    1 from Orange.misc import testing 
    2 from Orange.misc.testing import test_on_data, datasets_driven 
     1from Orange.utils import testing 
     2from Orange.utils.testing import test_on_data, datasets_driven 
    33 
    44try: 
  • Orange/testing/unit/tests/test_measures.py

    r10278 r10651  
    1 from Orange.misc import testing 
    2 from Orange.misc.testing import datasets_driven, test_on_data 
     1from Orange.utils import testing 
     2from Orange.utils.testing import datasets_driven, test_on_data 
    33from Orange.feature import scoring 
    44try: 
  • Orange/testing/unit/tests/test_preprocessors.py

    r10542 r10651  
    3838import orange 
    3939 
    40 import Orange.misc.testing as testing 
     40import Orange.utils.testing as testing 
    4141 
    4242@testing.datasets_driven(datasets=testing.CLASSIFICATION_DATASETS) 
  • Orange/testing/unit/tests/test_regression.py

    r10580 r10651  
    88 
    99from Orange.utils import environ 
    10 from Orange.misc import testing 
     10from Orange.utils import testing 
    1111 
    1212 
  • Orange/testing/unit/tests/test_rules.py

    r10278 r10651  
    1 from Orange.misc import testing 
     1from Orange.utils import testing 
    22from Orange.classification import rules 
    33 
  • Orange/testing/unit/tests/test_som.py

    r10317 r10651  
    1 from Orange.misc import testing 
    2 from Orange.misc.testing import datasets_driven, test_on_data 
     1from Orange.utils import testing 
     2from Orange.utils.testing import datasets_driven, test_on_data 
    33try: 
    44    import unittest2 as unittest 
  • Orange/testing/unit/tests/test_stepwise_wrapper.py

    r10278 r10651  
    55 
    66import Orange 
    7 from Orange.misc import testing 
     7from Orange.utils import testing 
    88 
    99from Orange.classification import bayes 
  • Orange/testing/unit/tests/test_svm.py

    r10641 r10651  
    1111from Orange.classification import svm                             
    1212from Orange.classification.svm.kernels import BagOfWords, RBFKernelWrapper 
    13 from Orange.misc import testing 
    14 from Orange.misc.testing import datasets_driven, test_on_datasets, test_on_data 
     13from Orange.utils import testing 
     14from Orange.utils.testing import datasets_driven, test_on_datasets, test_on_data 
    1515import orange 
    1616 
  • Orange/testing/unit/tests/test_table.py

    r10597 r10651  
    88except: 
    99    import unittest 
    10 from Orange.misc import testing 
     10from Orange.utils import testing 
    1111import Orange 
    1212import cPickle 
  • Orange/testing/unit/tests/test_tree.py

    r10412 r10651  
    1 from Orange.misc import testing 
    2 from Orange.misc.testing import datasets_driven, test_on_data 
     1from Orange.utils import testing 
     2from Orange.utils.testing import datasets_driven, test_on_data 
    33try: 
    44    import unittest2 as unittest 
  • Orange/testing/unit/tests/test_variable.py

    r10385 r10651  
    44    import unittest 
    55import Orange 
    6 from Orange.misc import testing 
     6from Orange.utils import testing 
    77 
    88class TestVariableMake(unittest.TestCase): 
  • Orange/utils/testing.py

    r10583 r10651  
    1111Example of use :: 
    1212 
    13     from Orange.misc import testing 
     13    from Orange.utils import testing 
    1414    import unittest 
    1515     
     
    569569    For example you can examine exceptions in tests from ipython -pdb :: 
    570570     
    571         In [1]: import Orange.misc.testing as testing 
     571        In [1]: import Orange.utils.testing as testing 
    572572        In [2]: testing.enable_pdb() 
    573573        In [3]: run tests/test_preprocessors.py 
  • docs/development/rst/testing.rst

    r10437 r10651  
    33####### 
    44 
    5 .. automodule:: Orange.misc.testing 
     5.. automodule:: Orange.utils.testing 
Note: See TracChangeset for help on using the changeset viewer.