Changeset 932

Timestamp:

05/11/10 00:12:39 (14 years ago)

Author:

ondrak

Message:

Extended negotiation cycle

Location:

applications/doprava

Files:

• Zlicingw.cfg (modified) (2 diffs)
• main_loop.cpp (modified) (3 diffs)

applications/doprava/Zlicingw.cfg

@@ -2 +2 @@
         { // agent 1
         class = "GreenWaveTrafficAgent";
-                name = "495";
-                lanes = (
+        name = "495";
+        lanes = (
                         { sg="VA"; inputs = ("495_DVA1","495_DVB");  outputs= ("601_DVA"); alpha= [1.0 ]; queue="495_Q1";}, 
                         { sg="VB"; inputs = ("495_DVA1","495_DVB");  outputs= ("601_DVA"); alpha= [1.0 ]; queue="495_Q2";}
-              );
-                neighbours = ("601");
-  offset = 40; //s
-  moje_special=14;
+        );
+        neighbours = ("601");
+        offset = 40; //s
+        moje_special=14;
 },
 { //agent 2
         class = "GreenWaveTrafficAgent";
-  name = "601";  
-                neighbours = ("495");
+        name = "601";  
+        neighbours = ("495");
 }
+
 );
 
 logger = {class="memlog"; filename = "zlicin"; maxlen = 1000;};
+
+
+
 
 system = {
@@ -32 +36 @@
         // length is 24 hours (24:00:00).
         stop_time = "01:00:00";
+        
 };
+
+//Number of recieve/broadcast calls before end of negotitaion
+negotiation_cycles = 5;

applications/doprava/main_loop.cpp

@@ -21 +21 @@
 int main ( int argc, char* argv[] ) {
         const char *fname;
+        int max_cycles=5; //max. number of sending/recieving during negotiation, changed to number from config file, if present (negotiation_cycles)
+
         if ( argc>1 ) {fname = argv[1]; }
         else { cout << "Missing configuration file.\n Usage: \n $> estimator config_file.cfg"<<endl; abort(); }
@@ -35 +37 @@
         shared_ptr<logger> L = UI::build <logger>( Cfg, "logger" );
         if (!L) {L=new stdlog();} // DEFAULT LOGGER <== poor choice, use better ones
+
+
 
         Config MsgStore;
@@ -62 +66 @@
         glob_ut[11] = 20;
 
+        //LENGTH OF NEGOTIATION
+        UI::get(max_cycles,Cfg,"negotiation_cycles");
+
         for ( int tK=0; tK < Ds->max_length(); tK++ ) {
+
                 Ds->log_write ( ); // write stuff to 
                 Ds->getdata(glob_dt);
-                
                 for ( int i=0; i<Ags.length(); i++ ) {
                         Ags(i) -> adapt(glob_dt);
                 }
-                
+
                 // NEGOTIATION CYCLE
-                for ( int i=0; i<Ags.length(); i++ ) {
-                        Ags(i) -> broadcast(Queue);
-                }
-                //DBG
-                MsgStore.writeFile("xxx");
-                // parse message queue
-                for ( int m=Queue.getLength()-1; m>=0; m-- ) { // go backwards - last mesages are discarded
-                        for ( int i=0; i<Ags.length(); i++ ) {
-                                Setting& msg=Queue[m];
-                                string m_to=msg["to"];
-                                if (m_to==Ags(i)->_name()) {
-                                        Ags(i)->receive(msg);
-                                        Queue.remove(m);
-                                        break;
-                                        // message delivered;
+                // ends when Queue is empty or after defined number of cycles
+                int cycle=0;
+                do {
+                        //DBG
+                        MsgStore.writeFile("xxx");
+                        // parse message queue
+                        for ( int m=Queue.getLength()-1; m>=0; m-- ) { // go backwards - last mesages are discarded
+                                for ( int i=0; i<Ags.length(); i++ ) {
+                                        Setting& msg=Queue[m];
+                                        string m_to=msg["to"];
+                                        if (m_to==Ags(i)->_name()) {
+                                                Ags(i)->receive(msg);
+                                                Queue.remove(m);
+                                                break;
+                                                // message delivered;
+                                        }
                                 }
                         }
-                }
-                if (Queue.getLength()>0){bdm_error("undelivered messages - probably unknown neighbours");}
-                
+                        if (Queue.getLength()>0){bdm_error("undelivered messages - probably unknown neighbours");}
+
+                        for ( int i=0; i<Ags.length(); i++ ) {
+                                Ags(i) -> broadcast(Queue);
+                        }
+
+                        cycle++;
+                } 
+                while ((Queue.getLength()>0) && (cycle<max_cycles));
+
                 for ( int i=0; i<Ags.length(); i++ ) {
                         Ags(i) -> act(glob_ut);
                 }
-                
+
                 L->step();
                 Ds->write(glob_ut);
                 Ds->step();                                                     // simulator step
-                
+
                 for ( int i=0; i<Ags.length(); i++ ) {
                         Ags(i) -> log_write();