Commit ecf450e0 authored by Felix Willnecker's avatar Felix Willnecker
Browse files

Merge branch 'develop' into 'master'

Cassandra 3x Support



See merge request !3
parents db648755 941b0fbc
FROM lwieske/java-8
MAINTAINER Felix Willnecker <willnecker@fortiss.org>
EXPOSE 8080
#DEBUG Information
RUN tail /etc/os-release
#Install GIT
RUN apk update && apk upgrade && \
apk add --no-cache bash git openssh
#Install MAVEN
ENV MAVEN_VERSION="3.2.5" \
M2_HOME=/usr/lib/mvn
RUN apk add --update wget && \
cd /tmp && \
wget "http://ftp.unicamp.br/pub/apache/maven/maven-3/$MAVEN_VERSION/binaries/apache-maven-$MAVEN_VERSION-bin.tar.gz" && \
tar -zxvf "apache-maven-$MAVEN_VERSION-bin.tar.gz" && \
mv "apache-maven-$MAVEN_VERSION" "$M2_HOME" && \
ln -s "$M2_HOME/bin/mvn" /usr/bin/mvn && \
apk del wget && \
rm /tmp/* /var/cache/apk/*
#Clone and build PET
RUN git clone https://git.fortiss.org/pmwt/PET.git
RUN cd PET/org.fortiss.pmwt.pet.build && mvn clean package
#Run PET
RUN cd ..
RUN java -jar PET/org.fortiss.pmwt.pet.webApplication/target/PET-swarm.jar
FROM lwieske/java-8
MAINTAINER Felix Willnecker <willnecker@fortiss.org>
EXPOSE 8080
#DEBUG Information
RUN tail /etc/os-release
#Install GIT
RUN apk update && apk upgrade && \
apk add --no-cache bash git openssh
#Install MAVEN
ENV MAVEN_VERSION="3.2.5" \
M2_HOME=/usr/lib/mvn
RUN apk add --update wget && \
cd /tmp && \
wget "http://ftp.unicamp.br/pub/apache/maven/maven-3/$MAVEN_VERSION/binaries/apache-maven-$MAVEN_VERSION-bin.tar.gz" && \
tar -zxvf "apache-maven-$MAVEN_VERSION-bin.tar.gz" && \
mv "apache-maven-$MAVEN_VERSION" "$M2_HOME" && \
ln -s "$M2_HOME/bin/mvn" /usr/bin/mvn && \
apk del wget && \
rm /tmp/* /var/cache/apk/*
#Clone and build PET
RUN git clone https://git.fortiss.org/pmwt/PET.git
RUN cd PET/org.fortiss.pmwt.pet.build && mvn clean package
#Run PET
RUN cd ..
RUN java -jar PET/org.fortiss.pmwt.pet.webApplication/target/PET-swarm.jar
......@@ -57,7 +57,7 @@ responseTimes.drawRelativeErrorBarPlot = function(plotData1, plotData2, containe
continue;
}
categories.push(transactionName);
data.push(Math.abs(1.0 - (plotData1[transactionName].mean / plotData2[similiar].mean)) * 100);
data.push(utilityFunction.relativeError(plotData2[similiar].mean, plotData1[transactionName].mean));
}
barPlot.plot(containerId, "Median response time (Relative Error in %)", "Transaction Name", "Relative Error (%)", series, categories, data, "%", 90);
......
......@@ -182,4 +182,14 @@ utilityFunction.getResourceContainerName = function(resourceContainerID) {
utilityFunction.escapeMetaCharacters = function(s) {
return s.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&');
};
\ No newline at end of file
}
utilityFunction.relativeError = function(val1, val2) {
var relError = Math.abs(1.0 - (val1 / val2)) * 100;
if (!isFinite(relError)) {
return 0;
}
return relError;
}
\ No newline at end of file
......@@ -104,7 +104,7 @@ utilization.drawRelativeErrorBarPlot = function(plotData1, plotData2, containerI
for (var resource in plotData1[resourceContainerID1]) {
categories.push(resource.toUpperCase());
data.push(Math.abs(1.0 - (plotData1[resourceContainerID1][resource].mean / plotData2[resourceContainerID2][resource].mean)) * 100);
data.push(utilityFunction.relativeError(plotData2[resourceContainerID2][resource].mean, plotData1[resourceContainerID1][resource].mean));
}
barPlot.plot(containerId, "Median Resource Utilization (Relative Error in %)", "Resource", "Relative Error (%)", series, categories, data, "%", 90);
......@@ -268,7 +268,7 @@ utilization.drawOverallRelativeErrorBarPlot = function(plotData1, plotData2, con
for (var resource in resourceSum1) {
categories.push(resource.toUpperCase());
data.push(Math.abs(1.0 - ((resourceSum1[resource].mean / resourceContainerCount1) / (resourceSum2[resource].mean / resourceContainerCount2))) * 100);
data.push(utilityFunction.relativeError(resourceSum2[resource].mean / resourceContainerCount2, resourceSum1[resource].mean / resourceContainerCount1));
}
barPlot.plot(containerId, "Median Overall Resource Utilization (Relative Error in %)", "Resource", "Relative Error (%)", series, categories, data, "%");
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment