Merge project manager

dsescripts/script1.dse

+# My first DSE script
+# Commands are not case sensitive
+# To execute this script: java RunDSE -debug script1.dse
+
+
+#Model
+ModelPath = /homes/apvrille/TechTTool/TMLCode/
+MappingFile = smartcard.tmap
+
+#Path
+PathToSimulator = /homes/apvrille/TechTTool/SystemCCode/generated/
+PathToResults = /homes/apvrille/TechTTool/SystemCCode/results/
+
+#Simulation
+
+#Use -1 value to unset
+SimulationMaxCycle = -1
+
+SimulationOutputVCD = true
+SimulationOutputHTML = true
+#SimulationOutputTXT = true
+SimulationOutputXML = true
+RecordResults = true
+SimulationCompilationCommand = make -j9 -C
+SimulationExecutionCommand = run.x
+
+SimulationExplorationMinimumCommand = 5
+SimulationExplorationMinimumBranch = 5
+
+ShowSimulatorRawOutput = false
+
+NbOfSimulationThreads = 128
+
+#Starting simulation
+#runSimulation = 100
+#runParallelSimulation = 10000
+#runexplo
+#runsimulation = 1
+
+#To print in a file all simulation results
+#saveAllResults
+
+#To print in a file a summary of simulation results
+#saveResultsSummary
+
+#To reset results
+#resetResults
+
+
+#Automatic DSE
+TaskModelFile = smartcard.tml
+MinNbOfCPUs = 1
+MaxNbOfCPUs = 3
+MinNbOfCoresPerCPU = 1
+MaxNbOfCoresPerCPU = 3
+NbOfSimulationsPerMapping = 10
+setTap = minSimulationDuration 10
+setTap = averageSimulationDuration 0
+setTap = maxSimulationDuration 0
+setTap = architectureComplexity 1
+setTap = averageCPUUsage -10
+runDSE
+#runParallelDSE
+saveAllResults
+saveResultsSummary
+
+#End of script

executablecode/Makefile.src

-SRCS = generated_src/main.c generated_src/AlarmActuator.c generated_src/PressureSensor.c generated_src/PressureController.c generated_src/MainController.c generated_src/AlarmManager.c generated_src/Timer__alarmTimer__AlarmManager.c 
\ No newline at end of file
+SRCS = generated_src/main.c generated_src/ResqueTeam.c generated_src/SoftwareOfRoverRobot.c generated_src/RobotWebsite.c generated_src/RobotApplication.c generated_src/Sensors.c 
\ No newline at end of file

src/main/java/ui/tmldd/TMLArchiPortArtifact.java

@@ -225,7 +225,7 @@ public class TMLArchiPortArtifact extends TGCWithoutInternalComponent implements
         boolean error = false;
 
         // Get the list of all other TMLArchiPortArtifact.java and retrieve the mapped ports
-		Vector<String> portsList = this.getTDiagramPanel().getMGUI().getAllTMLInputPorts();
+	Vector<String> portsList = this.getTDiagramPanel().getMGUI().getAllTMLInputPorts();
 
         //TraceManager.addDev( "bufferParameters before opening the window: " + bufferParameters.toString() );
         JDialogPortArtifact dialog = new JDialogPortArtifact( frame, "Setting port artifact attributes", this, mappedMemory, portsList, value );