[certi-cvs] certi libCERTI/LBTS.cc RTIA/TimeManagement.cc

[certi-cvs]

CVSROOT:        /sources/certi
Module name:    certi
Changes by:     Eric NOULARD <erk>      09/10/04 15:46:39

Modified files:
        libCERTI       : LBTS.cc 
        RTIA           : TimeManagement.cc 

Log message:
        Merge in patch #6929: Use methods in FederationTime ...
        from Mathias

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/LBTS.cc?cvsroot=certi&r1=3.13&r2=3.14
http://cvs.savannah.gnu.org/viewcvs/certi/RTIA/TimeManagement.cc?cvsroot=certi&r1=3.50&r2=3.51

Patches:
Index: libCERTI/LBTS.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/LBTS.cc,v
retrieving revision 3.13
retrieving revision 3.14
diff -u -b -r3.13 -r3.14
--- libCERTI/LBTS.cc    2 Apr 2009 19:58:07 -0000       3.13
+++ libCERTI/LBTS.cc    4 Oct 2009 15:46:38 -0000       3.14
@@ -19,7 +19,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 // USA
 //
-// $Id: LBTS.cc,v 3.13 2009/04/02 19:58:07 erk Exp $
+// $Id: LBTS.cc,v 3.14 2009/10/04 15:46:38 erk Exp $
 // ----------------------------------------------------------------------------
 
 
@@ -48,9 +48,9 @@
   federate without any regulating federate.
 */
 LBTS::LBTS()
-    : _LBTS(std::numeric_limits<double>::infinity()),
-      MyFederateNumber(0)
+    : MyFederateNumber(0)
 {
+  _LBTS.setPositiveInfinity();
 }
 
 // ----------------------------------------------------------------------------
@@ -66,7 +66,7 @@
     FederationTime hl ;
 
     // LBTS = + l'infini
-    _LBTS = std::numeric_limits<double>::infinity();
+    _LBTS.setPositiveInfinity();
 
     ClockSet::iterator i ;
     for (i = clocks.begin(); i != clocks.end(); ++i) {
@@ -160,4 +160,4 @@
 
 } // namespace certi
 
-// $Id: LBTS.cc,v 3.13 2009/04/02 19:58:07 erk Exp $
+// $Id: LBTS.cc,v 3.14 2009/10/04 15:46:38 erk Exp $

Index: RTIA/TimeManagement.cc
===================================================================
RCS file: /sources/certi/certi/RTIA/TimeManagement.cc,v
retrieving revision 3.50
retrieving revision 3.51
diff -u -b -r3.50 -r3.51
--- RTIA/TimeManagement.cc      14 Sep 2009 21:21:32 -0000      3.50
+++ RTIA/TimeManagement.cc      4 Oct 2009 15:46:39 -0000       3.51
@@ -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.50 2009/09/14 21:21:32 erk Exp $
+// $Id: TimeManagement.cc,v 3.51 2009/10/04 15:46:39 erk Exp $
 // ----------------------------------------------------------------------------
 
 #include <config.h>
@@ -837,7 +837,7 @@
 
     if (_est_contraint) {
         // give a TSO message.
-        if (_LBTS == std::numeric_limits<double>::infinity())
+        if (_LBTS.isPositiveInfinity())
            D.Out(pdDebug, "Logical time : %f, LBTS : infini.", 
date_avancee.getTime());
         else
            D.Out(pdDebug, "Logical time : %f, LBTS : %lf.", 
date_avancee.getTime(), _LBTS.getTime());
@@ -847,7 +847,7 @@
         // otherwise
         if (!msg_donne) {
             // if LBTS allows to give a timeAdvanceGrant.
-            if (_LBTS == std::numeric_limits<double>::infinity())
+            if (_LBTS.isPositiveInfinity())
                D.Out(pdDebug, "Logical time : %f, LBTS : infini, lookahead : 
%f.",
                      date_avancee.getTime(), _lookahead_courant.getTime());
             else
@@ -1001,4 +1001,4 @@
 
 }} // namespaces
 
-// $Id: TimeManagement.cc,v 3.50 2009/09/14 21:21:32 erk Exp $
+// $Id: TimeManagement.cc,v 3.51 2009/10/04 15:46:39 erk Exp $