--- loncom/homework/templates/functionplotone.problem	2010/11/11 03:53:33	1.1
+++ loncom/homework/templates/functionplotone.problem	2010/11/12 02:16:24	1.2
@@ -1,18 +1,19 @@
 <problem>
 <script type="loncapa/perl">$maxacc=&random(3,5,1);
-$maxbraketime=&random(6,10,2);</script>
+$maxbraketime=&random(6,10,2);
+$wait=&random(2,4,1);</script>
 <startouttext />
-At t=0 s, a car cruises at a constant positive velocity. Suddenly, a light switches to red. At t=$maxbraketime s, the driver is maximum on the brake. The car then stops in front of the red light for a while. Eventually, it drives off, and then again cruises at a constant velocity. Provide a graph of its acceleration as a function of time. The car cannot accelerate with more than $maxacc m/s<sup>2</sup>.<br />
-<endouttext />
+At t=0 s, a car cruises at a constant positive velocity. Suddenly, a light switches to red. At t=$maxbraketime s, the driver is maximum on the brake. The car then stops in front of the red light for over $wait seconds. Eventually, it drives off, and then again cruises at a constant velocity. The car cannot accelerate with more than $maxacc m/s<sup>2</sup>.<br />
+Provide a graph of its acceleration as a function of time.<br /> <endouttext />
 <functionplotresponse xaxisvisible="yes" xlabel="t [s]" gridvisible="yes" ylabel="a(t) [m/s^2]" id="11" xmax="30" yaxisvisible="yes" xmin="-4" ymin="-8" ymax="8">
 <spline initx="-2" inity="0" index="A" order="8" scalex="28" />
-<functionplotrule relationship="eq" xinitiallabel="start" xfinallabel="brake" value="0" derivative="0" percenterror="1" />
-<functionplotrule relationship="eq" xinitial="0" value="0" derivative="0" percenterror="1" />
-<functionplotrule relationship="lt" xinitiallabel="brake" xfinallabel="stop" value="0.1" derivative="0" />
-<functionplotrule relationship="eq" xinitial="$maxbraketime" value="0" derivative="1" percenterror="40" />
-<functionplotrule relationship="eq" xinitiallabel="stop" xfinallabel="driveoff" value="0" derivative="0" percenterror="1" />
-<functionplotrule relationship="gt" xinitiallabel="driveoff" xfinallabel="cruise" value="0.1" derivative="0" />
-<functionplotrule relationship="le" xinitiallabel="driveoff" xfinallabel="cruise" value="$maxacc" derivative="0" />
-<functionplotrule relationship="eq" xinitiallabel="cruise" xfinallabel="end" value="0" derivative="0" percenterror="1" />
+<functionplotrule relationship="eq" xinitiallabel="start" xfinallabel="brake" value="0" derivativeorder="0" percenterror="1" minimumlength="1" />
+<functionplotrule relationship="eq" xinitial="0" value="0" derivativeorder="0" percenterror="1" />
+<functionplotrule relationship="lt" xinitiallabel="brake" xfinallabel="stop" value="-0.1" derivativeorder="0" />
+<functionplotrule relationship="eq" xinitial="$maxbraketime" value="0" derivativeorder="1" percenterror="40" />
+<functionplotrule relationship="eq" xinitiallabel="stop" xfinallabel="driveoff" value="0" derivativeorder="0" percenterror="1" minimumlength="$wait" />
+<functionplotrule relationship="gt" xinitiallabel="driveoff" xfinallabel="cruise" value="0.1" derivativeorder="0" />
+<functionplotrule relationship="le" xinitiallabel="driveoff" xfinallabel="cruise" value="$maxacc" derivativeorder="0" />
+<functionplotrule relationship="eq" xinitiallabel="cruise" xfinallabel="end" value="0" derivativeorder="0" percenterror="1" minimumlength="1" />
 </functionplotresponse>
 </problem>