Changeset 9920:6fa60e34fd8c in orange


Ignore:
Timestamp:
02/07/12 13:19:36 (2 years ago)
Author:
markotoplak
Branch:
default
Parents:
9917:faac299dfd6e (diff), 9918:4aa830c55525 (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:
b824bbf7061472a0c60f6b706fc33915d247a2ab
Message:

Merged.

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • Orange/fixes/fix_changed_names.py

    r9912 r9920  
    3535           "orange.Value": "Orange.data.Value", 
    3636           "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", 
     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.new_meta_id", 
     44 
    4345           "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", 
  • Orange/fixes/fix_changed_names.py

    r9918 r9920  
    4343           "orange.newmetaid": "Orange.feature.new_meta_id", 
    4444 
    45            "orange.SymMatrix": "Orange.data.SymMatrix", 
     45           "orange.SymMatrix": "Orange.misc.SymMatrix", 
     46 
    4647           "orange.GetValue": "Orange.classification:Classifier.GetValue", 
    4748           "orange.GetProbabilities": "Orange.classification:Classifier.GetProbabilities", 
Note: See TracChangeset for help on using the changeset viewer.