From 48bd5fdeae9f6b4b6f0b1a4cc8beee533856c0c5 Mon Sep 17 00:00:00 2001
From: Reiner Jung <reiner.jung@email.uni-kiel.de>
Date: Fri, 23 Jun 2023 10:05:54 +0200
Subject: [PATCH] minor fixes to scripts to be able to find the correct data.
---
models/uvic/compare-models.sh | 26 +++++++++++---------
models/uvic/prepare-models-for-inspection.sh | 11 +++++----
2 files changed, 21 insertions(+), 16 deletions(-)
diff --git a/models/uvic/compare-models.sh b/models/uvic/compare-models.sh
index dbe3509..5e09687 100755
--- a/models/uvic/compare-models.sh
+++ b/models/uvic/compare-models.sh
@@ -17,33 +17,37 @@ checkExecutable "Restructuring" "${RESTRUCTURING}"
checkDirectory "Result directory" "${OPTIMIZATION_DATA}"
# main
-
-for I in `ls "${OPTIMIZATION_DATA}"` ; do
-
+for J in `find "${OPTIMIZATION_DATA}/jss"* -name '*uvic*job'` ; do
+ BASENAME=`basename $J`
information "----------------------------------------"
- information $I
+ information $BASENAME
information "----------------------------------------"
- export JOB_DIRECTORY="${OPTIMIZATION_DATA}/$I"
+ export JOB_DIRECTORY="$J"
checkDirectory "job directory" "${JOB_DIRECTORY}"
cd "${JOB_DIRECTORY}"
+ if [ -f "kieker-repositories.tar.xz" ] ; then
+ tar -xpf kieker-repositories.tar.xz
+ mv kieker-repositories/* .
+ fi
+
ORIGINAL="original-model"
if [ -d "${ORIGINAL}" ] ; then
LIST=""
- for J in "optimized-"* ; do
- if [ -d "$J" ] ; then
- LIST="$LIST $J"
+ for K in "optimized-"* ; do
+ if [ -d "$K" ] ; then
+ LIST="$LIST $K"
fi
done
"${RESTRUCTURING}" -i "${ORIGINAL}" $LIST -o "${JOB_DIRECTORY}" -e compare -s kuhn
- for J in $LIST ; do
- OPTIMIZED=`basename $J`
- "${DELTA}" -i "${JOB_DIRECTORY}/original-model-${OPTIMIZED}.xmi" -o "${JOB_DIRECTORY}/original-model-${OPTIMIZED}"
+ for K in $LIST ; do
+ OPTIMIZED=`basename $K`
+ "${DELTA}" -i "${JOB_DIRECTORY}/original-model-${OPTIMIZED}.xmi" -o "${JOB_DIRECTORY}/original-model-${OPTIMIZED}"
done
fi
done
diff --git a/models/uvic/prepare-models-for-inspection.sh b/models/uvic/prepare-models-for-inspection.sh
index 8f8cef0..ab50671 100755
--- a/models/uvic/prepare-models-for-inspection.sh
+++ b/models/uvic/prepare-models-for-inspection.sh
@@ -17,17 +17,18 @@ checkDirectory "Result directory" "${OPTIMIZATION_DATA}"
# main
-for I in `ls "${OPTIMIZATION_DATA}"` ; do
+for I in `find "${OPTIMIZATION_DATA}/jss"* -name '*uvic*job'` ; do
+ BASENAME=`basename $I`
information "----------------------------------------"
- information $I
+ information $BASENAME
information "----------------------------------------"
- export JOB_DIRECTORY="${OPTIMIZATION_DATA}/$I"
+ export JOB_DIRECTORY="$I"
checkDirectory "job directory" "${JOB_DIRECTORY}"
- export MODEL_ID=`echo "$I" | sed 's/^jss-jobs-[0-9]*-//g' | sed 's/\.job$//g'`
+ export MODEL_ID=`echo "$BASENAME" | sed 's/^jss-jobs-[0-9]*-//g' | sed 's/\.job$//g'`
NAME="2.9"
MODEL=`echo "${MODEL_ID}" | cut -d"_" -f1`
@@ -59,7 +60,7 @@ for I in `ls "${OPTIMIZATION_DATA}"` ; do
${MOP} -e "${MODEL_ID}-${OPTIMIZED}-merged" -i "original-model" "${OPTIMIZED}" -o "merge-${OPTIMIZED}" -s all merge
done
else
- error "Missing MED output for job $I"
+ error "Missing MED output for job $BASENAME"
fi
done
--
GitLab