Changeset 9546:2b6cc6f397fe in orange


Ignore:
Timestamp:
01/18/12 10:56:15 (2 years ago)
Author:
ales_erjavec <ales.erjavec@…>
Branch:
default
Convert:
a367b01157310c282e7919193d767127e7829e26
Message:

Renamed widget channel names in line with the new naming rules/convention.
Added backwards compatibility in orngDoc loadDocument to enable loading of schemas saved before the change.

Location:
orange
Files:
116 edited

Legend:

Unmodified
Added
Removed
  • orange/OrangeCanvas/orngDoc.py

    r8126 r9546  
    1313from orngSignalManager import SignalManager 
    1414import cPickle, math, orngHistory 
     15 
     16_CHANNEL_NAME_MAP = \ 
     17    {'Additional Tables': 'Additional Data', 
     18     'Attribute Definitions': 'Feature Definitions', 
     19     'Attribute List': 'Features', 
     20     'Attribute Pair': 'Interacting Features', 
     21     'Attribute Selection List': 'Features', 
     22     'Attribute Statistics': 'Feature Statistics', 
     23     'Attribute selection': 'Features', 
     24     'Attributes': 'Features', 
     25     'Choosen Tree': 'Selected Tree', 
     26     'Covered Examples': 'Covered Data', 
     27     'Data Instances': 'Data', 
     28     'Data Table': 'Data', 
     29     'Distance Matrix': 'Distances', 
     30     'Distance matrix': 'Distances', 
     31     'Example Subset': 'Data Subset', 
     32     'Example Table': 'Data', 
     33     'Examples': 'Data', 
     34     'Examples A': 'Data', 
     35     'Examples B': 'Data', 
     36     'Graph with ExampleTable': 'Graph with Data', 
     37     'Input Data': 'Data', 
     38     'Input Table': 'Data', 
     39     'Instances': 'Data', 
     40     'Items Distance Matrix': 'Distances', 
     41     'Items Subset': 'Item Subset', 
     42     'Items to Mark': 'Marked Itenms', 
     43     'KNN Classifier': 'kNN Classifier', 
     44     'Marked Examples': 'Marked Data', 
     45     'Matching Examples': 'Merged Data', 
     46     'Mismatching Examples': 'Mismatched Data', 
     47     'Output Data': 'Data', 
     48     'Output Table': 'Data', 
     49     'Preprocessed Example Table': 'Preprocessed Data', 
     50     'Primary Table': 'Primary Data', 
     51     'Reduced Example Table': 'Reduced Data', 
     52     'Remaining Examples': 'Remaining Data', 
     53     'SOMMap': 'SOM', 
     54     'Sample': 'Data Sample', 
     55     'Selected Attributes List': 'Selected Features', 
     56     'Selected Examples': 'Selected Data', 
     57     'Selected Instances': 'Selected Data', 
     58     'Selected Items Distance Matrix': 'Distance Matrix', 
     59     'Shuffled Data Table': 'Shuffled Data', 
     60     'Train Data': 'Training Data', 
     61     'Training data': 'Data', 
     62     'Unselected Examples': 'Other Data', 
     63     'Unselected Items': 'Other Items', 
     64     } 
     65     
    1566 
    1667class SchemaDoc(QWidget): 
     
    582633 
    583634                signalList = eval(signals) 
     635                 
    584636                for (outName, inName) in signalList: 
     637                    if not outName in [t[0] for t in outWidget.instance.outputs] \ 
     638                            and outName in _CHANNEL_NAME_MAP: 
     639                        outName = _CHANNEL_NAME_MAP[outName] 
     640                         
     641                    if not inName in [t[0] for t in inWidget.instance.inputs] \ 
     642                            and inName in _CHANNEL_NAME_MAP: 
     643                        inName = _CHANNEL_NAME_MAP[inName] 
     644                         
    585645                    self.addLink(outWidget, inWidget, outName, inName, enabled, saveTempDoc=False) 
    586646                #qApp.processEvents() 
  • orange/OrangeWidgets/Associate/OWAssociationRules.py

    r8042 r9546  
    4949        OWWidget.__init__(self, parent, signalManager, "AssociationRules", wantMainArea = 0) 
    5050 
    51         self.inputs = [("Examples", ExampleTable, self.setData)] 
     51        self.inputs = [("Data", ExampleTable, self.setData)] 
    5252        self.outputs = [("Association Rules", orange.AssociationRules)] 
    5353 
  • orange/OrangeWidgets/Associate/OWAssociationRulesTreeViewer.py

    r8042 r9546  
    2727 
    2828        self.inputs = [("Association Rules", orange.AssociationRules, self.arules)] 
    29         self.outputs = [("Association Rules", orange.AssociationRules), ("Covered Examples", ExampleTable), ("Matching Examples", ExampleTable), ("Mismatching Examples", ExampleTable)] 
     29        self.outputs = [("Association Rules", orange.AssociationRules), ("Covered Data", ExampleTable), ("Merged Data", ExampleTable), ("Mismatched Data", ExampleTable)] 
    3030 
    3131        self.showWholeRules = 1 
     
    213213            coveredExamples = matchingExamples = mismatchingExamples = None 
    214214 
    215         self.send("Covered Examples", coveredExamples) 
    216         self.send("Matching Examples", matchingExamples) 
    217         self.send("Mismatching Examples", mismatchingExamples) 
     215        self.send("Covered Data", coveredExamples) 
     216        self.send("Merged Data", matchingExamples) 
     217        self.send("Mismatched Data", mismatchingExamples) 
    218218         
    219219 
  • orange/OrangeWidgets/Associate/OWItemsets.py

    r8042 r9546  
    2222 
    2323        from OWItemsets import Itemsets 
    24         self.inputs = [("Examples", ExampleTable, self.setData)] 
     24        self.inputs = [("Data", ExampleTable, self.setData)] 
    2525        self.outputs = [("Itemsets", Itemsets)] 
    2626 
  • orange/OrangeWidgets/Associate/OWItemsetsExplorer.py

    r8042 r9546  
    1818 
    1919        self.inputs = [("Itemsets", Itemsets, self.setItemsets)] 
    20         self.outputs = [("Itemsets", Itemsets), ("Examples", ExampleTable)] 
     20        self.outputs = [("Itemsets", Itemsets), ("Data", ExampleTable)] 
    2121 
    2222        self.showWholeItemsets = 1 
     
    173173            examples = None 
    174174 
    175         self.send("Examples", examples) 
     175        self.send("Data", examples) 
    176176        
    177177 
  • orange/OrangeWidgets/Classify/OWC45Tree.py

    r8956 r9546  
    2323        self.callbackDeposit = [] 
    2424 
    25         self.inputs = [("Examples", ExampleTable, self.setData), ("Preprocess", PreprocessedLearner, self.setPreprocessor)] 
     25        self.inputs = [("Data", ExampleTable, self.setData), ("Preprocess", PreprocessedLearner, self.setPreprocessor)] 
    2626        self.outputs = [("Learner", orange.Learner),("Classification Tree", orange.TreeClassifier)]#, ("C45 Tree", orange.C45Classifier)] 
    2727 
  • orange/OrangeWidgets/Classify/OWCN2.py

    r8042 r9546  
    2828        OWWidget.__init__(self,parent,signalManager,"CN2", wantMainArea = 0, resizingEnabled = 0) 
    2929 
    30         self.inputs = [("Example Table", ExampleTable, self.dataset), ("Preprocess", PreprocessedLearner, self.setPreprocessor)] 
     30        self.inputs = [("Data", ExampleTable, self.dataset), ("Preprocess", PreprocessedLearner, self.setPreprocessor)] 
    3131        self.outputs = [("Learner", orange.Learner),("Classifier",orange.Classifier),("Unordered CN2 Classifier", orngCN2.CN2UnorderedClassifier)] 
    3232        self.QualityButton = 0 
  • orange/OrangeWidgets/Classify/OWCN2RulesViewer.py

    r8899 r9546  
    204204        OWWidget.__init__(self, parent, signalManager, name) 
    205205        self.inputs = [("Rule Classifier", orange.RuleClassifier, self.setRuleClassifier)] 
    206         self.outputs = [("Examples", ExampleTable), ("Attribute List", AttributeList)] 
     206        self.outputs = [("Data", ExampleTable), ("Features", AttributeList)] 
    207207         
    208208        self.show_Rule_length = True 
     
    393393                selectedExamples = orange.ExampleTable(selectedExamples) 
    394394                 
    395             self.send("Examples", selectedExamples) 
    396             self.send("Attribute List", orange.VarList(list(selectedAttrs))) 
    397          
    398         else: 
    399             self.send("Examples", None) 
    400             self.send("Attribute List", None) 
     395            self.send("Data", selectedExamples) 
     396            self.send("Features", orange.VarList(list(selectedAttrs))) 
     397         
     398        else: 
     399            self.send("Data", None) 
     400            self.send("Features", None) 
    401401         
    402402        self.changedFlag = False 
  • orange/OrangeWidgets/Classify/OWClassificationTree.py

    r8042 r9546  
    3131        OWWidget.__init__(self, parent, signalManager, name, wantMainArea = 0, resizingEnabled = 0) 
    3232 
    33         self.inputs = [("Examples", ExampleTable, self.setData), ("Preprocess", PreprocessedLearner, self.setPreprocessor)] 
     33        self.inputs = [("Data", ExampleTable, self.setData), ("Preprocess", PreprocessedLearner, self.setPreprocessor)] 
    3434        self.outputs = [("Learner", orange.TreeLearner),("Classification Tree", orange.TreeClassifier)] 
    3535 
  • orange/OrangeWidgets/Classify/OWClassificationTreeGraph.py

    r9272 r9546  
    202202 
    203203        self.inputs = [("Classification Tree", orange.TreeClassifier, self.ctree)] 
    204         self.outputs = [("Examples", ExampleTable)] 
     204        self.outputs = [("Data", ExampleTable)] 
    205205 
    206206        self.scene=TreeGraphicsScene(self) 
     
    382382 
    383383    def ctree(self, tree=None): 
    384         self.send("Examples", None) 
     384        self.send("Data", None) 
    385385        self.closeContext() 
    386386        self.targetCombo.clear() 
  • orange/OrangeWidgets/Classify/OWClassificationTreeViewer.py

    r9272 r9546  
    4747 
    4848        self.inputs = [("Classification Tree", orange.TreeClassifier, self.setClassificationTree)] 
    49         self.outputs = [("Examples", ExampleTable)] 
     49        self.outputs = [("Data", ExampleTable)] 
    5050 
    5151        # Settings 
     
    276276        if self.tree and item: 
    277277            data = self.nodeClassDict[item].examples 
    278             self.send("Examples", data) 
     278            self.send("Data", data) 
    279279 
    280280            tx = "" 
     
    297297                self.rule.setText("%(className)s = %(classLabel)s" % vars()) 
    298298        else: 
    299             self.send("Examples", None) 
     299            self.send("Data", None) 
    300300            self.rule.setText("") 
    301301 
  • orange/OrangeWidgets/Classify/OWEnsemble.py

    r9233 r9546  
    2828        OWWidget.__init__(self, parent, signalManager, name, wantMainArea=False) 
    2929         
    30         self.inputs = [("Learner", orange.Learner, self.setLearner), ("Examples", ExampleTable, self.setData)] 
     30        self.inputs = [("Learner", orange.Learner, self.setLearner), ("Data", ExampleTable, self.setData)] 
    3131        self.outputs = [("Learner", orange.Learner), ("Classifier", orange.Classifier)] 
    3232         
  • orange/OrangeWidgets/Classify/OWITree.py

    r6538 r9546  
    2525    def __init__(self,parent = None, signalManager = None): 
    2626        OWClassificationTreeViewer.__init__(self, parent, signalManager, 'I&nteractive Tree Builder') 
    27         self.inputs = [("Examples", ExampleTable, self.setData), ("Tree Learner", orange.Learner, self.setLearner)] 
    28         self.outputs = [("Examples", ExampleTable), ("Classifier", orange.TreeClassifier), ("Tree Learner", orange.Learner)] 
     27        self.inputs = [("Data", ExampleTable, self.setData), ("Tree Learner", orange.Learner, self.setLearner)] 
     28        self.outputs = [("Data", ExampleTable), ("Classifier", orange.TreeClassifier), ("Tree Learner", orange.Learner)] 
    2929 
    3030        self.attridx = 0 
     
    9292        self.infoa.setText("Number of nodes: %i" % orngTree.countNodes(self.tree)) 
    9393        self.infob.setText("Number of leaves: %i" % orngTree.countLeaves(self.tree)) 
    94 #        self.send("Examples", self.tree) 
     94#        self.send("Data", self.tree) 
    9595        self.send("Classifier", self.tree) 
    9696        self.send("Tree Learner", self.learner) 
     
    204204            self.openContext("", None) 
    205205 
    206         self.send("Examples", None) 
     206        self.send("Data", None) 
    207207        self.updateTree() 
    208208        self.v.invisibleRootItem().child(0).setSelected(1) 
  • orange/OrangeWidgets/Classify/OWKNN.py

    r8042 r9546  
    1919        self.callbackDeposit = [] 
    2020 
    21         self.inputs = [("Examples", ExampleTable, self.setData), ("Preprocess", PreprocessedLearner, self.setPreprocessor)] 
    22         self.outputs = [("Learner", orange.Learner),("KNN Classifier", orange.kNNClassifier)] 
     21        self.inputs = [("Data", ExampleTable, self.setData), ("Preprocess", PreprocessedLearner, self.setPreprocessor)] 
     22        self.outputs = [("Learner", orange.Learner),("kNN Classifier", orange.kNNClassifier)] 
    2323 
    2424        self.metricsList = [("Euclidean", orange.ExamplesDistanceConstructor_Euclidean), 
     
    115115                self.classifier = None 
    116116                self.error(str(errValue)) 
    117         self.send("KNN Classifier", self.classifier) 
     117        self.send("kNN Classifier", self.classifier) 
    118118 
    119119############################################################################## 
  • orange/OrangeWidgets/Classify/OWLogisticRegression.py

    r8042 r9546  
    1818        OWWidget.__init__(self, parent, signalManager, name, wantMainArea = 0, resizingEnabled = 0) 
    1919 
    20         self.inputs = [("Examples", ExampleTable, self.setData), ("Preprocess", PreprocessedLearner, self.setPreprocessor)] 
    21         self.outputs = [("Learner", orange.Learner), ("Classifier", orange.Classifier), ("Attributes", list)] 
     20        self.inputs = [("Data", ExampleTable, self.setData), ("Preprocess", PreprocessedLearner, self.setPreprocessor)] 
     21        self.outputs = [("Learner", orange.Learner), ("Classifier", orange.Classifier), ("Features", list)] 
    2222 
    2323        from orngTree import TreeLearner 
  • orange/OrangeWidgets/Classify/OWMajority.py

    r8042 r9546  
    1919        self.callbackDeposit = [] 
    2020 
    21         self.inputs = [("Examples", ExampleTable, self.setData), ("Preprocess", PreprocessedLearner, self.setPreprocessor)] 
     21        self.inputs = [("Data", ExampleTable, self.setData), ("Preprocess", PreprocessedLearner, self.setPreprocessor)] 
    2222        self.outputs = [("Learner", orange.Learner),("Classifier", orange.Classifier)] 
    2323 
  • orange/OrangeWidgets/Classify/OWNaiveBayes.py

    r8042 r9546  
    2121    def __init__(self, parent=None, signalManager = None, name='NaiveBayes'): 
    2222        OWWidget.__init__(self, parent, signalManager, name, wantMainArea = 0, resizingEnabled = 0) 
    23         self.inputs = [("Examples", ExampleTable, self.setData), ("Preprocess", PreprocessedLearner, self.setPreprocessor)] 
     23        self.inputs = [("Data", ExampleTable, self.setData), ("Preprocess", PreprocessedLearner, self.setPreprocessor)] 
    2424        self.outputs = [("Learner", orange.Learner),("Naive Bayesian Classifier", orange.BayesClassifier)] 
    2525 
  • orange/OrangeWidgets/Classify/OWRandomForest.py

    r9505 r9546  
    1919        OWWidget.__init__(self, parent, signalManager, name, wantMainArea=False, resizingEnabled=False) 
    2020 
    21         self.inputs = [("Examples", ExampleTable, self.setData), 
     21        self.inputs = [("Data", ExampleTable, self.setData), 
    2222                       ("Preprocess", PreprocessedLearner, self.setPreprocessor)] 
    2323         
  • orange/OrangeWidgets/Classify/OWSVM.py

    r9302 r9546  
    1818        OWWidget.__init__(self, parent, signalManager, name, wantMainArea = 0, resizingEnabled = 0) 
    1919         
    20         self.inputs = [("Example Table", ExampleTable, self.setData), 
     20        self.inputs = [("Data", ExampleTable, self.setData), 
    2121                       ("Preprocess", PreprocessedLearner, self.setPreprocessor)] 
    2222        self.outputs = [("Learner", orange.Learner, Default), 
  • orange/OrangeWidgets/Data/OWConcatenate.py

    r9271 r9546  
    1616    def __init__(self,parent=None, signalManager = None): 
    1717        OWWidget.__init__(self, parent, signalManager, "Concatenate", wantMainArea=0) 
    18         self.inputs = [("Primary Table", orange.ExampleTable, self.setData), ("Additional Tables", orange.ExampleTable, self.setMoreData, Multiple)] 
    19         self.outputs = [("Examples", ExampleTable)] 
     18        self.inputs = [("Primary Data", orange.ExampleTable, self.setData), ("Additional Data", orange.ExampleTable, self.setMoreData, Multiple)] 
     19        self.outputs = [("Data", ExampleTable)] 
    2020 
    2121        self.mergeAttributes = 0 
     
    176176 
    177177        self.dataReport = self.prepareDataReport(newTable) 
    178         self.send("Examples", newTable) 
     178        self.send("Data", newTable) 
    179179 
    180180    def sendReport(self): 
  • orange/OrangeWidgets/Data/OWContinuize.py

    r9527 r9546  
    4141        OWWidget.__init__(self, parent, signalManager, name, wantMainArea = 0) 
    4242 
    43         self.inputs = [("Examples", ExampleTable, self.setData)] 
    44         self.outputs = [("Examples", ExampleTable), ("Preprocessor", PreprocessedLearner)] 
     43        self.inputs = [("Data", ExampleTable, self.setData)] 
     44        self.outputs = [("Data", ExampleTable), ("Preprocessor", PreprocessedLearner)] 
    4545 
    4646        self.multinomialTreatment = 0 
     
    100100            self.cbTargetValue.clear() 
    101101            self.openContext("", self.data) 
    102             self.send("Examples", None) 
     102            self.send("Data", None) 
    103103        else: 
    104104            if not self.data or data.domain.classVar != self.data.domain.classVar: 
     
    150150                domain = continuizer(self.data, 0) 
    151151            domain.addmetas(self.data.domain.getmetas()) 
    152             self.send("Examples", orange.ExampleTable(domain, self.data)) 
     152            self.send("Data", orange.ExampleTable(domain, self.data)) 
    153153        self.dataChanged = False 
    154154         
  • orange/OrangeWidgets/Data/OWDataDomain.py

    r9271 r9546  
    285285        OWWidget.__init__(self, parent, signalManager, name, wantMainArea=False) 
    286286         
    287         self.inputs = [("Examples", ExampleTable, self.set_data)] 
    288         self.outputs = [("Examples", ExampleTable), ("Attribute List", AttributeList)] 
     287        self.inputs = [("Data", ExampleTable, self.set_data)] 
     288        self.outputs = [("Data", ExampleTable), ("Features", AttributeList)] 
    289289         
    290290        self.domain_role_hints = {} 
     
    634634            self.output_report = self.prepareDataReport(newdata) 
    635635            self.output_domain = domain 
    636             self.send("Examples", newdata) 
    637             self.send("Attribute List", orange.VarList(attributes)) 
     636            self.send("Data", newdata) 
     637            self.send("Features", orange.VarList(attributes)) 
    638638        else: 
    639639            self.output_report = [] 
    640             self.send("Examples", None) 
    641             self.send("Attribute List", None) 
     640            self.send("Data", None) 
     641            self.send("Features", None) 
    642642     
    643643    def reset(self): 
  • orange/OrangeWidgets/Data/OWDataInfo.py

    r9044 r9546  
    1515        OWWidget.__init__(self, parent, signalManager, name, wantMainArea=0) 
    1616         
    17         self.inputs = [("Data Table", ExampleTable, self.data)] 
     17        self.inputs = [("Data", ExampleTable, self.data)] 
    1818        self.rowcount = 0 
    1919        self.columncount = 0 
  • orange/OrangeWidgets/Data/OWDataSampler.py

    r9271 r9546  
    2020 
    2121        self.inputs = [("Data", ExampleTable, self.setData)] 
    22         self.outputs = [("Sample", ExampleTable), ("Remaining Examples", ExampleTable)] 
     22        self.outputs = [("Data Sample", ExampleTable), ("Remaining Data", ExampleTable)] 
    2323 
    2424        # initialization of variables 
     
    183183            self.infob.setText('') 
    184184            self.infoc.setText('') 
    185             self.send("Sample", None) 
    186             self.send("Remaining Examples", None) 
     185            self.send("Data Sample", None) 
     186            self.send("Remaining Data", None) 
    187187            self.data = None 
    188188 
     
    218218        self.nSample = len(sample) 
    219219        self.nRemainder = len(remainder) if remainder is not None else 0 
    220         self.send("Sample", sample) 
    221         self.send("Remaining Examples", remainder) 
     220        self.send("Data Sample", sample) 
     221        self.send("Remaining Data", remainder) 
    222222         
    223223        self.sampleButton.setEnabled(False) 
  • orange/OrangeWidgets/Data/OWDataTable.py

    r8042 r9546  
    140140        OWWidget.__init__(self, parent, signalManager, "Data Table") 
    141141 
    142         self.inputs = [("Examples", ExampleTable, self.dataset, Multiple + Default)] 
    143         self.outputs = [("Selected Examples", ExampleTable, Default), ("Unselected Examples", ExampleTable)] 
     142        self.inputs = [("Data", ExampleTable, self.dataset, Multiple + Default)] 
     143        self.outputs = [("Selected Data", ExampleTable, Default), ("Other Data", ExampleTable)] 
    144144 
    145145        self.data = {}          # key: id, value: ExampleTable 
     
    582582            selection = [1 if i in selected else 0 for i in range(len(model.examples))] 
    583583            data = model.examples.select(selection) 
    584             self.send("Selected Examples", data if len(data) > 0 else None) 
     584            self.send("Selected Data", data if len(data) > 0 else None) 
    585585            data = model.examples.select(selection, 0) 
    586             self.send("Unselected Examples", data if len(data) > 0 else None) 
    587         else: 
    588             self.send("Selected Examples", None) 
    589             self.send("Unselected Examples", None) 
     586            self.send("Other Data", data if len(data) > 0 else None) 
     587        else: 
     588            self.send("Selected Data", None) 
     589            self.send("Other Data", None) 
    590590             
    591591        self.selectionChangedFlag = False 
  • orange/OrangeWidgets/Data/OWDiscretize.py

    r9271 r9546  
    438438        self.loadSettings() 
    439439 
    440         self.inputs=[("Examples", ExampleTable, self.setData)] 
    441         self.outputs=[("Examples", ExampleTable)] 
     440        self.inputs=[("Data", ExampleTable, self.setData)] 
     441        self.outputs=[("Data", ExampleTable)] 
    442442        self.measures=[("Information gain", orange.MeasureAttribute_info()), 
    443443                       #("Gain ratio", orange.MeasureAttribute_gainRatio), 
     
    10751075            newdata = None 
    10761076 
    1077         self.send("Examples", newdata) 
     1077        self.send("Data", newdata) 
    10781078        dataChanged = False 
    10791079 
  • orange/OrangeWidgets/Data/OWEditDomain.py

    r9326 r9546  
    351351        OWWidget.__init__(self, parent, signalManager, title) 
    352352         
    353         self.inputs = [("Input Data", Orange.data.Table, self.set_data)] 
    354         self.outputs = [("Output Data", Orange.data.Table)] 
     353        self.inputs = [("Data", Orange.data.Table, self.set_data)] 
     354        self.outputs = [("Data", Orange.data.Table)] 
    355355         
    356356        # Settings 
     
    634634            new_data = Orange.data.Table(new_domain, self.data) 
    635635         
    636         self.send("Output Data", new_data) 
     636        self.send("Data", new_data) 
    637637        self.changed_flag = False 
    638638             
  • orange/OrangeWidgets/Data/OWFeatureConstructor.py

    r7870 r9546  
    5656        OWWidget.__init__(self, parent, signalManager, "FeatureConstructor") 
    5757 
    58         self.inputs = [("Examples", orange.ExampleTable, self.setData)] 
    59         self.outputs = [("Examples", ExampleTable)] 
     58        self.inputs = [("Data", orange.ExampleTable, self.setData)] 
     59        self.outputs = [("Data", ExampleTable)] 
    6060 
    6161        self.expression = self.attrname = "" 
     
    223223        self.dataChanged = False 
    224224        if not self.data: 
    225             self.send("Examples", None) 
     225            self.send("Data", None) 
    226226            return 
    227227 
     
    232232            if names.count(name)>1 or name in oldDomain > 1: 
    233233                self.error(1, "Multiple attributes with the same name (%s)" % name) 
    234                 self.send("Examples", None) 
     234                self.send("Data", None) 
    235235                return 
    236236 
     
    247247            if not solved: 
    248248                self.error(1, "Circular attribute definitions (%s)" % ", ".join([x[0] for x in unknown])) 
    249                 self.send("Examples", None) 
     249                self.send("Data", None) 
    250250                return 
    251251            for name, exp, unk_attrs in unknown: 
     
    256256        newDomain = orange.Domain(oldDomain.attributes + [orange.FloatVariable(str(attrname), getValueFrom = AttrComputer(reinserted[attrname])) for attrname in names], oldDomain.classVar) 
    257257        newDomain.addmetas(oldDomain.getmetas()) 
    258         self.send("Examples", orange.ExampleTable(newDomain, self.data)) 
     258        self.send("Data", orange.ExampleTable(newDomain, self.data)) 
  • orange/OrangeWidgets/Data/OWFile.py

    r9505 r9546  
    5151 
    5252        self.inputs = [] 
    53         self.outputs = [("Examples", ExampleTable)] 
     53        self.outputs = [("Data", ExampleTable)] 
    5454 
    5555        self.recentFiles=["(none)"] 
     
    231231         
    232232        if fn == "(none)": 
    233             self.send("Examples", None) 
     233            self.send("Data", None) 
    234234            self.infoa.setText("No data loaded") 
    235235            self.infob.setText("") 
     
    325325 
    326326        self.dataReport = self.prepareDataReport(data) 
    327         self.send("Examples", data) 
     327        self.send("Data", data) 
    328328        if self.processingHandler: self.processingHandler(self, 0)    # remove focus from this widget 
    329329 
  • orange/OrangeWidgets/Data/OWImageViewer.py

    r9509 r9546  
    196196        OWWidget.__init__(self, parent, signalManager, name, wantGraph=True) 
    197197         
    198         self.inputs = [("Example Table", ExampleTable, self.setData)] 
    199         self.outputs = [("Example Table", ExampleTable)] 
     198        self.inputs = [("Data", ExampleTable, self.setData)] 
     199        self.outputs = [("Data", ExampleTable)] 
    200200         
    201201        self.imageAttr = 0 
     
    420420            else: 
    421421                selected = None 
    422             self.send("Example Table", selected) 
     422            self.send("Data", selected) 
    423423        else: 
    424             self.send("Example Table", None) 
     424            self.send("Data", None) 
    425425        self.selectionChangedFlag = False 
    426426             
  • orange/OrangeWidgets/Data/OWImpute.py

    r8042 r9546  
    4949        OWWidget.__init__(self, parent, signalManager, name, wantMainArea = 0) 
    5050 
    51         self.inputs = [("Examples", ExampleTable, self.setData, Default), ("Learner for Imputation", orange.Learner, self.setModel)] 
    52         self.outputs = [("Examples", ExampleTable), ("Imputer", orange.ImputerConstructor)] 
     51        self.inputs = [("Data", ExampleTable, self.setData, Default), ("Learner for Imputation", orange.Learner, self.setModel)] 
     52        self.outputs = [("Data", ExampleTable), ("Imputer", orange.ImputerConstructor)] 
    5353 
    5454        self.attrIcons = self.createAttributeIconDict() 
     
    214214            self.indibox.setDisabled(True) 
    215215            self.data = None 
    216             self.send("Examples", data) 
     216            self.send("Data", data) 
    217217            self.attrList.clear() 
    218218        else: 
     
    414414            else: 
    415415                data = None 
    416             self.send("Examples", data) 
     416            self.send("Data", data) 
    417417        else: 
    418418            self.dataChanged = False 
  • orange/OrangeWidgets/Data/OWMergeData.py

    r9309 r9546  
    2525 
    2626        # set channels 
    27         self.inputs = [("Examples A", ExampleTable, self.onDataAInput), 
    28                        ("Examples B", ExampleTable, self.onDataBInput)] 
     27        self.inputs = [("Data", ExampleTable, self.onDataAInput), 
     28                       ("Data", ExampleTable, self.onDataBInput)] 
    2929         
    3030        self.outputs = [("Merged Examples A+B", ExampleTable), 
  • orange/OrangeWidgets/Data/OWOutliers.py

    r8042 r9546  
    2020        OWWidget.__init__(self, parent, signalManager, name, wantMainArea = 0) 
    2121 
    22         self.inputs = [("Examples", ExampleTable, self.cdata),("Distance matrix", orange.SymMatrix, self.cdistance)] 
     22        self.inputs = [("Data", ExampleTable, self.cdata),("Distances", orange.SymMatrix, self.cdistance)] 
    2323        self.outputs = [("Outliers", ExampleTable), ("Inliers", ExampleTable), ("Examples with Z-scores", ExampleTable)] 
    2424                
  • orange/OrangeWidgets/Data/OWPaintData.py

    r9163 r9546  
    693693        OWWidget.__init__(self, parent, signalManager, name, wantGraph=True) 
    694694         
    695         self.outputs = [("Example Table", ExampleTable)] 
     695        self.outputs = [("Data", ExampleTable)] 
    696696         
    697697        self.addClassAsMeta = False 
     
    895895            domain = orange.Domain(data.domain.attributes, None) 
    896896            data = orange.ExampleTable(domain, data) 
    897         self.send("Example Table", data) 
     897        self.send("Data", data) 
    898898         
    899899         
  • orange/OrangeWidgets/Data/OWPreprocess.py

    r9044 r9546  
    469469        OWWidget.__init__(self, parent, signalManager, name) 
    470470         
    471         self.inputs = [("Example Table", ExampleTable, self.setData)] #, ("Learner", orange.Learner, self.setLearner)] 
    472         self.outputs = [("Preprocess", orngWrap.PreprocessedLearner), ("Preprocessed Example Table", ExampleTable)] #, ("Preprocessor", orange.Preprocessor)] 
     471        self.inputs = [("Data", ExampleTable, self.setData)] #, ("Learner", orange.Learner, self.setLearner)] 
     472        self.outputs = [("Preprocess", orngWrap.PreprocessedLearner), ("Preprocessed Data", ExampleTable)] #, ("Preprocessor", orange.Preprocessor)] 
    473473         
    474474        self.autoCommit = False 
     
    721721        if self.data is not None: 
    722722            data = wrap.processData(self.data) 
    723             self.send("Preprocessed Example Table", data) 
     723            self.send("Preprocessed Data", data) 
    724724        self.send("Preprocess", wrap) 
    725725             
  • orange/OrangeWidgets/Data/OWPurgeDomain.py

    r8042 r9546  
    1717        self.settingsList=["removeValues", "removeAttributes", "removeClassAttribute", "removeClasses", "autoSend", "sortValues", "sortClasses"] 
    1818 
    19         self.inputs = [("Examples", ExampleTable, self.setData)] 
    20         self.outputs = [("Examples", ExampleTable)] 
     19        self.inputs = [("Data", ExampleTable, self.setData)] 
     20        self.outputs = [("Data", ExampleTable)] 
    2121 
    2222        self.data = None 
     
    7676        else: 
    7777            self.reducedAttrs = self.removedAttrs = self.resortedAttrs = self.classAttr = "" 
    78             self.send("Examples", None) 
     78            self.send("Data", None) 
    7979            self.data = None 
    8080        self.dataChanged = False 
     
    213213            newData = self.data 
    214214 
    215         self.send("Examples", newData) 
     215        self.send("Data", newData) 
    216216 
    217217        self.dataChanged = False 
  • orange/OrangeWidgets/Data/OWRank.py

    r9344 r9546  
    163163        OWWidget.__init__(self, parent, signalManager, "Rank") 
    164164 
    165         self.inputs = [("Examples", ExampleTable, self.setData)] 
    166         self.outputs = [("Reduced Example Table", ExampleTable, Default + Single)] 
     165        self.inputs = [("Data", ExampleTable, self.setData)] 
     166        self.outputs = [("Reduced Data", ExampleTable, Default + Single)] 
    167167 
    168168        self.nDecimals = 3 
     
    779779        selected = self.selectedAttrs() 
    780780        if not self.data or not selected: 
    781             self.send("Reduced Example Table", None) 
     781            self.send("Reduced Data", None) 
    782782        else: 
    783783            domain = orange.Domain(selected, self.data.domain.classVar) 
    784784            domain.addmetas(self.data.domain.getmetas()) 
    785785            data = orange.ExampleTable(domain, self.data) 
    786             self.send("Reduced Example Table", data) 
     786            self.send("Reduced Data", data) 
    787787        self.dataChanged = False 
    788788         
  • orange/OrangeWidgets/Data/OWSave.py

    r9044 r9546  
    3838        OWWidget.__init__(self, parent, signalManager, "Save", wantMainArea = 0, resizingEnabled = 0) 
    3939 
    40         self.inputs = [("Examples", ExampleTable, self.dataset)] 
     40        self.inputs = [("Data", ExampleTable, self.dataset)] 
    4141        self.outputs = [] 
    4242 
  • orange/OrangeWidgets/Data/OWSelectData.py

    r8042 r9546  
    1818        OWWidget.__init__(self, parent, signalManager, name, wantMainArea = 0)  #initialize base class 
    1919 
    20         self.inputs = [("Examples", ExampleTable, self.setData)] 
    21         self.outputs = [("Matching Examples", ExampleTable, Default), ("Non-Matching Examples", ExampleTable)] 
     20        self.inputs = [("Data", ExampleTable, self.setData)] 
     21        self.outputs = [("Merged Data", ExampleTable, Default), ("Non-Matching Examples", ExampleTable)] 
    2222 
    2323        self.name2var = {}   # key: variable name, item: orange.Variable 
     
    266266                    nonmatchingOutput = orange.ExampleTable(newDomain, nonMatchingOutput) 
    267267 
    268         self.send("Matching Examples", matchingOutput) 
     268        self.send("Merged Data", matchingOutput) 
    269269        self.send("Non-Matching Examples", nonMatchingOutput) 
    270270 
  • orange/OrangeWidgets/Evaluate/OWConfusionMatrix.py

    r9505 r9546  
    4848        # inputs 
    4949        self.inputs=[("Evaluation Results", orngTest.ExperimentResults, self.setTestResults, Default)] 
    50         self.outputs=[("Selected Examples", ExampleTable, 8)] 
     50        self.outputs=[("Selected Data", ExampleTable, 8)] 
    5151 
    5252        self.selectedLearner = [] 
     
    269269        res = self.res 
    270270        if not res or not selected or not self.selectedLearner: 
    271             self.send("Selected Examples", None) 
     271            self.send("Selected Data", None) 
    272272            return 
    273273 
     
    299299                        ex[id] = p 
    300300     
    301         self.send("Selected Examples", data) 
     301        self.send("Selected Data", data) 
    302302 
    303303 
  • orange/OrangeWidgets/Evaluate/OWPredictions.py

    r9250 r9546  
    135135 
    136136        self.callbackDeposit = [] 
    137         self.inputs = [("Examples", ExampleTable, self.setData), ("Predictors", orange.Classifier, self.setPredictor, Multiple)] 
     137        self.inputs = [("Data", ExampleTable, self.setData), ("Predictors", orange.Classifier, self.setPredictor, Multiple)] 
    138138        self.outputs = [("Predictions", ExampleTable)] 
    139139        self.predictors = {} 
  • orange/OrangeWidgets/Evaluate/OWReliability.py

    r9543 r9546  
    2727         
    2828        self.inputs = [("Learner", Orange.core.Learner, self.set_learner), 
    29                        ("Train Data", Orange.data.Table, self.set_train_data), 
     29                       ("Training Data", Orange.data.Table, self.set_train_data), 
    3030                       ("Test Data", Orange.data.Table, self.set_test_data)] 
    3131         
  • orange/OrangeWidgets/Prototypes/OWAddRowIds.py

    r9122 r9546  
    1515        OWWidget.__init__(self, parent, signalManager, title, wantMainArea=False) 
    1616         
    17         self.inputs = [("Input Table", Orange.data.Table, self.set_table)] 
    18         self.outputs = [("Output Table", Orange.data.Table)] 
     17        self.inputs = [("Data", Orange.data.Table, self.set_table)] 
     18        self.outputs = [("Data", Orange.data.Table)] 
    1919         
    2020        self.use_guid = False 
     
    4343            table = None 
    4444             
    45         self.send("Output Table", table) 
     45        self.send("Data", table) 
    4646             
    4747             
  • orange/OrangeWidgets/Prototypes/OWCalibratedClassifier.py

    r7789 r9546  
    5050        OWWidget.__init__(self, parent, signalManager, title) 
    5151 
    52         self.inputs = [("Examples", ExampleTable, self.setData), ("Base Learner", orange.Learner, self.setBaseLearner)] 
     52        self.inputs = [("Data", ExampleTable, self.setData), ("Base Learner", orange.Learner, self.setBaseLearner)] 
    5353        self.outputs = [("Learner", orange.Learner),("Classifier", orange.Classifier)] 
    5454 
  • orange/OrangeWidgets/Prototypes/OWCompare.py

    r6913 r9546  
    2121    def __init__(self,parent=None, signalManager = None): 
    2222        OWWidget.__init__(self, parent, signalManager, "Compare Examples") 
    23         self.inputs = [("Examples", ExampleTable, self.setData, Default)] 
     23        self.inputs = [("Data", ExampleTable, self.setData, Default)] 
    2424        self.outputs = [("Bars", list, Default)] 
    2525        self.icons = self.createAttributeIconDict() 
  • orange/OrangeWidgets/Prototypes/OWCorrelations.py

    r9419 r9546  
    154154#                          wantMainAre=False, noReport=True) 
    155155         
    156         self.inputs = [("Example Table", Orange.data.Table, self.set_data)] 
     156        self.inputs = [("Data", Orange.data.Table, self.set_data)] 
    157157         
    158158        self.outputs = [("Correlations", Orange.data.Table), 
  • orange/OrangeWidgets/Prototypes/OWDataDomainMk2.py

    r9254 r9546  
    284284        OWWidget.__init__(self, parent, signalManager, name, wantMainArea=False) 
    285285         
    286         self.inputs = [("Examples", ExampleTable, self.set_data)] 
    287         self.outputs = [("Examples", ExampleTable), ("Attribute List", AttributeList)] 
     286        self.inputs = [("Data", ExampleTable, self.set_data)] 
     287        self.outputs = [("Data", ExampleTable), ("Features", AttributeList)] 
    288288         
    289289        self.domain_role_hints = {} 
     
    632632            self.output_report = self.prepareDataReport(newdata) 
    633633            self.output_domain = domain 
    634             self.send("Examples", newdata) 
    635             self.send("Attribute List", orange.VarList(attributes)) 
     634            self.send("Data", newdata) 
     635            self.send("Features", orange.VarList(attributes)) 
    636636        else: 
    637637            self.output_report = [] 
    638             self.send("Examples", None) 
    639             self.send("Attribute List", None) 
     638            self.send("Data", None) 
     639            self.send("Features", None) 
    640640     
    641641    def reset(self): 
  • orange/OrangeWidgets/Prototypes/OWGaussianMixtures.py

    r8891 r9546  
    3131        OWWidget.__init__(self, parent, signalManager, title) 
    3232         
    33         self.inputs = [("Data Instances", Orange.data.Table, self.set_data)] 
     33        self.inputs = [("Data", Orange.data.Table, self.set_data)] 
    3434        self.outputs = [("Data with Indicator Matrix", Orange.data.Table)] 
    3535         
  • orange/OrangeWidgets/Prototypes/OWGroupBy.py

    r9122 r9546  
    5353                          wantMainArea=False) 
    5454         
    55         self.inputs = [("Input Data", Table, self.set_data)] 
    56         self.outputs = [("Output Data", Table)] 
     55        self.inputs = [("Data", Table, self.set_data)] 
     56        self.outputs = [("Data", Table)] 
    5757         
    5858        self.auto_commit = False 
     
    217217        else: 
    218218            data = None 
    219         self.send("Output Data", data) 
     219        self.send("Data", data) 
    220220        self.state_chaged_flag = False 
    221221         
  • orange/OrangeWidgets/Prototypes/OWInteractionGraphProto.py

    r6538 r9546  
    4242        OWWidget.__init__(self, parent, signalManager, "Interaction graph") 
    4343 
    44         self.inputs = [("Examples", ExampleTable, self.setData)] 
    45         self.outputs = [("Examples", ExampleTable), ("Attribute Pair", list), ("Selected Attributes List", list), ("Network", Network)] 
     44        self.inputs = [("Data", ExampleTable, self.setData)] 
     45        self.outputs = [("Data", ExampleTable), ("Interacting Features", list), ("Selected Features", list), ("Network", Network)] 
    4646 
    4747 
     
    166166            for (attr1, attr2, rect) in self.lines: 
    167167                if self.clickInside(rect.rect(), ev.pos()) == 1: 
    168                     self.send("Attribute Pair", [attr1, attr2]) 
     168                    self.send("Interacting Features", [attr1, attr2]) 
    169169                    return 
    170170                 
     
    176176                    (rect1, rect2, rect3, nbrect, text1, text2) = rects 
    177177                    if rect2.pen().color() == Qt.green: 
    178                         self.send("Attribute Pair", [str(text1.text()), str(text2.text())]) 
     178                        self.send("Interacting Features", [str(text1.text()), str(text2.text())]) 
    179179                     
    180180        elif ev.button() == Qt.LeftButton and name == "correlations": 
     
    185185                    (rect1, rect2, rect3, nbrect, text1, text2) = rects 
    186186                    if rect2.pen().color() != Qt.green: 
    187                         self.send("Attribute Pair", [str(text1.text()), str(text2.text())]) 
     187                        self.send("Interacting Features", [str(text1.text()), str(text2.text())]) 
    188188 
    189189        elif ev.button() == Qt.RightButton and (name == "interactions" or name == "correlations") and self.mergeAttributes: 
     
    236236        if self.data == None: return 
    237237        l = [str(self.shownAttribsLB.item(i).text()) for i in range(self.shownAttribsLB.count())] 
    238         self.send("Selected Attributes List", l) 
     238        self.send("Selected Features", l) 
    239239 
    240240 
     
    327327        self.updateCanvas() 
    328328 
    329         self.send("Examples", data) 
     329        self.send("Data", data) 
    330330        self.send("Network", self.graph) 
    331331 
  • orange/OrangeWidgets/Prototypes/OWItemsetViz.py

    r8042 r9546  
    245245        OWWidget.__init__(self, parent, signalManager, 'Itemset visualizer') 
    246246 
    247         self.inputs = [("Graph with ExampleTable", orange.Graph, self.setGraph), ("Example Subset", orange.ExampleTable, self.setExampleSubset)] 
    248         self.outputs=[("Selected Examples", ExampleTable), ("Selected Graph", orange.Graph)] 
     247        self.inputs = [("Graph with Data", orange.Graph, self.setGraph), ("Data Subset", orange.ExampleTable, self.setExampleSubset)] 
     248        self.outputs=[("Selected Data", ExampleTable), ("Selected Graph", orange.Graph)] 
    249249         
    250250        self.markerAttributes = [] 
     
    527527        if graph != None: 
    528528            if graph.items != None: 
    529                 self.send("Selected Examples", graph.items) 
     529                self.send("Selected Data", graph.items) 
    530530            else: 
    531                 self.send("Selected Examples", self.graph.getSelectedExamples()) 
     531                self.send("Selected Data", self.graph.getSelectedExamples()) 
    532532                 
    533533            self.send("Selected Graph", graph) 
     
    535535            items = self.graph.getSelectedExamples() 
    536536            if items != None: 
    537                 self.send("Selected Examples", items) 
     537                self.send("Selected Data", items) 
    538538            self.send("Selected Graph", None) 
    539539    
  • orange/OrangeWidgets/Prototypes/OWLogTransform.py

    r6915 r9546  
    1515    def __init__(self,parent=None, signalManager = None): 
    1616        OWWidget.__init__(self, parent, signalManager, "Compare Examples") 
    17         self.inputs = [("Examples", ExampleTable, self.setData, Default)] 
    18         self.outputs = [("Examples", ExampleTable, Default)] 
     17        self.inputs = [("Data", ExampleTable, self.setData, Default)] 
     18        self.outputs = [("Data", ExampleTable, Default)] 
    1919         
    2020        self.transformed = [] 
     
    7171            newDomain = orange.Domain([transs.get(attr.name, attr) for attr in oldDomain.attributes], 
    7272                                      transs.get(oldDomain.classVar.name, oldDomain.classVar)) 
    73             self.send("Examples", orange.ExampleTable(newDomain, self.data)) 
     73            self.send("Data", orange.ExampleTable(newDomain, self.data)) 
  • orange/OrangeWidgets/Prototypes/OWMissingValues.py

    r6913 r9546  
    3535    def __init__(self,parent=None, signalManager = None): 
    3636        OWWidget.__init__(self, parent, signalManager, "Compare Examples", noReport=True) 
    37         self.inputs = [("Instances", ExampleTable, self.setData, Default)] 
    38         self.outputs = [("Instances", ExampleTable, Default), ("Selected Instances", ExampleTable)] 
     37        self.inputs = [("Data", ExampleTable, self.setData, Default)] 
     38        self.outputs = [("Data", ExampleTable, Default), ("Selected Data", ExampleTable)] 
    3939         
    4040        self.check = [] 
     
    146146        else: 
    147147            self.dataout = None 
    148         self.send("Instances", self.dataout) 
     148        self.send("Data", self.dataout) 
    149149             
    150150    def sendSelected(self): 
     
    162162                filt_unk.check = [i==row for i in range(len(data.domain))] 
    163163                toSend = data.filterref(filt_unk) 
    164         self.send("Selected Instances", toSend) 
     164        self.send("Selected Data", toSend) 
    165165 
    166166    def sendReport(self): 
  • orange/OrangeWidgets/Prototypes/OWModelMap.py

    r9263 r9546  
    273273                               NetworkCanvas=OWModelMapCanvas) 
    274274         
    275         self.inputs = [("Distance Matrix", orange.SymMatrix, self.setMatrix, Default), 
     275        self.inputs = [("Distances", orange.SymMatrix, self.setMatrix, Default), 
    276276                       ("Model Subset", orange.ExampleTable, self.setSubsetModels)] 
    277277        self.outputs = [("Model", orange.Example), 
  • orange/OrangeWidgets/Prototypes/OWPivot.py

    r6913 r9546  
    2525    def __init__(self,parent=None, signalManager = None): 
    2626        OWWidget.__init__(self, parent, signalManager, "Pivot") 
    27         self.inputs = [("Examples", ExampleTable, self.setData, Default)] 
     27        self.inputs = [("Data", ExampleTable, self.setData, Default)] 
    2828        self.outputs = [("Selected Group", ExampleTable, Default)] 
    2929        self.settingsList = [a[1] for a in self.aggregates] 
  • orange/OrangeWidgets/Prototypes/OWQuickSelect.py

    r6913 r9546  
    2929    def __init__(self,parent=None, signalManager = None): 
    3030        OWWidget.__init__(self, parent, signalManager, "Quick Select", wantMainArea=0) 
    31         self.inputs = [("Examples", ExampleTable, self.setData, Default)] 
    32         self.outputs = [("Selected Examples", ExampleTable, Default), ("Remaining Examples", ExampleTable)] 
     31        self.inputs = [("Data", ExampleTable, self.setData, Default)] 
     32        self.outputs = [("Selected Data", ExampleTable, Default), ("Remaining Data", ExampleTable)] 
    3333        self.icons = self.createAttributeIconDict() 
    3434 
     
    9898    def updateOutput(self): 
    9999        if not self.data or not self.selectedAttribute or not self.selectedValues: 
    100             self.send("Selected Examples", None) 
    101             self.send("Remaining Examples", None) 
     100            self.send("Selected Data", None) 
     101            self.send("Remaining Data", None) 
    102102            self.outSelected = self.outRemaining = 0 
    103103            return 
     
    107107        pp.values[attr] = [self.valuesList[j].encode("utf-8") for j in self.selectedValues] 
    108108        selected = pp(self.data) 
    109         self.send("Selected Examples", selected) 
     109        self.send("Selected Data", selected) 
    110110         
    111111        pp = orange.Preprocessor_drop()  
    112112        pp.values[attr] = [self.valuesList[j].encode("utf-8") for j in self.selectedValues] 
    113113        remaining = pp(self.data) 
    114         self.send("Remaining Examples", remaining) 
     114        self.send("Remaining Data", remaining) 
    115115 
    116116        self.outSelected = len(selected) 
  • orange/OrangeWidgets/Prototypes/OWRandomForestOld.py

    r9427 r9546  
    1919        OWWidget.__init__(self, parent, signalManager, name, wantMainArea=False, resizingEnabled=False) 
    2020 
    21         self.inputs = [("Examples", ExampleTable, self.setData), ("Preprocess", PreprocessedLearner, self.setPreprocessor)] 
    22         self.outputs = [("Learner", orange.Learner),("Random Forest Classifier", orange.Classifier),("Choosen Tree", orange.TreeClassifier) ] 
     21        self.inputs = [("Data", ExampleTable, self.setData), ("Preprocess", PreprocessedLearner, self.setPreprocessor)] 
     22        self.outputs = [("Learner", orange.Learner),("Random Forest Classifier", orange.Classifier),("Selected Tree", orange.TreeClassifier) ] 
    2323 
    2424        self.name = 'Random Forest' 
     
    8989 
    9090    def extree(self): 
    91         self.send("Choosen Tree", self.classifier.classifiers[self.outtree]) 
     91        self.send("Selected Tree", self.classifier.classifiers[self.outtree]) 
    9292 
    9393    def streeEnabled(self, status): 
  • orange/OrangeWidgets/Prototypes/OWSQL.py

    r6913 r9546  
    1414    def __init__(self,parent=None, signalManager = None): 
    1515        OWWidget.__init__(self, parent, signalManager, "Compare Examples", wantMainArea=0) 
    16         self.outputs = [("Examples", ExampleTable, Default)] 
     16        self.outputs = [("Data", ExampleTable, Default)] 
    1717 
    1818        self.host = "localhost" 
     
    9191            self.errorIcon.setVisible(True) 
    9292            data = None 
    93         self.send("Examples", data) 
     93        self.send("Data", data) 
    9494         
    9595    def saveToLibrary(self): 
  • orange/OrangeWidgets/Prototypes/OWSQLSelect.py

    r6538 r9546  
    7070        except Exception, e: 
    7171            self.setInfo(('Query failed:', str(e))) 
    72         self.send("Examples", self.sqlReader.data()) 
     72        self.send("Data", self.sqlReader.data()) 
    7373        self.setInfo(('Query returned', 'Read ' + str(len(self.sqlReader.data())) + ' examples!')) 
    74         self.send("Attribute Definitions", self.sqlReader.domain) 
     74        self.send("Feature Definitions", self.sqlReader.domain) 
    7575        self.setMeta() 
    7676        self.lastQuery = query 
     
    8989        self.sqlReader = orngSQL.SQLReader() 
    9090        self.inputs = [] 
    91         self.outputs = [("Examples", ExampleTable), ("Attribute Definitions", orange.Domain)] 
     91        self.outputs = [("Data", ExampleTable), ("Feature Definitions", orange.Domain)] 
    9292 
    9393        #set default settings 
  • orange/OrangeWidgets/Prototypes/OWShuffle.py

    r9133 r9546  
    1616                          wantMainArea=False) 
    1717         
    18         self.inputs = [("Data Table", Orange.data.Table, self.set_data)] 
    19         self.outputs = [("Shuffled Data Table", Orange.data.Table)] 
     18        self.inputs = [("Data", Orange.data.Table, self.set_data)] 
     19        self.outputs = [("Shuffled Data", Orange.data.Table)] 
    2020         
    2121        self.seed = 0 
     
    4040            shuffled = Orange.data.Table(shuffled) if shuffled else \ 
    4141                       Orange.data.Table(self.data.domain) # In case of empty table 
    42         self.send("Shuffled Data Table", shuffled) 
     42        self.send("Shuffled Data", shuffled) 
    4343     
  • orange/OrangeWidgets/Prototypes/OWTimeDataVisualizer.py

    r5822 r9546  
    3030        OWWidget.__init__(self, parent, signalManager, "Time Data Visualizer", TRUE) 
    3131 
    32         self.inputs =  [("Examples", ExampleTable, self.setData, Default), ("Example Subset", ExampleTable, self.setSubsetData), ("Attribute selection", AttributeList, self.setShownAttributes)] 
    33         self.outputs = [("Selected Examples", ExampleTable), ("Unselected Examples", ExampleTable)] 
     32        self.inputs =  [("Data", ExampleTable, self.setData, Default), ("Data Subset", ExampleTable, self.setSubsetData), ("Features", AttributeList, self.setShownAttributes)] 
     33        self.outputs = [("Selected Data", ExampleTable), ("Other Data", ExampleTable)] 
    3434 
    3535        # local variables 
     
    191191        pass 
    192192#        (selected, unselected) = self.graph.getSelectionsAsExampleTables([self.attrX, self.attrY]) 
    193 #        self.send("Selected Examples",selected) 
    194 #        self.send("Unselected Examples",unselected) 
     193#        self.send("Selected Data",selected) 
     194#        self.send("Other Data",unselected) 
    195195 
    196196 
  • orange/OrangeWidgets/Prototypes/OWTimeline.py

    r8042 r9546  
    114114    def __init__(self, parent=None, signalManager=None, name="Timeline"): 
    115115        OWWidget.__init__(self, parent, signalManager, name) 
    116         self.inputs = [("Examples", ExampleTable, self.setData)] 
     116        self.inputs = [("Data", ExampleTable, self.setData)] 
    117117        self.outputs = [] 
    118118        self.lineDistance = 40 
  • orange/OrangeWidgets/Regression/OWEarth.py

    r9343 r9546  
    2222        OWWidget.__init__(self, parent, signalManager, title, wantMainArea=False) 
    2323         
    24         self.inputs = [("Training data", Orange.data.Table, self.set_data), ("Preprocessor", PreprocessedLearner, self.set_preprocessor)] 
     24        self.inputs = [("Data", Orange.data.Table, self.set_data), ("Preprocessor", PreprocessedLearner, self.set_preprocessor)] 
    2525        self.outputs = [("Learner", earth.EarthLearner), ("Predictor", earth.EarthClassifier)] 
    2626         
  • orange/OrangeWidgets/Regression/OWKNNRegression.py

    r9223 r9546  
    1414        OWKNN.__init__(self, parent, signalManager, title) 
    1515         
    16         self.inputs = [("Examples", ExampleTable, self.setData), ("Preprocess", PreprocessedLearner, self.setPreprocessor)] 
    17         self.outputs = [("Learner", orange.Learner),("KNN Classifier", orange.kNNClassifier)] 
     16        self.inputs = [("Data", ExampleTable, self.setData), ("Preprocess", PreprocessedLearner, self.setPreprocessor)] 
     17        self.outputs = [("Learner", orange.Learner),("kNN Classifier", orange.kNNClassifier)] 
    1818             
    1919    def setData(self,data): 
  • orange/OrangeWidgets/Regression/OWLinearRegression.py

    r9249 r9546  
    2424        OWWidget.__init__(self, parent, signalManager, title, wantMainArea=False) 
    2525         
    26         self.inputs = [("Training data", Orange.data.Table, self.set_data), 
     26        self.inputs = [("Data", Orange.data.Table, self.set_data), 
    2727                       ("Preprocessor", PreprocessedLearner, self.set_preprocessor)] 
    2828         
  • orange/OrangeWidgets/Regression/OWMean.py

    r9315 r9546  
    1515        OWWidget.__init__(self, parent, signalManager, title, wantMainArea=False) 
    1616 
    17         self.inputs = [("Examples", ExampleTable, self.setData), 
     17        self.inputs = [("Data", ExampleTable, self.setData), 
    1818                       ("Preprocess", PreprocessedLearner, self.setPreprocessor)] 
    1919         
  • orange/OrangeWidgets/Regression/OWPLS.py

    r9249 r9546  
    2222        OWWidget.__init__(self, parent, signalManager, title, wantMainArea=False) 
    2323         
    24         self.inputs = [("Training data", Orange.data.Table, self.set_data), 
     24        self.inputs = [("Data", Orange.data.Table, self.set_data), 
    2525                       ("Preprocessor", PreprocessedLearner, self.set_preprocessor)] 
    2626         
  • orange/OrangeWidgets/Regression/OWPade.py

    r9273 r9546  
    2121    def __init__(self, parent = None, signalManager = None, name = "Pade"): 
    2222        OWWidget.__init__(self, parent, signalManager, name, wantMainArea = 0)  #initialize base class 
    23         self.inputs = [("Examples", ExampleTable, self.onDataInput)] 
    24         self.outputs = [("Examples", ExampleTable)] 
     23        self.inputs = [("Data", ExampleTable, self.onDataInput)] 
     24        self.outputs = [("Data", ExampleTable)] 
    2525 
    2626        self.attributes = [] 
     
    158158        data = self.data 
    159159        if not data or not self.contAttributes: 
    160             self.send("Examples", None) 
     160            self.send("Data", None) 
    161161            return 
    162162 
     
    178178                                                             self.enableThreshold and abs(self.threshold), 
    179179                                                             self.useMQCNotation, self.derivativeAsMeta, self.differencesAsMeta, False, self.originalAsMeta) 
    180         self.send("Examples", paded) 
     180        self.send("Data", paded) 
    181181 
    182182 
  • orange/OrangeWidgets/Regression/OWRandomForestRegression.py

    r9427 r9546  
    1515        OWRandomForest.__init__(self, parent, signalManager, title) 
    1616         
    17         self.inputs = [("Examples", ExampleTable, self.setData), 
     17        self.inputs = [("Data", ExampleTable, self.setData), 
    1818                       ("Preprocess", PreprocessedLearner, self.setPreprocessor)] 
    1919         
  • orange/OrangeWidgets/Regression/OWRegressionTree.py

    r9223 r9546  
    3838        self.preprocessor = None 
    3939 
    40         self.inputs=[("Example Table",ExampleTable,self.dataset), ("Preprocess", PreprocessedLearner, self.setPreprocessor)] 
     40        self.inputs=[("Data",ExampleTable,self.dataset), ("Preprocess", PreprocessedLearner, self.setPreprocessor)] 
    4141        self.outputs=[("Learner",orange.Learner),("Regressor",orange.Classifier),("Regression Tree",orange.TreeClassifier)] 
    4242 
  • orange/OrangeWidgets/Regression/OWRegressionTreeViewer2D.py

    r8042 r9546  
    127127 
    128128        self.inputs = [("Classification Tree", orange.TreeClassifier, self.ctree)] 
    129         self.outputs = [("Examples", ExampleTable)] 
     129        self.outputs = [("Data", ExampleTable)] 
    130130         
    131131        self.NodeColorMethod = 1 
     
    256256 
    257257    def ctree(self, tree=None): 
    258         self.send("Examples", None) 
     258        self.send("Data", None) 
    259259        OWTreeViewer2D.ctree(self, tree) 
    260260 
  • orange/OrangeWidgets/Unsupervised/OWAttributeDistance.py

    r8042 r9546  
    2626        OWWidget.__init__(self, parent, signalManager, name, wantMainArea = 0, resizingEnabled = 0) 
    2727 
    28         self.inputs = [("Examples", ExampleTable, self.dataset)] 
    29         self.outputs = [("Distance Matrix", orange.SymMatrix)] 
     28        self.inputs = [("Data", ExampleTable, self.dataset)] 
     29        self.outputs = [("Distances", orange.SymMatrix)] 
    3030 
    3131        self.data = None 
     
    130130        else: 
    131131            matrix = None 
    132         self.send("Distance Matrix", matrix) 
     132        self.send("Distances", matrix) 
    133133 
    134134 
  • orange/OrangeWidgets/Unsupervised/OWDistanceFile.py

    r9273 r9546  
    102102         
    103103        if inputItems:  
    104             self.inputs = [("Examples", ExampleTable, self.getExamples, Default)] 
    105              
    106         self.outputs = [("Distance Matrix", orange.SymMatrix)] 
     104            self.inputs = [("Data", ExampleTable, self.getExamples, Default)] 
     105             
     106        self.outputs = [("Distances", orange.SymMatrix)] 
    107107 
    108108        self.recentFiles=[] 
     
    233233         
    234234        self.matrix.matrixType = orange.SymMatrix.Symmetric 
    235         self.send("Distance Matrix", self.matrix) 
     235        self.send("Distances", self.matrix) 
    236236 
    237237    def getExamples(self, data): 
  • orange/OrangeWidgets/Unsupervised/OWDistanceFilter.py

    r8042 r9546  
    1919        OWWidget.__init__(self, parent, signalManager, name, wantMainArea = 0, resizingEnabled = 0) 
    2020         
    21         self.inputs = [("Distance Matrix", orange.SymMatrix, self.setSymMatrix, Default), ("Example Subset", ExampleTable, self.setExampleSubset)] 
    22         self.outputs = [("Distance Matrix", orange.SymMatrix)] 
     21        self.inputs = [("Distances", orange.SymMatrix, self.setSymMatrix, Default), ("Data Subset", ExampleTable, self.setExampleSubset)] 
     22        self.outputs = [("Distances", orange.SymMatrix)] 
    2323         
    2424        self.matrix = None 
     
    6464                self.subsetAttrCombo.addItem(self.icons[var.varType], unicode(var.name)) 
    6565         
    66         self.send("Distance Matrix", self.matrix) 
     66        self.send("Distances", self.matrix) 
    6767         
    6868    def filter(self): 
     
    8484            matrix.items = self.matrix.items.getitems(nodes) 
    8585                     
    86             self.send("Distance Matrix", matrix) 
     86            self.send("Distances", matrix) 
    8787 
    8888if __name__=="__main__": 
  • orange/OrangeWidgets/Unsupervised/OWDistanceMap.py

    r9273 r9546  
    7373        OWWidget.__init__(self, parent, signalManager, 'Distance Map', wantGraph=True) 
    7474 
    75         self.inputs = [("Distance Matrix", orange.SymMatrix, self.setMatrix)] 
    76         self.outputs = [("Examples", ExampleTable), ("Attribute List", orange.VarList)] 
     75        self.inputs = [("Distances", orange.SymMatrix, self.setMatrix)] 
     76        self.outputs = [("Data", ExampleTable), ("Features", orange.VarList)] 
    7777 
    7878        self.clicked = False 
     
    313313 
    314314        if len(self.selection.getSelection())==0: 
    315             self.send("Attribute List", None) 
    316             self.send("Examples", None) 
     315            self.send("Features", None) 
     316            self.send("Data", None) 
    317317        else: 
    318318            selection = self.selection.getSelection() 
     
    341341                for i in selectedIndices: 
    342342                    selected.append(items[i]) 
    343                 self.send("Attribute List", selected) 
     343                self.send("Features", selected) 
    344344 
    345345 
     
    347347                ex = [items[x] for x in selectedIndices] 
    348348                selected = orange.ExampleTable(items[0].domain, ex) 
    349                 self.send("Examples", selected) 
     349                self.send("Data", selected) 
    350350 
    351351    def getGammaCorrectedPalette(self): 
     
    829829 
    830830    def setMatrix(self, matrix): 
    831         self.send("Examples", None) 
    832         self.send("Attribute List", None) 
     831        self.send("Data", None) 
     832        self.send("Features", None) 
    833833        self._clustering_cache.clear() 
    834834 
  • orange/OrangeWidgets/Unsupervised/OWExampleDistance.py

    r9058 r9546  
    2323        OWWidget.__init__(self, parent, signalManager, 'ExampleDistance', wantMainArea = 0, resizingEnabled = 0) 
    2424 
    25         self.inputs = [("Examples", ExampleTable, self.dataset)] 
    26         self.outputs = [("Distance Matrix", orange.SymMatrix)] 
     25        self.inputs = [("Data", ExampleTable, self.dataset)] 
     26        self.outputs = [("Distances", orange.SymMatrix)] 
    2727 
    2828        self.Metrics = 0 
     
    8989            self.error(0, "Could not create distance matrix! %s" % str(ex)) 
    9090            self.matrix = None 
    91             self.send("Distance Matrix", None) 
     91            self.send("Distances", None) 
    9292            return 
    9393        self.matrix.setattr('items', data) 
     
    102102                count += 1 
    103103        pb.finish() 
    104         self.send("Distance Matrix", self.matrix) 
     104        self.send("Distances", self.matrix) 
    105105 
    106106    def setLabel(self): 
    107107        for d in self.data: 
    108108            d.name = str(d[str(self.Label)]) 
    109         self.send("Distance Matrix", self.matrix) 
     109        self.send("Distances", self.matrix) 
    110110 
    111111    def setLabelComboItems(self): 
     
    126126            self.computeMatrix() 
    127127        else: 
    128             self.send("Distance Matrix", None) 
     128            self.send("Distances", None) 
    129129 
    130130################################################################################################## 
  • orange/OrangeWidgets/Unsupervised/OWHierarchicalClustering.py

    r9132 r9546  
    3636        OWWidget.__init__(self, parent, signalManager, 'Hierarchical Clustering', wantGraph=True) 
    3737         
    38         self.inputs = [("Distance matrix", orange.SymMatrix, self.set_matrix)] 
    39         self.outputs = [("Selected Examples", ExampleTable), ("Unselected Examples", ExampleTable), ("Centroids", ExampleTable)] 
     38        self.inputs = [("Distances", orange.SymMatrix, self.set_matrix)] 
     39        self.outputs = [("Selected Data", ExampleTable), ("Other Data", ExampleTable), ("Centroids", ExampleTable)] 
    4040        self.linkage = [("Single linkage", orange.HierarchicalClustering.Single), 
    4141                        ("Average linkage", orange.HierarchicalClustering.Average), 
     
    253253            self.dendrogram.clear() 
    254254            self.labelCombo.clear() 
    255             self.send("Selected Examples", None) 
    256             self.send("Unselected Examples", None) 
     255            self.send("Selected Data", None) 
     256            self.send("Other Data", None) 
    257257            self.classificationBox.setDisabled(True) 
    258258            return 
     
    458458         
    459459        if not selected: 
    460             self.send("Selected Examples", None) 
    461             self.send("Unselected Examples", None) 
     460            self.send("Selected Data", None) 
     461            self.send("Other Data", None) 
    462462            self.send("Centroids", None) 
    463463            return 
     
    501501                self.unselectedExamples = orange.ExampleTable(unselected) if unselected else None 
    502502                 
    503             self.send("Selected Examples", self.selectedExamples) 
    504             self.send("Unselected Examples", self.unselectedExamples) 
     503            self.send("Selected Data", self.selectedExamples) 
     504            self.send("Other Data", self.unselectedExamples) 
    505505 
    506506            self.centroids = None 
  • orange/OrangeWidgets/Unsupervised/OWInteractionGraph.py

    r9273 r9546  
    4646        OWWidget.__init__(self, parent, signalManager, "Interaction graph") 
    4747 
    48         self.inputs = [("Examples", ExampleTable, self.setData)] 
    49         self.outputs = [("Examples", ExampleTable), ("Attribute Pair", list), ("Selected Attributes List", list)] 
     48        self.inputs = [("Data", ExampleTable, self.setData)] 
     49        self.outputs = [("Data", ExampleTable), ("Interacting Features", list), ("Selected Features", list)] 
    5050 
    5151 
     
    158158            for (attr1, attr2, rect) in self.lines: 
    159159                if rect.contains(pos): 
    160                     self.send("Attribute Pair", [attr1, attr2]) 
     160                    self.send("Interacting Features", [attr1, attr2]) 
    161161                    return 
    162162        elif ev.button() == Qt.LeftButton and name == "interactions": 
     
    165165                if 1 in [item.contains(pos) for item in rects]: 
    166166                    (rect1, rect2, rect3, nbrect, text1, text2) = rects 
    167                     self.send("Attribute Pair", [str(text1.toPlainText()), str(text2.toPlainText())]) 
     167                    self.send("Interacting Features", [str(text1.toPlainText()), str(text2.toPlainText())]) 
    168168 
    169169        elif ev.button() == Qt.RightButton and name == "interactions" and self.mergeAttributes: 
     
    209209        if self.data == None: return 
    210210        l = [str(self.shownAttribsLB.item(i).text()) for i in range(self.shownAttribsLB.count())] 
    211         self.send("Selected Attributes List", l) 
     211        self.send("Selected Features", l) 
    212212 
    213213 
     
    348348        #self.canvasR.update() 
    349349 
    350         self.send("Examples", data) 
     350        self.send("Data", data) 
    351351 
    352352 
  • orange/OrangeWidgets/Unsupervised/OWKMeans.py

    r9238 r9546  
    5151        OWWidget.__init__(self, parent, signalManager, 'k-Means Clustering') 
    5252 
    53         self.inputs = [("Examples", ExampleTable, self.setData)] 
    54         self.outputs = [("Examples", ExampleTable), ("Centroids", ExampleTable)] 
     53        self.inputs = [("Data", ExampleTable, self.setData)] 
     54        self.outputs = [("Data", ExampleTable), ("Centroids", ExampleTable)] 
    5555 
    5656        #set default settings 
     
    364364            km = self.bestRun[1] if self.optimized else self.km  
    365365        if not self.data or not km: 
    366             self.send("Examples", None) 
     366            self.send("Data", None) 
    367367            self.send("Centroids", None) 
    368368            return 
     
    396396                c[origDomain.classVar] = "?" 
    397397 
    398         self.send("Examples", new) 
     398        self.send("Data", new) 
    399399        self.send("Centroids", centroids) 
    400400         
  • orange/OrangeWidgets/Unsupervised/OWMDS.py

    r9066 r9546  
    3737    def __init__(self, parent=None, signalManager=None, name="Multi Dimensional Scaling"): 
    3838        OWWidget.__init__(self, parent, signalManager, name, wantGraph=True) 
    39         self.inputs=[("Distances", orange.SymMatrix, self.cmatrix), ("Example Subset", ExampleTable, self.cselected)] 
    40         self.outputs=[("Example Table", ExampleTable), ("Structured Data Files", DataFiles)] 
     39        self.inputs=[("Distances", orange.SymMatrix, self.cmatrix), ("Data Subset", ExampleTable, self.cselected)] 
     40        self.outputs=[("Data", ExampleTable), ("Structured Data Files", DataFiles)] 
    4141 
    4242        self.StressFunc=3 
     
    484484    def sendExampleTable(self, selectedInd): 
    485485        if self.selectionOptions==0: 
    486             self.send("Example Table", orange.ExampleTable(self.data.getitems(selectedInd))) 
     486            self.send("Data", orange.ExampleTable(self.data.getitems(selectedInd))) 
    487487        else: 
    488488            xAttr=orange.FloatVariable("X") 
     
    500500                selection[i][xAttr]=self.mds.points[selectedInd[i]][0] 
    501501                selection[i][yAttr]=self.mds.points[selectedInd[i]][1] 
    502             self.send("Example Table", selection) 
     502            self.send("Data", selection) 
    503503 
    504504    def sendList(self, selectedInd): 
     
    523523                        selection[i][xAttr]=self.mds.points[selectedInd[i]][0] 
    524524                        selection[i][yAttr]=self.mds.points[selectedInd[i]][1] 
    525             self.send("Example Table", selection) 
     525            self.send("Data", selection) 
    526526            return 
    527527                
  • orange/OrangeWidgets/Unsupervised/OWModelEmbedder.py

    r9258 r9546  
    2828        OWWidget.__init__(self, parent, signalManager, "Model Embedder") 
    2929         
    30         self.inputs = [("Examples", orange.ExampleTable, self.setData), 
     30        self.inputs = [("Data", orange.ExampleTable, self.setData), 
    3131                       ("Model", orange.Example, self.setModel)] 
    3232         
    33         self.outputs = [("Selected Examples", ExampleTable), ("Unselected Examples", ExampleTable)] 
     33        self.outputs = [("Selected Data", ExampleTable), ("Other Data", ExampleTable)] 
    3434         
    3535        self.ow = None 
  • orange/OrangeWidgets/Unsupervised/OWModelFile.py

    r9258 r9546  
    2525         
    2626         
    27         self.outputs = [("Distance Matrix", orange.SymMatrix)] 
     27        self.outputs = [("Distances", orange.SymMatrix)] 
    2828         
    2929        self.dataFileBox.setTitle(" Model File ") 
     
    8080        else: 
    8181            self.matrix.originalData = self.originalData 
    82             self.send("Distance Matrix", self.matrix) 
     82            self.send("Distances", self.matrix) 
    8383         
    8484    def loadFile(self): 
  • orange/OrangeWidgets/Unsupervised/OWModelMapQt.py

    r9258 r9546  
    273273                               NetworkCanvas=OWModelMapCanvas) 
    274274         
    275         self.inputs = [("Distance Matrix", orange.SymMatrix, self.setMatrix, Default), 
     275        self.inputs = [("Distances", orange.SymMatrix, self.setMatrix, Default), 
    276276                       ("Model Subset", orange.ExampleTable, self.setSubsetModels)] 
    277277        self.outputs = [("Model", orange.Example), 
  • orange/OrangeWidgets/Unsupervised/OWNetExplorer.py

    r8155 r9546  
    4343        self.inputs = [("Network", orngNetwork.Network, self.setGraph, Default),  
    4444                       ("Items", orange.ExampleTable, self.setItems), 
    45                        ("Items to Mark", orange.ExampleTable, self.markItems),  
    46                        ("Items Subset", orange.ExampleTable, self.setExampleSubset),  
     45                       ("Marked Itenms", orange.ExampleTable, self.markItems),  
     46                       ("Item Subset", orange.ExampleTable, self.setExampleSubset),  
    4747                       ("Vertex Distance", orange.SymMatrix, self.setVertexDistance)] 
    4848         
    4949        self.outputs = [("Selected Network", orngNetwork.Network), 
    5050                        ("Selected Distance Matrix", orange.SymMatrix), 
    51                         ("Selected Examples", ExampleTable),  
    52                         ("Unselected Examples", ExampleTable),  
    53                         ("Marked Examples", ExampleTable), 
    54                         ("Attribute Selection List", AttributeList)] 
     51                        ("Selected Data", ExampleTable),  
     52                        ("Other Data", ExampleTable),  
     53                        ("Marked Data", ExampleTable), 
     54                        ("Features", AttributeList)] 
    5555         
    5656        self.markerAttributes = [] 
     
    382382        else: 
    383383            attributes = None 
    384         self.send("Attribute Selection List", attributes) 
     384        self.send("Features", attributes) 
    385385         
    386386    def edit(self): 
     
    570570            self.sendMarkedNodes(self.networkCanvas.getMarkedVertices()) 
    571571        else: 
    572             self.send("Marked Examples", None) 
     572            self.send("Marked Data", None) 
    573573            self.networkCanvas.sendMarkedNodes = None 
    574574         
    575575    def sendMarkedNodes(self, markedNodes):         
    576576        if len(markedNodes) == 0: 
    577             self.send("Marked Examples", None) 
     577            self.send("Marked Data", None) 
    578578            return 
    579579         
    580580        if self.optimization != None and self.optimization.graph != None and self.optimization.graph.items != None: 
    581581            items = self.optimization.graph.items.getitems(markedNodes) 
    582             self.send("Marked Examples", items) 
    583             return 
    584          
    585         self.send("Marked Examples", None) 
     582            self.send("Marked Data", items) 
     583            return 
     584         
     585        self.send("Marked Data", None) 
    586586 
    587587    def _collapse(self): 
     
    11221122        if graph != None: 
    11231123            if graph.items != None: 
    1124                 self.send("Selected Examples", graph.items) 
     1124                self.send("Selected Data", graph.items) 
    11251125            else: 
    1126                 self.send("Selected Examples", self.networkCanvas.getSelectedExamples()) 
     1126                self.send("Selected Data", self.networkCanvas.getSelectedExamples()) 
    11271127             
    11281128            #print "sendData:", self.visualize.graph.items.domain 
    1129             self.send("Unselected Examples", self.networkCanvas.getUnselectedExamples())     
     1129            self.send("Other Data", self.networkCanvas.getUnselectedExamples())     
    11301130            self.send("Selected Network", graph) 
    11311131        else: 
    11321132            items = self.networkCanvas.getSelectedExamples() 
    1133             self.send("Selected Examples", items) 
     1133            self.send("Selected Data", items) 
    11341134                 
    11351135            items = self.networkCanvas.getUnselectedExamples() 
    1136             self.send("Unselected Examples", items) 
     1136            self.send("Other Data", items) 
    11371137         
    11381138        matrix = None 
  • orange/OrangeWidgets/Unsupervised/OWNetworkFromDistances.py

    r8155 r9546  
    2424        OWNetworkHist.__init__(self) 
    2525         
    26         self.inputs = [("Distance Matrix", orange.SymMatrix, self.setMatrix)] 
    27         self.outputs = [("Network", orngNetwork.Network), ("Examples", ExampleTable), ("Distance Matrix", orange.SymMatrix)] 
     26        self.inputs = [("Distances", orange.SymMatrix, self.setMatrix)] 
     27        self.outputs = [("Network", orngNetwork.Network), ("Data", ExampleTable), ("Distances", orange.SymMatrix)] 
    2828 
    2929        self.addHistogramControls() 
     
    7272         
    7373        if self.matrix: 
    74             self.send("Distance Matrix", self.matrix) 
     74            self.send("Distances", self.matrix) 
    7575             
    7676        if self.graph == None: 
    77             self.send("Examples", None) 
     77            self.send("Data", None) 
    7878        else: 
    79             self.send("Examples", self.graph.items) 
     79            self.send("Data", self.graph.items) 
    8080                                                                      
    8181if __name__ == "__main__":     
  • orange/OrangeWidgets/Unsupervised/OWNxExplorer.py

    r9518 r9546  
    4949                           ("Network", Orange.network.Graph, self.set_graph, Default), 
    5050                           ("Items", Orange.data.Table, self.set_items), 
    51                            ("Items Subset", Orange.data.Table, self.mark_items),  
    52                            ("Items Distance Matrix", Orange.core.SymMatrix, self.set_items_distance_matrix)] 
     51                           ("Item Subset", Orange.data.Table, self.mark_items),  
     52                           ("Distances", Orange.core.SymMatrix, self.set_items_distance_matrix)] 
    5353             
    5454            self.outputs = [("Selected Network", Orange.network.Graph), 
    55                             ("Selected Items Distance Matrix", Orange.core.SymMatrix), 
     55                            ("Distance Matrix", Orange.core.SymMatrix), 
    5656                            ("Selected Items", Orange.data.Table),  
    57                             ("Unselected Items", Orange.data.Table),  
     57                            ("Other Items", Orange.data.Table),  
    5858                            ("Marked Items", Orange.data.Table)] 
    5959                            #("Attribute Selection List", AttributeList)] 
     
    553553                        nodes = self.networkCanvas.not_selected_nodes() 
    554554                        if len(nodes) > 0 and self.graph_base.items() is not None: 
    555                             self.send("Unselected Items", self.graph_base.items().getitems(nodes)) 
     555                            self.send("Other Items", self.graph_base.items().getitems(nodes)) 
    556556                        else: 
    557                             self.send("Unselected Items", None) 
     557                            self.send("Other Items", None) 
    558558                         
    559559                    self.send("Selected Network", graph) 
    560560                else: 
    561561                    self.send("Selected Items", None) 
    562                     self.send("Unselected Items", None) 
     562                    self.send("Other Items", None) 
    563563                    self.send("Selected Network", None) 
    564564                     
     
    567567                # signal connected 
    568568                matrix = None if self.items_matrix is None else self.items_matrix.getitems(selected_nodes) 
    569                 self.send("Selected Items Distance Matrix", matrix) 
     569                self.send("Distance Matrix", matrix) 
    570570         
    571571        def send_marked_nodes(self): 
     
    15031503            else: 
    15041504                attributes = None 
    1505             self.send("Attribute Selection List", attributes) 
     1505            self.send("Features", attributes) 
    15061506         
    15071507             
     
    15421542                           ("Nx View", Orange.network.NxView, self.set_network_view), 
    15431543                           ("Items", Orange.data.Table, self.setItems), 
    1544                            ("Items to Mark", Orange.data.Table, self.markItems),  
    1545                            ("Items Subset", Orange.data.Table, self.setExampleSubset),  
    1546                            ("Items Distance Matrix", Orange.core.SymMatrix, self.set_items_distance_matrix)] 
     1544                           ("Marked Itenms", Orange.data.Table, self.markItems),  
     1545                           ("Item Subset", Orange.data.Table, self.setExampleSubset),  
     1546                           ("Distances", Orange.core.SymMatrix, self.set_items_distance_matrix)] 
    15471547             
    15481548            self.outputs = [("Selected Network", Orange.network.Graph), 
    1549                             ("Selected Items Distance Matrix", Orange.core.SymMatrix), 
     1549                            ("Distance Matrix", Orange.core.SymMatrix), 
    15501550                            ("Selected Items", Orange.data.Table),  
    1551                             ("Unselected Items", Orange.data.Table),  
     1551                            ("Other Items", Orange.data.Table),  
    15521552                            ("Marked Items", Orange.data.Table), 
    1553                             ("Attribute Selection List", AttributeList)] 
     1553                            ("Features", AttributeList)] 
    15541554             
    15551555            self.markerAttributes = [] 
     
    18971897            else: 
    18981898                attributes = None 
    1899             self.send("Attribute Selection List", attributes) 
     1899            self.send("Features", attributes) 
    19001900             
    19011901        def edit(self): 
     
    26192619                    nodes = self.networkCanvas.getUnselectedExamples() 
    26202620                    if len(nodes) > 0 and self.graph_base.items() is not None: 
    2621                         self.send("Unselected Items", self.graph_base.items().getitems(nodes)) 
     2621                        self.send("Other Items", self.graph_base.items().getitems(nodes)) 
    26222622                    else: 
    2623                         self.send("Unselected Items", None) 
     2623                        self.send("Other Items", None) 
    26242624                         
    26252625                    self.send("Selected Network", graph) 
     
    26332633                    nodes = self.networkCanvas.getUnselectedExamples() 
    26342634                    if len(nodes) > 0 and self.graph_base.items() is not None: 
    2635                         self.send("Unselected Items", self.graph_base.items().getitems(nodes)) 
     2635                        self.send("Other Items", self.graph_base.items().getitems(nodes)) 
    26362636                    else: 
    2637                         self.send("Unselected Items", None) 
     2637                        self.send("Other Items", None) 
    26382638                 
    26392639            if len(self.signalManager.getLinks(self, None, \ 
     
    26442644                    matrix = self.items_matrix.getitems(vertices) 
    26452645         
    2646                 self.send("Selected Items Distance Matrix", matrix) 
     2646                self.send("Distance Matrix", matrix) 
    26472647                     
    26482648        def setCombos(self): 
  • orange/OrangeWidgets/Unsupervised/OWNxFromDistances.py

    r8156 r9546  
    3030        OWNxHist.__init__(self) 
    3131         
    32         self.inputs = [("Distance Matrix", Orange.core.SymMatrix, self.setMatrix)] 
     32        self.inputs = [("Distances", Orange.core.SymMatrix, self.setMatrix)] 
    3333        self.outputs = [("Network", Orange.network.Graph),  
    34                         ("Examples", Orange.data.Table),  
    35                         ("Distance Matrix", Orange.core.SymMatrix)] 
     34                        ("Data", Orange.data.Table),  
     35                        ("Distances", Orange.core.SymMatrix)] 
    3636 
    3737        self.addHistogramControls() 
     
    8686         
    8787        if self.matrix: 
    88             self.send("Distance Matrix", self.matrix) 
     88            self.send("Distances", self.matrix) 
    8989             
    9090        if self.graph == None: 
    91             self.send("Examples", None) 
     91            self.send("Data", None) 
    9292        else: 
    93             self.send("Examples", self.graph.items()) 
     93            self.send("Data", self.graph.items()) 
    9494                                                                      
    9595if __name__ == "__main__":     
  • orange/OrangeWidgets/Unsupervised/OWSOM.py

    r8042 r9546  
    2525        OWWidget.__init__(self, parent, signalManager, name, wantMainArea=False) 
    2626 
    27         self.inputs = [("Examples", ExampleTable, self.setData)] 
    28         self.outputs = [("Classifier", orange.Classifier), ("Learner", orange.Learner), ("SOMMap", orngSOM.SOMMap)] 
     27        self.inputs = [("Data", ExampleTable, self.setData)] 
     28        self.outputs = [("Classifier", orange.Classifier), ("Learner", orange.Learner), ("SOM", orngSOM.SOMMap)] 
    2929 
    3030        self.LearnerName="SOM Map" 
     
    111111        else: 
    112112            self.send("Classifier", None) 
    113             self.send("SOMMap", None) 
     113            self.send("SOM", None) 
    114114            self.send("Learner", None) 
    115115         
     
    134134            if self.data.domain.classVar: 
    135135                self.send("Classifier", self.classifier) 
    136             self.send("SOMMap", self.classifier) 
     136            self.send("SOM", self.classifier) 
    137137         
    138138 
  • orange/OrangeWidgets/Unsupervised/OWSOMVisualizer.py

    r9273 r9546  
    10041004    def __init__(self, parent=None, signalManager=None, name="SOM visualizer"): 
    10051005        OWWidget.__init__(self, parent, signalManager, name, wantGraph=True) 
    1006         self.inputs = [("SOMMap", orngSOM.SOMMap, self.setSomMap), ("Examples", ExampleTable, self.data)] 
    1007         self.outputs = [("Examples", ExampleTable)] 
     1006        self.inputs = [("SOM", orngSOM.SOMMap, self.setSomMap), ("Data", ExampleTable, self.data)] 
     1007        self.outputs = [("Data", ExampleTable)] 
    10081008         
    10091009        self.drawMode = 2 
     
    12401240        self.scene.setSom(None) 
    12411241        self.update() 
    1242         self.send("Examples", None) 
     1242        self.send("Data", None) 
    12431243         
    12441244    def invertSelection(self): 
     
    12711271                ex.extend(n.node.mappedExamples) 
    12721272        if len(ex): 
    1273             self.send("Examples",ex) 
    1274         else: 
    1275             self.send("Examples",None) 
     1273            self.send("Data",ex) 
     1274        else: 
     1275            self.send("Data",None) 
    12761276             
    12771277        self.selectionChanged = False 
  • orange/OrangeWidgets/Unsupervised/OWSaveDistanceFile.py

    r8042 r9546  
    1919        self.callbackDeposit = [] # deposit for OWGUI callback functions 
    2020        OWWidget.__init__(self, parent, signalManager, name, wantMainArea = 0, resizingEnabled = 0) 
    21         self.inputs = [("Distance Matrix", orange.SymMatrix, self.setData)] 
     21        self.inputs = [("Distances", orange.SymMatrix, self.setData)] 
    2222 
    2323        self.recentFiles=[] 
  • orange/OrangeWidgets/Visualize Qt/OWDiscretizeQt.py

    r8735 r9546  
    404404        self.loadSettings() 
    405405 
    406         self.inputs=[("Examples", ExampleTable, self.setData)] 
    407         self.outputs=[("Examples", ExampleTable)] 
     406        self.inputs=[("Data", ExampleTable, self.setData)] 
     407        self.outputs=[("Data", ExampleTable)] 
    408408        self.measures=[("Information gain", orange.MeasureAttribute_info()), 
    409409                       #("Gain ratio", orange.MeasureAttribute_gainRatio), 
     
    10411041            newdata = None 
    10421042 
    1043         self.send("Examples", newdata) 
     1043        self.send("Data", newdata) 
    10441044        dataChanged = False 
    10451045 
  • orange/OrangeWidgets/Visualize Qt/OWDistributionsQt.py

    r9065 r9546  
    461461        # inputs 
    462462        # data and graph temp variables 
    463         self.inputs = [("Examples", ExampleTable, self.setData, Default)] 
     463        self.inputs = [("Data", ExampleTable, self.setData, Default)] 
    464464 
    465465        self.data = None 
  • orange/OrangeWidgets/Visualize Qt/OWLinProj3D.py

    r8969 r9546  
    1414        OWLinProjQt.__init__(self, parent, signalManager, "Linear Projection 3D", graphClass=OWLinProj3DPlot) 
    1515 
    16         self.inputs = [("Examples", ExampleTable, self.setData, Default), 
    17                        ("Example Subset", ExampleTable, self.setSubsetData), 
    18                        ("Attribute Selection List", AttributeList, self.setShownAttributes), 
     16        self.inputs = [("Data", ExampleTable, self.setData, Default), 
     17                       ("Data Subset", ExampleTable, self.setSubsetData), 
     18                       ("Features", AttributeList, self.setShownAttributes), 
    1919                       ("Evaluation Results", orngTest.ExperimentResults, self.setTestResults), 
    2020                       ("VizRank Learner", orange.Learner, self.setVizRankLearner)] 
    21         self.outputs = [("Selected Examples", ExampleTable), 
    22                         ("Unselected Examples", ExampleTable), 
    23                         ("Attribute Selection List", AttributeList)] 
     21        self.outputs = [("Selected Data", ExampleTable), 
     22                        ("Other Data", ExampleTable), 
     23                        ("Features", AttributeList)] 
    2424        self.resize(1000, 600) 
    2525 
  • orange/OrangeWidgets/Visualize Qt/OWLinProjQt.py

    r9088 r9546  
    3636        OWVisWidget.__init__(self, parent, signalManager, name, TRUE) 
    3737 
    38         self.inputs = [("Examples", ExampleTable, self.setData, Default), 
    39                        ("Example Subset", ExampleTable, self.setSubsetData), 
    40                        ("Attribute Selection List", AttributeList, self.setShownAttributes), 
     38        self.inputs = [("Data", ExampleTable, self.setData, Default), 
     39                       ("Data Subset", ExampleTable, self.setSubsetData), 
     40                       ("Features", AttributeList, self.setShownAttributes), 
    4141                       ("Evaluation Results", orngTest.ExperimentResults, self.setTestResults), 
    4242                       ("VizRank Learner", orange.Learner, self.setVizRankLearner), 
    4343                       ("Distances btw. Instances", orange.SymMatrix, self.setDistances)] 
    44         self.outputs = [("Selected Examples", ExampleTable), ("Unselected Examples", ExampleTable), ("Attribute Selection List", AttributeList), ("FreeViz Learner", orange.Learner)] 
     44        self.outputs = [("Selected Data", ExampleTable), ("Other Data", ExampleTable), ("Features", AttributeList), ("FreeViz Learner", orange.Learner)] 
    4545 
    4646        name_lower = name.lower() 
     
    295295        (selected, unselected) = self.graph.getSelectionsAsExampleTables(self.getShownAttributeList(), addProjectedPositions = self.addProjectedPositions) 
    296296 
    297         self.send("Selected Examples", selected) 
    298         self.send("Unselected Examples", unselected) 
     297        self.send("Selected Data", selected) 
     298        self.send("Other Data", unselected) 
    299299 
    300300    def sendShownAttributes(self): 
    301         self.send("Attribute Selection List", [a[0] for a in self.shownAttributes]) 
     301        self.send("Features", [a[0] for a in self.shownAttributes]) 
    302302 
    303303    # show selected interesting projection 
  • orange/OrangeWidgets/Visualize Qt/OWMDSQt.py

    r9066 r9546  
    3838    def __init__(self, parent=None, signalManager=None, name="Multi Dimensional Scaling"): 
    3939        OWWidget.__init__(self, parent, signalManager, name, wantGraph=True) 
    40         self.inputs=[("Distances", orange.SymMatrix, self.cmatrix), ("Example Subset", ExampleTable, self.cselected)] 
    41         self.outputs=[("Example Table", ExampleTable)] 
     40        self.inputs=[("Distances", orange.SymMatrix, self.cmatrix), ("Data Subset", ExampleTable, self.cselected)] 
     41        self.outputs=[("Data", ExampleTable)] 
    4242 
    4343        self.StressFunc=3 
     
    481481    def sendExampleTable(self, selectedInd): 
    482482        if self.selectionOptions==0: 
    483             self.send("Example Table", orange.ExampleTable(self.data.getitems(selectedInd))) 
     483            self.send("Data", orange.ExampleTable(self.data.getitems(selectedInd))) 
    484484        else: 
    485485            xAttr=orange.FloatVariable("X") 
     
    497497                selection[i][xAttr]=self.mds.points[selectedInd[i]][0] 
    498498                selection[i][yAttr]=self.mds.points[selectedInd[i]][1] 
    499             self.send("Example Table", selection) 
     499            self.send("Data", selection) 
    500500 
    501501    def sendList(self, selectedInd): 
     
    520520                        selection[i][xAttr]=self.mds.points[selectedInd[i]][0] 
    521521                        selection[i][yAttr]=self.mds.points[selectedInd[i]][1] 
    522             self.send("Example Table", selection) 
     522            self.send("Data", selection) 
    523523            return 
    524524                
  • orange/OrangeWidgets/Visualize Qt/OWNxExplorer3D.py

    r9064 r9546  
    2020                       ("Network", Orange.network.Graph, self.set_graph, Default), 
    2121                       ("Items", Orange.data.Table, self.setItems), 
    22                        ("Items to Mark", Orange.data.Table, self.markItems),  
    23                        ("Items Subset", Orange.data.Table, self.setExampleSubset),  
    24                        ("Items Distance Matrix", Orange.core.SymMatrix, self.set_items_distance_matrix)] 
     22                       ("Marked Itenms", Orange.data.Table, self.markItems),  
     23                       ("Item Subset", Orange.data.Table, self.setExampleSubset),  
     24                       ("Distances", Orange.core.SymMatrix, self.set_items_distance_matrix)] 
    2525 
    2626        self.outputs = [("Selected Network", Orange.network.Graph), 
    27                         ("Selected Items Distance Matrix", Orange.core.SymMatrix), 
     27                        ("Distance Matrix", Orange.core.SymMatrix), 
    2828                        ("Selected Items", Orange.data.Table),  
    29                         ("Unselected Items", Orange.data.Table),  
     29                        ("Other Items", Orange.data.Table),  
    3030                        ("Marked Items", Orange.data.Table), 
    31                         ("Attribute Selection List", AttributeList)] 
     31                        ("Features", AttributeList)] 
    3232 
    3333 
  • orange/OrangeWidgets/Visualize Qt/OWNxExplorerQt.py

    r9262 r9546  
    4949                       ("Network", Orange.network.Graph, self.set_graph, Default), 
    5050                       ("Items", Orange.data.Table, self.setItems), 
    51                        ("Items to Mark", Orange.data.Table, self.markItems),  
    52                        ("Items Subset", Orange.data.Table, self.setExampleSubset),  
    53                        ("Items Distance Matrix", Orange.core.SymMatrix, self.set_items_distance_matrix)] 
     51                       ("Marked Itenms", Orange.data.Table, self.markItems),  
     52                       ("Item Subset", Orange.data.Table, self.setExampleSubset),  
     53                       ("Distances", Orange.core.SymMatrix, self.set_items_distance_matrix)] 
    5454         
    5555        self.outputs = [("Selected Network", Orange.network.Graph), 
    56                         ("Selected Items Distance Matrix", Orange.core.SymMatrix), 
     56                        ("Distance Matrix", Orange.core.SymMatrix), 
    5757                        ("Selected Items", Orange.data.Table),  
    58                         ("Unselected Items", Orange.data.Table),  
     58                        ("Other Items", Orange.data.Table),  
    5959                        ("Marked Items", Orange.data.Table), 
    60                         ("Attribute Selection List", AttributeList)] 
     60                        ("Features", AttributeList)] 
    6161         
    6262        self.networkCanvas = NetworkCanvas(self, self.mainArea, "Net Explorer") 
     
    376376        else: 
    377377            attributes = None 
    378         self.send("Attribute Selection List", attributes) 
     378        self.send("Features", attributes) 
    379379         
    380380    def edit(self): 
     
    737737            nodes = self.networkCanvas.not_selected_nodes() 
    738738            if len(nodes) > 0 and self.graph_base.items() is not None: 
    739                 self.send("Unselected Items", self.graph_base.items().getitems(nodes)) 
     739                self.send("Other Items", self.graph_base.items().getitems(nodes)) 
    740740            else: 
    741                 self.send("Unselected Items", None) 
     741                self.send("Other Items", None) 
    742742                 
    743743            self.send("Selected Network", graph) 
    744744        else: 
    745745            self.send("Selected Items", None) 
    746             self.send("Unselected Items", None) 
     746            self.send("Other Items", None) 
    747747            self.send("Selected Network", None) 
    748748             
    749749        matrix = None if self.items_matrix is None else self.items_matrix.getitems(selected_nodes) 
    750         self.send("Selected Items Distance Matrix", matrix) 
     750        self.send("Distance Matrix", matrix) 
    751751                 
    752752    def setCombos(self): 
  • orange/OrangeWidgets/Visualize Qt/OWParallelCoordinatesQt.py

    r8735 r9546  
    3535        self.showAllAttributes = 0 
    3636 
    37         self.inputs = [("Examples", ExampleTable, self.setData, Default), ("Example Subset", ExampleTable, self.setSubsetData), ("Attribute Selection List", AttributeList, self.setShownAttributes)] 
    38         self.outputs = [("Selected Examples", ExampleTable), ("Unselected Examples", ExampleTable), ("Attribute Selection List", AttributeList)] 
     37        self.inputs = [("Data", ExampleTable, self.setData, Default), ("Data Subset", ExampleTable, self.setSubsetData), ("Features", AttributeList, self.setShownAttributes)] 
     38        self.outputs = [("Selected Data", ExampleTable), ("Other Data", ExampleTable), ("Features", AttributeList)] 
    3939 
    4040        #set default settings 
     
    227227        if attrList == None: 
    228228            attrList = self.getShownAttributeList() 
    229         self.send("Attribute Selection List", attrList) 
     229        self.send("Features", attrList) 
    230230 
    231231    def selectionChanged(self): 
     
    237237    def sendSelections(self): 
    238238        (selected, unselected) = self.graph.getSelectionsAsExampleTables() 
    239         self.send("Selected Examples", selected) 
    240         self.send("Unselected Examples", unselected) 
     239        self.send("Selected Data", selected) 
     240        self.send("Other Data", unselected) 
    241241 
    242242 
  • orange/OrangeWidgets/Visualize Qt/OWPolyvizQt.py

    r8173 r9546  
    2626        OWLinProjQt.__init__(self, parent, signalManager, "Polyviz (qt)", graphClass = OWPolyvizGraphQt) 
    2727 
    28         self.inputs = [("Examples", ExampleTable, self.setData, Default), ("Example Subset", ExampleTable, self.setSubsetData), ("Attribute Selection List", AttributeList, self.setShownAttributes), ("Evaluation Results", orngTest.ExperimentResults, self.setTestResults), ("VizRank Learner", orange.Learner, self.setVizRankLearner)] 
    29         self.outputs = [("Selected Examples", ExampleTable), ("Unselected Examples", ExampleTable), ("Attribute Selection List", AttributeList)] 
     28        self.inputs = [("Data", ExampleTable, self.setData, Default), ("Data Subset", ExampleTable, self.setSubsetData), ("Features", AttributeList, self.setShownAttributes), ("Evaluation Results", orngTest.ExperimentResults, self.setTestResults), ("VizRank Learner", orange.Learner, self.setVizRankLearner)] 
     29        self.outputs = [("Selected Data", ExampleTable), ("Other Data", ExampleTable), ("Features", AttributeList)] 
    3030 
    3131        # SETTINGS TAB 
  • orange/OrangeWidgets/Visualize Qt/OWRadvizQt.py

    r8173 r9546  
    2424        OWLinProjQt.__init__(self, parent, signalManager, "Radviz (Qt)") 
    2525 
    26         self.inputs = [("Examples", ExampleTable, self.setData, Default), ("Example Subset", ExampleTable, self.setSubsetData), ("Attribute Selection List", AttributeList, self.setShownAttributes), ("Evaluation Results", orngTest.ExperimentResults, self.setTestResults), ("VizRank Learner", orange.Learner, self.setVizRankLearner)] 
    27         self.outputs = [("Selected Examples", ExampleTable), ("Unselected Examples", ExampleTable), ("Attribute Selection List", AttributeList)] 
     26        self.inputs = [("Data", ExampleTable, self.setData, Default), ("Data Subset", ExampleTable, self.setSubsetData), ("Features", AttributeList, self.setShownAttributes), ("Evaluation Results", orngTest.ExperimentResults, self.setTestResults), ("VizRank Learner", orange.Learner, self.setVizRankLearner)] 
     27        self.outputs = [("Selected Data", ExampleTable), ("Other Data", ExampleTable), ("Features", AttributeList)] 
    2828 
    2929 
  • orange/OrangeWidgets/Visualize Qt/OWScatterPlot3D.py

    r9088 r9546  
    523523        OWWidget.__init__(self, parent, signalManager, name, True) 
    524524 
    525         self.inputs = [('Examples', ExampleTable, self.set_data, Default), ('Subset Examples', ExampleTable, self.set_subset_data)] 
    526         self.outputs = [('Selected Examples', ExampleTable), ('Unselected Examples', ExampleTable)] 
     525        self.inputs = [('Data', ExampleTable, self.set_data, Default), ('Subset Examples', ExampleTable, self.set_subset_data)] 
     526        self.outputs = [('Selected Data', ExampleTable), ('Other Data', ExampleTable)] 
    527527 
    528528        self.x_attr = '' 
     
    821821        selected = self.data.selectref(list(selected)) 
    822822        unselected = self.data.selectref(list(unselected)) 
    823         self.send('Selected Examples', selected) 
    824         self.send('Unselected Examples', unselected) 
     823        self.send('Selected Data', selected) 
     824        self.send('Other Data', unselected) 
    825825 
    826826    def on_axis_change(self): 
  • orange/OrangeWidgets/Visualize Qt/OWScatterPlotQt.py

    r8735 r9546  
    3636        OWWidget.__init__(self, parent, signalManager, "Scatterplot (Qt)", TRUE) 
    3737 
    38         self.inputs =  [("Examples", ExampleTable, self.setData, Default), ("Example Subset", ExampleTable, self.setSubsetData), ("Attribute selection", AttributeList, self.setShownAttributes), ("Evaluation Results", orngTest.ExperimentResults, self.setTestResults), ("VizRank Learner", orange.Learner, self.setVizRankLearner)] 
    39         self.outputs = [("Selected Examples", ExampleTable), ("Unselected Examples", ExampleTable)] 
     38        self.inputs =  [("Data", ExampleTable, self.setData, Default), ("Data Subset", ExampleTable, self.setSubsetData), ("Features", AttributeList, self.setShownAttributes), ("Evaluation Results", orngTest.ExperimentResults, self.setTestResults), ("VizRank Learner", orange.Learner, self.setVizRankLearner)] 
     39        self.outputs = [("Selected Data", ExampleTable), ("Other Data", ExampleTable)] 
    4040 
    4141        self.graph = OWScatterPlotGraphQt(self, self.mainArea, "ScatterPlotQt") 
     
    258258    def sendSelections(self): 
    259259        (selected, unselected) = self.graph.getSelectionsAsExampleTables([self.attrX, self.attrY]) 
    260         self.send("Selected Examples",selected) 
    261         self.send("Unselected Examples",unselected) 
     260        self.send("Selected Data",selected) 
     261        self.send("Other Data",unselected) 
    262262 
    263263 
  • orange/OrangeWidgets/Visualize Qt/OWSphereviz3D.py

    r9045 r9546  
    247247        OWLinProjQt.__init__(self, parent, signalManager, "Sphereviz 3D", graphClass=OWSphereviz3DPlot) 
    248248 
    249         self.inputs = [("Examples", ExampleTable, self.setData, Default), 
    250                        ("Example Subset", ExampleTable, self.setSubsetData), 
    251                        ("Attribute Selection List", AttributeList, self.setShownAttributes), 
     249        self.inputs = [("Data", ExampleTable, self.setData, Default), 
     250                       ("Data Subset", ExampleTable, self.setSubsetData), 
     251                       ("Features", AttributeList, self.setShownAttributes), 
    252252                       ("Evaluation Results", orngTest.ExperimentResults, self.setTestResults), 
    253253                       ("VizRank Learner", orange.Learner, self.setVizRankLearner)] 
    254         self.outputs = [("Selected Examples", ExampleTable), 
    255                         ("Unselected Examples", ExampleTable), 
    256                         ("Attribute Selection List", AttributeList)] 
     254        self.outputs = [("Selected Data", ExampleTable), 
     255                        ("Other Data", ExampleTable), 
     256                        ("Features", AttributeList)] 
    257257        self.resize(1000, 600) 
    258258 
  • orange/OrangeWidgets/Visualize/OWAttributeStatistics.py

    r9272 r9546  
    4242        self.HighlightedAttribute = None 
    4343        #list inputs and outputs 
    44         self.inputs = [("Examples", ExampleTable, self.setData, Default)] 
    45         self.outputs = [("Attribute Statistics", ExampleTable)] 
     44        self.inputs = [("Data", ExampleTable, self.setData, Default)] 
     45        self.outputs = [("Feature Statistics", ExampleTable)] 
    4646 
    4747        #GUI 
     
    101101            self.dataset = self.dist = self.stat = None 
    102102            self.canvasview.hide() 
    103             self.send("Attribute Statistics", None) 
     103            self.send("Feature Statistics", None) 
    104104        else: 
    105105            self.canvasview.show() 
     
    122122            ndata[1][id] = "variance" 
    123123            ndata[2][id] = "modus" 
    124             self.send("Attribute Statistics", ndata) 
     124            self.send("Feature Statistics", ndata) 
    125125 
    126126        self.HighlightedAttribute = 0 
  • orange/OrangeWidgets/Visualize/OWCorrespondenceAnalysis.py

    r8042 r9546  
    2323        OWWidget.__init__(self, parent, signalManager, name, wantGraph=True) 
    2424         
    25         self.inputs = [("Examples", ExampleTable, self.setData)] 
    26         self.outputs = [("Selected Examples", ExampleTable), ("Remaining Examples", ExampleTable)] 
     25        self.inputs = [("Data", ExampleTable, self.setData)] 
     26        self.outputs = [("Selected Data", ExampleTable), ("Remaining Data", ExampleTable)] 
    2727         
    2828        self.colAttr = 0 
     
    138138        self.contributionInfo.setText("NA\nNA") 
    139139        self.graph.removeDrawingCurves(True, True, True) 
    140         self.send("Selected Examples", None) 
    141         self.send("Remaining Examples", None) 
     140        self.send("Selected Data", None) 
     141        self.send("Remaining Data", None) 
    142142        self.allAttrs = [] 
    143143         
     
    313313                            orange.ExampleTable(self.data.domain) 
    314314                         
    315             self.send("Selected Examples", selected) 
    316             self.send("Remaining Examples", remaining) 
     315            self.send("Selected Data", selected) 
     316            self.send("Remaining Data", remaining) 
    317317        else: 
    318             self.send("Selected Examples", None) 
    319             self.send("Remaining Examples", None) 
     318            self.send("Selected Data", None) 
     319            self.send("Remaining Data", None) 
    320320 
    321321     
  • orange/OrangeWidgets/Visualize/OWDistributions.py

    r8042 r9546  
    441441        # inputs 
    442442        # data and graph temp variables 
    443         self.inputs = [("Examples", ExampleTable, self.setData, Default)] 
     443        self.inputs = [("Data", ExampleTable, self.setData, Default)] 
    444444 
    445445        self.data = None 
  • orange/OrangeWidgets/Visualize/OWLinProj.py

    r8042 r9546  
    3434        OWVisWidget.__init__(self, parent, signalManager, name, TRUE) 
    3535 
    36         self.inputs = [("Examples", ExampleTable, self.setData, Default), 
    37                        ("Example Subset", ExampleTable, self.setSubsetData), 
    38                        ("Attribute Selection List", AttributeList, self.setShownAttributes), 
     36        self.inputs = [("Data", ExampleTable, self.setData, Default), 
     37                       ("Data Subset", ExampleTable, self.setSubsetData), 
     38                       ("Features", AttributeList, self.setShownAttributes), 
    3939                       ("Evaluation Results", orngTest.ExperimentResults, self.setTestResults), 
    4040                       ("VizRank Learner", orange.Learner, self.setVizRankLearner), 
    4141                       ("Distances btw. Instances", orange.SymMatrix, self.setDistances)] 
    42         self.outputs = [("Selected Examples", ExampleTable), ("Unselected Examples", ExampleTable), ("Attribute Selection List", AttributeList), ("FreeViz Learner", orange.Learner)] 
     42        self.outputs = [("Selected Data", ExampleTable), ("Other Data", ExampleTable), ("Features", AttributeList), ("FreeViz Learner", orange.Learner)] 
    4343 
    4444        # local variables 
     
    226226        (selected, unselected) = self.graph.getSelectionsAsExampleTables(self.getShownAttributeList(), addProjectedPositions = self.addProjectedPositions) 
    227227 
    228         self.send("Selected Examples", selected) 
    229         self.send("Unselected Examples", unselected) 
     228        self.send("Selected Data", selected) 
     229        self.send("Other Data", unselected) 
    230230 
    231231    def sendShownAttributes(self): 
    232         self.send("Attribute Selection List", [a[0] for a in self.shownAttributes]) 
     232        self.send("Features", [a[0] for a in self.shownAttributes]) 
    233233 
    234234    # show selected interesting projection 
  • orange/OrangeWidgets/Visualize/OWMosaicDisplay.py

    r9272 r9546  
    9595        self.names = []     # class values 
    9696 
    97         self.inputs = [("Examples", ExampleTable, self.setData, Default), ("Example Subset", ExampleTable, self.setSubsetData)] 
    98         self.outputs = [("Selected Examples", ExampleTable), ("Learner", orange.Learner)] 
     97        self.inputs = [("Data", ExampleTable, self.setData, Default), ("Data Subset", ExampleTable, self.setSubsetData)] 
     98        self.outputs = [("Selected Data", ExampleTable), ("Learner", orange.Learner)] 
    9999 
    100100        #load settings 
     
    811811    def sendSelectedData(self): 
    812812        # send the selected examples 
    813         self.send("Selected Examples", self.getSelectedExamples()) 
     813        self.send("Selected Data", self.getSelectedExamples()) 
    814814 
    815815    # add a new rectangle. update the graph and see which mosaics does it intersect. add this mosaics to the recentlyAdded list 
  • orange/OrangeWidgets/Visualize/OWMultiCorrespondenceAnalysis.py

    r7175 r9546  
    4949        OWCorrespondenceAnalysis.__init__(self, parent, signalManager, title) 
    5050         
    51         self.inputs = [("Examples", ExampleTable, self.setData)] 
    52         self.outputs = [("Selected Examples", ExampleTable), ("Remaining Examples", ExampleTable)] 
     51        self.inputs = [("Data", ExampleTable, self.setData)] 
     52        self.outputs = [("Selected Data", ExampleTable), ("Remaining Data", ExampleTable)] 
    5353         
    5454#        self.allAttrs = [] 
     
    105105        self.contributionInfo.setText("NA\nNA") 
    106106        self.graph.removeDrawingCurves(True, True, True) 
    107         self.send("Selected Examples", None) 
    108         self.send("Remaining Examples", None) 
     107        self.send("Selected Data", None) 
     108        self.send("Remaining Data", None) 
    109109        self.allAttrs = [] 
    110110                 
     
    236236                            orange.ExampleTable(self.data.domain) 
    237237                         
    238             self.send("Selected Examples", selected) 
    239             self.send("Remaining Examples", remaining) 
     238            self.send("Selected Data", selected) 
     239            self.send("Remaining Data", remaining) 
    240240        else: 
    241             self.send("Selected Examples", None) 
    242             self.send("Remaining Examples", None) 
     241            self.send("Selected Data", None) 
     242            self.send("Remaining Data", None) 
  • orange/OrangeWidgets/Visualize/OWParallelCoordinates.py

    r8042 r9546  
    3535        self.showAllAttributes = 0 
    3636 
    37         self.inputs = [("Examples", ExampleTable, self.setData, Default), ("Example Subset", ExampleTable, self.setSubsetData), ("Attribute Selection List", AttributeList, self.setShownAttributes)] 
    38         self.outputs = [("Selected Examples", ExampleTable), ("Unselected Examples", ExampleTable), ("Attribute Selection List", AttributeList)] 
     37        self.inputs = [("Data", ExampleTable, self.setData, Default), ("Data Subset", ExampleTable, self.setSubsetData), ("Features", AttributeList, self.setShownAttributes)] 
     38        self.outputs = [("Selected Data", ExampleTable), ("Other Data", ExampleTable), ("Features", AttributeList)] 
    3939 
    4040        #set default settings 
     
    229229        if attrList == None: 
    230230            attrList = self.getShownAttributeList() 
    231         self.send("Attribute Selection List", attrList) 
     231        self.send("Features", attrList) 
    232232 
    233233    def selectionChanged(self): 
     
    239239    def sendSelections(self): 
    240240        (selected, unselected) = self.graph.getSelectionsAsExampleTables() 
    241         self.send("Selected Examples", selected) 
    242         self.send("Unselected Examples", unselected) 
     241        self.send("Selected Data", selected) 
     242        self.send("Other Data", unselected) 
    243243 
    244244 
  • orange/OrangeWidgets/Visualize/OWPolyviz.py

    r6538 r9546  
    2626        OWLinProj.__init__(self, parent, signalManager, "Polyviz", graphClass = OWPolyvizGraph) 
    2727 
    28         self.inputs = [("Examples", ExampleTable, self.setData, Default), ("Example Subset", ExampleTable, self.setSubsetData), ("Attribute Selection List", AttributeList, self.setShownAttributes), ("Evaluation Results", orngTest.ExperimentResults, self.setTestResults), ("VizRank Learner", orange.Learner, self.setVizRankLearner)] 
    29         self.outputs = [("Selected Examples", ExampleTable), ("Unselected Examples", ExampleTable), ("Attribute Selection List", AttributeList)] 
     28        self.inputs = [("Data", ExampleTable, self.setData, Default), ("Data Subset", ExampleTable, self.setSubsetData), ("Features", AttributeList, self.setShownAttributes), ("Evaluation Results", orngTest.ExperimentResults, self.setTestResults), ("VizRank Learner", orange.Learner, self.setVizRankLearner)] 
     29        self.outputs = [("Selected Data", ExampleTable), ("Other Data", ExampleTable), ("Features", AttributeList)] 
    3030 
    3131        # SETTINGS TAB 
  • orange/OrangeWidgets/Visualize/OWRadviz.py

    r6538 r9546  
    2323        OWLinProj.__init__(self, parent, signalManager, "Radviz") 
    2424 
    25         self.inputs = [("Examples", ExampleTable, self.setData, Default), ("Example Subset", ExampleTable, self.setSubsetData), ("Attribute Selection List", AttributeList, self.setShownAttributes), ("Evaluation Results", orngTest.ExperimentResults, self.setTestResults), ("VizRank Learner", orange.Learner, self.setVizRankLearner)] 
    26         self.outputs = [("Selected Examples", ExampleTable), ("Unselected Examples", ExampleTable), ("Attribute Selection List", AttributeList)] 
     25        self.inputs = [("Data", ExampleTable, self.setData, Default), ("Data Subset", ExampleTable, self.setSubsetData), ("Features", AttributeList, self.setShownAttributes), ("Evaluation Results", orngTest.ExperimentResults, self.setTestResults), ("VizRank Learner", orange.Learner, self.setVizRankLearner)] 
     26        self.outputs = [("Selected Data", ExampleTable), ("Other Data", ExampleTable), ("Features", AttributeList)] 
    2727 
    2828 
  • orange/OrangeWidgets/Visualize/OWScatterPlot.py

    r8042 r9546  
    3636        OWWidget.__init__(self, parent, signalManager, "Scatter Plot", TRUE) 
    3737 
    38         self.inputs =  [("Examples", ExampleTable, self.setData, Default), ("Example Subset", ExampleTable, self.setSubsetData), ("Attribute selection", AttributeList, self.setShownAttributes), ("Evaluation Results", orngTest.ExperimentResults, self.setTestResults), ("VizRank Learner", orange.Learner, self.setVizRankLearner)] 
    39         self.outputs = [("Selected Examples", ExampleTable), ("Unselected Examples", ExampleTable)] 
     38        self.inputs =  [("Data", ExampleTable, self.setData, Default), ("Data Subset", ExampleTable, self.setSubsetData), ("Features", AttributeList, self.setShownAttributes), ("Evaluation Results", orngTest.ExperimentResults, self.setTestResults), ("VizRank Learner", orange.Learner, self.setVizRankLearner)] 
     39        self.outputs = [("Selected Data", ExampleTable), ("Other Data", ExampleTable)] 
    4040 
    4141        self.graph = OWScatterPlotGraph(self, self.mainArea, "ScatterPlot") 
     
    252252    def sendSelections(self): 
    253253        (selected, unselected) = self.graph.getSelectionsAsExampleTables([self.attrX, self.attrY]) 
    254         self.send("Selected Examples",selected) 
    255         self.send("Unselected Examples",unselected) 
     254        self.send("Selected Data",selected) 
     255        self.send("Other Data",unselected) 
    256256 
    257257 
  • orange/OrangeWidgets/Visualize/OWSieveDiagram.py

    r8042 r9546  
    2929        #self.controlArea.setMinimumWidth(250) 
    3030 
    31         self.inputs = [("Examples", ExampleTable, self.setData, Default), ("Attribute Selection List", AttributeList, self.setShownAttributes)] 
     31        self.inputs = [("Data", ExampleTable, self.setData, Default), ("Features", AttributeList, self.setShownAttributes)] 
    3232        self.outputs = [] 
    3333 
  • orange/OrangeWidgets/Visualize/OWSieveMultigram.py

    r8042 r9546  
    2626        OWWidget.__init__(self, parent, signalManager, "Sieve Multigram", wantGraph = True, wantStatusBar = True) 
    2727 
    28         self.inputs = [("Examples", ExampleTable, self.setData), ("Attribute Selection List", AttributeList, self.setShownAttributes)] 
     28        self.inputs = [("Data", ExampleTable, self.setData), ("Features", AttributeList, self.setShownAttributes)] 
    2929        self.outputs = [] 
    3030 
  • orange/OrangeWidgets/Visualize/OWSurveyPlot.py

    r9272 r9546  
    2929        OWWidget.__init__(self, parent, signalManager, "Survey Plot", TRUE) 
    3030 
    31         self.inputs = [("Examples", ExampleTable, self.setData, Default), ("Attribute Selection List", AttributeList, self.setShownAttributes)] 
    32         self.outputs = [("Attribute Selection List", AttributeList)] 
     31        self.inputs = [("Data", ExampleTable, self.setData, Default), ("Features", AttributeList, self.setShownAttributes)] 
     32        self.outputs = [("Features", AttributeList)] 
    3333 
    3434        #add a graph widget 
     
    161161 
    162162    def sendShownAttributes(self): 
    163         self.send("Attribute Selection List", [a[0] for a in self.shownAttributes]) 
     163        self.send("Features", [a[0] for a in self.shownAttributes]) 
    164164 
    165165    # just tell the graph to hide the selected rectangle 
Note: See TracChangeset for help on using the changeset viewer.