adding new test written by Helge from the other branch

src/main/java/de/monticore/lang/monticar/generator/roscpp/instructions/SetStructPortInstruction.java

@@ -92,18 +92,17 @@ public class SetStructPortInstruction{
                         upperBound = boundExists ? split[1].replaceAll("[^0-9]", "") : String.valueOf(Integer.valueOf(dimSizes.get(dimSizes.size()-1))-1);  
                     } else {
                         lowerBound = "0";
-												if(dimSizes.get(dimSizes.size()-1).equals("n")){
-													upperBound = "";
-												}else{
-                        	upperBound = String.valueOf(Integer.valueOf(dimSizes.get(dimSizes.size()-1))-1);  
-												}
+			if(dimSizes.get(dimSizes.size()-1).equals("n")){
+			    upperBound = "";
+		        }else{
+                    	    upperBound = String.valueOf(Integer.valueOf(dimSizes.get(dimSizes.size()-1))-1);  
+		        }
                     }
-										if(!upperBound.equals("")){
-		                  if (Integer.parseInt(lowerBound) > Integer.parseInt(upperBound)) {
-		                          Log.error(" ArrayBoundsHandler: lowerBound > upperBound!");
-		                  }
-
-		                  inst += "if(" + lowerBound + " <= counter && counter <= " + upperBound + "){\n";
+		    if(!upperBound.equals("")){
+		        if (Integer.parseInt(lowerBound) > Integer.parseInt(upperBound)) {
+		            Log.error(" ArrayBoundsHandler: lowerBound > upperBound!");
+		        }
+		        inst += "if(" + lowerBound + " <= counter && counter <= " + upperBound + "){\n";
                     }
                     String tmp;
                     

src/test/resources/results/arrayHandlingComp/RosAdapter_tests_structs_arrayHandlingComp.h

+#pragma once
+#include "IAdapter_tests_structs_arrayHandlingComp.h"
+#include "tests_structs_arrayHandlingComp.h"
+#include <ros/ros.h>
+#include <nav_msgs/Path.h>
+#include <std_msgs/ByteMultiArray.h>
+#include <std_msgs/Float64MultiArray.h>
+#include <std_msgs/Int32MultiArray.h>
+
+class RosAdapter_tests_structs_arrayHandlingComp: public IAdapter_tests_structs_arrayHandlingComp{
+	
+	tests_structs_arrayHandlingComp* component;
+	ros::Subscriber _name1Subscriber;
+	ros::Subscriber _name2Subscriber;
+	ros::Subscriber _name3Subscriber;
+	ros::Subscriber _name4Subscriber;
+	ros::Publisher _name5Publisher;
+	ros::Publisher _name6Publisher;
+	
+	public:
+	RosAdapter_tests_structs_arrayHandlingComp(){
+		
+	}
+	
+	void init(tests_structs_arrayHandlingComp* comp){
+		this->component = comp;
+		char* tmp = strdup("");
+		int i = 0;
+		ros::init(i, &tmp, "RosAdapter_tests_structs_arrayHandlingComp_node");
+		ros::NodeHandle node_handle = ros::NodeHandle();
+		
+		_name1Subscriber = node_handle.subscribe("/name1", 5, &RosAdapter_tests_structs_arrayHandlingComp::_name1Callback, this, ros::TransportHints().tcpNoDelay());
+		_name2Subscriber = node_handle.subscribe("/name2", 5, &RosAdapter_tests_structs_arrayHandlingComp::_name2Callback, this, ros::TransportHints().tcpNoDelay());
+		_name3Subscriber = node_handle.subscribe("/name3", 5, &RosAdapter_tests_structs_arrayHandlingComp::_name3Callback, this, ros::TransportHints().tcpNoDelay());
+		_name4Subscriber = node_handle.subscribe("/name4", 5, &RosAdapter_tests_structs_arrayHandlingComp::_name4Callback, this, ros::TransportHints().tcpNoDelay());
+		
+		_name5Publisher = node_handle.advertise<std_msgs::ByteMultiArray>("/name5",5);
+		_name6Publisher = node_handle.advertise<std_msgs::Int32MultiArray>("/name6",5);
+		
+		ros::spin();
+	}
+	
+	void _name1Callback(const std_msgs::Float64MultiArray::ConstPtr& msg){
+		
+		int counter = 0;
+		for(int i0 = 0; i0 < 3; i0++){
+			for(int i1 = 0; i1 < 1; i1++){
+				if(0 <= counter && counter <= 0){
+					(component->in1)(i0, i1-0) = msg->data[counter];
+				}
+				else if(0 > counter){
+					(component->in1)(i0, i1+0-0+1) = 0;
+				}
+				else{
+					(component->in1)(i0, i1) = 0;
+				}
+				counter++;
+			}
+		}
+		
+		
+	}
+	void _name2Callback(const std_msgs::ByteMultiArray::ConstPtr& msg){
+		
+		int counter = 0;
+		for(int i0 = 0; i0 < 4; i0++){
+			for(int i1 = 0; i1 < 4; i1++){
+				if(0 <= counter && counter <= 3){
+					(component->in2)(i0, i1) = msg->data[counter] != 0;
+				}
+				else if(0 > counter){
+					(component->in2)(i0, i1+3-0+1) = 0;
+				}
+				else{
+					(component->in2)(i0, i1) = 0;
+				}
+				counter++;
+			}
+		}
+		
+		
+	}
+	void _name3Callback(const nav_msgs::Path::ConstPtr& msg){
+		
+		int counter = 0;
+		for(int i0 = 0; i0 < 1; i0++){
+			for(int i1 = 0; i1 < 10; i1++){
+				if(0 <= counter && counter <= 9){
+					(component->in3)(i0, i1-0) = msg->poses[counter].pose.orientation.x;
+				}
+				else if(0 > counter){
+					(component->in3)(i0, i1+9-0+1) = 0;
+				}
+				else{
+					(component->in3)(i0, i1) = 0;
+				}
+				counter++;
+			}
+		}
+		
+		
+	}
+	void _name4Callback(const nav_msgs::Path::ConstPtr& msg){
+		
+		int counter = 0;
+		for(int i0 = 0; i0 < 1; i0++){
+			for(int i1 = 0; i1 < 7; i1++){
+				if(2 <= counter && counter <= 6){
+					(component->in4)(i0, i1-2) = msg->poses[counter].pose.orientation.x;
+				}
+				else if(2 > counter){
+					(component->in4)(i0, i1+6-2+1) = 0;
+				}
+				else{
+					(component->in4)(i0, i1) = 0;
+				}
+				counter++;
+			}
+		}
+		
+		
+	}
+	
+	void publish_name5Publisher(){
+		std_msgs::ByteMultiArray tmpMsg;
+		tmpMsg.data.resize(2 * 3);
+		int counter = 0;
+		for(int i0 = 0; i0 < 2; i0++){
+			for(int i1 = 0; i1 < 3; i1++){
+				tmpMsg.data[counter] = (component->out1)(i0, i1) ? 1 : 0;
+				counter++;
+			}
+		}
+		
+		_name5Publisher.publish(tmpMsg);
+	}
+	void publish_name6Publisher(){
+		std_msgs::Int32MultiArray tmpMsg;
+		tmpMsg.data.resize(2 * 4);
+		int counter = 0;
+		for(int i0 = 0; i0 < 2; i0++){
+			for(int i1 = 0; i1 < 4; i1++){
+				tmpMsg.data[counter] = (component->out2)(i0, i1);
+				counter++;
+			}
+		}
+		
+		_name6Publisher.publish(tmpMsg);
+	}
+	
+	void tick(){
+		publish_name5Publisher();
+		publish_name6Publisher();
+	}
+	
+};