Changeset 9958:62b559d84c51 in orange


Ignore:
Timestamp:
02/07/12 20:11:20 (2 years ago)
Author:
markotoplak
Branch:
default
rebase_source:
a37e52af16e3e8306c5627e6d0f50cc6e94455d9
Message:

Translated some names to new hierarchy.

Location:
docs/reference/rst
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • docs/reference/rst/Orange.data.domain.rst

    r9936 r9958  
    308308         variable from the list is used as the class variable. :: 
    309309 
    310              >>> domain1 = orange.Domain([a, b]) 
    311              >>> domain2 = orange.Domain(["a", b, c], domain) 
     310             >>> domain1 = Orange.data.Domain([a, b]) 
     311             >>> domain2 = Orange.data.Domain(["a", b, c], domain) 
    312312 
    313313         :param variables: List of variables (strings or instances of :obj:`~Orange.feature.Descriptor`) 
     
    323323         last variable should be used as the class variable. :: 
    324324 
    325              >>> domain1 = orange.Domain([a, b], False) 
    326              >>> domain2 = orange.Domain(["a", b, c], False, domain) 
     325             >>> domain1 = Orange.data.Domain([a, b], False) 
     326             >>> domain2 = Orange.data.Domain(["a", b, c], False, domain) 
    327327 
    328328         :param variables: List of variables (strings or instances of :obj:`~Orange.feature.Descriptor`) 
  • docs/reference/rst/Orange.data.instance.rst

    r9936 r9958  
    9191passed along with the data:: 
    9292 
    93     bayes = orange.BayesLearner(data, id) 
     93    bayes = Orange.classification.bayes.NaiveLearner(data, id) 
    9494 
    9595Many other functions accept weights in similar fashion. 
     
    112112accessed:: 
    113113 
    114     w = orange.FloatVariable("w") 
     114    w = Orange.feature.Continuous("w") 
    115115    data.domain.addmeta(id, w) 
    116116 
     
    125125allows for conversion from Python native types:: 
    126126 
    127     ok = orange.EnumVariable("ok?", values=["no", "yes"]) 
     127    ok = Orange.feature.Discrete("ok?", values=["no", "yes"]) 
    128128    ok_id = Orange.feature.Descriptor.new_meta_id() 
    129129    data.domain.addmeta(ok_id, ok) 
     
    237237        Convert the instance into an ordinary Python list. If the 
    238238        optional argument `level` is 1 (default), the result is a list of 
    239         instances of :obj:`orange.data.Value`. If it is 0, it contains 
     239        instances of :obj:`Orange.data.Value`. If it is 0, it contains 
    240240        pure Python objects, that is, strings for discrete variables 
    241241        and numbers for continuous ones. 
     
    281281        attributes are returned. :: 
    282282 
    283             data = orange.ExampleTable("inquisition2") 
     283            data = Orange.data.Table("inquisition2") 
    284284            example = data[4] 
    285             print example.getmetas() 
    286             print example.getmetas(int) 
    287             print example.getmetas(str) 
    288             print example.getmetas(orange.Variable) 
     285            print example.get_metas() 
     286            print example.get_metas(int) 
     287            print example.get_metas(str) 
     288            print example.get_metas(Orange.feature.Descriptor) 
    289289 
    290290        :param key_type: the key type; either ``int``, ``str`` or :obj:`~Orange.feature.Descriptor` 
  • docs/reference/rst/Orange.data.value.rst

    r9927 r9958  
    133133    deg3 = Orange.feature.Discrete( 
    134134        "deg3", values=["little", "medium", "big"]) 
    135     deg4 = orange.feature.Discrete( 
     135    deg4 = Orange.feature.Discrete( 
    136136        "deg4", values=["tiny", "little", "big", "huge"]) 
    137     val3 = orange.Value(deg3) 
    138     val4 = orange.Value(deg4) 
     137    val3 = Orange.data.Value(deg3) 
     138    val4 = Orange.data.Value(deg4) 
    139139    val3.value = "medium" 
    140140    val4.value = "little" 
  • docs/reference/rst/Orange.evaluation.scoring.rst

    r9904 r9958  
    321321We shall use the following code to prepare suitable experimental results:: 
    322322 
    323     ri2 = Orange.core.MakeRandomIndices2(voting, 0.6) 
     323    ri2 = Orange.data.sample.SubsetIndices2(voting, 0.6) 
    324324    train = voting.selectref(ri2, 0) 
    325325    test = voting.selectref(ri2, 1) 
Note: See TracChangeset for help on using the changeset viewer.