Changeset 3687:37898ca1c6aa in orange


Ignore:
Timestamp:
05/23/07 19:14:21 (7 years ago)
Author:
miha <miha.stajdohar@…>
Branch:
default
Convert:
dd82ecc70810233a83dd7813c48c57faa804460b
Message:

optimization on larger area (1.000 x 1.000 -> 10.000 x 10.000)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • source/orangeom/networkoptimization.cpp

    r3686 r3687  
    3232    k = 1; 
    3333    k2 = 1; 
    34     width = 1000; 
    35     height = 1000; 
     34    width = 10000; 
     35    height = 10000; 
    3636    links = NULL; 
    3737    pos = NULL; 
    3838    temperature = sqrt((double)(width*width + height*height)) / 10; 
     39    coolFactor = 0.96; 
    3940} 
    4041 
     
    6970        cout << endl; 
    7071    } 
    71  
    72     coolFactor = 0.96; 
    7372} 
    7473 
     
    448447 
    449448    graph->temperature = temperature; 
    450     graph->coolFactor = exp(log(0.04) / steps); 
     449    graph->coolFactor = exp(log(0.02) / steps); 
    451450     
    452451    if (graph->fruchtermanReingold(steps) > 0) 
     
    473472    RETURN_NONE; 
    474473} 
    475 /* 
    476 void temp(TGraph &graph) 
    477 { 
    478     graph = TGraphAsList(5, 0, false); 
    479 } 
    480 */ 
     474 
    481475WRAPPER(ExampleTable) 
    482476 
Note: See TracChangeset for help on using the changeset viewer.