Changeset 8590:db58d174f84b in orange


Ignore:
Timestamp:
08/03/11 16:20:32 (3 years ago)
Author:
miha <miha.stajdohar@…>
Branch:
default
Convert:
c7da49971f242100c7b293c352b903dd02788b13
Message:

First time working InsideView.

Location:
source/orangeplot
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • source/orangeplot/networkcurve.cpp

    r8588 r8590  
    327327} 
    328328 
    329 int NetworkCurve::fr(int steps, bool weighted) 
     329int NetworkCurve::fr(int steps, bool weighted, bool smooth_cooling) 
    330330{ 
    331331    int i, j; 
     
    382382        cooling_1 = (temperature - cooling_switch) / steps; 
    383383        cooling_2 = 0; 
     384    } 
     385 
     386    if (smooth_cooling) 
     387    { 
     388        if (steps < 20) 
     389        { 
     390            steps = 20; 
     391        } 
     392        temperature = cooling_switch; 
     393        cooling_1 = 0; 
     394        cooling_2 = (cooling_switch - sqrt(area) / 2000 ) / steps; 
    384395    } 
    385396 
  • source/orangeplot/networkcurve.h

    r8588 r8590  
    154154    virtual void register_points(); 
    155155     
    156     int fr(int steps, bool weighted); 
     156    int fr(int steps, bool weighted, bool smooth_cooling); 
    157157    int random(); 
    158158     
  • source/orangeplot/networkcurve.sip

    r8588 r8590  
    8383    virtual QRectF data_rect() const; 
    8484     
    85     int fr(int steps, bool weighted); 
     85    int fr(int steps, bool weighted, bool smooth_cooling); 
    8686    int random(); 
    8787 
Note: See TracChangeset for help on using the changeset viewer.