Improved uvic scripts.

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
 

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"

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}"