Changeset 10032:0d5d837b4d53 in orange


Ignore:
Timestamp:
02/08/12 00:17:36 (2 years ago)
Author:
tomazc <tomaz.curk@…>
Branch:
default
Parents:
10030:bcb85f6deaaa (diff), 10031:3113e6606c8f (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
rebase_source:
b395c018e11097399f0ce436d1b41c4196c94820
Message:

Porting of Orange.data.filter.

Files:
8 edited

Legend:

Unmodified
Added
Removed
  • Orange/__init__.py

    r9986 r10032  
    2121_import("data.utils") 
    2222_import("data.discretization") 
     23_import("data.filter") 
    2324 
    2425_import("network") 
  • Orange/__init__.py

    r10031 r10032  
    1919_import("data.io") 
    2020_import("data.sample") 
    21 _import("data.variable") 
     21_import("data.utils") 
     22_import("data.discretization") 
    2223_import("data.filter") 
    2324 
  • Orange/fixes/fix_changed_names.py

    r9991 r10032  
    525525           "orange.ProbabilityEstimatorList": "Orange.statistics.estimate.ProbabilityEstimatorList", 
    526526 
    527            "orange.FilterList": "Orange.preprocess.FilterList", 
    528            "orange.Filter": "Orange.preprocess.Filter", 
    529            "orange.Filter_conjunction": "Orange.preprocess.Filter_conjunction", 
    530            "orange.Filter_disjunction": "Orange.preprocess.Filter_disjunction", 
    531            "orange.Filter_hasClassValue": "Orange.preprocess.Filter_hasClassValue", 
    532            "orange.Filter_hasMeta": "Orange.preprocess.Filter_hasMeta", 
    533            "orange.Filter_hasSpecial": "Orange.preprocess.Filter_hasSpecial", 
    534            "orange.Filter_isDefined": "Orange.preprocess.Filter_isDefined", 
    535            "orange.Filter_random": "Orange.preprocess.Filter_random", 
    536            "orange.Filter_sameValue": "Orange.preprocess.Filter_sameValue", 
    537            "orange.Filter_values": "Orange.preprocess.Filter_values", 
     527           "orange.FilterList": "Orange.data.filter.FilterList", 
     528           "orange.Filter": "Orange.data.filter.Filter", 
     529           "orange.Filter_conjunction": "Orange.data.filter.Conjunction", 
     530           "orange.Filter_disjunction": "Orange.data.filter.Disjunction", 
     531           "orange.Filter_hasClassValue": "Orange.data.filter.HasClassValue", 
     532           "orange.Filter_hasMeta": "Orange.data.filter.HasMeta", 
     533           "orange.Filter_hasSpecial": "Orange.data.filter.HasSpecial", 
     534           "orange.Filter_isDefined": "Orange.data.filter.IsDefined", 
     535           "orange.Filter_random": "Orange.data.filter.Random", 
     536           "orange.Filter_sameValue": "Orange.data.filter.SameValue", 
     537           "orange.Filter_values": "Orange.data.filter.Values", 
     538           "orange.ValueFilter": "Orange.data.filter.ValueFilter", 
     539           "orange.ValueFilterList": "Orange.data.filter.ValueFilterList", 
     540           "orange.ValueFilter_discrete": "Orange.data.filter.ValueFilterDiscrete", 
     541           "orange.ValueFilter_continuous": "Orange.data.filter.ValueFilterContinuous", 
     542           "orange.ValueFilter_string": "Orange.data.filter.ValueFilterString", 
    538543 
    539544           # orngEnviron 
  • Orange/fixes/fix_changed_names.py

    r10031 r10032  
    3434           "orange.Domain": "Orange.data.Domain", 
    3535           "orange.Value": "Orange.data.Value", 
    36            "orange.VarTypes": "Orange.data.Type", 
    37            "orange.Variable": "Orange.data.variable.Variable", 
    38            "orange.EnumVariable": "Orange.data.variable.Discrete", 
    39            "orange.FloatVariable": "Orange.data.variable.Continuous", 
    40            "orange.StringVariable": "Orange.data.variable.String", 
    41            "orange.PythonVariable": "Orange.data.variable.Python", 
    42            "orange.VarList": "Orange.data.variable.Variables", 
    43            "orange.SymMatrix": "Orange.data.SymMatrix", 
     36           "orange.VarTypes": "Orange.feature.Type", 
     37           "orange.Variable": "Orange.feature.Descriptor", 
     38           "orange.EnumVariable": "Orange.feature.Discrete", 
     39           "orange.FloatVariable": "Orange.feature.Continuous", 
     40           "orange.StringVariable": "Orange.feature.String", 
     41           "orange.PythonVariable": "Orange.feature.Python", 
     42 
     43           "orange.newmetaid": "Orange.feature:Variable.new_meta_id", 
     44 
     45           "orange.SymMatrix": "Orange.misc.SymMatrix", 
     46 
    4447           "orange.GetValue": "Orange.classification:Classifier.GetValue", 
    4548           "orange.GetProbabilities": "Orange.classification:Classifier.GetProbabilities", 
    4649           "orange.GetBoth": "Orange.classification:Classifier.GetBoth", 
    47  
    48            "orange.newmetaid": "Orange.data.new_meta_id", 
    4950 
    5051           "orange.Distribution": "Orange.statistics.distribution.Distribution", 
     
    235236           "orange.MajorityLearner":"Orange.classification.majority.MajorityLearner", 
    236237           "orange.DefaultClassifier":"Orange.classification.ConstantClassifier", 
     238 
     239           "orngSQL.SQLReader": "Orange.data.sql.SQLReader", 
     240           "orngSQL.SQLWriter": "Orange.data.sql.SQLWriter", 
    237241 
    238242           "orange.LookupLearner":"Orange.classification.lookup.LookupLearner", 
     
    590594           "orange.RandomGenerator": "Orange.misc.Random", 
    591595 
     596           "orange.TransformValue": "Orange.data.utils.TransformValue", 
     597           "orange.Ordinal2Continuous": "Orange.data.utils.Ordinal2Continuous", 
     598           "orange.Discrete2Continuous": "Orange.data.utils.Discrete2Continuous", 
     599           "orange.NormalizeContinuous": "Orange.data.utils.NormalizeContinuous", 
     600           "orange.MapIntValue": "Orange.data.utils.MapIntValue", 
     601 
    592602           } 
    593603 
  • docs/reference/rst/Orange.data.rst

    r9992 r10032  
    1010    Orange.data.table 
    1111    Orange.data.sample 
     12    Orange.data.filter 
    1213    Orange.data.formats 
    1314    Orange.data.discretization 
  • docs/reference/rst/Orange.data.rst

    r10031 r10032  
    1313    Orange.data.formats 
    1414    Orange.data.discretization 
     15    Orange.data.continuization 
     16    Orange.data.utils 
     17    Orange.data.continuization 
     18    Orange.data.sql 
  • source/orange/_aliases.txt

    r9935 r10032  
    7676impute_class imputeClass 
    7777 
     78Filter_random 
     79random_generator randomGenerator 
  • source/orange/_aliases.txt

    r10031 r10032  
    7070feature_distances attribute_distances 
    7171 
     72TransformValue 
     73sub_transformer subtransformer 
     74 
    7275ImputerConstructor 
    7376impute_class imputeClass 
Note: See TracChangeset for help on using the changeset viewer.