From f826944d9fd2092d705fa69416921673e7b1d2c7 Mon Sep 17 00:00:00 2001
From: Reiner Jung <reiner.jung@email.uni-kiel.de>
Date: Fri, 12 May 2023 11:26:26 +0200
Subject: [PATCH] Improved uvic scripts.
---
models/uvic/compare-models.sh | 6 ++++++
models/uvic/config.template | 1 +
models/uvic/prepare-models-for-inspection.sh | 22 ++++++++++----------
models/uvic/run-architecture-analysis.sh | 2 +-
4 files changed, 19 insertions(+), 12 deletions(-)
diff --git a/models/uvic/compare-models.sh b/models/uvic/compare-models.sh
index dddb4cc..8b6978e 100755
--- a/models/uvic/compare-models.sh
+++ b/models/uvic/compare-models.sh
@@ -11,6 +11,8 @@ else
exit 1
fi
+export JAVA_OPTS="-Dlogback.configurationFile=${BASE_DIR}/logback.xml"
+
checkExecutable "Restructuring" "${RESTRUCTURING}"
checkDirectory "Result directory" "${OPTIMIZATION_DATA}"
@@ -76,6 +78,10 @@ jss-jobs-71-c-uvic_static_map-mom.job ; do
fi
done
"${RESTRUCTURING}" -i "${ORIGINAL}" $LIST -o "${JOB_DIRECTORY}" -e demo -s kuhn
+ for J in $LIST ; do
+ OPTIMIZED=`basename $J`
+ "${DELTA}" -i "${JOB_DIRECTORY}/original-model-${OPTIMIZED}.xmi" -o "${JOB_DIRECTORY}/original-model-${OPTIMIZED}"
+ done
fi
done
diff --git a/models/uvic/config.template b/models/uvic/config.template
index 6cd419b..5fe8dd5 100644
--- a/models/uvic/config.template
+++ b/models/uvic/config.template
@@ -25,6 +25,7 @@ RELABEL="${TOOL_DIR}/oceandsl-tools/bin/relabel"
FXCA="${TOOL_DIR}/oceandsl-tools/bin/fxca"
FXTRAN="${TOOL_DIR}/fxtran"
RESTRUCTURING="${TOOL_DIR}/oceandsl-tools/bin/restructuring"
+DELTA="${TOOL_DIR}/oceandsl-tools/bin/delta"
# collector tool
COLLECTOR="${TOOL_DIR}/collector/bin/collector"
diff --git a/models/uvic/prepare-models-for-inspection.sh b/models/uvic/prepare-models-for-inspection.sh
index a1dc4d5..7668d12 100755
--- a/models/uvic/prepare-models-for-inspection.sh
+++ b/models/uvic/prepare-models-for-inspection.sh
@@ -43,43 +43,43 @@ jss-jobs-71-c-uvic_static_map-mom.job ; do
export JOB_DIRECTORY="${OPTIMIZATION_DATA}/$I"
checkDirectory "job directory" "${JOB_DIRECTORY}"
-
+
P=`echo "$I" | sed 's/^jss-jobs-[0-9]*-//g' | sed 's/\.job$//g'`
-
+
NAME="2.9"
MODEL=`echo "$P" | cut -d"_" -f1`
MODE=`echo "$P" | cut -d"_" -f2`
FORM=`echo "$P" | cut -d"_" -f3 | sed 's/-\w*$//g'`
-
+
echo $NAME
echo $MODEL
echo $MODE
echo $FORM
-
+
SOURCE_LABEL="/home/hs/share/software/restructuring-experiments/architecture-recovery-and-optimization-data/uvic/$MODE/$FORM"
cat template.project | sed "s/NAME/$NAME-original/g" > "${JOB_DIRECTORY}/original-model/.project"
rm -rf "${JOB_DIRECTORY}/original-model-fl"
mkdir "${JOB_DIRECTORY}/original-model-fl"
${RELABEL} -i "${JOB_DIRECTORY}/original-model" -o "${JOB_DIRECTORY}/original-model-fl" -r "$SOURCE_LABEL:original" -e "$NAME-original-fl"
-
+
for J in `cat "${JOB_DIRECTORY}/med-output.csv" | sed 's/;/\t/g' | awk '{ print $3","$1","$2 }' | sed 's/^\([0-9],\)/00\1/' | sed 's/^\([0-9]\{2\},\)/0\1/' | sort | head -5` ; do
ORIGINAL=`echo "$J" | cut -d, -f2 | sed 's/"//g'`
OPTIMIZED=`echo "$J" | cut -d, -f3 | sed 's/"//g'`
STEPS=`echo "$J" | cut -d, -f1`
-
+
echo "$ORIGINAL -> $OPTIMIZED in $STEPS"
-
+
cat template.project | sed "s/NAME/$P-$OPTIMIZED/g" > "${JOB_DIRECTORY}/$OPTIMIZED/.project"
-
+
rm -rf "${JOB_DIRECTORY}/${OPTIMIZED}-fl"
mkdir "${JOB_DIRECTORY}/${OPTIMIZED}-fl"
-
+
rm -rf "${JOB_DIRECTORY}/merge-${OPTIMIZED}"
mkdir "${JOB_DIRECTORY}/merge-${OPTIMIZED}"
-
+
${RELABEL} -i "${JOB_DIRECTORY}/${OPTIMIZED}" -o "${JOB_DIRECTORY}/${OPTIMIZED}-fl" -r "$SOURCE_LABEL:$OPTIMIZED" -e "$NAME-$OPTIMIZED-fl"
-
+
${MOP} -e $P-$OPTIMIZED-merged -i "${JOB_DIRECTORY}/original-model-fl" "${JOB_DIRECTORY}/${OPTIMIZED}-fl" -o "${JOB_DIRECTORY}/merge-${OPTIMIZED}" -s all merge
done
done
diff --git a/models/uvic/run-architecture-analysis.sh b/models/uvic/run-architecture-analysis.sh
index 528ed24..ced2aee 100755
--- a/models/uvic/run-architecture-analysis.sh
+++ b/models/uvic/run-architecture-analysis.sh
@@ -18,7 +18,7 @@ else
exit 1
fi
-export JAVA_OPTS="-Dlogback.configurationFile=${BASE_DIR}/logback.groovy"
+export JAVA_OPTS="-Dlogback.configurationFile=${BASE_DIR}/logback.xml"
information "++++++++++++++++++++++++++++++++++++++"
information "Configuration ${EXPERIMENT_NAME}"
--
GitLab