Changeset 10016:46695dd492e7 in orange


Ignore:
Timestamp:
02/07/12 23:38:58 (2 years ago)
Author:
Jure Zbontar <jure.zbontar@…>
Branch:
default
Parents:
10015:80f04d2d6ce7 (diff), 10007:fc2f3a02d0d7 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge

Files:
377 deleted
4 edited

Legend:

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

    r9689 r10016  
     1Testing using euclidean distance 
    12Iris-setosa Iris-setosa 
    23Iris-versicolor Iris-versicolor 
     
    67 
    78 
    8  
     9Testing using hamming distance 
    910Iris-virginica Iris-virginica 
    1011Iris-setosa Iris-setosa 
  • Orange/testing/regression/results_reference/randomindicescv.py.txt

    r9689 r10016  
     1Indices for ordinary 10-fold CV 
    12<1, 1, 3, 8, 8, 3, 2, 7, 5, 0, 1, 5, 2, 9, 4, 7, 4, 9, 3, 6, 0, 2, 0, 6> 
     3Indices for 5 folds on 10 examples 
    24<3, 0, 1, 0, 3, 2, 4, 4, 1, 2> 
  • Orange/testing/regression/results_reference/treelearner.py.txt

    r9689 r10016  
    1 None 
    2 None 
    311.0 0.0 
    42 
    53 
    64Tree with minExamples = 5.0 
     5tear_rate=reduced: none (100.00%) 
     6tear_rate=normal 
     7|    astigmatic=no 
     8|    |    age=pre-presbyopic: soft (100.00%) 
     9|    |    age=presbyopic: none (50.00%) 
     10|    |    age=young: soft (100.00%) 
     11|    astigmatic=yes 
     12|    |    prescription=hypermetrope: none (66.67%) 
     13|    |    prescription=myope: hard (100.00%) 
    714 
    8 tear_rate (<15.000, 4.000, 5.000>)  
    9 : normal  
    10    astigmatic (<3.000, 4.000, 5.000>)  
    11    : no  
    12       age (<1.000, 0.000, 5.000>)  
    13       : pre-presbyopic --> soft (<0.000, 0.000, 2.000>)   
    14       : presbyopic --> none (<1.000, 0.000, 1.000>)   
    15       : young --> soft (<0.000, 0.000, 2.000>)   
    16    : yes  
    17       prescription (<2.000, 4.000, 0.000>)  
    18       : hypermetrope --> none (<2.000, 1.000, 0.000>)   
    19       : myope --> hard (<0.000, 3.000, 0.000>)   
    20 : reduced --> none (<12.000, 0.000, 0.000>)   
     15 
    2116 
    2217Tree with maxMajority = 0.5 
    23 --> none (<15.000, 4.000, 5.000>)  
     18none (62.50%) 
  • Orange/testing/regression/results_reference/treestructure.py.txt

    r9689 r10016  
    1 Tree size: 10 
     1Tree size: 15 
    22 
    33 
    44Unpruned tree 
     5tear_rate=reduced: none (100.00%) 
     6tear_rate=normal 
     7|    astigmatic=no 
     8|    |    age=pre-presbyopic: soft (100.00%) 
     9|    |    age=young: soft (100.00%) 
     10|    |    age=presbyopic 
     11|    |    |    prescription=hypermetrope: soft (100.00%) 
     12|    |    |    prescription=myope: none (100.00%) 
     13|    astigmatic=yes 
     14|    |    prescription=myope: hard (100.00%) 
     15|    |    prescription=hypermetrope 
     16|    |    |    age=pre-presbyopic: none (100.00%) 
     17|    |    |    age=presbyopic: none (100.00%) 
     18|    |    |    age=young: hard (100.00%) 
    519 
    6 tear_rate (<15.000, 4.000, 5.000>)  
    7 : normal  
    8    astigmatic (<3.000, 4.000, 5.000>)  
    9    : no  
    10       age (<1.000, 0.000, 5.000>)  
    11       : pre-presbyopic --> soft (<0.000, 0.000, 2.000>)   
    12       : presbyopic --> none (<1.000, 0.000, 1.000>)   
    13       : young --> soft (<0.000, 0.000, 2.000>)   
    14    : yes  
    15       prescription (<2.000, 4.000, 0.000>)  
    16       : hypermetrope --> none (<2.000, 1.000, 0.000>)   
    17       : myope --> hard (<0.000, 3.000, 0.000>)   
    18 : reduced --> none (<12.000, 0.000, 0.000>)   
     20 
    1921 
    2022Pruned tree 
     23tear_rate=reduced: none (100.00%) 
     24tear_rate=normal 
     25|    astigmatic=no: soft (83.33%) 
     26|    astigmatic=yes: hard (66.67%) 
    2127 
    22 tear_rate (<15.000, 4.000, 5.000>)  
    23 : normal  
    24    astigmatic (<3.000, 4.000, 5.000>)  
    25    : no --> soft (<1.000, 0.000, 5.000>)   
    26    : yes --> hard (<2.000, 4.000, 0.000>)   
    27 : reduced --> none (<12.000, 0.000, 0.000>)  
Note: See TracChangeset for help on using the changeset viewer.