Commit 38dc064a authored by berge's avatar berge
Browse files

Fixed cf04 and config descriptions

parent 79dd8216

ttcn/GeoNetworking/LibItsGeoNetworking_Functions.ttcn

+17 −14
Original line number Diff line number Diff line
@@ -60,6 +60,9 @@ module LibItsGeoNetworking_Functions { 
         * @desc This configuration features:

         *       - one ITS node (IUT)

         *       - two ITS nodes (nodeA, nodeB)

         *       - Area1 which only includes NodeB and IUT

         *       - Area2 which only includes NodeB 

         *         NodeB being close to the area center    

         */

        function f_cf01Up() runs on ItsNt {
@@ -93,8 +96,9 @@ module LibItsGeoNetworking_Functions { 
         *       - one ITS node (IUT)

         *       - one ITS node (NodeA)

         *       - one ITS node (NodeB)

         *       - Area1 which only includes Tester 

         *         Tester being close to the area center          

         *       - Area1 which only includes NodeA, NodeB and IUT

         *       - Area2 which only includes NodeA and NodeB 

         *         NodeA being close to the area center          

         *         

         * @param p_nodeA

         * @param p_nodeB
@@ -148,9 +152,12 @@ module LibItsGeoNetworking_Functions { 
        /**

         * @desc This configuration features:

         *       - one ITS node (IUT)

         *       - one ITS node not in direction of NodeA (NodeB)       

         *       - one ITS node in direction of Tester (NodeC)

         *       - Area1 which only includes NodeA, NodeB and IUT, 

         *       - one ITS node (NodeA)

         *       - one ITS node in direction of NodeA (NodeB)

         *       - one ITS node not in direction of NodeA (NodeC)       

         *       - Area1 which only includes NodeB and IUT

         *       - Area2 which only includes NodeB 

         *         NodeB being close to the area center   

         */

        function f_cf03Up(out ItsNt p_nodeB, out ItsNt p_nodeC) runs on ItsMtc {
@@ -208,28 +215,26 @@ module LibItsGeoNetworking_Functions { 
         *         shortest distance to NodeA (NodeB)

         *       - one ITS node in direction of NodeA (NodeD)

         *       - one ITS node not in direction of NodeA (NodeC)

         *       - Area2 which only includes NodeA, NodeB and NodeD, 

         *       - Area1 which only includes NodeB, NodeD and IUT

         *       - Area2 which only includes NodeA, NodeB and NodeD 

         *         NodeB being close to the area center             

         */

        function f_cf04Up(out ItsNt p_nodeA, out ItsNt p_nodeB, out ItsNt p_nodeC, out ItsNt p_nodeD) runs on ItsMtc {

        function f_cf04Up(out ItsNt p_nodeB, out ItsNt p_nodeC, out ItsNt p_nodeD) runs on ItsMtc {



            // Variables

            var PositionTable v_positionTable := {};



            // Create

            p_nodeA := ItsNt.create(c_compNodeA) alive;

            p_nodeB := ItsNt.create(c_compNodeB) alive;

            p_nodeC := ItsNt.create(c_compNodeC) alive;

            p_nodeD := ItsNt.create(c_compNodeD) alive;



            // Map

            map(p_nodeA:geoNetworkingPort, system:geoNetworkingPort);

            map(p_nodeB:geoNetworkingPort, system:geoNetworkingPort);

            map(p_nodeC:geoNetworkingPort, system:geoNetworkingPort);

            map(p_nodeD:geoNetworkingPort, system:geoNetworkingPort);

            

            // Connect

            connect(p_nodeA:syncPort, self:syncPort);

            connect(p_nodeB:syncPort, self:syncPort);

            connect(p_nodeC:syncPort, self:syncPort);

            connect(p_nodeD:syncPort, self:syncPort);
@@ -241,11 +246,9 @@ module LibItsGeoNetworking_Functions { 
            f_addPosition(v_positionTable, c_compNodeC, f_computePosition());

            f_addPosition(v_positionTable, c_compNodeD, f_computePosition());

                        

            p_nodeA.start(f_initialiseComponent(v_positionTable, c_compNodeA));

            p_nodeB.start(f_initialiseComponent(v_positionTable, c_compNodeB));

            p_nodeC.start(f_initialiseComponent(v_positionTable, c_compNodeC));

            p_nodeD.start(f_initialiseComponent(v_positionTable, c_compNodeD));

            p_nodeA.done;

            p_nodeB.done;

            p_nodeC.done;

            p_nodeD.done;