[LON-CAPA-cvs] cvs: loncom /homework functionplotresponse.pm /homework/templates functionplotone.problem functionplottwo.problem functionplottwo.problem.meta doc/loncapafiles loncapafiles.lpml

www www@source.lon-capa.org
Fri, 12 Nov 2010 02:16:25 -0000


This is a MIME encoded message

--www1289528185
Content-Type: text/plain

www		Fri Nov 12 02:16:25 2010 EDT

  Added files:                 
    /loncom/homework/templates	functionplottwo.problem 
                              	functionplottwo.problem.meta 

  Modified files:              
    /doc/loncapafiles	loncapafiles.lpml 
    /loncom/homework	functionplotresponse.pm 
    /loncom/homework/templates	functionplotone.problem 
  Log:
  * Debug window
  * Minimum and maximum length of ranges
  * derivative -> derivativeorder
  * Another template
  
  
--www1289528185
Content-Type: text/plain
Content-Disposition: attachment; filename="www-20101112021625.txt"

Index: doc/loncapafiles/loncapafiles.lpml
diff -u doc/loncapafiles/loncapafiles.lpml:1.710 doc/loncapafiles/loncapafiles.lpml:1.711
--- doc/loncapafiles/loncapafiles.lpml:1.710	Thu Nov 11 03:51:36 2010
+++ doc/loncapafiles/loncapafiles.lpml	Fri Nov 12 02:16:15 2010
@@ -2,7 +2,7 @@
  "http://lpml.sourceforge.net/DTD/lpml.dtd">
 <!-- loncapafiles.lpml -->
 
-<!-- $Id: loncapafiles.lpml,v 1.710 2010/11/11 03:51:36 www Exp $ -->
+<!-- $Id: loncapafiles.lpml,v 1.711 2010/11/12 02:16:15 www Exp $ -->
 
 <!--
 
@@ -1313,6 +1313,8 @@
 examupload.problem.meta;
 functionplotone.problem;
 functionplotone.problem.meta;
+functionplottwo.problem;
+functionplottwo.problem.meta;
 HintFormula.problem;
 HintFormula.problem.meta;
 HintMathResponse.problem;
Index: loncom/homework/functionplotresponse.pm
diff -u loncom/homework/functionplotresponse.pm:1.34 loncom/homework/functionplotresponse.pm:1.35
--- loncom/homework/functionplotresponse.pm:1.34	Thu Nov 11 15:57:49 2010
+++ loncom/homework/functionplotresponse.pm	Fri Nov 12 02:16:20 2010
@@ -1,7 +1,7 @@
 # LearningOnline Network with CAPA
 # option list style responses
 #
-# $Id: functionplotresponse.pm,v 1.34 2010/11/11 15:57:49 www Exp $
+# $Id: functionplotresponse.pm,v 1.35 2010/11/12 02:16:20 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -376,7 +376,7 @@
           &Apache::lonxml::warning(&mt('Rule relationship not defined.'));
           $relationship='eq';
       }
-      my $derivative=&Apache::lonxml::get_param('derivative',$parstack,$safeeval);
+      my $derivative=&Apache::lonxml::get_param('derivativeorder',$parstack,$safeeval);
       unless (($derivative==0) || ($derivative==1) || ($derivative==2)) {
          &Apache::lonxml::warning(&mt('Rule derivative not defined.'));
          $derivative=0;
@@ -388,6 +388,8 @@
            $beginninglabel,
            &Apache::lonxml::get_param('xfinal',$parstack,$safeeval),
            $endinglabel,
+           &Apache::lonxml::get_param('minimumlength',$parstack,$safeeval),
+           &Apache::lonxml::get_param('maximumlength',$parstack,$safeeval),
            $relationship,
            &Apache::lonxml::get_param('value',$parstack,$safeeval),
            &Apache::lonxml::get_param('percenterror',$parstack,$safeeval)
@@ -396,21 +398,23 @@
         $result=&Apache::edit::tag_start($target,$token,'Function Plot Evaluation Rule').
              &Apache::edit::text_arg('Index:','index',
                                      $token,'4').'&nbsp;'.
-             &Apache::edit::select_arg(&mt('Function:'),'derivative',
+             &Apache::edit::select_arg(&mt('Function:'),'derivativeorder',
                                   [['0','Function itself'],
                                    ['1','First derivative'],
                                    ['2','Second derivative']],$token).'<br />'.
-
              &Apache::edit::text_arg('(Initial) x-value:','xinitial',
-                                      $token,'4').
+                                      $token,'8').
              &Apache::edit::select_or_text_arg('(Initial) x-value label:','xinitiallabel',
                                                [['start','Start of Plot']],$token,'8').'<br />'.
 
              &Apache::edit::text_arg('Optional final x-value for ranges:','xfinal',
-                                      $token,'4').
+                                      $token,'8').
              &Apache::edit::select_or_text_arg('Optional final x-value label:','xfinallabel',
                                                [['end','End of Plot']],$token,'8').'<br />'.
-
+             &Apache::edit::text_arg('Optional minimum length for range:','minimumlength',
+                                     $token,'8').
+             &Apache::edit::text_arg('Optional maximum length for range:','maximumlength',
+                                     $token,'8').'<br />'.
              &Apache::edit::select_arg(&mt('Relationship:'),'relationship',
                                   [['eq','equal'],
                                    ['ne','not equal'],
@@ -419,14 +423,16 @@
                                    ['lt','less than'],
                                    ['le','less than or equal']],$token).
              $result.= &Apache::edit::select_or_text_arg('Value:','value',
-                                               [['undef','not defined']],$token,'4').
+                                               [['undef','not defined']],$token,'8').
              &Apache::edit::text_arg('Percent error:','percenterror',
-                                     $token,'4').
+                                     $token,'8').
              &Apache::edit::end_row();
   } elsif ($target eq 'modified') {
     my $constructtag=&Apache::edit::get_new_args($token,$parstack,
-                                                 $safeeval,'index','derivative','xinitial','xinitiallabel','xfinal','xfinallabel','relationship',
-                                                           'value','percenterror');
+                                                 $safeeval,'index','derivativeorder',
+                                                           'xinitial','xinitiallabel','xfinal','xfinallabel',
+                                                           'minimumlength','maximumlength',
+                                                           'relationship','value','percenterror');
     if ($constructtag) { $result=&Apache::edit::rebuild_tag($token); }
    }
    return $result;
@@ -597,6 +603,7 @@
 sub populate_arrays {
     my ($id,$xmin,$xmax)=@_;
     for (my $i=0; $i<=400; $i++) {
+       $Apache::functionplotresponse::actualxval[$i]=undef;
        $Apache::functionplotresponse::func[$i]=undef;
        $Apache::functionplotresponse::dfuncdx[$i]=undef;
        $Apache::functionplotresponse::d2funcd2x[$i]=undef;
@@ -618,11 +625,13 @@
                         $env{'form.HWVAL_'.$id.'_'.$label.'S'.$ni.'_y'});
 # Run in small steps over spline parameter
             for (my $t=0; $t<=1; $t+=0.0001) {
-                my $xi=&array_index($xmin,$xmax,&cubic_hermite($t,@xparms));
+                my $xreal=&cubic_hermite($t,@xparms);
+                my $xi=&array_index($xmin,$xmax,$xreal);
                 if ($xi<$xiold) { return 'no_func'; }
                 if (($xi>$xiold) && ($xi>=0) && ($xi<=400)) {
                    if (defined($Apache::functionplotresponse::func[$xi])) { return 'no_func'; }
                    $xiold=$xi;
+                   $Apache::functionplotresponse::actualxval[$xi]=$xreal;
 # Function value
                    my $funcval=&cubic_hermite($t,@yparms);
                    $Apache::functionplotresponse::func[$xi]=$funcval;
@@ -745,7 +754,31 @@
      $result.=&axes_script($internalid,$xmin,$xmax,$ymin,$ymax,$xaxisvisible,$yaxisvisible,$gridvisible);
      $result.=&axes_label($internalid,$xlabel,$ylabel);
 # init script is left open
-  }
+  } elsif (($target eq 'answer') &&
+            ($env{'form.answer_output_mode'} ne 'tex') &&
+            ($Apache::lonhomework::viewgrades == 'F')) {
+      my (undef,undef,$udom,$uname)=&Apache::lonnet::whichuser();
+      my $windowopen=&Apache::lonhtmlcommon::javascript_docopen();
+      my $start_page = &Apache::loncommon::start_page('Rules Log', undef,
+                                               {'only_body' => 1,
+                                                'bgcolor'   => '#FFFFFF',
+                                                'js_ready'  => 1,});
+      my $end_page = &Apache::loncommon::end_page({'js_ready' => 1,});
+      $uname =~s/\W//g;
+      $udom  =~s/\W//g;
+      my $function_name =
+                join('_','LONCAPA_scriptvars',$uname,$udom,
+                     $env{'form.counter'},$Apache::lonxml::curdepth);
+      my $rules_var ="<script type=\"text/javascript\">
+// <![CDATA[
+    function $function_name() {newWindow=open('','new_W','width=500,height=500,scrollbars=1,resizable=yes');newWindow.$windowopen;newWindow.document.writeln('$start_page<pre>".
+    $Apache::functionplotresponse::ruleslog.
+    "<\\/pre>$end_page');newWindow.document.close();newWindow.focus()}
+// ]]>
+</script><a href=\"javascript:$function_name();void(0);\">".&mt('Rules Log')."</a><br />";
+            &Apache::lonxml::add_script_result($rules_var);
+        }
+
   return $result;
 }
 
@@ -787,15 +820,24 @@
    return 0;
 }
 
+sub addlog {
+   my ($text)=@_;
+   $Apache::functionplotresponse::ruleslog.=$text.'<br />';
+}
+
+sub actualval {
+   my ($i,$xmin,$xmax)=@_;
+   return $xmin+$i/400.*($xmax-$xmin);
+}
+ 
 sub functionplotrulecheck {
    my ($rule,$xmin,$xmax,$ymin,$ymax)=@_;
 
-#   &Apache::lonnet::logthis("Rule $rule $xmin $xmax $ymin $ymax");
-
-   my ($label,$derivative,$xinitial,$xinitiallabel,$xfinal,$xfinallabel,$relationship,$value,$percent)
+   my ($label,$derivative,$xinitial,$xinitiallabel,$xfinal,$xfinallabel,$minimumlength,$maximumlength,$relationship,$value,$percent)
       =split(/\:/,$rule);
    $percent=($percent>0?$percent:5);
-
+   &addlog("=================");
+   &addlog("Rule $label for ".('function itself','first derivative','second derivative')[$derivative]." $relationship $value");
    my $li=0;
    my $lh=400;
 
@@ -821,12 +863,14 @@
    }
 # if the label is defined, use it
    if (defined($Apache::functionplotresponse::functionplotrulelabels{$xinitiallabel})) {
+      &addlog("Using lower label $xinitiallabel");
       $li=$Apache::functionplotresponse::functionplotrulelabels{$xinitiallabel};
    } else {
       $li=&array_index($xmin,$xmax,$xinitial);
    }
    unless ($findupper) {
       if (defined($Apache::functionplotresponse::functionplotrulelabels{$xfinallabel})) {
+         &addlog("Using upper label $xfinallabel");
          $lh=$Apache::functionplotresponse::functionplotrulelabels{$xfinallabel}-1;
       } else {
          $lh=&array_index($xmin,$xmax,$xfinal);
@@ -839,7 +883,11 @@
        $lh=$li;
    }
 
-#   &Apache::lonnet::logthis("Init $xinitial=$li Final $xfinal=$lh Findupper: $findupper");
+   &addlog("Boundaries: x=".&actualval($li,$xmin,$xmax)." (".$Apache::functionplotresponse::actualxval[$li]."; index $li)) to x=".
+                            &actualval($lh,$xmin,$xmax)." (".$Apache::functionplotresponse::actualxval[$lh]."; index $lh))");
+   if ($findupper) {
+      &addlog("Looking for label $xfinallabel");
+   }
    my $tol=$percent*($ymax-$ymin)/100;
    if ($xmax>$xmin) {
       if ($derivative==2) {
@@ -858,16 +906,33 @@
            $val=$Apache::functionplotresponse::func[$i];
         }
         unless (&compare_rel($relationship,$value,$val,$tol)) { 
-#           &Apache::lonnet::logthis("Condition false $findupper at $i with $val tol:$tol from $value");
+           &addlog("Condition not fulfilled at x=".&actualval($i,$xmin,$xmax)." (".$Apache::functionplotresponse::actualxval[$i]."; index $i)");
+           &addlog("Actual value ".(defined($val)?$val:'undef').", expected $value, tolerance $tol");
            if (($findupper) && ($i>$li)) {
+# check for minimum and maximum lengths
+              my $length=&actualval($i,$xmin,$xmax)-&actualval($li,$xmin,$xmax);
+              if ($minimumlength) {
+                 if ($length<$minimumlength) {
+                    &addlog("Rule $label failed, actual length $length, minimum length $minimumlength");
+                    return 0;
+                 }
+              }
+              if ($maximumlength) {
+                 if ($length>$maximumlength) {
+                    &addlog("Rule $label failed, actual length $length, maximum length $maximumlength");
+                    return 0;
+                 }
+              }
               $Apache::functionplotresponse::functionplotrulelabels{$xfinallabel}=$i;
-#              &Apache::lonnet::logthis("Setting $xfinallabel to $i");
+              &addlog("Rule $label passed, setting label $xfinallabel");
               return 1;
            } else {
+              &addlog("Rule $label failed.");
               return 0; 
            }
         }
    }
+   &addlog("Rule $label passed.");
    return 1;
 }
 
@@ -907,11 +972,17 @@
 
         my $ad='';
         undef  %Apache::functionplotresponse::functionplotrulelabels;
+        $Apache::functionplotresponse::ruleslog='';
         $Apache::functionplotresponse::functionplotrulelabels{'start'}=400;
         $Apache::functionplotresponse::functionplotrulelabels{'end'}=0;
         if (&populate_arrays($internalid,$xmin,$xmax) eq 'no_func') {
            $ad='NOT_FUNCTION';
         } else {
+           &addlog("Start of function ".&actualval($Apache::functionplotresponse::functionplotrulelabels{'start'},$xmin,$xmax)." (index ".
+                                        $Apache::functionplotresponse::functionplotrulelabels{'start'}.")");
+           &addlog("End of function ".&actualval($Apache::functionplotresponse::functionplotrulelabels{'end'},$xmin,$xmax)." (index ".
+                                        $Apache::functionplotresponse::functionplotrulelabels{'end'}.")");
+
 # We have a function that we can actually grade, go through the spline rules.
            foreach my $rule (@Apache::functionplotresponse::functionplotrules) {
               unless (&functionplotrulecheck($rule,$xmin,$xmax,$ymin,$ymax)) {
Index: loncom/homework/templates/functionplotone.problem
diff -u loncom/homework/templates/functionplotone.problem:1.1 loncom/homework/templates/functionplotone.problem:1.2
--- loncom/homework/templates/functionplotone.problem:1.1	Thu Nov 11 03:53:33 2010
+++ loncom/homework/templates/functionplotone.problem	Fri Nov 12 02:16:24 2010
@@ -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>

Index: loncom/homework/templates/functionplottwo.problem
+++ loncom/homework/templates/functionplottwo.problem
<problem>
<script type="loncapa/perl">$x=&random(5,10,1);</script>
<startouttext />
Make a sketch of the electrostatic potential (zero at infinity) of a negative point charge located at x=$x m.
<endouttext />
<functionplotresponse xaxisvisible="yes" xlabel="x [m]" gridvisible="yes" ylabel="V(x) [V]" id="11" xmax="30" yaxisvisible="yes" xmin="-4" ymin="-10" ymax="10">
<spline initx="-2" inity="0" index="A" order="2" scalex="4" />
<spline index="B" order="2" initx="12" inity="0" scalex="4" />
<functionplotrule relationship="eq" value="undef" derivative="0" xinitial="$x" />
<functionplotrule relationship="lt" value="0" derivativeorder="0" xinitiallabel="start" xfinallabel="chargeleft" />
<functionplotrule relationship="lt" value="0" derivativeorder="1" xinitiallabel="start" xfinallabel="chargeleft" />
<functionplotrule relationship="le" value="0" derivativeorder="2" xinitiallabel="start" xfinallabel="chargeleft" />
<functionplotrule relationship="eq" xinitiallabel="chargeleft" xfinallabel="chargeright" value="undef" derivativeorder="0" />
<functionplotrule relationship="lt" value="0" derivativeorder="0" xinitiallabel="chargeright" xfinallabel="end" />
<functionplotrule relationship="gt" value="0" derivativeorder="1" xinitiallabel="chargeright" xfinallabel="end" />
<functionplotrule relationship="le" value="0" derivativeorder="2" xinitiallabel="chargeright" xfinallabel="end" />
</functionplotresponse>
</problem>

Index: loncom/homework/templates/functionplottwo.problem.meta
+++ loncom/homework/templates/functionplottwo.problem.meta
<title>Functionplotresponse with two Splines and Labels</title>
<category>Free Form Problems</category>

--www1289528185--