From ca342aa10c30987e69f5834fff78417d4e0e9e3a Mon Sep 17 00:00:00 2001
From: Martina Maggio <maggio.martina@gmail.com>
Date: Wed, 17 Apr 2019 15:23:03 +0200
Subject: [PATCH] artifact mod
---
artifact/process_results.sh | 4 ++--
artifact/src/sim/main.cpp | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/artifact/process_results.sh b/artifact/process_results.sh
index 32a4d20..38fd229 100755
--- a/artifact/process_results.sh
+++ b/artifact/process_results.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-MATLABPATH="/usr/local"
-#MATLABPATH="/Applications/MATLAB_R2017a.app"
+#MATLABPATH="/usr/local"
+MATLABPATH="/Applications/MATLAB_R2017a.app"
MATLABPROGRAM="$MATLABPATH/bin/matlab"
# result folder handling
diff --git a/artifact/src/sim/main.cpp b/artifact/src/sim/main.cpp
index 4212784..b0f1785 100644
--- a/artifact/src/sim/main.cpp
+++ b/artifact/src/sim/main.cpp
@@ -389,7 +389,7 @@ void compute_responsetimes() {
// two pending jobs of the same task are allowed at the same time
if (pending_jobs.size() > 1)
if (pending_jobs.at(0).task_id == pending_jobs.at(1).task_id)
- std::sort(pending_jobs.begin(), pending_jobs.begin() + 1,
+ std::sort(pending_jobs.begin(), pending_jobs.end(),
[](const job &a, const job &b) {
return a.act_instant < b.act_instant; });
--
GitLab