[certi-cvs] certi/RTIA TimeManagement.cc

[certi-cvs]

CVSROOT:        /sources/certi
Module name:    certi
Changes by:     Eric NOULARD <erk>      10/08/17 07:59:11

Modified files:
        RTIA           : TimeManagement.cc 

Log message:
        NERA (or NMRA) just as TARA should authorize to go up to the LBTS, LBTS 
INCLUDED
        on the contrary NER just as TAR should authorize to go up to the LBTS, 
LBTS EXCLUDED.
        
        see §8.x.z of HLA 1.3 or IEEE-1516 documents

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/certi/RTIA/TimeManagement.cc?cvsroot=certi&r1=3.65&r2=3.66

Patches:
Index: TimeManagement.cc
===================================================================
RCS file: /sources/certi/certi/RTIA/TimeManagement.cc,v
retrieving revision 3.65
retrieving revision 3.66
diff -u -b -r3.65 -r3.66
--- TimeManagement.cc   17 Aug 2010 06:47:38 -0000      3.65
+++ TimeManagement.cc   17 Aug 2010 07:59:11 -0000      3.66
@@ -18,7 +18,7 @@
 // along with this program ; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 //
-// $Id: TimeManagement.cc,v 3.65 2010/08/17 06:47:38 erk Exp $
+// $Id: TimeManagement.cc,v 3.66 2010/08/17 07:59:11 erk Exp $
 // ----------------------------------------------------------------------------
 
 #include <config.h>
@@ -483,7 +483,9 @@
         Debug(D,pdDebug) << "TM::nextEventAdvance - date avancee="<< 
date_avancee.getTime()
                        << " date min=" << date_min.getTime() << " LBTS = " << 
_LBTS.getTime() << std::endl;
 
-        if (date_min < _LBTS) {
+        if ((date_min < _LBTS)||
+               ((date_min <= _LBTS) && (_avancee_en_cours == NERA))
+            ) {
             // nextEventRequest is done because either a TSO message
             // can be delivered or no message with lower value than
             // expected time is avail.
@@ -662,7 +664,7 @@
     if (e == e_NO_EXCEPTION) {
         _lookahead_courant = lookahead ;
 
-        // On previent les autres en leur envoyant un message nul qui contient
+        // On previent les autres en leur envoyant un message NULL qui contient
         // notre temps local + le Lookahead.
         if (_est_regulateur)
             sendNullMessage(_heure_courante);
@@ -1049,4 +1051,4 @@
 
 }} // namespaces
 
-// $Id: TimeManagement.cc,v 3.65 2010/08/17 06:47:38 erk Exp $
+// $Id: TimeManagement.cc,v 3.66 2010/08/17 07:59:11 erk Exp $