[LON-CAPA-cvs] cvs: loncom /homework edit.pm functionplotresponse.pm insertlist.xml

www www at source.lon-capa.org
Mon Nov 21 21:13:38 EST 2011


www		Tue Nov 22 02:13:38 2011 EDT

  Modified files:              
    /loncom/homework	edit.pm functionplotresponse.pm insertlist.xml 
  Log:
  Custom function plot rule
  
  
Index: loncom/homework/edit.pm
diff -u loncom/homework/edit.pm:1.137 loncom/homework/edit.pm:1.138
--- loncom/homework/edit.pm:1.137	Sat Nov 19 13:45:36 2011
+++ loncom/homework/edit.pm	Tue Nov 22 02:13:37 2011
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # edit mode helpers
 #
-# $Id: edit.pm,v 1.137 2011/11/19 13:45:36 www Exp $
+# $Id: edit.pm,v 1.138 2011/11/22 02:13:37 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -444,6 +444,20 @@
 <functionplotvectorsumrule />';
 }
 
+sub insert_functionplotcustomrule {
+    return '
+<functionplotcustomrule>
+<answer type="loncapa/perl">
+# &fpr_val("label"), &fpr_f($x), &fpr_dfdx($x), &fpr_d2fdx2($x)
+# ($xs,$xe,$ys,$ye)=&fpr_vectorcoords("Name"), ($x,$y)=&fpr_objectcoords("Name")
+# &fpr_vectorlength("Name"), &fpr_vectorangle("Name")
+ 
+# Return 0 or 1
+return 1;
+</answer>
+</functionplotcustomrule>';
+}
+
 sub insert_functionplotruleset {
     return '
 <functionplotruleset>
Index: loncom/homework/functionplotresponse.pm
diff -u loncom/homework/functionplotresponse.pm:1.84 loncom/homework/functionplotresponse.pm:1.85
--- loncom/homework/functionplotresponse.pm:1.84	Mon Nov 21 21:45:32 2011
+++ loncom/homework/functionplotresponse.pm	Tue Nov 22 02:13:37 2011
@@ -1,7 +1,7 @@
 # LearningOnline Network with CAPA
 # Functionplot responses
 #
-# $Id: functionplotresponse.pm,v 1.84 2011/11/21 21:45:32 www Exp $
+# $Id: functionplotresponse.pm,v 1.85 2011/11/22 02:13:37 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -32,10 +32,13 @@
 use Apache::lonlocal;
 use Apache::lonnet;
 use Apache::run;
+use LONCAPA;
  
 BEGIN {
   &Apache::lonxml::register('Apache::functionplotresponse',('functionplotresponse','backgroundplot','spline',
-                                                            'plotobject','plotvector','functionplotvectorrule','functionplotvectorsumrule',
+                                                            'plotobject','plotvector',
+                                                            'functionplotvectorrule','functionplotvectorsumrule',
+                                                            'functionplotcustomrule',
                                                             'functionplotrule','functionplotruleset',
                                                             'functionplotelements'));
 }
@@ -920,13 +923,12 @@
              &Apache::edit::text_arg('Absolute error angle:','angleerror',
                                      $token,'8').
              &Apache::edit::end_row();
-  } elsif ($target eq 'modified') {
-    $env{'form.'.&Apache::edit::html_element_name('object')}=ucfirst($env{'form.'.&Apache::edit::html_element_name('object')});
-    my $constructtag=&Apache::edit::get_new_args($token,$parstack,
-                                                 $safeeval,'index','vectors',
-                                                           'length','angle',
-                                                           ,'lengtherror','angleerror');
-    if ($constructtag) { $result=&Apache::edit::rebuild_tag($token); }
+   } elsif ($target eq 'modified') {
+      my $constructtag=&Apache::edit::get_new_args($token,$parstack,
+                                                   $safeeval,'index','vectors',
+                                                             'length','angle',
+                                                             'lengtherror','angleerror');
+      if ($constructtag) { $result=&Apache::edit::rebuild_tag($token); }
    }
    return $result;
 }
@@ -941,6 +943,65 @@
 }
 
 #
+# <functionplotcustom ... />
+#
+sub start_functionplotcustomrule {
+   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+   my $result='';
+   my $label=&Apache::lonxml::get_param('index',$parstack,$safeeval);
+   $Apache::functionplotresponse::counter++;
+   if ($label=~/\W/) {
+      &Apache::lonxml::warning(&mt('Rule indices should only contain alphanumeric characters.'));
+   }
+   $label=~s/\W//gs;
+   unless ($label) {
+      $label='R'.$Apache::functionplotresponse::counter;
+   } else {
+      $label='R'.$label;
+   }
+   &Apache::lonxml::register('Apache::response',('answer'));
+   if ($target eq 'edit') {
+        $result=&Apache::edit::tag_start($target,$token,'Function Plot Custom Rule').
+             &Apache::edit::text_arg('Index/Name:','index',$token,'10').
+             &Apache::edit::end_row();
+  } elsif ($target eq 'modified') {
+      my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,'index');
+      if ($constructtag) { $result=&Apache::edit::rebuild_tag($token); }
+   }
+   return $result;
+}
+
+sub end_functionplotcustomrule {
+   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+   my $result='';
+   if ($target eq 'edit') {
+      $result=&Apache::edit::end_table();
+   } elsif ($target eq 'grade') {
+# Simply remember - in order - for later
+      my $label=&Apache::lonxml::get_param('index',$parstack,$safeeval);
+      $Apache::functionplotresponse::counter++;
+      if ($label=~/\W/) {
+         &Apache::lonxml::warning(&mt('Rule indices should only contain alphanumeric characters.'));
+      }
+      $label=~s/\W//gs;
+      unless ($label) {
+         $label='R'.$Apache::functionplotresponse::counter;
+      } else {
+         $label='R'.$label;
+      }
+      push(@Apache::functionplotresponse::functionplotvectorrules,join(':',(
+           $label,
+           'custom',
+           &escape($Apache::response::custom_answer[-1])
+          )));
+   }
+   &Apache::lonxml::deregister('Apache::response',('answer'));
+   return $result;
+}
+
+
+
+#
 # <spline index="..." order="1,2,3,4" initx="..." inity="..." scalex="..." scaley="..." />
 #
 # Unfortunately, GeoGebra seems to want all splines after everything else, so we need to store them
@@ -1462,6 +1523,8 @@
       return &vectorcheck($rule,$xmin,$xmax,$ymin,$ymax,$safeeval);
    } elsif ($type eq 'sum') {
       return &sumcheck($rule,$xmin,$xmax,$ymin,$ymax,$safeeval);
+   } elsif ($type eq 'custom') {
+      return &customcheck($rule,$safeeval);
    }
 }
 
@@ -1597,6 +1660,20 @@
    return 1;
 }
 
+sub customcheck {
+   my ($rule,$safeeval)=@_;
+   my ($label,$type,$prg)=split(/\:/,$rule);
+   &addlog("Custom Rule ".$label);
+   my $result=&Apache::run::run(&unescape($prg),$safeeval);
+   &addlog("Algorithm returned $result");
+   unless ($result) {
+      &setfailed($label);
+      return 0;
+   }
+   &addlog("Rule $label passed.");
+   return 1;
+}
+
 #
 # Evaluate a functionplotrule
 #
Index: loncom/homework/insertlist.xml
diff -u loncom/homework/insertlist.xml:1.27 loncom/homework/insertlist.xml:1.28
--- loncom/homework/insertlist.xml:1.27	Sat Nov 19 13:45:36 2011
+++ loncom/homework/insertlist.xml	Tue Nov 22 02:13:37 2011
@@ -60,7 +60,7 @@
                 <description>Function Plot Rule Set</description>
                 <color>#99ff88</color>
                 <insert_sub>insert_functionplotruleset</insert_sub>
-                <allow>functionplotrule,functionplotvectorrule,functionplotvectorsumrule</allow>
+                <allow>functionplotrule,functionplotvectorrule,functionplotvectorsumrule,functionplotcustomrule</allow>
         <tag>
         <tag name="functionplotelements">
                 <description>Function Plot Elements</description>
@@ -95,6 +95,12 @@
                 <allow></allow>
         </tag>
 
+        <tag name="functionplotcustomrule">
+                <description>Function Plot Custom Rule</description>
+                <color>#99ff88</color>
+                <insert_sub>insert_functionplotcustomrule</insert_sub>
+                <allow></allow>
+        </tag>
 
 	<tag name="caparesponse::answergroup">
 		<description>Collection of Answers</description>




More information about the LON-CAPA-cvs mailing list