Minor graph fixes, see details below
- Fix to SCPFmastershipFailoverLat.R unreferenced variable
- Removed misleading comments
- Fix to maximum y-axis in various SCPF scripts
- Minor code refractoring
- Changed contact info to university email
Change-Id: I825f435827f824c094b61afc9abe2559e989cdf3
diff --git a/TestON/JenkinsFile/scripts/SCPFIntentInstallWithdrawRerouteLat.R b/TestON/JenkinsFile/scripts/SCPFIntentInstallWithdrawRerouteLat.R
index f2697db..186c1c2 100644
--- a/TestON/JenkinsFile/scripts/SCPFIntentInstallWithdrawRerouteLat.R
+++ b/TestON/JenkinsFile/scripts/SCPFIntentInstallWithdrawRerouteLat.R
@@ -18,7 +18,7 @@
# along with TestON. If not, see <http://www.gnu.org/licenses/>.
#
# If you have any questions, or if you don't understand R,
-# please contact Jeremy Ronquillo: jeremyr@opennetworking.org
+# please contact Jeremy Ronquillo: j_ronquillo@u.pacific.edu
# **********************************************************
# STEP 1: File management.
@@ -26,9 +26,7 @@
print( "STEP 1: File management." )
-# Command line arguments are read. Args usually include the database filename and the output
-# directory for the graphs to save to.
-# ie: Rscript SCPFgraphGenerator SCPFsampleDataDB.csv ~/tmp/
+# Command line arguments are read.
print( "Reading commmand-line args." )
args <- commandArgs( trailingOnly=TRUE )
@@ -51,9 +49,7 @@
flowObjFileModifier <- "fobj_"
}
-# Filenames for output graphs include the testname and the graph type.
-# See the examples below. paste() is used to concatenate strings.
-
+# paste() is used to concatenate strings
errBarOutputFile <- paste( args[ 9 ], "SCPFIntentInstallWithdrawRerouteLat", sep="" )
errBarOutputFile <- paste( errBarOutputFile, args[ 7 ], sep="_" )
if ( args[ 1 ] == "y" ){
@@ -153,20 +149,11 @@
theme_set( theme_grey( base_size = 20 ) ) # set the default text size of the graph.
-# Calculate window to display graph, based on the lowest and highest points of the data.
-if ( min( dataFrame$ms - dataFrame$stds ) < 0){
- yWindowMin <- min( dataFrame$ms - dataFrame$stds ) * 1.05
-} else {
- yWindowMin <- 0
-}
-yWindowMax <- max( dataFrame$ms + dataFrame$stds )
-
mainPlot <- ggplot( data = dataFrame, aes( x = scale, y = ms, ymin = ms - stds, ymax = ms + stds,fill = type ) )
# Formatting the plot
width <- 1.3 # Width of the bars.
xScaleConfig <- scale_x_continuous( breaks=c( 1, 3, 5, 7, 9) )
-yLimit <- ylim( yWindowMin, yWindowMax )
xLabel <- xlab( "Scale" )
yLabel <- ylab( "Latency (ms)" )
fillLabel <- labs( fill="Type" )
@@ -180,7 +167,7 @@
theme <- theme( plot.title=element_text( hjust = 0.5, size = 22, face='bold' ) )
# Store plot configurations as 1 variable
-fundamentalGraphData <- mainPlot + xScaleConfig + yLimit + xLabel + yLabel + fillLabel + theme
+fundamentalGraphData <- mainPlot + xScaleConfig + xLabel + yLabel + fillLabel + theme
# Create the bar graph with error bars.