[certi-cvs] certi scripts/CERTI_Message.msg libCERTI/M_Clas...

[certi-cvs]

CVSROOT:        /sources/certi
Module name:    certi
Changes by:     Eric NOULARD <erk>      10/03/08 11:35:30

Modified files:
        scripts        : CERTI_Message.msg 
        libCERTI       : M_Classes.hh M_Classes.cc 

Log message:
        Simplifies the enable/disable messages
        no boolean OnOff field is needed

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/certi/scripts/CERTI_Message.msg?cvsroot=certi&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/M_Classes.hh?cvsroot=certi&r1=3.5&r2=3.6
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/M_Classes.cc?cvsroot=certi&r1=3.5&r2=3.6

Patches:
Index: scripts/CERTI_Message.msg
===================================================================
RCS file: /sources/certi/certi/scripts/CERTI_Message.msg,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- scripts/CERTI_Message.msg   7 Mar 2010 18:19:09 -0000       1.13
+++ scripts/CERTI_Message.msg   8 Mar 2010 11:35:30 -0000       1.14
@@ -34,28 +34,22 @@
 }
 
 native AttributeHandleSet {    
+    representation combine
     language CXX  [#include "certi.hh"]
     language Java [import hla.rti.AttributeHandleSet;]
 }
 
 native LogicalTimeInterval {
-    language Java [import hla.rti.AttributeHandleSet;]
-}
-
-native SuppliedAttributes {    
-    language Java [import hla.rti.SuppliedAttributes;]
+    representation combine
+    language Java [import hla.rti.LogicalTimeInterval;]
 }
 
 native FederateHandleSet {
+    representation combine
     language CXX  [#include "certi.hh"]
-    //language CXX  [typedef RTI::FederateHandleSet FederateHandleSet;]
     language Java [import hla.rti.FederateHandleSet;]
 }
 
-native SuppliedParameters {    
-    language Java [import hla.rti.SuppliedParameters;]
-}
-
 native Region {
     language CXX  [#include "certi.hh"]    
     language Java [import hla.rti.Region;]
@@ -158,6 +152,12 @@
     language CXX [combine EventRetractionHandle]      
 }
 
+// The EventRetraction is not inheriting from base "Message"
+// this is a plain message which may be used as field
+// in messages merging from "Message". As such
+// it won't appear in the generated factory method.
+// It's a convenient way to describe a structured native
+// message using "combine". 
 message EventRetraction {
        required FederateHandle sendingFederate {default = 0}
     required uint64         SN              {default = 0}
@@ -511,22 +511,26 @@
         required OrderType              order
 }
 
+// HLA 1.3 - §8.2
 message M_Enable_Time_Regulation : merge Message {
-    required onoff  enable {default=true}
+    combine LogicalTimeInterval {
     required double lookahead {default=0}
+    }
 }
 
+// HLA 1.3 - §8.4
 message M_Disable_Time_Regulation : merge Message {
-    required onoff  enable {default=false}
+    combine LogicalTimeInterval {
     required double lookahead {default=0}
+    }
 }
 
+// HLA 1.3 - §8.5
 message M_Enable_Time_Constrained : merge Message {
-    required onoff  enable {default=true}
 }
 
+// HLA 1.3 - §8.7
 message M_Disable_Time_Constrained : merge Message {
-    required onoff  enable {default=false}
 }
 
 message M_Query_Lbts : merge Message {}
@@ -548,15 +552,28 @@
 }
 
 message M_Request_Retraction : merge Message {}
+
+// HLA 1.3 - §8.8
 message M_Time_Advance_Request : merge Message {}
+
 message M_Time_Advance_Request_Available : merge Message {}
+
 message M_Next_Event_Request : merge Message {}
+
 message M_Next_Event_Request_Available : merge Message {}
+
 message M_Flush_Queue_Request : merge Message {}
+
 message M_Time_Advance_Grant : merge Message {}
+
 message M_Enable_Asynchronous_Delivery : merge Message {}
+
 message M_Disable_Asynchronous_Delivery : merge Message {}
+
+// HLA 1.3 - §8.3
 message M_Time_Regulation_Enabled : merge Message {}
+
+// HLA 1.3 - §8.6
 message M_Time_Constrained_Enabled : merge Message {}
 
 native Extent {

Index: libCERTI/M_Classes.hh
===================================================================
RCS file: /sources/certi/certi/libCERTI/M_Classes.hh,v
retrieving revision 3.5
retrieving revision 3.6
diff -u -b -r3.5 -r3.6
--- libCERTI/M_Classes.hh       7 Mar 2010 18:46:25 -0000       3.5
+++ libCERTI/M_Classes.hh       8 Mar 2010 11:35:30 -0000       3.6
@@ -1,4 +1,4 @@
-// Generated on 2010 March Sun, 07 at 19:42:42 by the CERTI message generator
+// Generated on 2010 March Mon, 08 at 09:41:07 by the CERTI message generator
 #ifndef M_CLASSES_HH
 #define M_CLASSES_HH
 // ****-**** Global System includes ****-****
@@ -196,7 +196,12 @@
       M_TICK_REQUEST_STOP, 
       LAST 
    } CERTI_Message_MessageType_t; //end of enum CERTI_Message_MessageType 
-
+   // The EventRetraction is not inheriting from base "Message"
+   // this is a plain message which may be used as field
+   // in messages merging from "Message". As such
+   // it won't appear in the generated factory method.
+   // It's a convenient way to describe a structured native
+   // message using "combine". 
    class CERTI_EXPORT EventRetraction {
       public:
          EventRetraction();
@@ -1760,7 +1765,7 @@
          OrderType order;
       private:
    };
-
+   // HLA 1.3 - §8.2
    class CERTI_EXPORT M_Enable_Time_Regulation : public Message {
       public:
          typedef Message Super;
@@ -1769,19 +1774,15 @@
          virtual void serialize(MessageBuffer& msgBuffer);
          virtual void deserialize(MessageBuffer& msgBuffer);
          // specific Getter(s)/Setter(s)
-         void enableOn() {enable = true;}
-         void enableOff() {enable = false;}
-         bool isEnableOn() const {return enable;}
          const double& getLookahead() const {return lookahead;}
          void setLookahead(const double& newLookahead) 
{lookahead=newLookahead;}
          // the show method
          virtual void show(std::ostream& out);
       protected:
-         bool enable;
          double lookahead;
       private:
    };
-
+   // HLA 1.3 - §8.4
    class CERTI_EXPORT M_Disable_Time_Regulation : public Message {
       public:
          typedef Message Super;
@@ -1790,52 +1791,30 @@
          virtual void serialize(MessageBuffer& msgBuffer);
          virtual void deserialize(MessageBuffer& msgBuffer);
          // specific Getter(s)/Setter(s)
-         void enableOn() {enable = true;}
-         void enableOff() {enable = false;}
-         bool isEnableOn() const {return enable;}
          const double& getLookahead() const {return lookahead;}
          void setLookahead(const double& newLookahead) 
{lookahead=newLookahead;}
          // the show method
          virtual void show(std::ostream& out);
       protected:
-         bool enable;
          double lookahead;
       private:
    };
-
+   // HLA 1.3 - §8.5
    class CERTI_EXPORT M_Enable_Time_Constrained : public Message {
       public:
          typedef Message Super;
          M_Enable_Time_Constrained();
          virtual ~M_Enable_Time_Constrained();
-         virtual void serialize(MessageBuffer& msgBuffer);
-         virtual void deserialize(MessageBuffer& msgBuffer);
-         // specific Getter(s)/Setter(s)
-         void enableOn() {enable = true;}
-         void enableOff() {enable = false;}
-         bool isEnableOn() const {return enable;}
-         // the show method
-         virtual void show(std::ostream& out);
       protected:
-         bool enable;
       private:
    };
-
+   // HLA 1.3 - §8.7
    class CERTI_EXPORT M_Disable_Time_Constrained : public Message {
       public:
          typedef Message Super;
          M_Disable_Time_Constrained();
          virtual ~M_Disable_Time_Constrained();
-         virtual void serialize(MessageBuffer& msgBuffer);
-         virtual void deserialize(MessageBuffer& msgBuffer);
-         // specific Getter(s)/Setter(s)
-         void enableOn() {enable = true;}
-         void enableOff() {enable = false;}
-         bool isEnableOn() const {return enable;}
-         // the show method
-         virtual void show(std::ostream& out);
       protected:
-         bool enable;
       private:
    };
 
@@ -1925,7 +1904,7 @@
       protected:
       private:
    };
-
+   // HLA 1.3 - §8.8
    class CERTI_EXPORT M_Time_Advance_Request : public Message {
       public:
          typedef Message Super;
@@ -1997,7 +1976,7 @@
       protected:
       private:
    };
-
+   // HLA 1.3 - §8.3
    class CERTI_EXPORT M_Time_Regulation_Enabled : public Message {
       public:
          typedef Message Super;
@@ -2006,7 +1985,7 @@
       protected:
       private:
    };
-
+   // HLA 1.3 - §8.6
    class CERTI_EXPORT M_Time_Constrained_Enabled : public Message {
       public:
          typedef Message Super;

Index: libCERTI/M_Classes.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/M_Classes.cc,v
retrieving revision 3.5
retrieving revision 3.6
diff -u -b -r3.5 -r3.6
--- libCERTI/M_Classes.cc       7 Mar 2010 18:46:25 -0000       3.5
+++ libCERTI/M_Classes.cc       8 Mar 2010 11:35:30 -0000       3.6
@@ -1,4 +1,4 @@
-// Generated on 2010 March Sun, 07 at 19:45:00 by the CERTI message generator
+// Generated on 2010 March Mon, 08 at 09:41:06 by the CERTI message generator
 #include <vector>
 #include <string>
 #include "M_Classes.hh"
@@ -2678,7 +2678,6 @@
    M_Enable_Time_Regulation::M_Enable_Time_Regulation() {
       this->messageName = "M_Enable_Time_Regulation";
       this->type = Message::ENABLE_TIME_REGULATION;
-      enable=true;
       lookahead=0;
    }
 
@@ -2689,7 +2688,6 @@
       //Call mother class
       Super::serialize(msgBuffer);
       //Specific serialization code
-      msgBuffer.write_bool(enable);
       msgBuffer.write_double(lookahead);
    }
 
@@ -2697,7 +2695,6 @@
       //Call mother class
       Super::deserialize(msgBuffer);
       //Specific deserialization code
-      enable = msgBuffer.read_bool();
       lookahead = msgBuffer.read_double();
    }
 
@@ -2705,14 +2702,12 @@
       out << "[M_Enable_Time_Regulation -Begin]" << std::endl;      //Call 
mother class
       Super::show(out);
       //Specific show code
-      out << " enable = " << enable << " "       << std::endl;
       out << " lookahead = " << lookahead << " "       << std::endl;
       out << "[M_Enable_Time_Regulation -End]" << std::endl;   }
 
    M_Disable_Time_Regulation::M_Disable_Time_Regulation() {
       this->messageName = "M_Disable_Time_Regulation";
       this->type = Message::DISABLE_TIME_REGULATION;
-      enable=false;
       lookahead=0;
    }
 
@@ -2723,7 +2718,6 @@
       //Call mother class
       Super::serialize(msgBuffer);
       //Specific serialization code
-      msgBuffer.write_bool(enable);
       msgBuffer.write_double(lookahead);
    }
 
@@ -2731,7 +2725,6 @@
       //Call mother class
       Super::deserialize(msgBuffer);
       //Specific deserialization code
-      enable = msgBuffer.read_bool();
       lookahead = msgBuffer.read_double();
    }
 
@@ -2739,70 +2732,25 @@
       out << "[M_Disable_Time_Regulation -Begin]" << std::endl;      //Call 
mother class
       Super::show(out);
       //Specific show code
-      out << " enable = " << enable << " "       << std::endl;
       out << " lookahead = " << lookahead << " "       << std::endl;
       out << "[M_Disable_Time_Regulation -End]" << std::endl;   }
 
    M_Enable_Time_Constrained::M_Enable_Time_Constrained() {
       this->messageName = "M_Enable_Time_Constrained";
       this->type = Message::ENABLE_TIME_CONSTRAINED;
-      enable=true;
    }
 
    M_Enable_Time_Constrained::~M_Enable_Time_Constrained() {
    }
 
-   void M_Enable_Time_Constrained::serialize(MessageBuffer& msgBuffer) {
-      //Call mother class
-      Super::serialize(msgBuffer);
-      //Specific serialization code
-      msgBuffer.write_bool(enable);
-   }
-
-   void M_Enable_Time_Constrained::deserialize(MessageBuffer& msgBuffer) {
-      //Call mother class
-      Super::deserialize(msgBuffer);
-      //Specific deserialization code
-      enable = msgBuffer.read_bool();
-   }
-
-   void M_Enable_Time_Constrained::show(std::ostream& out) {
-      out << "[M_Enable_Time_Constrained -Begin]" << std::endl;      //Call 
mother class
-      Super::show(out);
-      //Specific show code
-      out << " enable = " << enable << " "       << std::endl;
-      out << "[M_Enable_Time_Constrained -End]" << std::endl;   }
-
    M_Disable_Time_Constrained::M_Disable_Time_Constrained() {
       this->messageName = "M_Disable_Time_Constrained";
       this->type = Message::DISABLE_TIME_CONSTRAINED;
-      enable=false;
    }
 
    M_Disable_Time_Constrained::~M_Disable_Time_Constrained() {
    }
 
-   void M_Disable_Time_Constrained::serialize(MessageBuffer& msgBuffer) {
-      //Call mother class
-      Super::serialize(msgBuffer);
-      //Specific serialization code
-      msgBuffer.write_bool(enable);
-   }
-
-   void M_Disable_Time_Constrained::deserialize(MessageBuffer& msgBuffer) {
-      //Call mother class
-      Super::deserialize(msgBuffer);
-      //Specific deserialization code
-      enable = msgBuffer.read_bool();
-   }
-
-   void M_Disable_Time_Constrained::show(std::ostream& out) {
-      out << "[M_Disable_Time_Constrained -Begin]" << std::endl;      //Call 
mother class
-      Super::show(out);
-      //Specific show code
-      out << " enable = " << enable << " "       << std::endl;
-      out << "[M_Disable_Time_Constrained -End]" << std::endl;   }
-
    M_Query_Lbts::M_Query_Lbts() {
       this->messageName = "M_Query_Lbts";
       this->type = Message::QUERY_LBTS;