Commit 79dd8216 authored by berge's avatar berge
Browse files

Fixed cf03

parent 13cf55ab

ttcn/GeoNetworking/LibItsGeoNetworking_Functions.ttcn

+2 −10
Original line number Original line Diff line number Diff line
@@ -148,28 +148,24 @@ module LibItsGeoNetworking_Functions { 
        /**

        /**

         * @desc This configuration features:

         * @desc This configuration features:

         *       - one ITS node (IUT)

         *       - one ITS node (IUT)

         *       - one ITS node (NodeA)

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

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

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

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

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

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

         */

         */

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

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





            // Variables

            // Variables

            var PositionTable v_positionTable := {};

            var PositionTable v_positionTable := {};

 

 

            // Create

            // Create

            p_nodeA := ItsNt.create(c_compNodeA) alive;

            p_nodeB := ItsNt.create(c_compNodeB) alive;

            p_nodeB := ItsNt.create(c_compNodeB) alive;

            p_nodeC := ItsNt.create(c_compNodeC) alive;

            p_nodeC := ItsNt.create(c_compNodeC) alive;





            // Map

            // Map

            map(p_nodeA:geoNetworkingPort, system:geoNetworkingPort);

            map(p_nodeB:geoNetworkingPort, system:geoNetworkingPort);

            map(p_nodeB:geoNetworkingPort, system:geoNetworkingPort);

            map(p_nodeC:geoNetworkingPort, system:geoNetworkingPort);

            map(p_nodeC:geoNetworkingPort, system:geoNetworkingPort);

            

            

            // Connect

            // Connect

            connect(p_nodeA:syncPort, self:syncPort);

            connect(p_nodeB:syncPort, self:syncPort);

            connect(p_nodeB:syncPort, self:syncPort);

            connect(p_nodeC:syncPort, self:syncPort);

            connect(p_nodeC:syncPort, self:syncPort);
@@ -179,10 +175,8 @@ module LibItsGeoNetworking_Functions { 
            f_addPosition(v_positionTable, c_compNodeB, f_computePosition());

            f_addPosition(v_positionTable, c_compNodeB, f_computePosition());

            f_addPosition(v_positionTable, c_compNodeC, f_computePosition());

            f_addPosition(v_positionTable, c_compNodeC, f_computePosition());

            

            

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

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

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

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

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

            p_nodeA.done;

            p_nodeB.done;

            p_nodeB.done;

            p_nodeC.done;

            p_nodeC.done;
@@ -194,15 +188,13 @@ module LibItsGeoNetworking_Functions { 
         * @param p_nodeB

         * @param p_nodeB

         * @param p_nodeC

         * @param p_nodeC

         */

         */

        function f_cf03Down(in ItsNt p_nodeA, in ItsNt p_nodeB, in ItsNt p_nodeC) runs on ItsMtc {

        function f_cf03Down(in ItsNt p_nodeB, in ItsNt p_nodeC) runs on ItsMtc {

            

            

            // Map

            // Map

            unmap(p_nodeA:geoNetworkingPort, system:geoNetworkingPort);

            unmap(p_nodeB:geoNetworkingPort, system:geoNetworkingPort);

            unmap(p_nodeB:geoNetworkingPort, system:geoNetworkingPort);

            unmap(p_nodeC:geoNetworkingPort, system:geoNetworkingPort);

            unmap(p_nodeC:geoNetworkingPort, system:geoNetworkingPort);

            

            

            // Connect

            // Connect

            disconnect(p_nodeA:syncPort, self:syncPort);

            disconnect(p_nodeB:syncPort, self:syncPort);

            disconnect(p_nodeB:syncPort, self:syncPort);

            disconnect(p_nodeC:syncPort, self:syncPort);

            disconnect(p_nodeC:syncPort, self:syncPort);