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

www www at source.lon-capa.org
Mon Nov 21 16:45:37 EST 2011


www		Mon Nov 21 21:45:37 2011 EDT

  Modified files:              
    /loncom/homework	functionplotresponse.pm 
    /loncom/xml	lonxml.pm 
  Log:
  Evaluate vector conditions with respect to each other
  
  
Index: loncom/homework/functionplotresponse.pm
diff -u loncom/homework/functionplotresponse.pm:1.83 loncom/homework/functionplotresponse.pm:1.84
--- loncom/homework/functionplotresponse.pm:1.83	Mon Nov 21 20:48:50 2011
+++ loncom/homework/functionplotresponse.pm	Mon Nov 21 21:45:32 2011
@@ -1,7 +1,7 @@
 # LearningOnline Network with CAPA
 # Functionplot responses
 #
-# $Id: functionplotresponse.pm,v 1.83 2011/11/21 20:48:50 www Exp $
+# $Id: functionplotresponse.pm,v 1.84 2011/11/21 21:45:32 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -837,11 +837,11 @@
              &Apache::edit::text_arg('Tip not attached to object:','nottippoint',
                                       $token,'16').'<br />'.
              &Apache::edit::text_arg('Length:','length',
-                                     $token,'16').
-             &Apache::edit::text_arg('Angle:','angle',
-                                     $token,'16').
+                                     $token,'30').
              &Apache::edit::text_arg('Absolute error length:','lengtherror',
-                                     $token,'8').
+                                     $token,'8').'<br />'.
+             &Apache::edit::text_arg('Angle:','angle',
+                                     $token,'30').
              &Apache::edit::text_arg('Absolute error angle:','angleerror',
                                      $token,'8').
              &Apache::edit::end_row();
@@ -912,12 +912,12 @@
              &Apache::edit::text_arg('Comma-separated list of vectors:','vectors',
                                       $token,'30').'<br />'.
              &Apache::edit::text_arg('Sum vector length:','length',
-                                     $token,'16').
+                                     $token,'30').
+             &Apache::edit::text_arg('Absolute error length:','lengtherror',
+                                     $token,'8').'<br />'.
              &Apache::edit::text_arg('Sum vector angle:','angle',
-                                     $token,'16').
-             &Apache::edit::text_arg('Error length:','lengtherror',
-                                     $token,'8').
-             &Apache::edit::text_arg('Error angle:','angleerror',
+                                     $token,'30').
+             &Apache::edit::text_arg('Absolute error angle:','angleerror',
                                      $token,'8').
              &Apache::edit::end_row();
   } elsif ($target eq 'modified') {
@@ -1356,6 +1356,43 @@
                                                                 $arg)];
 }
 
+sub fpr_vectorcoords {
+   my ($arg)=@_;
+   $arg=~s/\W//gs;
+   $arg=ucfirst($arg);
+   my $id=$Apache::inputtags::response[-1];
+   my $partid=$Apache::inputtags::part;
+   my $internalid = $partid.'_'.$id;
+   return ($env{'form.HWVAL_'.$internalid.'_'.$arg.'Start_x'},
+           $env{'form.HWVAL_'.$internalid.'_'.$arg.'End_x'},
+           $env{'form.HWVAL_'.$internalid.'_'.$arg.'Start_y'},
+           $env{'form.HWVAL_'.$internalid.'_'.$arg.'End_y'});
+}
+
+sub fpr_objectcoords {
+   my ($arg)=@_;
+   $arg=~s/\W//gs;
+   $arg=ucfirst($arg);
+   my $id=$Apache::inputtags::response[-1];
+   my $partid=$Apache::inputtags::part;
+   my $internalid = $partid.'_'.$id;
+   return ($env{'form.HWVAL_'.$internalid.'_'.$arg.'_x'},
+           $env{'form.HWVAL_'.$internalid.'_'.$arg.'_y'});
+}
+
+sub fpr_vectorlength {
+   my ($arg)=@_;
+   my ($xs,$xe,$ys,$ye)=&fpr_vectorcoords($arg);
+   return sqrt(($xe-$xs)*($xe-$xs)+($ye-$ys)*($ye-$ys));
+}
+
+sub fpr_vectorangle {
+   my ($arg)=@_;
+   my ($xs,$xe,$ys,$ye)=&fpr_vectorcoords($arg);
+   my $angle=57.2957795*atan2(($ye-$ys),($xe-$xs));
+   if ($angle<0) { $angle=360+$angle; }
+   return $angle;
+}
 
 sub vectorcoords {
    my ($id,$label)=@_;
Index: loncom/xml/lonxml.pm
diff -u loncom/xml/lonxml.pm:1.523 loncom/xml/lonxml.pm:1.524
--- loncom/xml/lonxml.pm:1.523	Mon Nov 14 00:20:42 2011
+++ loncom/xml/lonxml.pm	Mon Nov 21 21:45:36 2011
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # XML Parser Module 
 #
-# $Id: lonxml.pm,v 1.523 2011/11/14 00:20:42 raeburn Exp $
+# $Id: lonxml.pm,v 1.524 2011/11/21 21:45:36 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -792,6 +792,10 @@
   $safehole->wrap(\&Apache::functionplotresponse::fpr_f,$safeeval,'&fpr_f');
   $safehole->wrap(\&Apache::functionplotresponse::fpr_dfdx,$safeeval,'&fpr_dfdx');
   $safehole->wrap(\&Apache::functionplotresponse::fpr_d2fdx2,$safeeval,'&fpr_d2fdx2');
+  $safehole->wrap(\&Apache::functionplotresponse::fpr_vectorcoords,$safeeval,'&fpr_vectorcoords');
+  $safehole->wrap(\&Apache::functionplotresponse::fpr_objectcoords,$safeeval,'&fpr_objectcoords');
+  $safehole->wrap(\&Apache::functionplotresponse::fpr_vectorlength,$safeeval,'&fpr_vectorlength');
+  $safehole->wrap(\&Apache::functionplotresponse::fpr_vectorangle,$safeeval,'&fpr_vectorangle');
 
 #  use Data::Dumper;
 #  $safehole->wrap(\&Data::Dumper::Dumper,$safeeval,'&LONCAPA_INTERNAL_Dumper');




More information about the LON-CAPA-cvs mailing list