Index: /reasoner/evaluation.tex =================================================================== --- /reasoner/evaluation.tex (revision 258) +++ /reasoner/evaluation.tex (revision 259) @@ -213,5 +213,5 @@ Latitude 7490 & 1.3.0 & Open 1.8 & 433 & 13.4 / 424.0 & 52.6 / 6000 & 603.3 / 23696\\ Latitude 7490 & 1.3.0 & Open 10 & 433 & 14.9 / 484.4 & 52.6 / 6000 & 603.3 / 23696\\ -Jenkins & 1.3.0 & Open 8 & 427 & 18.6 / 627.9 & 53.3 / 6000 & 709.3 / 23703\\ +Jenkins & 1.3.0 & Open 8 & 427 & 18.9 / 562.1 & 53.3 / 6000 & 709.3 / 23703\\ Pi 3 & 1.1.0 & Oracle 1.8 & 400 & 958.1 / 28651.7 & 977.6 / 24110 & 1679.0 / 46487.8\\ Pi 3 & 1.3.0 & Oracle 1.8 & 433 & 255.0 / 6117.3 & 52.6 / 6000 & 815.3 / 23708.3\\ @@ -283,12 +283,12 @@ \end{itemize} - -\begin{figure}[!htb] - \centering - \includegraphics[width=\linewidth]{figures/benchmark-results-old-1_1_0-jdk1_8-20190215_reasoningTime_all.pdf} - \hfill - \includegraphics[width=\linewidth]{figures/benchmark-results-old-1_1_0-jdk1_8-20190215_translationTime_all.pdf} - \hfill - \includegraphics[width=\linewidth]{figures/benchmark-results-old-1_1_0-jdk1_8-20190215_evaluationTime_all.pdf} +\newcommand\evalPDFscale[0]{0.67} +\begin{figure}[!htb] + \centering + \includegraphics[scale=\evalPDFscale]{figures/benchmark-results-old-1_1_0-jdk1_8-20190215_reasoningTime_all.pdf} + \hfill + \includegraphics[scale=\evalPDFscale]{figures/benchmark-results-old-1_1_0-jdk1_8-20190215_translationTime_all.pdf} + \hfill + \includegraphics[scale=\evalPDFscale]{figures/benchmark-results-old-1_1_0-jdk1_8-20190215_evaluationTime_all.pdf} \caption{Reasoner 1.10 on the Dell Latitude 6430u using Oracle JDK 1.8.}\label{fig:old-1_10-jdk8} \end{figure} @@ -298,9 +298,9 @@ \begin{figure}[!htb] \centering - \includegraphics[width=\linewidth]{figures/benchmark-results-old-1_3_0-jdk1_8-20190215_reasoningTime_all.pdf} - \hfill - \includegraphics[width=\linewidth]{figures/benchmark-results-old-1_3_0-jdk1_8-20190215_translationTime_all.pdf} - \hfill - \includegraphics[width=\linewidth]{figures/benchmark-results-old-1_3_0-jdk1_8-20190215_evaluationTime_all.pdf} + \includegraphics[scale=\evalPDFscale]{figures/benchmark-results-old-1_3_0-jdk1_8-20190215_reasoningTime_all.pdf} + \hfill + \includegraphics[scale=\evalPDFscale]{figures/benchmark-results-old-1_3_0-jdk1_8-20190215_translationTime_all.pdf} + \hfill + \includegraphics[scale=\evalPDFscale]{figures/benchmark-results-old-1_3_0-jdk1_8-20190215_evaluationTime_all.pdf} \caption{Reasoner 1.30 on the Dell Latitude 6430u using Oracle JDK 1.8.}\label{fig:old-1_30-jdk8} \end{figure} @@ -310,9 +310,9 @@ \begin{figure}[!htb] \centering - \includegraphics[width=\linewidth]{figures/benchmark-results-new-1_3_0-ojdk1_8-20190215_reasoningTime_all.pdf} - \hfill - \includegraphics[width=\linewidth]{figures/benchmark-results-new-1_3_0-ojdk1_8-20190215_translationTime_all.pdf} - \hfill - \includegraphics[width=\linewidth]{figures/benchmark-results-new-1_3_0-ojdk1_8-20190215_evaluationTime_all.pdf} + \includegraphics[scale=\evalPDFscale]{figures/benchmark-results-new-1_3_0-ojdk1_8-20190215_reasoningTime_all.pdf} + \hfill + \includegraphics[scale=\evalPDFscale]{figures/benchmark-results-new-1_3_0-ojdk1_8-20190215_translationTime_all.pdf} + \hfill + \includegraphics[scale=\evalPDFscale]{figures/benchmark-results-new-1_3_0-ojdk1_8-20190215_evaluationTime_all.pdf} \caption{Reasoner 1.30 on the Dell Latitude 7490 using Open JDK 1.8.}\label{fig:new-1_30-ojdk8} \end{figure} @@ -322,9 +322,9 @@ \begin{figure}[!htb] \centering - \includegraphics[width=\linewidth]{figures/benchmark-results-new-1_3_0-ojdk10-20190215_reasoningTime_all.pdf} - \hfill - \includegraphics[width=\linewidth]{figures/benchmark-results-new-1_3_0-ojdk10-20190215_translationTime_all.pdf} - \hfill - \includegraphics[width=\linewidth]{figures/benchmark-results-new-1_3_0-ojdk10-20190215_evaluationTime_all.pdf} + \includegraphics[scale=\evalPDFscale]{figures/benchmark-results-new-1_3_0-ojdk10-20190215_reasoningTime_all.pdf} + \hfill + \includegraphics[scale=\evalPDFscale]{figures/benchmark-results-new-1_3_0-ojdk10-20190215_translationTime_all.pdf} + \hfill + \includegraphics[scale=\evalPDFscale]{figures/benchmark-results-new-1_3_0-ojdk10-20190215_evaluationTime_all.pdf} \caption{Reasoner 1.30 on the Dell Latitude 7490 using Open JDK 10.}\label{fig:new-1_30-ojdk10} \end{figure} @@ -334,9 +334,9 @@ \begin{figure}[!htb] \centering - \includegraphics[width=\linewidth]{figures/benchmark-results-jenkins-1_3_0-20190215_reasoningTime_all.pdf} - \hfill - \includegraphics[width=\linewidth]{figures/benchmark-results-jenkins-1_3_0-20190215_translationTime_all.pdf} - \hfill - \includegraphics[width=\linewidth]{figures/benchmark-results-jenkins-1_3_0-20190215_evaluationTime_all.pdf} + \includegraphics[scale=\evalPDFscale]{figures/benchmark-results-jenkins-1_3_0-20190215_reasoningTime_all.pdf} + \hfill + \includegraphics[scale=\evalPDFscale]{figures/benchmark-results-jenkins-1_3_0-20190215_translationTime_all.pdf} + \hfill + \includegraphics[scale=\evalPDFscale]{figures/benchmark-results-jenkins-1_3_0-20190215_evaluationTime_all.pdf} \caption{Reasoner 1.30 on Jenkins Ubuntu Open JDK 1.8.}\label{fig:jenkins-1_30-ojdk10} \end{figure} @@ -346,9 +346,9 @@ \begin{figure}[!htb] \centering - \includegraphics[width=\linewidth]{figures/benchmark-results-pi-1_1_0-jdk1_8-20190219_reasoningTime_all.pdf} - \hfill - \includegraphics[width=\linewidth]{figures/benchmark-results-pi-1_1_0-jdk1_8-20190219_translationTime_all.pdf} - \hfill - \includegraphics[width=\linewidth]{figures/benchmark-results-pi-1_1_0-jdk1_8-20190219_evaluationTime_all.pdf} + \includegraphics[scale=\evalPDFscale]{figures/benchmark-results-pi-1_1_0-jdk1_8-20190219_reasoningTime_all.pdf} + \hfill + \includegraphics[scale=\evalPDFscale]{figures/benchmark-results-pi-1_1_0-jdk1_8-20190219_translationTime_all.pdf} + \hfill + \includegraphics[scale=\evalPDFscale]{figures/benchmark-results-pi-1_1_0-jdk1_8-20190219_evaluationTime_all.pdf} \caption{Reasoner 1.10 on a Pi 3 using Oracle JDK 1.8.}\label{fig:pi-1_10-jdk8} \end{figure} @@ -358,9 +358,9 @@ \begin{figure}[!htb] \centering - \includegraphics[width=\linewidth]{figures/benchmark-results-pi-1_3_0-jdk1_8-20190219_reasoningTime_all.pdf} - \hfill - \includegraphics[width=\linewidth]{figures/benchmark-results-pi-1_3_0-jdk1_8-20190219_translationTime_all.pdf} - \hfill - \includegraphics[width=\linewidth]{figures/benchmark-results-pi-1_3_0-jdk1_8-20190219_evaluationTime_all.pdf} + \includegraphics[scale=\evalPDFscale]{figures/benchmark-results-pi-1_3_0-jdk1_8-20190219_reasoningTime_all.pdf} + \hfill + \includegraphics[scale=\evalPDFscale]{figures/benchmark-results-pi-1_3_0-jdk1_8-20190219_translationTime_all.pdf} + \hfill + \includegraphics[scale=\evalPDFscale]{figures/benchmark-results-pi-1_3_0-jdk1_8-20190219_evaluationTime_all.pdf} \caption{Reasoner 1.30 on a Pi 3 using Oracle JDK 1.8.}\label{fig:pi-1_30-jdk8} \end{figure} Index: /reasoner/measures/log.txt =================================================================== --- /reasoner/measures/log.txt (revision 258) +++ /reasoner/measures/log.txt (revision 259) @@ -1,28 +1,16 @@ [1] "processing folder W:/offlineFiles/EASy-concepts/reasoner/measures/benchmark-results-jenkins-1_3_0-20190215" -[1] " loading data (1)" -[1] " reasoning time diagram 1" -[1] " translation time diagram 1" -[1] " evaluation time diagram 1" [1] "#tests;427" -[1] "reasoning time;0;18.6327367012379;627.857142857143" -[1] "translation time;0;7.97122783539645;354" -[1] "evaluation time;0;6.60337905654065;261.857142857143" +[1] "reasoning time;0;18.8758503401361;562.142857142857" +[1] "translation time;0;8.05720976915356;280.285714285714" +[1] "evaluation time;0;6.41889706702353;278.857142857143" [1] "constraints count;0;53.3629976580796;6000" -[1] "reevaluation count;0;709.335731013717;23703.2857142857" -[1] " loading data (all)" -[1] " reasoning time diagram all" -[1] " translation time diagram all" -[1] " evaluation time diagram all" -[1] "#tests;449" -[1] "reasoning time;0;18.1497984940078;552.285714285714" -[1] "translation time;0;7.72914943260155;242.371428571429" -[1] "evaluation time;0;6.34549262912292;239.4" -[1] "constraints count;0;51.1224944320713;6000" -[1] "reevaluation count;0;676.32083996182;23699.6285714286" +[1] "reevaluation count;0;709.311140849783;23703.2857142857" +[1] "#tests;514" +[1] "reasoning time;0;46.4212293866963;559.142857142857" +[1] "translation time;0;19.5075597554197;280.285714285714" +[1] "evaluation time;0;15.6086946451732;277.285714285714" +[1] "constraints count;0;44.6050583657588;6000" +[1] "reevaluation count;0;1712.07329071706;23703.2857142857" [1] "processing folder W:/offlineFiles/EASy-concepts/reasoner/measures/benchmark-results-new-1_3_0-ojdk1_8-20190215" -[1] " loading data (1)" -[1] " reasoning time diagram 1" -[1] " translation time diagram 1" -[1] " evaluation time diagram 1" [1] "#tests;433" [1] "reasoning time;0;13.4028373474101;424" @@ -31,8 +19,4 @@ [1] "constraints count;0;52.6235565819861;6000" [1] "reevaluation count;0;603.311448366876;23696" -[1] " loading data (all)" -[1] " reasoning time diagram all" -[1] " translation time diagram all" -[1] " evaluation time diagram all" [1] "#tests;517" [1] "reasoning time;0;28.8461545546652;443.771428571429" @@ -42,8 +26,4 @@ [1] "reevaluation count;0;1236.59463940315;23696" [1] "processing folder W:/offlineFiles/EASy-concepts/reasoner/measures/benchmark-results-new-1_3_0-ojdk10-20190215" -[1] " loading data (1)" -[1] " reasoning time diagram 1" -[1] " translation time diagram 1" -[1] " evaluation time diagram 1" [1] "#tests;433" [1] "reasoning time;0;14.8669306059606;484.428571428571" @@ -52,8 +32,4 @@ [1] "constraints count;0;52.6235565819861;6000" [1] "reevaluation count;0;603.316397228637;23696.5714285714" -[1] " loading data (all)" -[1] " reasoning time diagram all" -[1] " translation time diagram all" -[1] " evaluation time diagram all" [1] "#tests;538" [1] "reasoning time;0;34.9081209063551;479.314285714286" @@ -63,8 +39,4 @@ [1] "reevaluation count;0;1360.5263409453;23697" [1] "processing folder W:/offlineFiles/EASy-concepts/reasoner/measures/benchmark-results-new-eclipse-1_3_0-ojdk10-20190215" -[1] " loading data (1)" -[1] " reasoning time diagram 1" -[1] " translation time diagram 1" -[1] " evaluation time diagram 1" [1] "#tests;433" [1] "reasoning time;0;15.2083470801716;506.571428571429" @@ -73,8 +45,4 @@ [1] "constraints count;0;52.6235565819861;6000" [1] "reevaluation count;0;603.332233586275;23697.5714285714" -[1] " loading data (all)" -[1] " reasoning time diagram all" -[1] " translation time diagram all" -[1] " evaluation time diagram all" [1] "#tests;525" [1] "reasoning time;0;32.8600453514739;485.628571428571" @@ -84,8 +52,4 @@ [1] "reevaluation count;0;1255.07419501134;23697.5714285714" [1] "processing folder W:/offlineFiles/EASy-concepts/reasoner/measures/benchmark-results-old-1_1_0-jdk1_8-20190215" -[1] " loading data (1)" -[1] " reasoning time diagram 1" -[1] " translation time diagram 1" -[1] " evaluation time diagram 1" [1] "#tests;400" [1] "reasoning time;0;16.40125;655.142857142857" @@ -94,8 +58,4 @@ [1] "constraints count;0;723.18125;24110" [1] "reevaluation count;0;1092.48946428571;46469.1428571429" -[1] " loading data (all)" -[1] " reasoning time diagram all" -[1] " translation time diagram all" -[1] " evaluation time diagram all" [1] "#tests;477" [1] "reasoning time;0;39.1217929519816;667.257142857143" @@ -105,8 +65,4 @@ [1] "reevaluation count;0;2612.6485474693;46469.1428571429" [1] "processing folder W:/offlineFiles/EASy-concepts/reasoner/measures/benchmark-results-old-1_3_0-jdk1_8-20190215" -[1] " loading data (1)" -[1] " reasoning time diagram 1" -[1] " translation time diagram 1" -[1] " evaluation time diagram 1" [1] "#tests;433" [1] "reasoning time;0;11.7713625866051;399.142857142857" @@ -115,8 +71,4 @@ [1] "constraints count;0;52.6235565819861;6000" [1] "reevaluation count;0;603.293632464533;23695.4285714286" -[1] " loading data (all)" -[1] " reasoning time diagram all" -[1] " translation time diagram all" -[1] " evaluation time diagram all" [1] "#tests;542" [1] "reasoning time;0;27.0017527675277;373.742857142857" @@ -126,8 +78,4 @@ [1] "reevaluation count;0;1393.59093305219;23695.4285714286" [1] "processing folder W:/offlineFiles/EASy-concepts/reasoner/measures/benchmark-results-old-eclipse-1_1_0-jdk1_8-20190215" -[1] " loading data (1)" -[1] " reasoning time diagram 1" -[1] " translation time diagram 1" -[1] " evaluation time diagram 1" [1] "#tests;400" [1] "reasoning time;0;16.6328571428571;663" @@ -136,8 +84,4 @@ [1] "constraints count;0;723.18125;24110" [1] "reevaluation count;0;1092.57232142857;46470" -[1] " loading data (all)" -[1] " reasoning time diagram all" -[1] " translation time diagram all" -[1] " evaluation time diagram all" [1] "#tests;482" [1] "reasoning time;0;43.6953764078245;755.571428571429" @@ -147,8 +91,4 @@ [1] "reevaluation count;0;2839.77845287493;46470" [1] "processing folder W:/offlineFiles/EASy-concepts/reasoner/measures/benchmark-results-old-eclipse-1_3_0-jdk1_8-20190215" -[1] " loading data (1)" -[1] " reasoning time diagram 1" -[1] " translation time diagram 1" -[1] " evaluation time diagram 1" [1] "#tests;433" [1] "reasoning time;0;11.8201913559881;468.428571428571" @@ -157,8 +97,4 @@ [1] "constraints count;0;52.6235565819861;6000" [1] "reevaluation count;0;603.267568459254;23701.1428571429" -[1] " loading data (all)" -[1] " reasoning time diagram all" -[1] " translation time diagram all" -[1] " evaluation time diagram all" [1] "#tests;538" [1] "reasoning time;0;26.5948884758364;394.085714285714" @@ -168,8 +104,4 @@ [1] "reevaluation count;0;1357.47769516729;23701.1428571429" [1] "processing folder W:/offlineFiles/EASy-concepts/reasoner/measures/benchmark-results-pi-1_1_0-jdk1_8-20190219" -[1] " loading data (1)" -[1] " reasoning time diagram 1" -[1] " translation time diagram 1" -[1] " evaluation time diagram 1" [1] "#tests;400" [1] "reasoning time;0;958.052678571429;28651.7142857143" @@ -178,8 +110,4 @@ [1] "constraints count;0;977.62375;24110" [1] "reevaluation count;0;1679.00803571429;46487.8571428571" -[1] " loading data (all)" -[1] " reasoning time diagram all" -[1] " translation time diagram all" -[1] " evaluation time diagram all" [1] "#tests;478" [1] "reasoning time;0.0285714285714286;2790.09086471409;28689.8571428571" @@ -189,8 +117,4 @@ [1] "reevaluation count;0;4696.50678421996;46492.7142857143" [1] "processing folder W:/offlineFiles/EASy-concepts/reasoner/measures/benchmark-results-pi-1_3_0-jdk1_8-20190219" -[1] " loading data (1)" -[1] " reasoning time diagram 1" -[1] " translation time diagram 1" -[1] " evaluation time diagram 1" [1] "#tests;433" [1] "reasoning time;0;254.985015946332;6117.28571428571" @@ -199,8 +123,4 @@ [1] "constraints count;0;52.6235565819861;6000" [1] "reevaluation count;0;815.268228307489;23708.2857142857" -[1] " loading data (all)" -[1] " reasoning time diagram all" -[1] " translation time diagram all" -[1] " evaluation time diagram all" [1] "#tests;544" [1] "reasoning time;0.0571428571428571;671.583193277311;6285.85714285714" Index: /reasoner/measures/script.r =================================================================== --- /reasoner/measures/script.r (revision 258) +++ /reasoner/measures/script.r (revision 259) @@ -157,5 +157,5 @@ # URI as label (for interactive use ggplotly(tooltip=c("label")) after plot(gg)) and tags as values. # default settings can be changed through data$... or column names as strings -my.createErrorBarDiagram = function(data, yCol, yColName, yBarCol, diagramTitle="", xCol="MODEL_COMPLEXITY", xColName="model complexity", labelCol="URI", colorCol="tag", colorLegendName="", regression=TRUE, sizeFactor=5, legendPos="bottom") { +my.createErrorBarDiagram = function(data, yCol, yColName, yBarCol, diagramTitle="", xCol="MODEL_COMPLEXITY", xColName="model complexity", labelCol="URI", colorCol="tag", colorLegendName="", regression=TRUE, sizeFactor=5, legendPos="right") { size <- length(data) #ggplot seems to do levels(factor(.)) by its own @@ -223,5 +223,5 @@ # creates the diagrams for a data set to be written into dir using the given indicator (name) -my.createDiagrams = function(data, dir, indicator) { +my.createDiagrams = function(data, dir, indicator, picWidth=23, picHeight=9, picUnits="cm") { write(paste(" reasoning time diagram", indicator), stderr()) gg <- @@ -234,5 +234,5 @@ ggsave( filename=my.composeFileName(dir, "reasoningTime", indicator), - plot=gg) + plot=gg, width=picWidth, height=picHeight, units=picUnits) write(paste(" translation time diagram", indicator), stderr()) @@ -245,5 +245,5 @@ ggsave( filename=my.composeFileName(dir, "translationTime", indicator), - plot=gg) + plot=gg, width=picWidth, height=picHeight, units=picUnits) write(paste(" evaluation time diagram", indicator), stderr()) @@ -256,5 +256,5 @@ ggsave( filename=my.composeFileName(dir, "evaluationTime", indicator), - plot=gg) + plot=gg, width=picWidth, height=picHeight, units=picUnits) my.printStatistics(data, dir, indicator)