diff --git a/models/uvic/compare-models.sh b/models/uvic/compare-models.sh
index 8b6978e4f1a20ec9cc94ef6ad94547807358d519..dbe3509ce7a6c13d5769ace8f8133cc6b2955c22 100755
--- a/models/uvic/compare-models.sh
+++ b/models/uvic/compare-models.sh
@@ -18,24 +18,7 @@ checkDirectory "Result directory" "${OPTIMIZATION_DATA}"
# main
-for I in jss-jobs-58-a-uvic_combined_iface-map-common.job \
-jss-jobs-58-b-uvic_combined_iface-map-embm.job \
-jss-jobs-58-c-uvic_combined_iface-map-mom.job \
-jss-jobs-59-a-uvic_combined_map-common.job \
-jss-jobs-59-b-uvic_combined_map-embm.job \
-jss-jobs-59-c-uvic_combined_map-mom.job \
-jss-jobs-64-a-uvic_dynamic_iface-map-common.job \
-jss-jobs-64-b-uvic_dynamic_iface-map-embm.job \
-jss-jobs-64-c-uvic_dynamic_iface-map-mom.job \
-jss-jobs-65-a-uvic_dynamic_map-common.job \
-jss-jobs-65-b-uvic_dynamic_map-embm.job \
-jss-jobs-65-c-uvic_dynamic_map-mom.job \
-jss-jobs-70-a-uvic_static_iface-map-common.job \
-jss-jobs-70-b-uvic_static_iface-map-embm.job \
-jss-jobs-70-c-uvic_static_iface-map-mom.job \
-jss-jobs-71-a-uvic_static_map-common.job \
-jss-jobs-71-b-uvic_static_map-embm.job \
-jss-jobs-71-c-uvic_static_map-mom.job ; do
+for I in `ls "${OPTIMIZATION_DATA}"` ; do
information "----------------------------------------"
information $I
@@ -45,39 +28,19 @@ jss-jobs-71-c-uvic_static_map-mom.job ; do
checkDirectory "job directory" "${JOB_DIRECTORY}"
- export ORIGINAL_ARCHIVE="${JOB_DIRECTORY}/optimized-models.tar.xz"
- export OPTIMIZED_ARCHIVE="${JOB_DIRECTORY}/original-model.tar.xz"
- export COMBINED_ARCHIVE="${JOB_DIRECTORY}/kieker-repositories.tar.xz"
-
cd "${JOB_DIRECTORY}"
- if [ -f "${ORIGINAL_ARCHIVE}" ] && [ -f "${OPTIMIZED_ARCHIVE}" ] ; then
- tar -xpf "${ORIGINAL_ARCHIVE}"
- tar -xpf "${OPTIMIZED_ARCHIVE}"
- elif [ -f "${COMBINED_ARCHIVE}" ] ; then
- rm -rf "${JOB_DIRECTORY}/original-model"
- for J in "${JOB_DIRECTORY}/optimized-"* ; do
- if [ -d "$J" ] ; then
- rm -rf "$J"
- fi
- done
- tar -xpf "${COMBINED_ARCHIVE}"
- mv "${JOB_DIRECTORY}/kieker-repositories/"* .
- else
- echo "No data."
- fi
-
- ORIGINAL="${JOB_DIRECTORY}/original-model"
+ ORIGINAL="original-model"
if [ -d "${ORIGINAL}" ] ; then
LIST=""
- for J in "${JOB_DIRECTORY}/optimized-"* ; do
+ for J in "optimized-"* ; do
if [ -d "$J" ] ; then
LIST="$LIST $J"
fi
done
- "${RESTRUCTURING}" -i "${ORIGINAL}" $LIST -o "${JOB_DIRECTORY}" -e demo -s kuhn
+ "${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}"
diff --git a/models/uvic/prepare-models-for-inspection.sh b/models/uvic/prepare-models-for-inspection.sh
index a3f55c8ffc9a5ee6924cefff232d12ea4706fcc2..8f8cef0e67953b17b73d505e00cec8e5b93d8a3f 100755
--- a/models/uvic/prepare-models-for-inspection.sh
+++ b/models/uvic/prepare-models-for-inspection.sh
@@ -17,24 +17,7 @@ checkDirectory "Result directory" "${OPTIMIZATION_DATA}"
# main
-for I in jss-jobs-58-a-uvic_combined_iface-map-common.job \
-jss-jobs-58-b-uvic_combined_iface-map-embm.job \
-jss-jobs-58-c-uvic_combined_iface-map-mom.job \
-jss-jobs-59-a-uvic_combined_map-common.job \
-jss-jobs-59-b-uvic_combined_map-embm.job \
-jss-jobs-59-c-uvic_combined_map-mom.job \
-jss-jobs-64-a-uvic_dynamic_iface-map-common.job \
-jss-jobs-64-b-uvic_dynamic_iface-map-embm.job \
-jss-jobs-64-c-uvic_dynamic_iface-map-mom.job \
-jss-jobs-65-a-uvic_dynamic_map-common.job \
-jss-jobs-65-b-uvic_dynamic_map-embm.job \
-jss-jobs-65-c-uvic_dynamic_map-mom.job \
-jss-jobs-70-a-uvic_static_iface-map-common.job \
-jss-jobs-70-b-uvic_static_iface-map-embm.job \
-jss-jobs-70-c-uvic_static_iface-map-mom.job \
-jss-jobs-71-a-uvic_static_map-common.job \
-jss-jobs-71-b-uvic_static_map-embm.job \
-jss-jobs-71-c-uvic_static_map-mom.job ; do
+for I in `ls "${OPTIMIZATION_DATA}"` ; do
information "----------------------------------------"
information $I
@@ -44,45 +27,40 @@ jss-jobs-71-c-uvic_static_map-mom.job ; do
checkDirectory "job directory" "${JOB_DIRECTORY}"
- P=`echo "$I" | sed 's/^jss-jobs-[0-9]*-//g' | sed 's/\.job$//g'`
+ export MODEL_ID=`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'`
+ MODEL=`echo "${MODEL_ID}" | cut -d"_" -f1`
+ MODE=`echo "${MODEL_ID}" | cut -d"_" -f2`
+ FORM=`echo "${MODEL_ID}" | cut -d"_" -f3 | sed 's/-\w*$//g'`
- echo $NAME
- echo $MODEL
- echo $MODE
- echo $FORM
+ information " name $NAME"
+ information " model $MODEL"
+ information " mode $MODE"
+
+ cd "${JOB_DIRECTORY}"
- SOURCE_LABEL="/home/hs/share/software/restructuring-experiments/architecture-recovery-and-optimization-data/uvic/$MODE/$FORM"
+ if [ -f "med-output.csv" ] ; then
- cat template.project | sed "s/NAME/$NAME-original/g" > "${JOB_DIRECTORY}/original-model/.project"
+ cat "${BASE_DIR}/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 "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` ; 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`
- 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"
- echo "$ORIGINAL -> $OPTIMIZED in $STEPS"
+ cat "${BASE_DIR}/template.project" | sed "s/NAME/${MODEL_ID}-$OPTIMIZED/g" > "${JOB_DIRECTORY}/$OPTIMIZED/.project"
- cat template.project | sed "s/NAME/$P-$OPTIMIZED/g" > "${JOB_DIRECTORY}/$OPTIMIZED/.project"
+ rm -rf "${JOB_DIRECTORY}/merge-${OPTIMIZED}"
+ mkdir "${JOB_DIRECTORY}/merge-${OPTIMIZED}"
- 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
+ ${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"
+ fi
done
# end