Changeset 10290:38d72aa8acd9 in orange


Ignore:
Timestamp:
02/17/12 15:11:46 (2 years ago)
Author:
Miha Stajdohar <miha.stajdohar@…>
Branch:
default
rebase_source:
74dd3ec421167af08f5ea36978da5618f5da0f4e
Message:

Orange feature print-out changed, fixed corresponding tests.

Location:
Orange/testing/regression
Files:
10 added
25 edited

Legend:

Unmodified
Added
Removed
  • Orange/testing/regression/results_reference/attributes.py.txt

    r9954 r10290  
    1 EnumVariable 'status' 
     1Orange.feature.Discrete 'status' 
    22Attributes {} 
    33Set a=12 
  • Orange/testing/regression/results_reference/data.io-read.weka.py.txt

    r9954 r10290  
    11[NotFound, NotFound, NotFound, NotFound, NotFound] 
    22[sepallength, sepalwidth, petallength, petalwidth, class] 
    3 <FloatVariable 'sepallength', FloatVariable 'sepalwidth', FloatVariable 'petallength', FloatVariable 'petalwidth'> 
     3<Orange.feature.Continuous 'sepallength', Orange.feature.Continuous 'sepalwidth', Orange.feature.Continuous 'petallength', Orange.feature.Continuous 'petalwidth'> 
    445.1 3.5 1.4 0.2 Iris-setosa 
    554.9 3.0 1.4 0.2 Iris-setosa 
     
    155155[OK, OK, OK, OK, OK] 
    156156[sepallength, sepalwidth, petallength, petalwidth, class] 
    157 <FloatVariable 'sepallength', FloatVariable 'sepalwidth', FloatVariable 'petallength', FloatVariable 'petalwidth'> 
     157<Orange.feature.Continuous 'sepallength', Orange.feature.Continuous 'sepalwidth', Orange.feature.Continuous 'petallength', Orange.feature.Continuous 'petalwidth'> 
    1581585.1 3.5 1.4 0.2 Iris-setosa 
    1591594.9 3.0 1.4 0.2 Iris-setosa 
  • Orange/testing/regression/results_reference/discretization.py.txt

    r10017 r10290  
    1212[3.1, '(2.90, 3.30]', 'Iris-setosa'] 
    1313 
    14 Discretized attribute: EnumVariable 'D_sepal width' 
    15 Continuous attribute: FloatVariable 'sepal width' 
     14Discretized attribute: Orange.feature.Discrete 'D_sepal width' 
     15Continuous attribute: Orange.feature.Continuous 'sepal width' 
    1616Cut-off points: <2.90000009537, 3.29999995232> 
    1717 
  • Orange/testing/regression/results_reference/hierarchical-example-2.py.txt

    r10155 r10290  
    22 
    33 Cluster 0  
    4  
    5 [4.5, 2.3, 1.3, 0.3, 'Iris-setosa'] 
    6  
    7  
    8  Cluster 1  
    9  
    10 [6.3, 3.3, 6.0, 2.5, 'Iris-virginica'] 
    11 [6.4, 3.2, 5.3, 2.3, 'Iris-virginica'] 
    12 [6.3, 3.4, 5.6, 2.4, 'Iris-virginica'] 
    13 [6.2, 3.4, 5.4, 2.3, 'Iris-virginica'] 
    14 [6.8, 3.0, 5.5, 2.1, 'Iris-virginica'] 
    15 [6.9, 3.1, 5.4, 2.1, 'Iris-virginica'] 
    16 [6.9, 3.1, 5.1, 2.3, 'Iris-virginica'] 
    17 [6.7, 3.0, 5.2, 2.3, 'Iris-virginica'] 
    18 [6.9, 3.2, 5.7, 2.3, 'Iris-virginica'] 
    19 [6.8, 3.2, 5.9, 2.3, 'Iris-virginica'] 
    20 [6.7, 3.1, 5.6, 2.4, 'Iris-virginica'] 
    21 [6.7, 3.3, 5.7, 2.5, 'Iris-virginica'] 
    22 [6.7, 3.3, 5.7, 2.1, 'Iris-virginica'] 
    23 [6.3, 2.9, 5.6, 1.8, 'Iris-virginica'] 
    24 [6.5, 3.0, 5.5, 1.8, 'Iris-virginica'] 
    25 [6.4, 3.1, 5.5, 1.8, 'Iris-virginica'] 
    26 [6.5, 3.2, 5.1, 2.0, 'Iris-virginica'] 
    27 [6.5, 3.0, 5.2, 2.0, 'Iris-virginica'] 
    28 [6.5, 3.0, 5.8, 2.2, 'Iris-virginica'] 
    29 [6.4, 2.8, 5.6, 2.1, 'Iris-virginica'] 
    30 [6.4, 2.8, 5.6, 2.2, 'Iris-virginica'] 
    31 [7.1, 3.0, 5.9, 2.1, 'Iris-virginica'] 
    32 [7.3, 2.9, 6.3, 1.8, 'Iris-virginica'] 
    33 [7.4, 2.8, 6.1, 1.9, 'Iris-virginica'] 
    34 [7.2, 3.2, 6.0, 1.8, 'Iris-virginica'] 
    35 [7.2, 3.0, 5.8, 1.6, 'Iris-virginica'] 
    36 [7.6, 3.0, 6.6, 2.1, 'Iris-virginica'] 
    37 [7.7, 2.8, 6.7, 2.0, 'Iris-virginica'] 
    38 [7.7, 3.0, 6.1, 2.3, 'Iris-virginica'] 
    39 [7.7, 2.6, 6.9, 2.3, 'Iris-virginica'] 
    40 [7.2, 3.6, 6.1, 2.5, 'Iris-virginica'] 
    41 [7.7, 3.8, 6.7, 2.2, 'Iris-virginica'] 
    42 [7.9, 3.8, 6.4, 2.0, 'Iris-virginica'] 
    43  
    44  
    45  Cluster 2  
    46  
    47 [5.1, 3.5, 1.4, 0.2, 'Iris-setosa'] 
    48 [5.2, 3.5, 1.5, 0.2, 'Iris-setosa'] 
    49 [5.0, 3.4, 1.5, 0.2, 'Iris-setosa'] 
    50 [5.1, 3.4, 1.5, 0.2, 'Iris-setosa'] 
    51 [5.2, 3.4, 1.4, 0.2, 'Iris-setosa'] 
    52 [5.0, 3.6, 1.4, 0.2, 'Iris-setosa'] 
    53 [5.1, 3.5, 1.4, 0.3, 'Iris-setosa'] 
    54 [5.0, 3.5, 1.3, 0.3, 'Iris-setosa'] 
    55 [5.0, 3.2, 1.2, 0.2, 'Iris-setosa'] 
    56 [5.0, 3.3, 1.4, 0.2, 'Iris-setosa'] 
    57 [4.6, 3.4, 1.4, 0.3, 'Iris-setosa'] 
    58 [4.8, 3.4, 1.6, 0.2, 'Iris-setosa'] 
    59 [4.8, 3.4, 1.9, 0.2, 'Iris-setosa'] 
    60 [5.1, 3.3, 1.7, 0.5, 'Iris-setosa'] 
    61 [5.0, 3.4, 1.6, 0.4, 'Iris-setosa'] 
    62 [5.0, 3.5, 1.6, 0.6, 'Iris-setosa'] 
    63 [5.4, 3.4, 1.7, 0.2, 'Iris-setosa'] 
    64 [5.5, 3.5, 1.3, 0.2, 'Iris-setosa'] 
    65 [5.4, 3.4, 1.5, 0.4, 'Iris-setosa'] 
    66 [4.6, 3.6, 1.0, 0.2, 'Iris-setosa'] 
    67 [5.4, 3.9, 1.7, 0.4, 'Iris-setosa'] 
    68 [5.4, 3.9, 1.3, 0.4, 'Iris-setosa'] 
    69 [5.7, 3.8, 1.7, 0.3, 'Iris-setosa'] 
    70 [5.4, 3.7, 1.5, 0.2, 'Iris-setosa'] 
    71 [5.3, 3.7, 1.5, 0.2, 'Iris-setosa'] 
    72 [5.1, 3.8, 1.5, 0.3, 'Iris-setosa'] 
    73 [5.1, 3.8, 1.6, 0.2, 'Iris-setosa'] 
    74 [5.1, 3.7, 1.5, 0.4, 'Iris-setosa'] 
    75 [5.1, 3.8, 1.9, 0.4, 'Iris-setosa'] 
    76 [4.9, 3.0, 1.4, 0.2, 'Iris-setosa'] 
    77 [5.0, 3.0, 1.6, 0.2, 'Iris-setosa'] 
    78 [4.8, 3.0, 1.4, 0.3, 'Iris-setosa'] 
    79 [4.9, 3.1, 1.5, 0.1, 'Iris-setosa'] 
    80 [4.9, 3.1, 1.5, 0.1, 'Iris-setosa'] 
    81 [4.9, 3.1, 1.5, 0.1, 'Iris-setosa'] 
    82 [4.8, 3.0, 1.4, 0.1, 'Iris-setosa'] 
    83 [4.8, 3.1, 1.6, 0.2, 'Iris-setosa'] 
    84 [4.7, 3.2, 1.3, 0.2, 'Iris-setosa'] 
    85 [4.6, 3.2, 1.4, 0.2, 'Iris-setosa'] 
    86 [4.7, 3.2, 1.6, 0.2, 'Iris-setosa'] 
    87 [4.6, 3.1, 1.5, 0.2, 'Iris-setosa'] 
    88 [4.4, 3.2, 1.3, 0.2, 'Iris-setosa'] 
    89 [4.4, 2.9, 1.4, 0.2, 'Iris-setosa'] 
    90 [4.4, 3.0, 1.3, 0.2, 'Iris-setosa'] 
    91 [4.3, 3.0, 1.1, 0.1, 'Iris-setosa'] 
    92 [5.8, 4.0, 1.2, 0.2, 'Iris-setosa'] 
    93 [5.2, 4.1, 1.5, 0.1, 'Iris-setosa'] 
    94 [5.5, 4.2, 1.4, 0.2, 'Iris-setosa'] 
    95 [5.7, 4.4, 1.5, 0.4, 'Iris-setosa'] 
    96  
    97  
    98  Cluster 3  
    994 
    1005[7.0, 3.2, 4.7, 1.4, 'Iris-versicolor'] 
     
    16570[5.0, 2.0, 3.5, 1.0, 'Iris-versicolor'] 
    16671[4.9, 2.5, 4.5, 1.7, 'Iris-virginica'] 
     72 
     73 
     74 Cluster 1  
     75 
     76[4.5, 2.3, 1.3, 0.3, 'Iris-setosa'] 
     77 
     78 
     79 Cluster 2  
     80 
     81[5.1, 3.5, 1.4, 0.2, 'Iris-setosa'] 
     82[5.2, 3.5, 1.5, 0.2, 'Iris-setosa'] 
     83[5.0, 3.4, 1.5, 0.2, 'Iris-setosa'] 
     84[5.1, 3.4, 1.5, 0.2, 'Iris-setosa'] 
     85[5.2, 3.4, 1.4, 0.2, 'Iris-setosa'] 
     86[5.0, 3.6, 1.4, 0.2, 'Iris-setosa'] 
     87[5.1, 3.5, 1.4, 0.3, 'Iris-setosa'] 
     88[5.0, 3.5, 1.3, 0.3, 'Iris-setosa'] 
     89[5.0, 3.2, 1.2, 0.2, 'Iris-setosa'] 
     90[5.0, 3.3, 1.4, 0.2, 'Iris-setosa'] 
     91[4.6, 3.4, 1.4, 0.3, 'Iris-setosa'] 
     92[4.8, 3.4, 1.6, 0.2, 'Iris-setosa'] 
     93[4.8, 3.4, 1.9, 0.2, 'Iris-setosa'] 
     94[5.1, 3.3, 1.7, 0.5, 'Iris-setosa'] 
     95[5.0, 3.4, 1.6, 0.4, 'Iris-setosa'] 
     96[5.0, 3.5, 1.6, 0.6, 'Iris-setosa'] 
     97[5.4, 3.4, 1.7, 0.2, 'Iris-setosa'] 
     98[5.5, 3.5, 1.3, 0.2, 'Iris-setosa'] 
     99[5.4, 3.4, 1.5, 0.4, 'Iris-setosa'] 
     100[4.6, 3.6, 1.0, 0.2, 'Iris-setosa'] 
     101[5.4, 3.9, 1.7, 0.4, 'Iris-setosa'] 
     102[5.4, 3.9, 1.3, 0.4, 'Iris-setosa'] 
     103[5.7, 3.8, 1.7, 0.3, 'Iris-setosa'] 
     104[5.4, 3.7, 1.5, 0.2, 'Iris-setosa'] 
     105[5.3, 3.7, 1.5, 0.2, 'Iris-setosa'] 
     106[5.1, 3.8, 1.5, 0.3, 'Iris-setosa'] 
     107[5.1, 3.8, 1.6, 0.2, 'Iris-setosa'] 
     108[5.1, 3.7, 1.5, 0.4, 'Iris-setosa'] 
     109[5.1, 3.8, 1.9, 0.4, 'Iris-setosa'] 
     110[4.9, 3.0, 1.4, 0.2, 'Iris-setosa'] 
     111[5.0, 3.0, 1.6, 0.2, 'Iris-setosa'] 
     112[4.8, 3.0, 1.4, 0.3, 'Iris-setosa'] 
     113[4.9, 3.1, 1.5, 0.1, 'Iris-setosa'] 
     114[4.9, 3.1, 1.5, 0.1, 'Iris-setosa'] 
     115[4.9, 3.1, 1.5, 0.1, 'Iris-setosa'] 
     116[4.8, 3.0, 1.4, 0.1, 'Iris-setosa'] 
     117[4.8, 3.1, 1.6, 0.2, 'Iris-setosa'] 
     118[4.7, 3.2, 1.3, 0.2, 'Iris-setosa'] 
     119[4.6, 3.2, 1.4, 0.2, 'Iris-setosa'] 
     120[4.7, 3.2, 1.6, 0.2, 'Iris-setosa'] 
     121[4.6, 3.1, 1.5, 0.2, 'Iris-setosa'] 
     122[4.4, 3.2, 1.3, 0.2, 'Iris-setosa'] 
     123[4.4, 2.9, 1.4, 0.2, 'Iris-setosa'] 
     124[4.4, 3.0, 1.3, 0.2, 'Iris-setosa'] 
     125[4.3, 3.0, 1.1, 0.1, 'Iris-setosa'] 
     126[5.8, 4.0, 1.2, 0.2, 'Iris-setosa'] 
     127[5.2, 4.1, 1.5, 0.1, 'Iris-setosa'] 
     128[5.5, 4.2, 1.4, 0.2, 'Iris-setosa'] 
     129[5.7, 4.4, 1.5, 0.4, 'Iris-setosa'] 
     130 
     131 
     132 Cluster 3  
     133 
     134[6.3, 3.3, 6.0, 2.5, 'Iris-virginica'] 
     135[6.4, 3.2, 5.3, 2.3, 'Iris-virginica'] 
     136[6.3, 3.4, 5.6, 2.4, 'Iris-virginica'] 
     137[6.2, 3.4, 5.4, 2.3, 'Iris-virginica'] 
     138[6.8, 3.0, 5.5, 2.1, 'Iris-virginica'] 
     139[6.9, 3.1, 5.4, 2.1, 'Iris-virginica'] 
     140[6.9, 3.1, 5.1, 2.3, 'Iris-virginica'] 
     141[6.7, 3.0, 5.2, 2.3, 'Iris-virginica'] 
     142[6.9, 3.2, 5.7, 2.3, 'Iris-virginica'] 
     143[6.8, 3.2, 5.9, 2.3, 'Iris-virginica'] 
     144[6.7, 3.1, 5.6, 2.4, 'Iris-virginica'] 
     145[6.7, 3.3, 5.7, 2.5, 'Iris-virginica'] 
     146[6.7, 3.3, 5.7, 2.1, 'Iris-virginica'] 
     147[6.3, 2.9, 5.6, 1.8, 'Iris-virginica'] 
     148[6.5, 3.0, 5.5, 1.8, 'Iris-virginica'] 
     149[6.4, 3.1, 5.5, 1.8, 'Iris-virginica'] 
     150[6.5, 3.2, 5.1, 2.0, 'Iris-virginica'] 
     151[6.5, 3.0, 5.2, 2.0, 'Iris-virginica'] 
     152[6.5, 3.0, 5.8, 2.2, 'Iris-virginica'] 
     153[6.4, 2.8, 5.6, 2.1, 'Iris-virginica'] 
     154[6.4, 2.8, 5.6, 2.2, 'Iris-virginica'] 
     155[7.1, 3.0, 5.9, 2.1, 'Iris-virginica'] 
     156[7.3, 2.9, 6.3, 1.8, 'Iris-virginica'] 
     157[7.4, 2.8, 6.1, 1.9, 'Iris-virginica'] 
     158[7.2, 3.2, 6.0, 1.8, 'Iris-virginica'] 
     159[7.2, 3.0, 5.8, 1.6, 'Iris-virginica'] 
     160[7.6, 3.0, 6.6, 2.1, 'Iris-virginica'] 
     161[7.7, 2.8, 6.7, 2.0, 'Iris-virginica'] 
     162[7.7, 3.0, 6.1, 2.3, 'Iris-virginica'] 
     163[7.7, 2.6, 6.9, 2.3, 'Iris-virginica'] 
     164[7.2, 3.6, 6.1, 2.5, 'Iris-virginica'] 
     165[7.7, 3.8, 6.7, 2.2, 'Iris-virginica'] 
     166[7.9, 3.8, 6.4, 2.0, 'Iris-virginica'] 
     167Iris-setosa:   0  Iris-versicolor:  50  Iris-virginica:  17  
    167168Iris-setosa:   1  Iris-versicolor:   0  Iris-virginica:   0  
     169Iris-setosa:  49  Iris-versicolor:   0  Iris-virginica:   0  
    168170Iris-setosa:   0  Iris-versicolor:   0  Iris-virginica:  33  
    169 Iris-setosa:  49  Iris-versicolor:   0  Iris-virginica:   0  
    170 Iris-setosa:   0  Iris-versicolor:  50  Iris-virginica:  17  
  • Orange/testing/regression/results_reference/misc-selection-bestonthefly.py.txt

    r10035 r10290  
    1 1.000: EnumVariable 'milk' 
    2 1.000: EnumVariable 'milk' 
    3 1.000: EnumVariable 'milk' 
     11.000: Orange.feature.Discrete 'milk' 
     21.000: Orange.feature.Discrete 'milk' 
     31.000: Orange.feature.Discrete 'milk' 
  • Orange/testing/regression/results_reference/multitarget.py.txt

    r9954 r10290  
    1 Features: <FloatVariable 'X1', FloatVariable 'X2', FloatVariable 'X3'> 
    2 Classes: <FloatVariable 'Y1', FloatVariable 'Y2', FloatVariable 'Y3', FloatVariable 'Y4'> 
     1Features: <Orange.feature.Continuous 'X1', Orange.feature.Continuous 'X2', Orange.feature.Continuous 'X3'> 
     2Classes: <Orange.feature.Continuous 'Y1', Orange.feature.Continuous 'Y2', Orange.feature.Continuous 'Y3', Orange.feature.Continuous 'Y4'> 
    33First instance: [0.628, 0.095, 0.652] (0.490, 1.237, 1.808, 0.422) 
    44Actual classes: [<orange.Value 'Y1'='0.490'>, <orange.Value 'Y2'='1.237'>, <orange.Value 'Y3'='1.808'>, <orange.Value 'Y4'='0.422'>] 
  • Orange/testing/regression/results_reference/pls-example.py.txt

    r9954 r10290  
    1 Input variables:     <FloatVariable 'X1', FloatVariable 'X2', FloatVariable 'X3'> 
    2 Response variables:  <FloatVariable 'Y1', FloatVariable 'Y2', FloatVariable 'Y3', FloatVariable 'Y4'> 
     1Input variables:     <Orange.feature.Continuous 'X1', Orange.feature.Continuous 'X2', Orange.feature.Continuous 'X3'> 
     2Response variables:  <Orange.feature.Continuous 'Y1', Orange.feature.Continuous 'Y2', Orange.feature.Continuous 'Y3', Orange.feature.Continuous 'Y4'> 
    33Prediction for the first 2 data instances:  
    44 
  • Orange/testing/regression/results_reference/sql-example.py.txt

    r10110 r10290  
    22150 instances returned 
    33Output data domain: 
    4 StringVariable 'sepal length' 
    5 StringVariable 'sepal width' 
    6 StringVariable 'petal length' 
    7 StringVariable 'petal width' 
    8 StringVariable 'iris' 
     4Orange.feature.String 'sepal length' 
     5Orange.feature.String 'sepal width' 
     6Orange.feature.String 'petal length' 
     7Orange.feature.String 'petal width' 
     8Orange.feature.String 'iris' 
    99First instance : ['5.09999990463', '3.5', '1.39999997616', '0.20000000298', 'Iris-setosa']  
    101022 instances returned 
  • Orange/testing/regression/results_reference/unusedValues.py.txt

    r10009 r10290  
    11 
    2 EnumVariable 'a' retained as is 
    3 EnumVariable 'b' reduced, new values are <0, 2> 
    4 EnumVariable 'c' removed 
    5 EnumVariable 'd' retained as is 
    6 EnumVariable 'y' retained as is 
     2Orange.feature.Discrete 'a' retained as is 
     3Orange.feature.Discrete 'b' reduced, new values are <0, 2> 
     4Orange.feature.Discrete 'c' removed 
     5Orange.feature.Discrete 'd' retained as is 
     6Orange.feature.Discrete 'y' retained as is 
  • Orange/testing/regression/results_tests_20/modules_misc_bestOnTheFly.py.txt

    r9968 r10290  
    1 1.000: EnumVariable 'milk' 
    2 1.000: EnumVariable 'milk' 
    3 1.000: EnumVariable 'milk' 
     11.000: Orange.feature.Discrete 'milk' 
     21.000: Orange.feature.Discrete 'milk' 
     31.000: Orange.feature.Discrete 'milk' 
  • Orange/testing/regression/results_tests_20/reference_basket.py.txt

    r10116 r10290  
    1111[], {"amongst":1.000, "our":1.000, "weaponry":1.000, "are":1.000, "such":1.000, "diverse":1.000, "elements":1.000, "as":1.000, "fear":1.000, "surprise":1.000, "ruthless":1.000, "efficiency":1.000, "an":1.000, "almost":1.000, "fanatical":1.000, "devotion":1.000, "to":1.000, "the":1.000, "Pope":1.000, "and":1.000, "nice":1.000, "red":1.000, "uniforms":1.000, "oh damn":1.000} 
    1212[(-27, <orange.Value 'no'='1.000'>), (-26, <orange.Value 'four'='1.000'>), (-7, <orange.Value 'our'='1.000'>)] 
    13 [(FloatVariable 'four', <orange.Value 'four'='1.000'>), (FloatVariable 'no', <orange.Value 'no'='1.000'>), (FloatVariable 'our', <orange.Value 'our'='1.000'>)] 
     13[(Orange.feature.Continuous 'four', <orange.Value 'four'='1.000'>), (Orange.feature.Continuous 'no', <orange.Value 'no'='1.000'>), (Orange.feature.Continuous 'our', <orange.Value 'our'='1.000'>)] 
  • Orange/testing/regression/results_tests_20/reference_cb-learner.py.txt

    r9951 r10290  
    1 EnumVariable 'tear_rate' 
     1Orange.feature.Discrete 'tear_rate' 
    22<normal, reduced> 
    33<soft, none, none> 
  • Orange/testing/regression/results_tests_20/reference_discretization.py.txt

    r9951 r10290  
    1212[3.1, '(2.90, 3.30]', 'Iris-setosa'] 
    1313 
    14 Discretized attribute: EnumVariable 'D_sepal width' 
    15 Continuous attribute: FloatVariable 'sepal width' 
     14Discretized attribute: Orange.feature.Discrete 'D_sepal width' 
     15Continuous attribute: Orange.feature.Continuous 'sepal width' 
    1616Cut-off points: <2.90000009537, 3.29999995232> 
    1717 
  • Orange/testing/regression/results_tests_20/reference_distributions.py.txt

    r9951 r10290  
    1 <type 'orange.DiscDistribution'> 
     1<type 'Orange.statistics.distribution.Discrete'> 
    22<685.000, 72.000, 28.000, 29.000, 59.000, 43.000, 2.000, 0.000> 
    33Distribution of 'workclass' (through values) 
     
    3030<685.000, 72.000, 28.000, 29.000, 59.000, 43.000, 2.000, 0.000> 
    3131<685.000, 72.000, 28.000, 29.000, 59.000, 43.000, 2.000, 0.000> 
    32 <type 'orange.ContDistribution'> 
     32<type 'Orange.statistics.distribution.Continuous'> 
    3333<2.000: 8.000, 3.000: 8.000, 4.000: 30.000, 5.000: 18.000, 6.000: 24.000, 7.000: 34.000, 8.000: 22.000, 9.000: 327.000, 10.000: 193.000, 11.000: 41.000, 12.000: 39.000, 13.000: 152.000, 14.000: 57.000, 15.000: 9.000, 16.000: 15.000> 
    3434                           age: avg. 38.906 
  • Orange/testing/regression/results_tests_20/reference_domain2.py.txt

    r9951 r10290  
    443443True 
    444444False 
    445 {-100: FloatVariable 'required', -99: FloatVariable 'optional'} 
    446 {-99: FloatVariable 'optional'} 
    447 {-100: FloatVariable 'required'} 
     445{-100: Orange.feature.Continuous 'required', -99: Orange.feature.Continuous 'optional'} 
     446{-99: Orange.feature.Continuous 'optional'} 
     447{-100: Orange.feature.Continuous 'required'} 
  • Orange/testing/regression/results_tests_20/reference_example_merge.py.txt

    r10117 r10290  
    11First example:  [1, 2], {"m1":3, "m2":4} 
    22Second example:  [1, 2.5], {"m1":3, "m3":4.5} 
    3 Merge:  <FloatVariable 'a1', FloatVariable 'a3', FloatVariable 'm1'> 
     3Merge:  <Orange.feature.Continuous 'a1', Orange.feature.Continuous 'a3', Orange.feature.Continuous 'm1'> 
  • Orange/testing/regression/results_tests_20/reference_exampletable_merge.py.txt

    r10117 r10290  
    11 
    2 Domain 1:  <FloatVariable 'a1', FloatVariable 'a2'> 
    3 Domain 2:  <FloatVariable 'a1', FloatVariable 'a3'> 
    4 Merged:    <FloatVariable 'a1', FloatVariable 'a2', FloatVariable 'a3'> 
     2Domain 1:  <Orange.feature.Continuous 'a1', Orange.feature.Continuous 'a2'> 
     3Domain 2:  <Orange.feature.Continuous 'a1', Orange.feature.Continuous 'a3'> 
     4Merged:    <Orange.feature.Continuous 'a1', Orange.feature.Continuous 'a2', Orange.feature.Continuous 'a3'> 
    55 
    66   [1, 2], {"m1":3, "m2":4} 
  • Orange/testing/regression/results_tests_20/reference_hclust.py.txt

    r9951 r10290  
    169169Iris-setosa:   0    Iris-versicolor:  50    Iris-virginica:  17    
    170170Iris-setosa:   0    Iris-versicolor:   0    Iris-virginica:  33    
    171 <type 'orange.ExampleTable'> of length 49 
    172 <type 'orange.ExampleTable'> of length 1 
    173 <type 'orange.ExampleTable'> of length 67 
    174 <type 'orange.ExampleTable'> of length 33 
     171<type 'Orange.data.Table'> of length 49 
     172<type 'Orange.data.Table'> of length 1 
     173<type 'Orange.data.Table'> of length 67 
     174<type 'Orange.data.Table'> of length 33 
  • Orange/testing/regression/results_tests_20/reference_pp-attributes.py.txt

    r9951 r10290  
    33Preprocessor_select 
    44 
    5 Attributes: <EnumVariable 'age', EnumVariable 'tear_rate'>, classVar None 
     5Attributes: <Orange.feature.Discrete 'age', Orange.feature.Discrete 'tear_rate'>, classVar None 
    66['young', 'reduced'] 
    77['young', 'normal'] 
     
    1313Preprocessor_ignore 
    1414 
    15 Attributes: <EnumVariable 'prescription', EnumVariable 'astigmatic'>, classVar EnumVariable 'lenses' 
     15Attributes: <Orange.feature.Discrete 'prescription', Orange.feature.Discrete 'astigmatic'>, classVar Orange.feature.Discrete 'lenses' 
    1616['myope', 'no', 'none'] 
    1717['myope', 'no', 'soft'] 
  • Orange/testing/regression/results_tests_20/reference_subsetsgenerators.py.txt

    r9951 r10290  
    22 
    33Attributes by call-constructed subsets generator 
    4 (EnumVariable 'a', EnumVariable 'b', EnumVariable 'c') 
    5 (EnumVariable 'a', EnumVariable 'b', EnumVariable 'd') 
    6 (EnumVariable 'a', EnumVariable 'b', EnumVariable 'e') 
    7 (EnumVariable 'a', EnumVariable 'b', EnumVariable 'f') 
    8 (EnumVariable 'a', EnumVariable 'c', EnumVariable 'd') 
    9 (EnumVariable 'a', EnumVariable 'c', EnumVariable 'e') 
    10 (EnumVariable 'a', EnumVariable 'c', EnumVariable 'f') 
    11 (EnumVariable 'a', EnumVariable 'd', EnumVariable 'e') 
    12 (EnumVariable 'a', EnumVariable 'd', EnumVariable 'f') 
    13 (EnumVariable 'a', EnumVariable 'e', EnumVariable 'f') 
    14 (EnumVariable 'b', EnumVariable 'c', EnumVariable 'd') 
    15 (EnumVariable 'b', EnumVariable 'c', EnumVariable 'e') 
    16 (EnumVariable 'b', EnumVariable 'c', EnumVariable 'f') 
    17 (EnumVariable 'b', EnumVariable 'd', EnumVariable 'e') 
    18 (EnumVariable 'b', EnumVariable 'd', EnumVariable 'f') 
    19 (EnumVariable 'b', EnumVariable 'e', EnumVariable 'f') 
    20 (EnumVariable 'c', EnumVariable 'd', EnumVariable 'e') 
    21 (EnumVariable 'c', EnumVariable 'd', EnumVariable 'f') 
    22 (EnumVariable 'c', EnumVariable 'e', EnumVariable 'f') 
    23 (EnumVariable 'd', EnumVariable 'e', EnumVariable 'f') 
     4(Orange.feature.Discrete 'a', Orange.feature.Discrete 'b', Orange.feature.Discrete 'c') 
     5(Orange.feature.Discrete 'a', Orange.feature.Discrete 'b', Orange.feature.Discrete 'd') 
     6(Orange.feature.Discrete 'a', Orange.feature.Discrete 'b', Orange.feature.Discrete 'e') 
     7(Orange.feature.Discrete 'a', Orange.feature.Discrete 'b', Orange.feature.Discrete 'f') 
     8(Orange.feature.Discrete 'a', Orange.feature.Discrete 'c', Orange.feature.Discrete 'd') 
     9(Orange.feature.Discrete 'a', Orange.feature.Discrete 'c', Orange.feature.Discrete 'e') 
     10(Orange.feature.Discrete 'a', Orange.feature.Discrete 'c', Orange.feature.Discrete 'f') 
     11(Orange.feature.Discrete 'a', Orange.feature.Discrete 'd', Orange.feature.Discrete 'e') 
     12(Orange.feature.Discrete 'a', Orange.feature.Discrete 'd', Orange.feature.Discrete 'f') 
     13(Orange.feature.Discrete 'a', Orange.feature.Discrete 'e', Orange.feature.Discrete 'f') 
     14(Orange.feature.Discrete 'b', Orange.feature.Discrete 'c', Orange.feature.Discrete 'd') 
     15(Orange.feature.Discrete 'b', Orange.feature.Discrete 'c', Orange.feature.Discrete 'e') 
     16(Orange.feature.Discrete 'b', Orange.feature.Discrete 'c', Orange.feature.Discrete 'f') 
     17(Orange.feature.Discrete 'b', Orange.feature.Discrete 'd', Orange.feature.Discrete 'e') 
     18(Orange.feature.Discrete 'b', Orange.feature.Discrete 'd', Orange.feature.Discrete 'f') 
     19(Orange.feature.Discrete 'b', Orange.feature.Discrete 'e', Orange.feature.Discrete 'f') 
     20(Orange.feature.Discrete 'c', Orange.feature.Discrete 'd', Orange.feature.Discrete 'e') 
     21(Orange.feature.Discrete 'c', Orange.feature.Discrete 'd', Orange.feature.Discrete 'f') 
     22(Orange.feature.Discrete 'c', Orange.feature.Discrete 'e', Orange.feature.Discrete 'f') 
     23(Orange.feature.Discrete 'd', Orange.feature.Discrete 'e', Orange.feature.Discrete 'f') 
    2424 
    2525 
    2626Attributes through list comprehension 
    27 [(EnumVariable 'a', EnumVariable 'b', EnumVariable 'c'), (EnumVariable 'a', EnumVariable 'b', EnumVariable 'd'), (EnumVariable 'a', EnumVariable 'b', EnumVariable 'e'), (EnumVariable 'a', EnumVariable 'b', EnumVariable 'f'), (EnumVariable 'a', EnumVariable 'c', EnumVariable 'd'), (EnumVariable 'a', EnumVariable 'c', EnumVariable 'e'), (EnumVariable 'a', EnumVariable 'c', EnumVariable 'f'), (EnumVariable 'a', EnumVariable 'd', EnumVariable 'e'), (EnumVariable 'a', EnumVariable 'd', EnumVariable 'f'), (EnumVariable 'a', EnumVariable 'e', EnumVariable 'f'), (EnumVariable 'b', EnumVariable 'c', EnumVariable 'd'), (EnumVariable 'b', EnumVariable 'c', EnumVariable 'e'), (EnumVariable 'b', EnumVariable 'c', EnumVariable 'f'), (EnumVariable 'b', EnumVariable 'd', EnumVariable 'e'), (EnumVariable 'b', EnumVariable 'd', EnumVariable 'f'), (EnumVariable 'b', EnumVariable 'e', EnumVariable 'f'), (EnumVariable 'c', EnumVariable 'd', EnumVariable 'e'), (EnumVariable 'c', EnumVariable 'd', EnumVariable 'f'), (EnumVariable 'c', EnumVariable 'e', EnumVariable 'f'), (EnumVariable 'd', EnumVariable 'e', EnumVariable 'f')] 
     27[(Orange.feature.Discrete 'a', Orange.feature.Discrete 'b', Orange.feature.Discrete 'c'), (Orange.feature.Discrete 'a', Orange.feature.Discrete 'b', Orange.feature.Discrete 'd'), (Orange.feature.Discrete 'a', Orange.feature.Discrete 'b', Orange.feature.Discrete 'e'), (Orange.feature.Discrete 'a', Orange.feature.Discrete 'b', Orange.feature.Discrete 'f'), (Orange.feature.Discrete 'a', Orange.feature.Discrete 'c', Orange.feature.Discrete 'd'), (Orange.feature.Discrete 'a', Orange.feature.Discrete 'c', Orange.feature.Discrete 'e'), (Orange.feature.Discrete 'a', Orange.feature.Discrete 'c', Orange.feature.Discrete 'f'), (Orange.feature.Discrete 'a', Orange.feature.Discrete 'd', Orange.feature.Discrete 'e'), (Orange.feature.Discrete 'a', Orange.feature.Discrete 'd', Orange.feature.Discrete 'f'), (Orange.feature.Discrete 'a', Orange.feature.Discrete 'e', Orange.feature.Discrete 'f'), (Orange.feature.Discrete 'b', Orange.feature.Discrete 'c', Orange.feature.Discrete 'd'), (Orange.feature.Discrete 'b', Orange.feature.Discrete 'c', Orange.feature.Discrete 'e'), (Orange.feature.Discrete 'b', Orange.feature.Discrete 'c', Orange.feature.Discrete 'f'), (Orange.feature.Discrete 'b', Orange.feature.Discrete 'd', Orange.feature.Discrete 'e'), (Orange.feature.Discrete 'b', Orange.feature.Discrete 'd', Orange.feature.Discrete 'f'), (Orange.feature.Discrete 'b', Orange.feature.Discrete 'e', Orange.feature.Discrete 'f'), (Orange.feature.Discrete 'c', Orange.feature.Discrete 'd', Orange.feature.Discrete 'e'), (Orange.feature.Discrete 'c', Orange.feature.Discrete 'd', Orange.feature.Discrete 'f'), (Orange.feature.Discrete 'c', Orange.feature.Discrete 'e', Orange.feature.Discrete 'f'), (Orange.feature.Discrete 'd', Orange.feature.Discrete 'e', Orange.feature.Discrete 'f')] 
    2828 
    2929 
    3030Subsets by ordinary subsets generator 
    31 (EnumVariable 'a', EnumVariable 'b', EnumVariable 'c') 
    32 (EnumVariable 'a', EnumVariable 'b', EnumVariable 'd') 
    33 (EnumVariable 'a', EnumVariable 'b', EnumVariable 'e') 
    34 (EnumVariable 'a', EnumVariable 'b', EnumVariable 'f') 
    35 (EnumVariable 'a', EnumVariable 'c', EnumVariable 'd') 
    36 (EnumVariable 'a', EnumVariable 'c', EnumVariable 'e') 
    37 (EnumVariable 'a', EnumVariable 'c', EnumVariable 'f') 
    38 (EnumVariable 'a', EnumVariable 'd', EnumVariable 'e') 
    39 (EnumVariable 'a', EnumVariable 'd', EnumVariable 'f') 
    40 (EnumVariable 'a', EnumVariable 'e', EnumVariable 'f') 
    41 (EnumVariable 'b', EnumVariable 'c', EnumVariable 'd') 
    42 (EnumVariable 'b', EnumVariable 'c', EnumVariable 'e') 
    43 (EnumVariable 'b', EnumVariable 'c', EnumVariable 'f') 
    44 (EnumVariable 'b', EnumVariable 'd', EnumVariable 'e') 
    45 (EnumVariable 'b', EnumVariable 'd', EnumVariable 'f') 
    46 (EnumVariable 'b', EnumVariable 'e', EnumVariable 'f') 
    47 (EnumVariable 'c', EnumVariable 'd', EnumVariable 'e') 
    48 (EnumVariable 'c', EnumVariable 'd', EnumVariable 'f') 
    49 (EnumVariable 'c', EnumVariable 'e', EnumVariable 'f') 
    50 (EnumVariable 'd', EnumVariable 'e', EnumVariable 'f') 
     31(Orange.feature.Discrete 'a', Orange.feature.Discrete 'b', Orange.feature.Discrete 'c') 
     32(Orange.feature.Discrete 'a', Orange.feature.Discrete 'b', Orange.feature.Discrete 'd') 
     33(Orange.feature.Discrete 'a', Orange.feature.Discrete 'b', Orange.feature.Discrete 'e') 
     34(Orange.feature.Discrete 'a', Orange.feature.Discrete 'b', Orange.feature.Discrete 'f') 
     35(Orange.feature.Discrete 'a', Orange.feature.Discrete 'c', Orange.feature.Discrete 'd') 
     36(Orange.feature.Discrete 'a', Orange.feature.Discrete 'c', Orange.feature.Discrete 'e') 
     37(Orange.feature.Discrete 'a', Orange.feature.Discrete 'c', Orange.feature.Discrete 'f') 
     38(Orange.feature.Discrete 'a', Orange.feature.Discrete 'd', Orange.feature.Discrete 'e') 
     39(Orange.feature.Discrete 'a', Orange.feature.Discrete 'd', Orange.feature.Discrete 'f') 
     40(Orange.feature.Discrete 'a', Orange.feature.Discrete 'e', Orange.feature.Discrete 'f') 
     41(Orange.feature.Discrete 'b', Orange.feature.Discrete 'c', Orange.feature.Discrete 'd') 
     42(Orange.feature.Discrete 'b', Orange.feature.Discrete 'c', Orange.feature.Discrete 'e') 
     43(Orange.feature.Discrete 'b', Orange.feature.Discrete 'c', Orange.feature.Discrete 'f') 
     44(Orange.feature.Discrete 'b', Orange.feature.Discrete 'd', Orange.feature.Discrete 'e') 
     45(Orange.feature.Discrete 'b', Orange.feature.Discrete 'd', Orange.feature.Discrete 'f') 
     46(Orange.feature.Discrete 'b', Orange.feature.Discrete 'e', Orange.feature.Discrete 'f') 
     47(Orange.feature.Discrete 'c', Orange.feature.Discrete 'd', Orange.feature.Discrete 'e') 
     48(Orange.feature.Discrete 'c', Orange.feature.Discrete 'd', Orange.feature.Discrete 'f') 
     49(Orange.feature.Discrete 'c', Orange.feature.Discrete 'e', Orange.feature.Discrete 'f') 
     50(Orange.feature.Discrete 'd', Orange.feature.Discrete 'e', Orange.feature.Discrete 'f') 
    5151 
    5252 
    5353Subsets by pre-constructed bound set 
    54 (EnumVariable 'a', EnumVariable 'b', EnumVariable 'c') 
    55 (EnumVariable 'a', EnumVariable 'b', EnumVariable 'd') 
    56 (EnumVariable 'a', EnumVariable 'b', EnumVariable 'e') 
    57 (EnumVariable 'a', EnumVariable 'b', EnumVariable 'f') 
    58 (EnumVariable 'a', EnumVariable 'c', EnumVariable 'd') 
    59 (EnumVariable 'a', EnumVariable 'c', EnumVariable 'e') 
    60 (EnumVariable 'a', EnumVariable 'c', EnumVariable 'f') 
    61 (EnumVariable 'a', EnumVariable 'd', EnumVariable 'e') 
    62 (EnumVariable 'a', EnumVariable 'd', EnumVariable 'f') 
    63 (EnumVariable 'a', EnumVariable 'e', EnumVariable 'f') 
    64 (EnumVariable 'b', EnumVariable 'c', EnumVariable 'd') 
    65 (EnumVariable 'b', EnumVariable 'c', EnumVariable 'e') 
    66 (EnumVariable 'b', EnumVariable 'c', EnumVariable 'f') 
    67 (EnumVariable 'b', EnumVariable 'd', EnumVariable 'e') 
    68 (EnumVariable 'b', EnumVariable 'd', EnumVariable 'f') 
    69 (EnumVariable 'b', EnumVariable 'e', EnumVariable 'f') 
    70 (EnumVariable 'c', EnumVariable 'd', EnumVariable 'e') 
    71 (EnumVariable 'c', EnumVariable 'd', EnumVariable 'f') 
    72 (EnumVariable 'c', EnumVariable 'e', EnumVariable 'f') 
    73 (EnumVariable 'd', EnumVariable 'e', EnumVariable 'f') 
     54(Orange.feature.Discrete 'a', Orange.feature.Discrete 'b', Orange.feature.Discrete 'c') 
     55(Orange.feature.Discrete 'a', Orange.feature.Discrete 'b', Orange.feature.Discrete 'd') 
     56(Orange.feature.Discrete 'a', Orange.feature.Discrete 'b', Orange.feature.Discrete 'e') 
     57(Orange.feature.Discrete 'a', Orange.feature.Discrete 'b', Orange.feature.Discrete 'f') 
     58(Orange.feature.Discrete 'a', Orange.feature.Discrete 'c', Orange.feature.Discrete 'd') 
     59(Orange.feature.Discrete 'a', Orange.feature.Discrete 'c', Orange.feature.Discrete 'e') 
     60(Orange.feature.Discrete 'a', Orange.feature.Discrete 'c', Orange.feature.Discrete 'f') 
     61(Orange.feature.Discrete 'a', Orange.feature.Discrete 'd', Orange.feature.Discrete 'e') 
     62(Orange.feature.Discrete 'a', Orange.feature.Discrete 'd', Orange.feature.Discrete 'f') 
     63(Orange.feature.Discrete 'a', Orange.feature.Discrete 'e', Orange.feature.Discrete 'f') 
     64(Orange.feature.Discrete 'b', Orange.feature.Discrete 'c', Orange.feature.Discrete 'd') 
     65(Orange.feature.Discrete 'b', Orange.feature.Discrete 'c', Orange.feature.Discrete 'e') 
     66(Orange.feature.Discrete 'b', Orange.feature.Discrete 'c', Orange.feature.Discrete 'f') 
     67(Orange.feature.Discrete 'b', Orange.feature.Discrete 'd', Orange.feature.Discrete 'e') 
     68(Orange.feature.Discrete 'b', Orange.feature.Discrete 'd', Orange.feature.Discrete 'f') 
     69(Orange.feature.Discrete 'b', Orange.feature.Discrete 'e', Orange.feature.Discrete 'f') 
     70(Orange.feature.Discrete 'c', Orange.feature.Discrete 'd', Orange.feature.Discrete 'e') 
     71(Orange.feature.Discrete 'c', Orange.feature.Discrete 'd', Orange.feature.Discrete 'f') 
     72(Orange.feature.Discrete 'c', Orange.feature.Discrete 'e', Orange.feature.Discrete 'f') 
     73(Orange.feature.Discrete 'd', Orange.feature.Discrete 'e', Orange.feature.Discrete 'f') 
    7474 
    7575 
    7676Subsets by min-max generator 
    77 (EnumVariable 'a',) 
    78 (EnumVariable 'b',) 
    79 (EnumVariable 'c',) 
    80 (EnumVariable 'd',) 
    81 (EnumVariable 'e',) 
    82 (EnumVariable 'f',) 
    83 (EnumVariable 'a', EnumVariable 'b') 
    84 (EnumVariable 'a', EnumVariable 'c') 
    85 (EnumVariable 'a', EnumVariable 'd') 
    86 (EnumVariable 'a', EnumVariable 'e') 
    87 (EnumVariable 'a', EnumVariable 'f') 
    88 (EnumVariable 'b', EnumVariable 'c') 
    89 (EnumVariable 'b', EnumVariable 'd') 
    90 (EnumVariable 'b', EnumVariable 'e') 
    91 (EnumVariable 'b', EnumVariable 'f') 
    92 (EnumVariable 'c', EnumVariable 'd') 
    93 (EnumVariable 'c', EnumVariable 'e') 
    94 (EnumVariable 'c', EnumVariable 'f') 
    95 (EnumVariable 'd', EnumVariable 'e') 
    96 (EnumVariable 'd', EnumVariable 'f') 
    97 (EnumVariable 'e', EnumVariable 'f') 
    98 (EnumVariable 'a', EnumVariable 'b', EnumVariable 'c') 
    99 (EnumVariable 'a', EnumVariable 'b', EnumVariable 'd') 
    100 (EnumVariable 'a', EnumVariable 'b', EnumVariable 'e') 
    101 (EnumVariable 'a', EnumVariable 'b', EnumVariable 'f') 
    102 (EnumVariable 'a', EnumVariable 'c', EnumVariable 'd') 
    103 (EnumVariable 'a', EnumVariable 'c', EnumVariable 'e') 
    104 (EnumVariable 'a', EnumVariable 'c', EnumVariable 'f') 
    105 (EnumVariable 'a', EnumVariable 'd', EnumVariable 'e') 
    106 (EnumVariable 'a', EnumVariable 'd', EnumVariable 'f') 
    107 (EnumVariable 'a', EnumVariable 'e', EnumVariable 'f') 
    108 (EnumVariable 'b', EnumVariable 'c', EnumVariable 'd') 
    109 (EnumVariable 'b', EnumVariable 'c', EnumVariable 'e') 
    110 (EnumVariable 'b', EnumVariable 'c', EnumVariable 'f') 
    111 (EnumVariable 'b', EnumVariable 'd', EnumVariable 'e') 
    112 (EnumVariable 'b', EnumVariable 'd', EnumVariable 'f') 
    113 (EnumVariable 'b', EnumVariable 'e', EnumVariable 'f') 
    114 (EnumVariable 'c', EnumVariable 'd', EnumVariable 'e') 
    115 (EnumVariable 'c', EnumVariable 'd', EnumVariable 'f') 
    116 (EnumVariable 'c', EnumVariable 'e', EnumVariable 'f') 
    117 (EnumVariable 'd', EnumVariable 'e', EnumVariable 'f') 
     77(Orange.feature.Discrete 'a',) 
     78(Orange.feature.Discrete 'b',) 
     79(Orange.feature.Discrete 'c',) 
     80(Orange.feature.Discrete 'd',) 
     81(Orange.feature.Discrete 'e',) 
     82(Orange.feature.Discrete 'f',) 
     83(Orange.feature.Discrete 'a', Orange.feature.Discrete 'b') 
     84(Orange.feature.Discrete 'a', Orange.feature.Discrete 'c') 
     85(Orange.feature.Discrete 'a', Orange.feature.Discrete 'd') 
     86(Orange.feature.Discrete 'a', Orange.feature.Discrete 'e') 
     87(Orange.feature.Discrete 'a', Orange.feature.Discrete 'f') 
     88(Orange.feature.Discrete 'b', Orange.feature.Discrete 'c') 
     89(Orange.feature.Discrete 'b', Orange.feature.Discrete 'd') 
     90(Orange.feature.Discrete 'b', Orange.feature.Discrete 'e') 
     91(Orange.feature.Discrete 'b', Orange.feature.Discrete 'f') 
     92(Orange.feature.Discrete 'c', Orange.feature.Discrete 'd') 
     93(Orange.feature.Discrete 'c', Orange.feature.Discrete 'e') 
     94(Orange.feature.Discrete 'c', Orange.feature.Discrete 'f') 
     95(Orange.feature.Discrete 'd', Orange.feature.Discrete 'e') 
     96(Orange.feature.Discrete 'd', Orange.feature.Discrete 'f') 
     97(Orange.feature.Discrete 'e', Orange.feature.Discrete 'f') 
     98(Orange.feature.Discrete 'a', Orange.feature.Discrete 'b', Orange.feature.Discrete 'c') 
     99(Orange.feature.Discrete 'a', Orange.feature.Discrete 'b', Orange.feature.Discrete 'd') 
     100(Orange.feature.Discrete 'a', Orange.feature.Discrete 'b', Orange.feature.Discrete 'e') 
     101(Orange.feature.Discrete 'a', Orange.feature.Discrete 'b', Orange.feature.Discrete 'f') 
     102(Orange.feature.Discrete 'a', Orange.feature.Discrete 'c', Orange.feature.Discrete 'd') 
     103(Orange.feature.Discrete 'a', Orange.feature.Discrete 'c', Orange.feature.Discrete 'e') 
     104(Orange.feature.Discrete 'a', Orange.feature.Discrete 'c', Orange.feature.Discrete 'f') 
     105(Orange.feature.Discrete 'a', Orange.feature.Discrete 'd', Orange.feature.Discrete 'e') 
     106(Orange.feature.Discrete 'a', Orange.feature.Discrete 'd', Orange.feature.Discrete 'f') 
     107(Orange.feature.Discrete 'a', Orange.feature.Discrete 'e', Orange.feature.Discrete 'f') 
     108(Orange.feature.Discrete 'b', Orange.feature.Discrete 'c', Orange.feature.Discrete 'd') 
     109(Orange.feature.Discrete 'b', Orange.feature.Discrete 'c', Orange.feature.Discrete 'e') 
     110(Orange.feature.Discrete 'b', Orange.feature.Discrete 'c', Orange.feature.Discrete 'f') 
     111(Orange.feature.Discrete 'b', Orange.feature.Discrete 'd', Orange.feature.Discrete 'e') 
     112(Orange.feature.Discrete 'b', Orange.feature.Discrete 'd', Orange.feature.Discrete 'f') 
     113(Orange.feature.Discrete 'b', Orange.feature.Discrete 'e', Orange.feature.Discrete 'f') 
     114(Orange.feature.Discrete 'c', Orange.feature.Discrete 'd', Orange.feature.Discrete 'e') 
     115(Orange.feature.Discrete 'c', Orange.feature.Discrete 'd', Orange.feature.Discrete 'f') 
     116(Orange.feature.Discrete 'c', Orange.feature.Discrete 'e', Orange.feature.Discrete 'f') 
     117(Orange.feature.Discrete 'd', Orange.feature.Discrete 'e', Orange.feature.Discrete 'f') 
    118118 
    119119 
    120120Subsets by constant generator 
    121 (EnumVariable 'a', EnumVariable 'b', EnumVariable 'c') 
     121(Orange.feature.Discrete 'a', Orange.feature.Discrete 'b', Orange.feature.Discrete 'c') 
    122122 
    123123 
    124124... once more: subsets by constant generator 
    125 (EnumVariable 'a', EnumVariable 'b', EnumVariable 'c') 
     125(Orange.feature.Discrete 'a', Orange.feature.Discrete 'b', Orange.feature.Discrete 'c') 
  • Orange/testing/regression/results_tests_20/reference_tab-basket.py.txt

    r9951 r10290  
    88[0.39, 1], {"Ca":7.78} 
    99[0.57, 1], {"Ca":8.22, "c":13.000} 
    10 All metas:  [FloatVariable 'Ca', FloatVariable 'a', FloatVariable 'b', FloatVariable 'c', FloatVariable 'd'] 
    11 Required metas:  [FloatVariable 'Ca'] 
    12 Optional metas:  [FloatVariable 'a', FloatVariable 'b', FloatVariable 'c', FloatVariable 'd'] 
     10All metas:  [Orange.feature.Continuous 'Ca', Orange.feature.Continuous 'a', Orange.feature.Continuous 'b', Orange.feature.Continuous 'c', Orange.feature.Continuous 'd'] 
     11Required metas:  [Orange.feature.Continuous 'Ca'] 
     12Optional metas:  [Orange.feature.Continuous 'a', Orange.feature.Continuous 'b', Orange.feature.Continuous 'c', Orange.feature.Continuous 'd'] 
  • Orange/testing/regression/results_tests_20/reference_unusedValues.py.txt

    r9951 r10290  
    11 
    2 EnumVariable 'a' retained as is 
    3 EnumVariable 'b' reduced, new values are <0, 2> 
    4 EnumVariable 'c' removed 
    5 EnumVariable 'd' retained as is 
    6 EnumVariable 'y' retained as is 
     2Orange.feature.Discrete 'a' retained as is 
     3Orange.feature.Discrete 'b' reduced, new values are <0, 2> 
     4Orange.feature.Discrete 'c' removed 
     5Orange.feature.Discrete 'd' retained as is 
     6Orange.feature.Discrete 'y' retained as is 
    77 
    88Original example table 
     
    1818Removal with 'removedOneValued=true' 
    1919 
    20 EnumVariable 'a' retained as is 
    21 EnumVariable 'b' reduced, new values are <0, 2> 
    22 EnumVariable 'c' removed 
    23 EnumVariable 'd' removed 
    24 EnumVariable 'y' retained as is 
     20Orange.feature.Discrete 'a' retained as is 
     21Orange.feature.Discrete 'b' reduced, new values are <0, 2> 
     22Orange.feature.Discrete 'c' removed 
     23Orange.feature.Discrete 'd' removed 
     24Orange.feature.Discrete 'y' retained as is 
  • Orange/testing/regression/results_tutorial/domain3.py.txt

    r9953 r10290  
    11orange.Domain(["Na", "Mg"], domain) 
    2   classVar: FloatVariable 'Mg' 
    3   attributes: <FloatVariable 'Na'> 
     2  classVar: Orange.feature.Continuous 'Mg' 
     3  attributes: <Orange.feature.Continuous 'Na'> 
    44 
    55orange.Domain(["Na", "Mg"], 1, domain) 
    6   classVar: FloatVariable 'Mg' 
    7   attributes: <FloatVariable 'Na'> 
     6  classVar: Orange.feature.Continuous 'Mg' 
     7  attributes: <Orange.feature.Continuous 'Na'> 
    88 
    99orange.Domain(["Na", "Mg"], 0, domain) 
    1010  classVar: None 
    11   attributes: <FloatVariable 'Na', FloatVariable 'Mg'> 
     11  attributes: <Orange.feature.Continuous 'Na', Orange.feature.Continuous 'Mg'> 
    1212 
    1313orange.Domain(["Na", "Mg"], domain.variables) 
    14   classVar: FloatVariable 'Mg' 
    15   attributes: <FloatVariable 'Na'> 
     14  classVar: Orange.feature.Continuous 'Mg' 
     15  attributes: <Orange.feature.Continuous 'Na'> 
    1616 
    1717orange.Domain(["Na", "Mg"], 1, domain.variables) 
    18   classVar: FloatVariable 'Mg' 
    19   attributes: <FloatVariable 'Na'> 
     18  classVar: Orange.feature.Continuous 'Mg' 
     19  attributes: <Orange.feature.Continuous 'Na'> 
    2020 
    2121orange.Domain(["Na", "Mg"], 0, domain.variables) 
    2222  classVar: None 
    23   attributes: <FloatVariable 'Na', FloatVariable 'Mg'> 
     23  attributes: <Orange.feature.Continuous 'Na', Orange.feature.Continuous 'Mg'> 
    2424 
    2525orange.Domain([domain["Na"], "Mg"], 0, domain.variables) 
    2626  classVar: None 
    27   attributes: <FloatVariable 'Na', FloatVariable 'Mg'> 
     27  attributes: <Orange.feature.Continuous 'Na', Orange.feature.Continuous 'Mg'> 
    2828 
    2929orange.Domain([domain["Na"], "Mg"], 0, domain) 
    3030  classVar: None 
    31   attributes: <FloatVariable 'Na', FloatVariable 'Mg'> 
     31  attributes: <Orange.feature.Continuous 'Na', Orange.feature.Continuous 'Mg'> 
    3232 
    3333orange.Domain([domain["Na"], "Mg"], 0, domain.variables) 
    3434  classVar: None 
    35   attributes: <FloatVariable 'Na', FloatVariable 'Mg'> 
     35  attributes: <Orange.feature.Continuous 'Na', Orange.feature.Continuous 'Mg'> 
    3636 
    3737orange.Domain([domain["Na"], domain["Mg"]], 0) 
    3838  classVar: None 
    39   attributes: <FloatVariable 'Na', FloatVariable 'Mg'> 
     39  attributes: <Orange.feature.Continuous 'Na', Orange.feature.Continuous 'Mg'> 
    4040 
    4141orange.Domain([domain["Na"], domain["Mg"]], 1) 
    42   classVar: FloatVariable 'Mg' 
    43   attributes: <FloatVariable 'Na'> 
     42  classVar: Orange.feature.Continuous 'Mg' 
     43  attributes: <Orange.feature.Continuous 'Na'> 
    4444 
    4545orange.Domain([domain["Na"], domain["Mg"]], None) 
    4646  classVar: None 
    47   attributes: <FloatVariable 'Na', FloatVariable 'Mg'> 
     47  attributes: <Orange.feature.Continuous 'Na', Orange.feature.Continuous 'Mg'> 
    4848 
    4949orange.Domain([domain["Na"], domain["Mg"]], orange.EnumVariable("something completely different")) 
    50   classVar: EnumVariable 'something completely different' 
    51   attributes: <FloatVariable 'Na', FloatVariable 'Mg'> 
     50  classVar: Orange.feature.Discrete 'something completely different' 
     51  attributes: <Orange.feature.Continuous 'Na', Orange.feature.Continuous 'Mg'> 
    5252 
    5353orange.Domain(domain) 
    54   classVar: FloatVariable 'y' 
    55   attributes: <FloatVariable 'RI', FloatVariable 'Na', FloatVariable 'Mg', FloatVariable 'Al', FloatVariable 'Si', FloatVariable 'K', FloatVariable 'Ca', FloatVariable 'Ba', FloatVariable 'Fe'> 
     54  classVar: Orange.feature.Continuous 'y' 
     55  attributes: <Orange.feature.Continuous 'RI', Orange.feature.Continuous 'Na', Orange.feature.Continuous 'Mg', Orange.feature.Continuous 'Al', Orange.feature.Continuous 'Si', Orange.feature.Continuous 'K', Orange.feature.Continuous 'Ca', Orange.feature.Continuous 'Ba', Orange.feature.Continuous 'Fe'> 
    5656 
    5757orange.Domain(domain, 0) 
    5858  classVar: None 
    59   attributes: <FloatVariable 'RI', FloatVariable 'Na', FloatVariable 'Mg', FloatVariable 'Al', FloatVariable 'Si', FloatVariable 'K', FloatVariable 'Ca', FloatVariable 'Ba', FloatVariable 'Fe', FloatVariable 'y'> 
     59  attributes: <Orange.feature.Continuous 'RI', Orange.feature.Continuous 'Na', Orange.feature.Continuous 'Mg', Orange.feature.Continuous 'Al', Orange.feature.Continuous 'Si', Orange.feature.Continuous 'K', Orange.feature.Continuous 'Ca', Orange.feature.Continuous 'Ba', Orange.feature.Continuous 'Fe', Orange.feature.Continuous 'y'> 
    6060 
    6161orange.Domain(domain, 1) 
    62   classVar: FloatVariable 'y' 
    63   attributes: <FloatVariable 'RI', FloatVariable 'Na', FloatVariable 'Mg', FloatVariable 'Al', FloatVariable 'Si', FloatVariable 'K', FloatVariable 'Ca', FloatVariable 'Ba', FloatVariable 'Fe'> 
     62  classVar: Orange.feature.Continuous 'y' 
     63  attributes: <Orange.feature.Continuous 'RI', Orange.feature.Continuous 'Na', Orange.feature.Continuous 'Mg', Orange.feature.Continuous 'Al', Orange.feature.Continuous 'Si', Orange.feature.Continuous 'K', Orange.feature.Continuous 'Ca', Orange.feature.Continuous 'Ba', Orange.feature.Continuous 'Fe'> 
    6464 
    6565orange.Domain(domain, "Mg") 
    66   classVar: FloatVariable 'Mg' 
    67   attributes: <FloatVariable 'RI', FloatVariable 'Na', FloatVariable 'Al', FloatVariable 'Si', FloatVariable 'K', FloatVariable 'Ca', FloatVariable 'Ba', FloatVariable 'Fe', FloatVariable 'y'> 
     66  classVar: Orange.feature.Continuous 'Mg' 
     67  attributes: <Orange.feature.Continuous 'RI', Orange.feature.Continuous 'Na', Orange.feature.Continuous 'Al', Orange.feature.Continuous 'Si', Orange.feature.Continuous 'K', Orange.feature.Continuous 'Ca', Orange.feature.Continuous 'Ba', Orange.feature.Continuous 'Fe', Orange.feature.Continuous 'y'> 
    6868 
    6969orange.Domain(domain, domain[0]) 
    70   classVar: FloatVariable 'RI' 
    71   attributes: <FloatVariable 'Na', FloatVariable 'Mg', FloatVariable 'Al', FloatVariable 'Si', FloatVariable 'K', FloatVariable 'Ca', FloatVariable 'Ba', FloatVariable 'Fe', FloatVariable 'y'> 
     70  classVar: Orange.feature.Continuous 'RI' 
     71  attributes: <Orange.feature.Continuous 'Na', Orange.feature.Continuous 'Mg', Orange.feature.Continuous 'Al', Orange.feature.Continuous 'Si', Orange.feature.Continuous 'K', Orange.feature.Continuous 'Ca', Orange.feature.Continuous 'Ba', Orange.feature.Continuous 'Fe', Orange.feature.Continuous 'y'> 
    7272 
    7373orange.Domain(domain, None) 
    7474  classVar: None 
    75   attributes: <FloatVariable 'RI', FloatVariable 'Na', FloatVariable 'Mg', FloatVariable 'Al', FloatVariable 'Si', FloatVariable 'K', FloatVariable 'Ca', FloatVariable 'Ba', FloatVariable 'Fe', FloatVariable 'y'> 
     75  attributes: <Orange.feature.Continuous 'RI', Orange.feature.Continuous 'Na', Orange.feature.Continuous 'Mg', Orange.feature.Continuous 'Al', Orange.feature.Continuous 'Si', Orange.feature.Continuous 'K', Orange.feature.Continuous 'Ca', Orange.feature.Continuous 'Ba', Orange.feature.Continuous 'Fe', Orange.feature.Continuous 'y'> 
    7676 
    7777orange.Domain(domain, orange.FloatVariable("nothing completely different")) 
    78   classVar: FloatVariable 'nothing completely different' 
    79   attributes: <FloatVariable 'RI', FloatVariable 'Na', FloatVariable 'Mg', FloatVariable 'Al', FloatVariable 'Si', FloatVariable 'K', FloatVariable 'Ca', FloatVariable 'Ba', FloatVariable 'Fe', FloatVariable 'y'> 
     78  classVar: Orange.feature.Continuous 'nothing completely different' 
     79  attributes: <Orange.feature.Continuous 'RI', Orange.feature.Continuous 'Na', Orange.feature.Continuous 'Mg', Orange.feature.Continuous 'Al', Orange.feature.Continuous 'Si', Orange.feature.Continuous 'K', Orange.feature.Continuous 'Ca', Orange.feature.Continuous 'Ba', Orange.feature.Continuous 'Fe', Orange.feature.Continuous 'y'> 
    8080 
  • Orange/testing/regression/tests/exclude-from-regression.txt

    r9983 r10290  
     1__init__.py 
  • Orange/testing/regression/tests_20/exclude-from-regression.txt

    r10113 r10290  
    2222modules_server_files2.py 
    2323reference_matrix.py 
     24__init__.py 
Note: See TracChangeset for help on using the changeset viewer.