2 files changed, 13 insertions, 12 deletions

diff --git a/plot_ecrts b/plot_ecrts
index f2af270..fd76b22 100755
--- a/plot_ecrts
+++ b/plot_ecrts
@@ -74,28 +74,28 @@ function plot_file {
     YRANGE=" --yrange -0.05 1.05  --yticks 0 0.1"
     case $AXIS in
         ucap)
-            if [ "$SCHED" == "P-EDF" ]
+            XRANGE="--xrange 0.5 32.5 --xticks 0 2"             
+            XRANGE="--xrange 0.5 22.5 --xticks 0 2"             
+            if [ "$SCHED" == "G-EDF" ] && [ "$TEST" == "hard" ]
             then
-                XRANGE="--xrange 0.5 32.5 --xticks 0 2"
-            else
                 XRANGE="--xrange 0.5 14.5 --xticks 0 1"
             fi
             AXIS_LABEL="task set utilization (prior to inflation)"
             ;;
         res)
-            XRANGE="--xrange 0 5.5 --xticks 0 1"
+            XRANGE="--xrange 0 5.05 --xticks 0 1"
             AXIS_LABEL="average number of resources per task"
             ;;
         nest)
-            XRANGE="--xrange 0 0.55 --xticks 0 0.1"
+            XRANGE="--xrange 0 0.505 --xticks 0 0.1"
             AXIS_LABEL="probability of nested requests"
             ;;
         contention)
-            XRANGE="--xrange 25 575 --xticks 0 50"
+            XRANGE="--xrange 45 555 --xticks 0 50"
             AXIS_LABEL="requests per resource per second"
             ;;
         wratio)
-            XRANGE="--xrange 0 0.55 --xticks 0 0.1"
+            XRANGE="--xrange 0 0.505 --xticks 0 0.1"
             AXIS_LABEL="ratio of write requests"
             ;;
         *)
@@ -106,7 +106,7 @@ function plot_file {
     TITLE="$TEST schedulability under $SCHED with$PARAMS"
     RANGE="$XRANGE $YRANGE"
     $PLOTTER $RANGE "$NAME" "$AXIS_LABEL" "ratio of schedulable task sets" "$TITLE" \
-        $STRIPPED 1 2 "fair mutex" \
+        $STRIPPED 1 2 "task-fair mutex" \
         $STRIPPED 1 3 "task-fair RW" \
         $STRIPPED 1 4 "phase-fair RW"
     rm $STRIPPED
diff --git a/plot_scatter b/plot_scatter
index 6ebb436..de709f3 100755
--- a/plot_scatter
+++ b/plot_scatter
@@ -3,7 +3,7 @@
 #NICE="blacktext linewidth 4.0 \"Helvetica\" 16 "
 
 # try thinner lines
-NICE="blacktext linewidth 1.0 \"Helvetica\" 16 "
+NICE="color blacktext solid linewidth 1.0 \"Helvetica\" 20 size 16cm,7cm"
 
 EXT="png"
 TERMINAL="png size 1024,768 large"
@@ -15,7 +15,7 @@ while true; do
       --eps)
           shift
           EXT="eps"
-          TERMINAL="postscript color eps $NICE"
+          TERMINAL="postscript eps $NICE"
           ;;
       --lines)
           shift
@@ -100,7 +100,8 @@ if [ "$PLOT" = "plot " ]; then
 fi
 
 OUT="${OUT}.${EXT}"
-
+KEY="set key below"
+KEY="set key off"
 gnuplot <<EOM
 set terminal $TERMINAL
 set out '/dev/null'
@@ -112,7 +113,7 @@ $PLOT
 set ylabel  '$YLABEL'
 set xlabel  '$XLABEL'
 set title '$TITLE'
-set key below
+$KEY
 set data style $GRAPH
 set out '$OUT'
 replot