Changeset 1555:9422c051c5cf in orange-bioinformatics


Ignore:
Timestamp:
02/09/12 19:53:56 (2 years ago)
Author:
markotoplak
Branch:
default
Message:

Orange.data.variable -> Orange.feature

Files:
3 edited

Legend:

Unmodified
Added
Removed
  • obiArrayExpress.py

    r1530 r1555  
    830830    for header_name, quant, column in zip(header, quantification, matrix.T): 
    831831        if _is_continuous(column): 
    832             feature = Orange.data.variable.Continuous(header_name) 
     832            feature = Orange.feature.Continuous(header_name) 
    833833            column[numpy.where(1 - is_float(column))] = "?" # relace all non parsable floats with '?' 
    834834        else: 
    835835            values = set(column) 
    836             feature = Orange.data.variable.Discrete(header_name, values=sorted(values)) 
     836            feature = Orange.feature.Discrete(header_name, values=sorted(values)) 
    837837        feature.attributes["quantification"] = quant 
    838838        features.append(feature) 
    839839         
    840     row_ref_feature = Orange.data.variable.String(row_ref) 
     840    row_ref_feature = Orange.feature.String(row_ref) 
    841841    domain = Orange.data.Domain(features, None) 
    842     domain.addmeta(Orange.data.new_meta_id(), row_ref_feature) 
     842    domain.addmeta(Orange.feature.Descriptor.new_meta_id(), row_ref_feature) 
    843843     
    844844    table = Orange.data.Table(domain, [list(row) for row in matrix]) 
  • widgets/OWGenotypeDistances.py

    r1489 r1555  
    447447        def get_attr(attr_index, i): 
    448448            if attr_index is None: 
    449                 attr = Orange.data.variable.Continuous(missing_name_gen.next()) 
     449                attr = Orange.feature.Continuous(missing_name_gen.next()) 
    450450                attr.attributes.update(relevant_items[i]) 
    451451                return attr 
     
    482482            attrs = [] 
    483483            for d in rd: 
    484                 attr = Orange.data.variable.Continuous(inactive_name_gen.next()) 
     484                attr = Orange.feature.Continuous(inactive_name_gen.next()) 
    485485                attr.attributes.update(d) 
    486486                attrs.append(attr) 
  • widgets/prototypes/OWGeneAtlasTissueExpression.py

    r1500 r1555  
    182182        """ 
    183183        vars = data.domain.variables + data.domain.get_metas().values() 
    184         vars = [var for var in vars if isinstance(var, (Orange.data.variable.String))] 
     184        vars = [var for var in vars if isinstance(var, (Orange.feature.String))] 
    185185        self.candidate_vars = vars 
    186186        self.gene_attr_cb.addItems([var.name for var in vars]) 
Note: See TracChangeset for help on using the changeset viewer.