Commit 5cd9fd95 authored by Lachlan's avatar Lachlan

Merge branch 'lachlanmackenzie/CorrectGraphingOfLocalResults' into 'master'

Correct master branch plotting to include current result

See merge request !44
parents 154f3b69 bda9b52f
Pipeline #61746880 failed with stages
in 36 minutes and 22 seconds
......@@ -13,6 +13,7 @@ GRAPH_PATH="$DEFAULT_RESULT_PATH/graph_set/"
RESULTS_FILE_NAME="results-$NOW-$NOWT.json"
DEFAULT_FILE_NAME="results.json"
WEB_PAGE_OUTPUT_PATH="$DEFAULT_RESULT_PATH/web_pages/$JOB_NAME"
PLOT_DAYS="1"
echo "Removing $WEB_PAGE_OUTPUT_PATH"
rm -rf "$WEB_PAGE_OUTPUT_PATH"
......@@ -25,6 +26,10 @@ if ! [ -z "${BENCHMARK_CONFIG}" ]; then
BENCHMARK_CONF="${BENCHMARK_CONFIG}"
fi
if ! [ -z "${DAYS_TO_PLOT}" ]; then
PLOT_DAYS="${DAYS_TO_PLOT}"
fi
# Unistall and re-install due to dependency issues with numpy and
# path conflicts betweeen different numpy versions
pip3 uninstall -y matplotlib
......@@ -48,7 +53,7 @@ if [ "$BRANCH" != "master" ] && [ -z "${BESPOKE_WRITE}" ] && [ -z "${DEBUG_MASTE
exit 1
fi
line=$( create_graph_config $DEFAULT_RESULT_PATH/$DEFAULT_FILE_NAME )
com="python3 graphresults.py -d $CACHE_PATH/ -i $DEFAULT_RESULT_PATH/$DEFAULT_FILE_NAME -o $GRAPH_PATH $line"
com="python3 graphresults.py -d $CACHE_PATH/ -i $DEFAULT_RESULT_PATH/$DEFAULT_FILE_NAME -t $PLOT_DAYS -o $GRAPH_PATH $line"
echo $com
eval $com
cat $DEFAULT_RESULT_PATH/$DEFAULT_FILE_NAME
......@@ -61,7 +66,7 @@ else
fi
line=$( create_graph_config $FILE )
echo $line
com="python3 graphresults.py -d $CACHE_PATH/ -o $GRAPH_PATH $line"
com="python3 graphresults.py -d $CACHE_PATH/ -i $FILE -t $PLOT_DAYS -o $GRAPH_PATH $line"
echo $com
eval $com
else
......@@ -71,7 +76,7 @@ else
fi
line=$( create_graph_config $DEFAULT_RESULT_PATH/$DEFAULT_FILE_NAME )
echo $line
com="python3 graphresults.py -d $CACHE_PATH/ -i $DEFAULT_RESULT_PATH/$DEFAULT_FILE_NAME -o $GRAPH_PATH $line"
com="python3 graphresults.py -d $CACHE_PATH/ -i $DEFAULT_RESULT_PATH/$DEFAULT_FILE_NAME -t $PLOT_DAYS -o $GRAPH_PATH $line"
echo $com
eval $com
fi
......
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