Changeset 1136

Show
Ignore:
Timestamp:
07/14/10 12:38:29 (14 years ago)
Author:
ondrak
Message:

bugfix again...

Location:
applications/doprava
Files:
2 modified

Legend:

Unmodified
Added
Removed
  • applications/doprava/Zlicingw.cfg

    r1127 r1136  
    11agents = ( 
    22        { // agent 1 
    3         class = "GreenWaveTrafficAgent"; 
    4         name = "495"; 
    5         lanes = ( 
     3    class = "GreenWaveTrafficAgent"; 
     4    name = "495"; 
     5    lanes = ( 
    66                        { sg="VA"; inputs = ("495_DVA1");  outputs= ("DUMMY_DET"); input_distances=[30]; output_distances=[200]; alpha= [1.0 ]; queue="495_QA"; beta=1;},  
    77                        { sg="VB"; inputs = ("495_DVB1");  outputs= ("601_DVA","601_DVAa"); input_distances=[30]; output_distances=[190,190]; alpha= [0.5,0.5 ]; queue="495_QB"; beta=1;}, 
     
    1010                        { sg="VE"; inputs = ("495_DVE");  outputs= ("601_DVA","601_DVAa"); input_distances=[30]; output_distances=[190,190]; alpha= [0.5,0.5 ]; queue="495_QE"; beta=1;},  
    1111                        { sg="VF"; inputs = ("495_DVF1");  outputs= ("DUMMY_DET"); input_distances=[30]; output_distances=[200]; alpha= [1.0 ]; queue="495_QF"; beta=1;} 
    12         ); 
    13         neighbours = ("601"); 
    14         offset = 60; //s 
    15   green_names = ("495_VA","495_VB","495_VC","495_VD","495_VE","495_VF"); 
    16   green_starts= [72,4,5,35,36,71]; 
    17   green_times = [0.4875,0.3375,0.775,0.4,0.5375,0.1];// fractions of cycle_length 
    18   stage_names = ("495_F1","495_F2","495_F3"); 
    19   stage_times = [30,30,20];}, 
    20 { //agent 2 
    21         class = "GreenWaveTrafficAgent"; 
    22         name = "601"; 
    23         lanes = ( 
     12    ); 
     13    neighbours = ("601"); 
     14    offset = 60; //s 
     15        green_names = ("495_VA","495_VB","495_VC","495_VD","495_VE","495_VF"); 
     16        green_starts= [72,4,5,35,36,71]; 
     17        green_times = [0.4875,0.3375,0.775,0.4,0.5375,0.1];// fractions of cycle_length 
     18        stage_names = ("495_F1","495_F2","495_F3"); 
     19        stage_times = [30,30,20]; 
     20        passive=0; 
     21        VP=40;                                  //average speed of cars 
     22        car_leaving_time=2;     //time cars need to leave queue 
     23        cycle_count=5;                  //number of complete negotiation cycles before making avarage offset and sending it to Aimsun 
     24    negot_start=4;                      //starting offset for negotiation 
     25    negot_limit=1;                      //ending offset for negotitation 
     26    find_best_start=8;          //starting offset for find_best_offset 
     27    find_best_limit=2;          //ending offset for find_best_offset 
     28  }, 
     29  { //agent 2 
     30    class = "GreenWaveTrafficAgent"; 
     31    name = "601"; 
     32    lanes = ( 
    2433                        { sg="VA"; inputs = ("601_DVA");  outputs= ("DUMMY_DET","DUMMY_DET"); input_distances=[30]; output_distances=[200,200]; alpha= [0.54, 0.46 ]; queue="601_QA2"; beta=1;},  
    2534                        { sg="VA"; inputs = ("601_DVAa");  outputs= ("DUMMY_DET","DUMMY_DET"); input_distances=[30]; output_distances=[200,200]; alpha= [0.44,0.56]; queue="601_QA1"; beta=1;}, 
     
    2938                        { sg="VD"; inputs = ("601_DVD1");  outputs= ("DUMMY_DET"); input_distances=[30]; output_distances=[200]; alpha= [1.0 ]; queue="601_QD"; beta=1;}, 
    3039                        { sg="SE"; inputs = ("601_DSE1");  outputs= ("DUMMY_DET"); input_distances=[30]; output_distances=[200]; alpha= [1.0 ]; queue="601_QSE"; beta=1;},  
    31                         { sg="VE"; inputs = ("601_DVE1");  outputs= ("495_DVC","495_DVD"); input_distances=[30]; output_distances=[190,190]; alpha= [0.5,0.5 ]; queue="601_QE"; beta=1;} 
    32         );   
    33         neighbours = ("495"); 
    34         offset = 40; 
    35         green_names = ("601_VA","601_VB","601_VC","601_VD","601_VE","601_SE"); 
     40                        { sg="VE"; inputs = ("601_DVE1");  outputs= ("495_DVC","495_DVD"); input_distances=[30]; output_distances=[190,190]; alpha= [0.5,0.5 ]; queue="601_QE"; beta=1;}    
     41    );   
     42    neighbours = ("495"); 
     43    offset = 40; 
     44    green_names = ("601_VA","601_VB","601_VC","601_VD","601_VE","601_SE"); 
    3645        green_starts= [54,9,26,25,9,9]; 
    3746        green_times = [0.325,0.1375,0.65,0.275,0.1375,0.5125];// fractions of cycle_length 
     
    3948        stage_times = [30,30,20]; 
    4049        passive=1; 
    41 } 
     50        VP=40;                                  //average speed of cars 
     51        car_leaving_time=2;     //time cars need to leave queue 
     52        cycle_count=5;                  //number of complete negotiation cycles before making avarage offset and sending it to Aimsun 
     53    negot_start=4;                      //starting offset for negotiation 
     54    negot_limit=1;                      //ending offset for negotitation 
     55    find_best_start=8;          //starting offset for find_best_offset 
     56    find_best_limit=2;          //ending offset for find_best_offset 
     57  } 
    4258); 
    4359 
     
    5066        // constant entrances: entrances = "zlicin_const01_495_601.csv"; 
    5167        //                     entrances = "zlicin_const02_495_601.csv"; 
    52         entrances = "zlicin_const02_495_601.csv"; 
     68        entrances = "zlicin_20071212_495_601.csv"; 
    5369 
    5470        // Simulation length. Due to design of the Aimsun simulator, 
    5571        // simulation in our case starts always at 00:00:00. Default simulation 
    5672        // length is 24 hours (24:00:00). 
    57         stop_time = "24:00:00"; 
     73        //stop_time = "00:05:00"; 
    5874         
    5975        // Simulation length in number of cycles (one cycle = 90 s) 
    6076        // If present, overwrites stop_time. Ensures corrent termination of simulation 
    6177        // Example: 1 hour = 40 cycles, 6 hours = 240 cycles, 24 hours = 960  
    62         stop_cycle=5; 
     78        stop_cycle=960; 
    6379         
    6480}; 
  • applications/doprava/traffic_agent_offset.h

    r1135 r1136  
    225225                                                                t_end=min(t_gb_vec(l),t_cars_begin(k)); 
    226226                                                        } 
    227                                                         t_act=t_end; 
    228227                                                } 
     228                                                t_act=t_end; 
     229 
    229230                                                //raising rating 
    230231                                                if (virtual_queue<0) { 
     
    243244                                                        t_ge_vec.del(l); 
    244245                                                } 
    245  
    246246                                        } 
    247247                                        //if no other expectations found