Merge branch 'multi_variant_model' into 'develop'

Multi variant model

See merge request !1

EMADL2TORCS/generate2ros.sh → EMADL2TORCS/generate2ros_dpnet_variant.sh

@@ -4,7 +4,7 @@ echo "Cleaning target directory..."
 rm -rf target/*
 
 echo "Generating code..."
-java -cp embedded-montiarc-math-middleware-generator-0.0.11-SNAPSHOT-jar-with-dependencies.jar de.monticore.lang.monticar.generator.middleware.DistributedTargetGeneratorCli --models-dir=src/main/ --root-model=dp.mastercomponent --output-dir=target/Mastercomponent --generators=emadlcpp,roscpp --backend=MXNET
+java -cp embedded-montiarc-math-middleware-generator-0.0.12-SNAPSHOT-jar-with-dependencies.jar de.monticore.lang.monticar.generator.middleware.DistributedTargetGeneratorCli --models-dir=src/dpnet_variant/ --root-model=dp.mastercomponent --output-dir=target/Mastercomponent --generators=emadlcpp,roscpp --backend=MXNET
 
 echo "Copying build and run scripts..."
 cp -rf resources/scripts/* target/

EMADL2TORCS/generate2ros_groundTruthLabels_variant.sh

+#!/bin/bash
+
+echo "Cleaning target directory..."
+rm -rf target/*
+
+echo "Generating code..."
+java -cp embedded-montiarc-math-middleware-generator-0.0.12-SNAPSHOT-jar-with-dependencies.jar de.monticore.lang.monticar.generator.middleware.DistributedTargetGeneratorCli --models-dir=src/groundTruthLabels_variant/ --root-model=dp.mastercomponent --output-dir=target/Mastercomponent --generators=emadlcpp,roscpp --backend=MXNET
+
+echo "Copying build and run scripts..."
+cp -rf resources/scripts/* target/
+chmod u+x target/*.sh
+
+echo "Copying CNN weights..."
+cp -rf resources/TORCSComponent target/TORCSComponent
+chmod u+x resources/TORCSComponent/*.sh
+cp -rf resources/dpnet target/model
+
+echo "Building generated code..."
+cd target
+./build_all.sh
+
+echo "Please start TORCS, configure race and run ./run_all.sh"

EMADL2TORCS/resources/TORCSComponent/src/TORCSComponent/src/torcsclient.cpp

@@ -8,6 +8,7 @@
 #include <assert.h>
 #include <ros/console.h>
 #include <cv.hpp>
+#include <highgui.h>
 
 using namespace torcs;
 

EMADL2TORCS/resources/TORCSComponent/src/TORCSComponent/src/torcsclient.h

@@ -5,6 +5,7 @@
 #include <memory>
 #include <functional>
 #include <std_msgs/Float32MultiArray.h>
+#include <atomic>
 
 #define DEBUG_LOG false
 
@@ -157,4 +158,3 @@ private:
 };
 
 }
-